Skip to content

Commit 67bea4c

Browse files
jeremyaryjeremyary
authored
chore: Update CI-related AWS settings due to cred swap & global namespace issues (#4171)
* chore: Bumping CI to test new cloud creds, do not merge Signed-off-by: Jeremy Ary <jary@redhat.com> * chore: Update S3 CI bucket to avoid global namespace issues Signed-off-by: Jeremy Ary <jary@redhat.com> --------- Signed-off-by: Jeremy Ary <jary@redhat.com>
1 parent adc2939 commit 67bea4c

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ test-python-universal-athena:
172172
ATHENA_DATA_SOURCE=AwsDataCatalog \
173173
ATHENA_DATABASE=default \
174174
ATHENA_WORKGROUP=primary \
175-
ATHENA_S3_BUCKET_NAME=feast-integration-tests \
175+
ATHENA_S3_BUCKET_NAME=feast-int-bucket \
176176
python -m pytest -n 8 --integration \
177177
-k "not test_go_feature_server and \
178178
not test_logged_features_validation and \

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<img src="docs/assets/feast_logo.png" width="550">
66
</a>
77
</p>
8-
<br />
8+
<br />
99

1010
[![unit-tests](https://github.com/feast-dev/feast/actions/workflows/unit_tests.yml/badge.svg?branch=master&event=push)](https://github.com/feast-dev/feast/actions/workflows/unit_tests.yml)
1111
[![integration-tests-and-build](https://github.com/feast-dev/feast/actions/workflows/master_only.yml/badge.svg?branch=master&event=push)](https://github.com/feast-dev/feast/actions/workflows/master_only.yml)

‎docs/reference/offline-stores/redshift.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ The following inline policy can be used to grant Redshift necessary permissions
130130
"Action": "s3:*",
131131
"Effect": "Allow",
132132
"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/*"
135135
]
136136
}
137137
],

‎sdk/python/feast/infra/offline_stores/contrib/athena_offline_store/tests/data_source.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __init__(self, project_name: str, *args, **kwargs):
3131
data_source = os.getenv("ATHENA_DATA_SOURCE", "AwsDataCatalog")
3232
database = os.getenv("ATHENA_DATABASE", "default")
3333
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")
3535

3636
self.client = aws_utils.get_athena_data_client(region)
3737
self.s3 = aws_utils.get_s3_resource(region)

‎sdk/python/tests/integration/feature_repos/repo_configuration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ def construct_test_environment(
461461
test_repo_config.python_feature_server and test_repo_config.provider == "aws"
462462
) or test_repo_config.registry_location == RegistryLocation.S3:
463463
aws_registry_path = os.getenv(
464-
"AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"
464+
"AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"
465465
)
466466
registry: Union[str, RegistryConfig] = (
467467
f"{aws_registry_path}/{project}/registry.db"

‎sdk/python/tests/integration/feature_repos/universal/data_sources/redshift.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,17 @@ def __init__(self, project_name: str, *args, **kwargs):
3030
self.s3 = aws_utils.get_s3_resource(os.getenv("AWS_REGION", "us-west-2"))
3131

3232
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"),
3434
region=os.getenv("AWS_REGION", "us-west-2"),
3535
user=os.getenv("AWS_USER", "admin"),
3636
database=os.getenv("AWS_DB", "feast"),
3737
s3_staging_location=os.getenv(
3838
"AWS_STAGING_LOCATION",
39-
"s3://feast-integration-tests/redshift/tests/ingestion",
39+
"s3://feast-int-bucket/redshift/tests/ingestion",
4040
),
4141
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",
4344
),
4445
workgroup="",
4546
)

‎sdk/python/tests/integration/registration/test_feature_store.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def feature_store_with_gcs_registry():
226226
@pytest.fixture
227227
def feature_store_with_s3_registry():
228228
aws_registry_path = os.getenv(
229-
"AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"
229+
"AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"
230230
)
231231
return FeatureStore(
232232
config=RepoConfig(

‎sdk/python/tests/integration/registration/test_registry.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def gcs_registry() -> Registry:
5353
@pytest.fixture
5454
def s3_registry() -> Registry:
5555
aws_registry_path = os.getenv(
56-
"AWS_REGISTRY_PATH", "s3://feast-integration-tests/registries"
56+
"AWS_REGISTRY_PATH", "s3://feast-int-bucket/registries"
5757
)
5858
registry_config = RegistryConfig(
5959
path=f"{aws_registry_path}/{int(time.time() * 1000)}/registry.db",

‎sdk/python/tests/unit/infra/offline_stores/test_offline_store.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ def retrieval_job(request, environment):
112112
return FileRetrievalJob(lambda: 1, full_feature_names=False)
113113
elif request.param is RedshiftRetrievalJob:
114114
offline_store_config = RedshiftOfflineStoreConfig(
115-
cluster_id="feast-integration-tests",
115+
cluster_id="feast-int-bucket",
116116
region="us-west-2",
117117
user="admin",
118118
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",
121121
workgroup="",
122122
)
123123
environment.test_repo_config.offline_store = offline_store_config

0 commit comments

Comments
 (0)