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

backend/s3: Parity with the AWS provider configuration options #33765

Merged
merged 9 commits into from
Aug 30, 2023

Conversation

jar-b
Copy link
Member

@jar-b jar-b commented Aug 29, 2023

Adds the following arguments to the S3 backend for parity with the AWS Provider.

  • custom_ca_bundle
  • ec2_metadata_service_endpoint
  • ec2_metadata_service_endpoint_mode
  • http_proxy
  • insecure
  • use_fips_endpoint
  • use_dualstack_endpoint
  • sts_region
  • use_path_style (deprecates force_path_style)
  • retry_mode
% TF_ACC=1 go test -count=1 ./internal/backend/remote-state/s3/...
ok      github.com/hashicorp/terraform/internal/backend/remote-state/s3 103.942s

Closes #33689
Closes #30444
Closes #30496
Closes #33693
Closes #30491
Closes #33692
Relates #33687

Target Release

1.6.x

Draft CHANGELOG entry

UPGRADE NOTES

  • custom_ca_bundle argument and support for the corresponding AWS environment variable, AWS_CA_BUNDLE, for providing custom root and intermediate certificates. (#33689)
  • ec2_metadata_service_endpoint and ec2_metadata_service_endpoint_mode arguments and support for the corresponding AWS environment variables, AWS_EC2_METADATA_SERVICE_ENDPOINT and AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE for setting the EC2 metadata service (IMDS) endpoint. The environment variable AWS_METADATA_URL is also supported for compatibility with the AWS provider, but is deprecated. (#30444)
  • http_proxy, insecure, use_fips_endpoint, and use_dualstack_endpoint arguments and support for the corresponding environment variables, HTTP_PROXY and HTTPS_PROXY, which enable custom HTTP proxy configurations and the use of alternative AWS endpoints. (#30496)
  • sts_region argument to use an alternative region for STS operations. (#33693)
  • The force_path_style argument is deprecated in favor of use_path_style for consistency with the AWS SDK. (#30491)
  • retry_mode argument and support for the corresponding AWS_RETRY_MODE environment variable to configure how retries are attempted. (#33692)

Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

% TF_ACC=1 go test -count=1 ./internal/backend/remote-state/s3/...
ok  	github.com/hashicorp/terraform/internal/backend/remote-state/s3	108.948s

@jar-b
Copy link
Member Author

jar-b commented Aug 30, 2023

After additional validation functions:

% TF_ACC=1 go test -count=1 ./internal/backend/remote-state/s3/...
ok      github.com/hashicorp/terraform/internal/backend/remote-state/s3 110.781s

@jar-b jar-b merged commit 2e54c1f into main Aug 30, 2023
@jar-b jar-b deleted the s3/aws-provider-parity branch August 30, 2023 18:14
@github-actions
Copy link
Contributor

Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch.

Copy link
Contributor

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.