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.

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

fix: add forcePathStyle and enableAccelerate config properties back to the S3 client #1099

Merged
merged 2 commits into from
Nov 1, 2023

Conversation

aajtodd
Copy link
Contributor

@aajtodd aajtodd commented Nov 1, 2023

Issue #

fixes #1098

Description of changes

f6502eb erroneously removed the explicit configuration settings forcePathStyle and enableAccelerate from S3 client config. The intended change was to remove parsing these from CLI specific shared config.

This PR also fixes finalize config to respect the environment/system property settings for useArnRegion and disableMrap (matching Java v2 for the system properties).

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@aajtodd aajtodd requested a review from a team as a code owner November 1, 2023 14:58
@@ -37,10 +54,9 @@ class ClientConfigIntegration : KotlinIntegration {
""".trimIndent()
}

// FIXME: default signer doesn't yet implement sigv4a, default to mrap OFF until it does
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this still true?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We select auth scheme based on the model not on endpoint rules (yet) and we don't support sigv4a yet no matter what. Whether it's enabled or not isn't going to matter I don't think so I just changed it to the "correct" default.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still causes changes to how our endpoints are resolved. I think we should leave this disabled until we support MRAP in the default case.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not a hill worth dying on, reverting.

}

@Test
fun testConfigPropertiesPresent() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this testing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That these properties don't accidentally disappear again from codegen.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not immediately clear from the code. Can we leave a comment indicating why we have a test with no assertions?

Copy link

github-actions bot commented Nov 1, 2023

A new generated diff is ready to view.

@@ -37,10 +54,9 @@ class ClientConfigIntegration : KotlinIntegration {
""".trimIndent()
}

// FIXME: default signer doesn't yet implement sigv4a, default to mrap OFF until it does
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still causes changes to how our endpoints are resolved. I think we should leave this disabled until we support MRAP in the default case.

}

@Test
fun testConfigPropertiesPresent() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not immediately clear from the code. Can we leave a comment indicating why we have a test with no assertions?

Copy link

sonarqubecloud bot commented Nov 1, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

Copy link

github-actions bot commented Nov 1, 2023

A new generated diff is ready to view.

@aajtodd aajtodd merged commit 1ef81ff into main Nov 1, 2023
16 checks passed
@aajtodd aajtodd deleted the fix-s3-config branch November 1, 2023 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

forcedPathStyle was needed and removed
3 participants