Skip to content

Commit e0e2e15

Browse files
authored
Merge pull request #44459 from stefanfreitag/b-aws_instance-capacity-reservation
fix: fix interface conversion panic
2 parents c642733 + 23bf264 commit e0e2e15

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.changelog/44459.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_instance: Fix `interface conversion: interface {} is nil, not map[string]interface {}` panics when `capacity_reservation_target` is empty
3+
```

internal/service/ec2/ec2_instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3616,7 +3616,7 @@ func expandCapacityReservationSpecification(tfMap map[string]any) *awstypes.Capa
36163616
apiObject.CapacityReservationPreference = awstypes.CapacityReservationPreference(v)
36173617
}
36183618

3619-
if v, ok := tfMap["capacity_reservation_target"].([]any); ok && len(v) > 0 {
3619+
if v, ok := tfMap["capacity_reservation_target"].([]any); ok && len(v) > 0 && v[0] != nil {
36203620
apiObject.CapacityReservationTarget = expandCapacityReservationTarget(v[0].(map[string]any))
36213621
}
36223622

internal/service/ec2/ec2_instance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10048,7 +10048,7 @@ resource "aws_instance" "test" {
1004810048
resource "aws_ec2_capacity_reservation" "test" {
1004910049
instance_type = data.aws_ec2_instance_type_offering.available.instance_type
1005010050
instance_platform = %[2]q
10051-
availability_zone = data.aws_availability_zones.available.names[0]
10051+
availability_zone = data.aws_availability_zones.available.names[1]
1005210052
instance_count = 10
1005310053
1005410054
tags = {

0 commit comments

Comments
 (0)