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

b/aws_s3_bucket-object_lock-default-refactor #25098

Merged
merged 7 commits into from
Jul 25, 2022
Merged

b/aws_s3_bucket-object_lock-default-refactor #25098

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b37ec4d
Change default behavior of object_lock_enabled arg
May 28, 2022
00baa86
extra whitespace
May 28, 2022
400e697
Removed object_lock_enabled default from docs
May 29, 2022
9841eff
added changelog
May 29, 2022
9a5b130
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
YakDriver Jul 25, 2022
bf21f1a
s3: Fixes for object_lock
YakDriver Jul 25, 2022
3001218
s3/docs: Fix typo
YakDriver Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions internal/service/s3/bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,8 +714,7 @@ func resourceBucketCreate(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] S3 bucket create: %s", bucket)

req := &s3.CreateBucketInput{
Bucket: aws.String(bucket),
ObjectLockEnabledForBucket: aws.Bool(d.Get("object_lock_enabled").(bool)),
Bucket: aws.String(bucket),
}

if acl, ok := d.GetOk("acl"); ok {
Expand Down Expand Up @@ -743,6 +742,11 @@ func resourceBucketCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("error validating S3 Bucket (%s) name: %w", bucket, err)
}

// S3 Object Lock is not supported on all partitions.
if v, ok := d.GetOk("object_lock_enabled"); ok {
req.ObjectLockEnabledForBucket = aws.Bool(v.(bool))
}

// S3 Object Lock can only be enabled on bucket creation.
objectLockConfiguration := expandObjectLockConfiguration(d.Get("object_lock_configuration").([]interface{}))
if objectLockConfiguration != nil && aws.StringValue(objectLockConfiguration.ObjectLockEnabled) == s3.ObjectLockEnabledEnabled {
Expand Down Expand Up @@ -1282,7 +1286,7 @@ func resourceBucketRead(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("error setting object_lock_configuration: %w", err)
}
} else {
d.Set("object_lock_enabled", false)
d.Set("object_lock_enabled", nil)
d.Set("object_lock_configuration", nil)
}

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/s3_bucket.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ The following arguments are supported:
Use the resource [`aws_s3_bucket_lifecycle_configuration`](s3_bucket_lifecycle_configuration.html) instead.
* `logging` - (Optional, **Deprecated**) A configuration of [S3 bucket logging](https://docs.aws.amazon.com/AmazonS3/latest/UG/ManagingBucketLogging.html) parameters. See [Logging](#logging) below for details. Terraform will only perform drift detection if a configuration value is provided.
Use the resource [`aws_s3_bucket_logging`](s3_bucket_logging.html.markdown) instead.
* `object_lock_enabled` - (Optional, Default:`false`, Forces new resource) Indicates whether this bucket has an Object Lock configuration enabled. Valid values are `true` or `false`.
* `object_lock_enabled` - (Optional, Forces new resource) Indicates whether this bucket has an Object Lock configuration enabled. Valid values are `true` or `false`. This argument is not supported in all regions or partitions
* `object_lock_configuration` - (Optional, **Deprecated**) A configuration of [S3 object locking](https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html). See [Object Lock Configuration](#object-lock-configuration) below for details.
Terraform wil only perform drift detection if a configuration value is provided.
Use the `object_lock_enabled` parameter and the resource [`aws_s3_bucket_object_lock_configuration`](s3_bucket_object_lock_configuration.html.markdown) instead.
Expand Down