modified confusing environment variable names, added how to use Athena

younggyu-oh · younggyu-oh · commit 327289edb60b · 2022-08-10T03:05:46.000+09:00
Signed-off-by: Youngkyu OH &lt;toping4445@gmail.com&gt;
diff --git a/Makefile b/Makefile
@@ -139,13 +139,17 @@ test-python-universal-trino:
 			not test_universal_types" \
  	 sdk/python/tests
 
+#To use Athena as an offline store, you need to create an Athena database and an S3 bucket on AWS. https://docs.aws.amazon.com/athena/latest/ug/getting-started.html
+#Modify environment variables ATHENA_DATA_SOURCE, ATHENA_DATABASE, ATHENA_S3_BUCKET_NAME if you want to change the data source, database, and bucket name of S3 to use.
+#If tests fail with the pytest -n 8 option, change the number to 1.
 test-python-universal-athena:
 	PYTHONPATH='.' \
 	FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.offline_stores.contrib.athena_repo_configuration \
 	PYTEST_PLUGINS=feast.infra.offline_stores.contrib.athena_offline_store.tests \
  	FEAST_USAGE=False IS_TEST=True \
-	S3_DATABASE=sampledb \
-	S3_BUCKET_NAME=sagemaker-yelo-test \
+	ATHENA_DATA_SOURCE=AwsDataCatalog \
+	ATHENA_DATABASE=default \
+	ATHENA_S3_BUCKET_NAME=feast-integration-tests \
  	python -m pytest -n 8 --integration \
  	 	-k "not test_go_feature_server and \
 		    not test_logged_features_validation and \
diff --git a/sdk/python/feast/infra/offline_stores/contrib/athena_offline_store/tests/data_source.py b/sdk/python/feast/infra/offline_stores/contrib/athena_offline_store/tests/data_source.py
@@ -30,18 +30,18 @@ def __init__(self, project_name: str, *args, **kwargs):
         self.client = aws_utils.get_athena_data_client("ap-northeast-2")
         self.s3 = aws_utils.get_s3_resource("ap-northeast-2")
         data_source = (
-            os.environ.get("S3_DATA_SOURCE")
-            if os.environ.get("S3_DATA_SOURCE")
+            os.environ.get("ATHENA_DATA_SOURCE")
+            if os.environ.get("ATHENA_DATA_SOURCE")
             else "AwsDataCatalog"
         )
         database = (
-            os.environ.get("S3_DATABASE")
-            if os.environ.get("S3_DATABASE")
+            os.environ.get("ATHENA_DATABASE")
+            if os.environ.get("ATHENA_DATABASE")
             else "default"
         )
         bucket_name = (
-            os.environ.get("S3_BUCKET_NAME")
-            if os.environ.get("S3_BUCKET_NAME")
+            os.environ.get("ATHENA_S3_BUCKET_NAME")
+            if os.environ.get("ATHENA_S3_BUCKET_NAME")
             else "feast-integration-tests"
         )
         self.offline_store_config = AthenaOfflineStoreConfig(
