Skip to content

Commit

Permalink
backend/s3: allow skipping the region check (#16757)
Browse files Browse the repository at this point in the history
Without the possibility to skip this check, it’s not possible to use a custom region with a third-party service that mimicks the S3 API.
  • Loading branch information
Sander van Harmelen authored and apparentlymart committed Dec 5, 2017
1 parent 09a2da9 commit aaedf25
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
8 changes: 8 additions & 0 deletions backend/remote-state/s3/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ func New() backend.Backend {
Default: false,
},

"skip_region_validation": {
Type: schema.TypeBool,
Optional: true,
Description: "Skip static validation of region name.",
Default: false,
},

"skip_requesting_account_id": {
Type: schema.TypeBool,
Optional: true,
Expand Down Expand Up @@ -243,6 +250,7 @@ func (b *Backend) configure(ctx context.Context) error {
Token: data.Get("token").(string),
SkipCredsValidation: data.Get("skip_credentials_validation").(bool),
SkipGetEC2Platforms: data.Get("skip_get_ec2_platforms").(bool),
SkipRegionValidation: data.Get("skip_region_validation").(bool),
SkipRequestingAccountId: data.Get("skip_requesting_account_id").(bool),
SkipMetadataApiCheck: data.Get("skip_metadata_api_check").(bool),
}
Expand Down
3 changes: 2 additions & 1 deletion website/docs/backends/types/s3.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,11 @@ The following configuration options or environment variables are supported:
* `assume_role_policy` - (Optional) The permissions applied when assuming a role.
* `external_id` - (Optional) The external ID to use when assuming the role.
* `session_name` - (Optional) The session name to use when assuming the role.
* `workspace_key_prefix` - (Optional) The prefix applied to the state path
* `workspace_key_prefix` - (Optional) The prefix applied to the state path
inside the bucket. This is only relevant when using a non-default workspace.
This defaults to "env:"
* `skip_credentials_validation` - (Optional) Skip the credentials validation via the STS API.
* `skip_get_ec2_platforms` - (Optional) Skip getting the supported EC2 platforms.
* `skip_region_validation` - (Optional) Skip validation of provided region name.
* `skip_requesting_account_id` - (Optional) Skip requesting the account ID.
* `skip_metadata_api_check` - (Optional) Skip the AWS Metadata API check.

0 comments on commit aaedf25

Please sign in to comment.