From b1f7ad097a91b1080220368f0b26ce7d4029002e Mon Sep 17 00:00:00 2001 From: Yingwen Date: Thu, 27 Apr 2023 20:25:20 +0800 Subject: [PATCH] test: Fix s3 region in test (#1493) --- .env.example | 1 + src/storage/src/region/tests/compact.rs | 1 + tests-integration/src/test_util.rs | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/.env.example b/.env.example index 2f842b2f76..4abec140f6 100644 --- a/.env.example +++ b/.env.example @@ -3,6 +3,7 @@ GT_S3_BUCKET=S3 bucket GT_S3_ACCESS_KEY_ID=S3 access key id GT_S3_ACCESS_KEY=S3 secret access key GT_S3_ENDPOINT_URL=S3 endpoint url +GT_S3_REGION=S3 region # Settings for oss test GT_OSS_BUCKET=OSS bucket GT_OSS_ACCESS_KEY_ID=OSS access key id diff --git a/src/storage/src/region/tests/compact.rs b/src/storage/src/region/tests/compact.rs index 22ab357e38..b6e5c7c7d8 100644 --- a/src/storage/src/region/tests/compact.rs +++ b/src/storage/src/region/tests/compact.rs @@ -51,6 +51,7 @@ fn new_object_store(store_dir: &str, s3_bucket: Option) -> ObjectStore { .root(&root) .access_key_id(&env::var("GT_S3_ACCESS_KEY_ID").unwrap()) .secret_access_key(&env::var("GT_S3_ACCESS_KEY").unwrap()) + .region(&env::var("GT_S3_REGION").unwrap()) .bucket(&bucket); return ObjectStore::new(builder).unwrap().finish(); diff --git a/tests-integration/src/test_util.rs b/tests-integration/src/test_util.rs index 78babbf34d..971480a8ed 100644 --- a/tests-integration/src/test_util.rs +++ b/tests-integration/src/test_util.rs @@ -151,6 +151,13 @@ fn get_test_store_config( .secret_access_key(&s3_config.secret_access_key) .bucket(&s3_config.bucket); + if s3_config.endpoint.is_some() { + builder.endpoint(s3_config.endpoint.as_ref().unwrap()); + } + if s3_config.region.is_some() { + builder.region(s3_config.region.as_ref().unwrap()); + } + let config = ObjectStoreConfig::S3(s3_config); let store = ObjectStore::new(builder).unwrap().finish();