GeezerVison is showing github.com — chore: Update S3 CI bucket to avoid global namespace issues · feast-dev/feast@ae7759d
File treeExpand file treeCollapse file tree Open diff view settings docs/reference/offline-stores feast/infra/offline_stores/contrib/athena_offline_store/tests unit/infra/offline_stores
Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: Makefile +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -172,7 +172,7 @@ test-python-universal-athena: | 172 | 172 | ATHENA_DATA_SOURCE=AwsDataCatalog \ | 173 | 173 | ATHENA_DATABASE=default \ | 174 | 174 | ATHENA_WORKGROUP=primary \ | 175 | | - ATHENA_S3_BUCKET_NAME=feast-integration-tests \ | | 175 | + ATHENA_S3_BUCKET_NAME=feast-int-bucket \ | 176 | 176 | python -m pytest -n 8 --integration \ | 177 | 177 | -k "not test_go_feature_server and \ | 178 | 178 | not test_logged_features_validation and \ | |
Collapse file Copy file name to clipboardExpand all lines: docs/reference/offline-stores/redshift.md +2-2Lines changed: 2 additions & 2 deletions - Display the source diff
- Display the rich diff
| 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 | ], | |
Collapse file Copy file name to clipboardExpand all lines: sdk/python/feast/infra/offline_stores/contrib/athena_offline_store/tests/data_source.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -31,7 +31,7 @@ def __init__(self, project_name: str, *args, **kwargs): | 31 | 31 | data_source = os.getenv("ATHENA_DATA_SOURCE", "AwsDataCatalog") | 32 | 32 | database = os.getenv("ATHENA_DATABASE", "default") | 33 | 33 | workgroup = os.getenv("ATHENA_WORKGROUP", "primary") | 34 | | - bucket_name = os.getenv("ATHENA_S3_BUCKET_NAME", "feast-integration-tests") | | 34 | + bucket_name = os.getenv("ATHENA_S3_BUCKET_NAME", "feast-int-bucket") | 35 | 35 |
| 36 | 36 | self.client = aws_utils.get_athena_data_client(region) | 37 | 37 | self.s3 = aws_utils.get_s3_resource(region) | |
Collapse file Copy file name to clipboardExpand all lines: sdk/python/tests/integration/feature_repos/repo_configuration.py +1-1Lines changed: 1 addition & 1 deletion | 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" | |
Collapse file Copy file name to clipboardExpand all lines: sdk/python/tests/integration/feature_repos/universal/data_sources/redshift.py +4-3Lines changed: 4 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -30,16 +30,17 @@ def __init__(self, project_name: str, *args, **kwargs): | 30 | 30 | self.s3 = aws_utils.get_s3_resource(os.getenv("AWS_REGION", "us-west-2")) | 31 | 31 |
| 32 | 32 | self.offline_store_config = RedshiftOfflineStoreConfig( | 33 | | - cluster_id=os.getenv("AWS_CLUSTER_ID", "feast-integration-tests"), | | 33 | + cluster_id=os.getenv("AWS_CLUSTER_ID", "feast-int-bucket"), | 34 | 34 | region=os.getenv("AWS_REGION", "us-west-2"), | 35 | 35 | user=os.getenv("AWS_USER", "admin"), | 36 | 36 | database=os.getenv("AWS_DB", "feast"), | 37 | 37 | s3_staging_location=os.getenv( | 38 | 38 | "AWS_STAGING_LOCATION", | 39 | | - "s3://feast-integration-tests/redshift/tests/ingestion", | | 39 | + "s3://feast-int-bucket/redshift/tests/ingestion", | 40 | 40 | ), | 41 | 41 | iam_role=os.getenv( | 42 | | - "AWS_IAM_ROLE", "arn:aws:iam::402087665549:role/redshift_s3_access_role" | | 42 | + "AWS_IAM_ROLE", | | 43 | + "arn:aws:iam::585132637328:role/service-role/AmazonRedshift-CommandsAccessRole-20240403T092631", | 43 | 44 | ), | 44 | 45 | workgroup="", | 45 | 46 | ) | |
Collapse file Copy file name to clipboardExpand all lines: sdk/python/tests/integration/registration/test_feature_store.py +1-1Lines changed: 1 addition & 1 deletion | 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( | |
Collapse file Copy file name to clipboardExpand all lines: sdk/python/tests/integration/registration/test_registry.py +1-1Lines changed: 1 addition & 1 deletion | 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", | |
Collapse file Copy file name to clipboardExpand all lines: sdk/python/tests/unit/infra/offline_stores/test_offline_store.py +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -112,12 +112,12 @@ def retrieval_job(request, environment): | 112 | 112 | return FileRetrievalJob(lambda: 1, full_feature_names=False) | 113 | 113 | elif request.param is RedshiftRetrievalJob: | 114 | 114 | offline_store_config = RedshiftOfflineStoreConfig( | 115 | | - cluster_id="feast-integration-tests", | | 115 | + cluster_id="feast-int-bucket", | 116 | 116 | region="us-west-2", | 117 | 117 | user="admin", | 118 | 118 | database="feast", | 119 | | - s3_staging_location="s3://feast-integration-tests/redshift/tests/ingestion", | 120 | | - iam_role="arn:aws:iam::402087665549:role/redshift_s3_access_role", | | 119 | + s3_staging_location="s3://feast-int-bucket/redshift/tests/ingestion", | | 120 | + iam_role="arn:aws:iam::585132637328:role/service-role/AmazonRedshift-CommandsAccessRole-20240403T092631", | 121 | 121 | workgroup="", | 122 | 122 | ) | 123 | 123 | environment.test_repo_config.offline_store = offline_store_config | |
|