Skip to content

Commit 09d05fb

Browse files
committed
s3: rename blocked_encryption_types_list to blocked_encryption_types
Removes the '_list' suffix from the attribute name to follow Terraform's convention of using plural names for list attributes without the suffix.
1 parent 0bbd430 commit 09d05fb

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

internal/service/s3/bucket_server_side_encryption_configuration.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func resourceBucketServerSideEncryptionConfiguration() *schema.Resource {
7474
},
7575
},
7676
},
77-
"blocked_encryption_types_list": {
77+
"blocked_encryption_types": {
7878
Type: schema.TypeList,
7979
Optional: true,
8080
Elem: &schema.Schema{
@@ -302,7 +302,7 @@ func expandServerSideEncryptionRules(l []any) []types.ServerSideEncryptionRule {
302302
rule.ApplyServerSideEncryptionByDefault = expandServerSideEncryptionByDefault(v)
303303
}
304304

305-
if v, ok := tfMap["blocked_encryption_types_list"].([]any); ok && len(v) > 0 {
305+
if v, ok := tfMap["blocked_encryption_types"].([]any); ok && len(v) > 0 {
306306
rule.BlockedEncryptionTypes = expandBlockedEncryptionTypes(v)
307307
}
308308

@@ -327,7 +327,7 @@ func flattenServerSideEncryptionRules(rules []types.ServerSideEncryptionRule) []
327327
}
328328

329329
if rule.BlockedEncryptionTypes != nil {
330-
m["blocked_encryption_types_list"] = flattenBlockedEncryptionTypes(rule.BlockedEncryptionTypes)
330+
m["blocked_encryption_types"] = flattenBlockedEncryptionTypes(rule.BlockedEncryptionTypes)
331331
}
332332

333333
if rule.BucketKeyEnabled != nil {

internal/service/s3/bucket_server_side_encryption_configuration_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func TestAccS3BucketServerSideEncryptionConfiguration_blockedEncryptionTypesList
6969
Check: resource.ComposeAggregateTestCheckFunc(
7070
testAccCheckBucketServerSideEncryptionConfigurationExists(ctx, resourceName),
7171
resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"),
72-
resource.TestCheckResourceAttr(resourceName, "rule.0.blocked_encryption_types_list.#", "1"),
73-
resource.TestCheckResourceAttr(resourceName, "rule.0.blocked_encryption_types_list.0", "SSE-C"),
72+
resource.TestCheckResourceAttr(resourceName, "rule.0.blocked_encryption_types.#", "1"),
73+
resource.TestCheckResourceAttr(resourceName, "rule.0.blocked_encryption_types.0", "SSE-C"),
7474
),
7575
},
7676
{
@@ -86,8 +86,8 @@ func TestAccS3BucketServerSideEncryptionConfiguration_blockedEncryptionTypesList
8686
Check: resource.ComposeAggregateTestCheckFunc(
8787
testAccCheckBucketServerSideEncryptionConfigurationExists(ctx, resourceName),
8888
resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"),
89-
resource.TestCheckResourceAttr(resourceName, "rule.0.blocked_encryption_types_list.#", "1"),
90-
resource.TestCheckResourceAttr(resourceName, "rule.0.blocked_encryption_types_list.0", "NONE"),
89+
resource.TestCheckResourceAttr(resourceName, "rule.0.blocked_encryption_types.#", "1"),
90+
resource.TestCheckResourceAttr(resourceName, "rule.0.blocked_encryption_types.0", "NONE"),
9191
),
9292
},
9393
},
@@ -694,8 +694,8 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "test" {
694694
kms_master_key_id = aws_kms_key.test.id
695695
sse_algorithm = "aws:kms"
696696
}
697-
bucket_key_enabled = true
698-
blocked_encryption_types_list = %[2]s
697+
bucket_key_enabled = true
698+
blocked_encryption_types = %[2]s
699699
}
700700
}
701701
`, rName, blockedTypes)

website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "example" {
5656
kms_master_key_id = aws_kms_key.mykey.arn
5757
sse_algorithm = "aws:kms"
5858
}
59-
bucket_key_enabled = true
60-
blocked_encryption_types_list = ["SSE-C"]
59+
bucket_key_enabled = true
60+
blocked_encryption_types = ["SSE-C"]
6161
}
6262
}
6363
```
@@ -76,7 +76,7 @@ This resource supports the following arguments:
7676
The `rule` configuration block supports the following arguments:
7777

7878
* `apply_server_side_encryption_by_default` - (Optional) Single object for setting server-side encryption by default. [See below](#apply_server_side_encryption_by_default).
79-
* `blocked_encryption_types_list` - (Optional) List of server-side encryption types to block for object uploads. Valid values are `SSE-C` (blocks uploads using server-side encryption with customer-provided keys) and `NONE` (unblocks all encryption types). Starting in March 2026, Amazon S3 will automatically block SSE-C uploads for all new buckets.
79+
* `blocked_encryption_types` - (Optional) List of server-side encryption types to block for object uploads. Valid values are `SSE-C` (blocks uploads using server-side encryption with customer-provided keys) and `NONE` (unblocks all encryption types). Starting in March 2026, Amazon S3 will automatically block SSE-C uploads for all new buckets.
8080
* `bucket_key_enabled` - (Optional) Whether or not to use [Amazon S3 Bucket Keys](https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-key.html) for SSE-KMS.
8181

8282
### apply_server_side_encryption_by_default

0 commit comments

Comments
 (0)