Skip to content

Commit fe97ba9

Browse files
committed
r/aws_ec2_transit_gateway: fix crash setting encryption_support
Fixes a regression introduced in `v6.25.0` of the Terraform AWS provider. ```console % make testacc TESTARGS='-run=TestAccTransitGateway_serial/Gateway_\(basic\|encryptionSupport\)' PKG=ec2 make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 b-transitgateway-crash 🌿... TF_ACC=1 go1.24.11 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run=TestAccTransitGateway_serial/Gateway_\(basic\|encryptionSupport\) -timeout 360m -vet=off 2025/12/05 14:44:31 Creating Terraform AWS Provider (SDKv2-style)... 2025/12/05 14:44:31 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccTransitGateway_serial (0.00s) --- PASS: TestAccTransitGateway_serial/Gateway_basic (191.96s) --- PASS: TestAccTransitGateway_serial/Gateway_encryptionSupportWhenCreated (191.97s) --- PASS: TestAccTransitGateway_serial/Gateway_encryptionSupportWhenUpdated (200.48s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ec2 207.173s ```
1 parent 724f799 commit fe97ba9

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.changelog/45462.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_ec2_transit_gateway: Fix potential crash when setting `encryption_support`. This addresses a regression introduced in [v6.25.0](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md#6250-december-4-2025).
3+
```

internal/service/ec2/transitgateway_.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,18 @@ func resourceTransitGatewayRead(ctx context.Context, d *schema.ResourceData, met
235235
d.Set("default_route_table_propagation", transitGateway.Options.DefaultRouteTablePropagation)
236236
d.Set(names.AttrDescription, transitGateway.Description)
237237
d.Set("dns_support", transitGateway.Options.DnsSupport)
238-
var encryptionSupport string
239-
encryptionState := transitGateway.Options.EncryptionSupport.EncryptionState
240-
if encryptionState == awstypes.EncryptionStateValueEnabled || encryptionState == awstypes.EncryptionStateValueEnabling {
241-
encryptionSupport = string(awstypes.EncryptionSupportOptionValueEnable)
242-
} else {
243-
encryptionSupport = string(awstypes.EncryptionSupportOptionValueDisable)
238+
239+
if transitGateway.Options.EncryptionSupport != nil {
240+
var encryptionSupport string
241+
encryptionState := transitGateway.Options.EncryptionSupport.EncryptionState
242+
if encryptionState == awstypes.EncryptionStateValueEnabled || encryptionState == awstypes.EncryptionStateValueEnabling {
243+
encryptionSupport = string(awstypes.EncryptionSupportOptionValueEnable)
244+
} else {
245+
encryptionSupport = string(awstypes.EncryptionSupportOptionValueDisable)
246+
}
247+
d.Set("encryption_support", encryptionSupport)
244248
}
245-
d.Set("encryption_support", encryptionSupport)
249+
246250
d.Set("multicast_support", transitGateway.Options.MulticastSupport)
247251
d.Set(names.AttrOwnerID, transitGateway.OwnerId)
248252
d.Set("propagation_default_route_table_id", transitGateway.Options.PropagationDefaultRouteTableId)

0 commit comments

Comments
 (0)