chore: Update S3 CI bucket to avoid global namespace issues

jeremyary · jeremyary · commit 2d28af7596da · 2024-05-03T10:40:06.000-05:00
Signed-off-by: Jeremy Ary &lt;jary@redhat.com&gt;
diff --git a/Makefile b/Makefile
@@ -172,7 +172,7 @@ test-python-universal-athena:
 	ATHENA_DATA_SOURCE=AwsDataCatalog \
 	ATHENA_DATABASE=default \
 	ATHENA_WORKGROUP=primary \
-	ATHENA_S3_BUCKET_NAME=feast-integration-tests \
+	ATHENA_S3_BUCKET_NAME=feast-int-bucket \
  	python -m pytest -n 8 --integration \
  	 	-k "not test_go_feature_server and \
 		    not test_logged_features_validation and \
diff --git a/docs/reference/offline-stores/redshift.md b/docs/reference/offline-stores/redshift.md
@@ -130,8 +130,8 @@ The following inline policy can be used to grant Redshift necessary permissions
             "Action": "s3:*",
             "Effect": "Allow",
             "Resource": [
-                "arn:aws:s3:::feast-integration-tests",
-                "arn:aws:s3:::feast-integration-tests/*"
+                "arn:aws:s3:::feast-int-bucket",
+                "arn:aws:s3:::feast-int-bucket/*"
             ]
         }
     ],
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
@@ -31,7 +31,7 @@ def __init__(self, project_name: str, *args, **kwargs):
         data_source = os.getenv("ATHENA_DATA_SOURCE", "AwsDataCatalog")
         database = os.getenv("ATHENA_DATABASE", "default")
         workgroup = os.getenv("ATHENA_WORKGROUP", "primary")
-        bucket_name = os.getenv("ATHENA_S3_BUCKET_NAME", "feast-integration-tests")
+        bucket_name = os.getenv("ATHENA_S3_BUCKET_NAME", "feast-int-bucket")
 
         self.client = aws_utils.get_athena_data_client(region)
         self.s3 = aws_utils.get_s3_resource(region)
diff --git a/sdk/python/tests/integration/feature_repos/repo_configuration.py b/sdk/python/tests/integration/feature_repos/repo_configuration.py
@@ -461,7 +461,7 @@ def construct_test_environment(
         test_repo_config.python_feature_server and test_repo_config.provider == "aws"
     ) or test_repo_config.registry_location == RegistryLocation.S3:
         aws_registry_path = os.getenv(
-            "AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"
+            "AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"
         )
         registry: Union[str, RegistryConfig] = (
             f"{aws_registry_path}/{project}/registry.db"
diff --git a/sdk/python/tests/integration/feature_repos/universal/data_sources/redshift.py b/sdk/python/tests/integration/feature_repos/universal/data_sources/redshift.py
@@ -30,13 +30,13 @@ def __init__(self, project_name: str, *args, **kwargs):
         self.s3 = aws_utils.get_s3_resource(os.getenv("AWS_REGION", "us-west-2"))
 
         self.offline_store_config = RedshiftOfflineStoreConfig(
-            cluster_id=os.getenv("AWS_CLUSTER_ID", "feast-integration-tests"),
+            cluster_id=os.getenv("AWS_CLUSTER_ID", "feast-int-bucket"),
             region=os.getenv("AWS_REGION", "us-west-2"),
             user=os.getenv("AWS_USER", "admin"),
             database=os.getenv("AWS_DB", "feast"),
             s3_staging_location=os.getenv(
                 "AWS_STAGING_LOCATION",
-                "s3://feast-integration-tests/redshift/tests/ingestion",
+                "s3://feast-int-bucket/redshift/tests/ingestion",
             ),
             iam_role=os.getenv(
                 "AWS_IAM_ROLE", "arn:aws:iam::402087665549:role/redshift_s3_access_role"
diff --git a/sdk/python/tests/integration/registration/test_feature_store.py b/sdk/python/tests/integration/registration/test_feature_store.py
@@ -226,7 +226,7 @@ def feature_store_with_gcs_registry():
 @pytest.fixture
 def feature_store_with_s3_registry():
     aws_registry_path = os.getenv(
-        "AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"
+        "AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"
     )
     return FeatureStore(
         config=RepoConfig(
diff --git a/sdk/python/tests/integration/registration/test_registry.py b/sdk/python/tests/integration/registration/test_registry.py
@@ -53,7 +53,7 @@ def gcs_registry() -> Registry:
 @pytest.fixture
 def s3_registry() -> Registry:
     aws_registry_path = os.getenv(
-        "AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"
+        "AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"
     )
     registry_config = RegistryConfig(
         path=f"{aws_registry_path}/{int(time.time() * 1000)}/registry.db",
diff --git a/sdk/python/tests/unit/infra/offline_stores/test_offline_store.py b/sdk/python/tests/unit/infra/offline_stores/test_offline_store.py
@@ -112,11 +112,11 @@ def retrieval_job(request, environment):
         return FileRetrievalJob(lambda: 1, full_feature_names=False)
     elif request.param is RedshiftRetrievalJob:
         offline_store_config = RedshiftOfflineStoreConfig(
-            cluster_id="feast-integration-tests",
+            cluster_id="feast-int-bucket",
             region="us-west-2",
             user="admin",
             database="feast",
-            s3_staging_location="s3://feast-integration-tests/redshift/tests/ingestion",
+            s3_staging_location="s3://feast-int-bucket/redshift/tests/ingestion",
             iam_role="arn:aws:iam::402087665549:role/redshift_s3_access_role",
             workgroup="",
         )

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,8 @@ The following inline policy can be used to grant Redshift necessary permissions`
`130`	`130`	`"Action": "s3:*",`
`131`	`131`	`"Effect": "Allow",`
`132`	`132`	`"Resource": [`
`133`		`- "arn:aws:s3:::feast-integration-tests",`
`134`		`- "arn:aws:s3:::feast-integration-tests/*"`
	`133`	`+ "arn:aws:s3:::feast-int-bucket",`
	`134`	`+ "arn:aws:s3:::feast-int-bucket/*"`
`135`	`135`	`]`
`136`	`136`	`}`
`137`	`137`	`],`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ def construct_test_environment(`
`461`	`461`	`test_repo_config.python_feature_server and test_repo_config.provider == "aws"`
`462`	`462`	`) or test_repo_config.registry_location == RegistryLocation.S3:`
`463`	`463`	`aws_registry_path = os.getenv(`
`464`		`- "AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"`
	`464`	`+ "AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"`
`465`	`465`	`)`
`466`	`466`	`registry: Union[str, RegistryConfig] = (`
`467`	`467`	`f"{aws_registry_path}/{project}/registry.db"`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ def feature_store_with_gcs_registry():`
`226`	`226`	`@pytest.fixture`
`227`	`227`	`def feature_store_with_s3_registry():`
`228`	`228`	`aws_registry_path = os.getenv(`
`229`		`- "AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"`
	`229`	`+ "AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"`
`230`	`230`	`)`
`231`	`231`	`return FeatureStore(`
`232`	`232`	`config=RepoConfig(`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ def gcs_registry() -> Registry:`
`53`	`53`	`@pytest.fixture`
`54`	`54`	`def s3_registry() -> Registry:`
`55`	`55`	`aws_registry_path = os.getenv(`
`56`		`- "AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"`
	`56`	`+ "AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"`
`57`	`57`	`)`
`58`	`58`	`registry_config = RegistryConfig(`
`59`	`59`	`path=f"{aws_registry_path}/{int(time.time() * 1000)}/registry.db",`