Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update environment variable name for amazonS3builder in integration (#2550) #2553

Merged
merged 2 commits into from
Aug 23, 2022
Merged

Update environment variable name for amazonS3builder in integration (#2550) #2553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7558d4
update variable name for amazonS3builder in integration (#2550)
amrltqt Aug 22, 2022
81ad026
apply env at step level (#2550)
amrltqt Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/object_store.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ jobs:
RUST_BACKTRACE: "1"
# Run integration tests
TEST_INTEGRATION: 1
AWS_DEFAULT_REGION: "us-east-1"
AWS_ACCESS_KEY_ID: test
AWS_SECRET_ACCESS_KEY: test
AWS_ENDPOINT: http://localstack:4566
EC2_METADATA_ENDPOINT: http://ec2-metadata:1338
AZURE_USE_EMULATOR: "1"
AZURITE_BLOB_STORAGE_URL: "http://azurite:10000"
Expand All @@ -101,6 +97,11 @@ jobs:
echo '{"gcs_base_url": "https://fake-gcs:4443", "disable_oauth": true, "client_email": "", "private_key": ""}' > "$GOOGLE_SERVICE_ACCOUNT"

- name: Setup LocalStack (AWS emulation)
env:
AWS_DEFAULT_REGION: "us-east-1"
AWS_ACCESS_KEY_ID: test
AWS_SECRET_ACCESS_KEY: test
AWS_ENDPOINT: http://localstack:4566
run: |
cd /tmp
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
Expand All @@ -121,6 +122,11 @@ jobs:
rustup default stable

- name: Run object_store tests
env:
OBJECT_STORE_AWS_DEFAULT_REGION: "us-east-1"
OBJECT_STORE_AWS_ACCESS_KEY_ID: test
OBJECT_STORE_AWS_SECRET_ACCESS_KEY: test
OBJECT_STORE_AWS_ENDPOINT: http://localstack:4566
run: |
# run tests
cargo test -p object_store --features=aws,azure,azure_test,gcp
33 changes: 18 additions & 15 deletions object_store/src/aws/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,10 +547,10 @@ mod tests {
dotenv::dotenv().ok();

let required_vars = [
"AWS_DEFAULT_REGION",
"OBJECT_STORE_AWS_DEFAULT_REGION",
"OBJECT_STORE_BUCKET",
"AWS_ACCESS_KEY_ID",
"AWS_SECRET_ACCESS_KEY",
"OBJECT_STORE_AWS_ACCESS_KEY_ID",
"OBJECT_STORE_AWS_SECRET_ACCESS_KEY",
];
let unset_vars: Vec<_> = required_vars
.iter()
Expand Down Expand Up @@ -582,30 +582,33 @@ mod tests {
} else {
let config = AmazonS3Builder::new()
.with_access_key_id(
env::var("AWS_ACCESS_KEY_ID")
.expect("already checked AWS_ACCESS_KEY_ID"),
env::var("OBJECT_STORE_AWS_ACCESS_KEY_ID")
.expect("already checked OBJECT_STORE_AWS_ACCESS_KEY_ID"),
)
.with_secret_access_key(
env::var("AWS_SECRET_ACCESS_KEY")
.expect("already checked AWS_SECRET_ACCESS_KEY"),
env::var("OBJECT_STORE_AWS_SECRET_ACCESS_KEY")
.expect("already checked OBJECT_STORE_AWS_SECRET_ACCESS_KEY"),
)
.with_region(
env::var("AWS_DEFAULT_REGION")
.expect("already checked AWS_DEFAULT_REGION"),
env::var("OBJECT_STORE_AWS_DEFAULT_REGION")
.expect("already checked OBJECT_STORE_AWS_DEFAULT_REGION"),
)
.with_bucket_name(
env::var("OBJECT_STORE_BUCKET")
.expect("already checked OBJECT_STORE_BUCKET"),
)
.with_allow_http(true);

let config = if let Some(endpoint) = env::var("AWS_ENDPOINT").ok() {
config.with_endpoint(endpoint)
} else {
config
};
let config =
if let Some(endpoint) = env::var("OBJECT_STORE_AWS_ENDPOINT").ok() {
config.with_endpoint(endpoint)
} else {
config
};

let config = if let Some(token) = env::var("AWS_SESSION_TOKEN").ok() {
let config = if let Some(token) =
env::var("OBJECT_STORE_AWS_SESSION_TOKEN").ok()
{
config.with_token(token)
} else {
config
Expand Down