From 6d004fe13d0f91c138883c2428c53eb34517421c Mon Sep 17 00:00:00 2001 From: Dheeraj Kumar Date: Fri, 26 Apr 2024 14:10:48 +0530 Subject: [PATCH 1/3] Fix bug in aws_ec2_capacity_reservation causing failure if removed outside terraform --- internal/service/ec2/errors.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ec2/errors.go b/internal/service/ec2/errors.go index f416593dea3..7f04be3ced7 100644 --- a/internal/service/ec2/errors.go +++ b/internal/service/ec2/errors.go @@ -31,7 +31,7 @@ const ( errCodeInvalidAllocationIDNotFound = "InvalidAllocationID.NotFound" errCodeInvalidAssociationIDNotFound = "InvalidAssociationID.NotFound" errCodeInvalidAttachmentIDNotFound = "InvalidAttachmentID.NotFound" - errCodeInvalidCapacityReservationIdNotFound = "InvalidCapacityReservationId.NotFound'" + errCodeInvalidCapacityReservationIdNotFound = "InvalidCapacityReservationId.NotFound" errCodeInvalidCarrierGatewayIDNotFound = "InvalidCarrierGatewayID.NotFound" errCodeInvalidClientVPNActiveAssociationNotFound = "InvalidClientVpnActiveAssociationNotFound" errCodeInvalidClientVPNAssociationIdNotFound = "InvalidClientVpnAssociationIdNotFound" From 031f8be609af0ecb9a73cd6627f482a077e2c78b Mon Sep 17 00:00:00 2001 From: Dheeraj Kumar Date: Fri, 26 Apr 2024 20:56:14 +0530 Subject: [PATCH 2/3] Add changelog --- .changelog/37127.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/37127.txt diff --git a/.changelog/37127.txt b/.changelog/37127.txt new file mode 100644 index 00000000000..9565b1a5169 --- /dev/null +++ b/.changelog/37127.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_ec2_capacity_reservation: Fix issue where removing resource cause an error in refresh and delete +``` \ No newline at end of file From 6082872728a97d38f76d11cdb7d9c0aae3fa0e2a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 11 Jun 2024 06:38:15 -0700 Subject: [PATCH 3/3] Tweak CHANGELOG entry. --- .changelog/37127.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/37127.txt b/.changelog/37127.txt index 9565b1a5169..dac282ec525 100644 --- a/.changelog/37127.txt +++ b/.changelog/37127.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/aws_ec2_capacity_reservation: Fix issue where removing resource cause an error in refresh and delete +resource/aws_ec2_capacity_reservation: Fix `InvalidCapacityReservationId.NotFound` errors during Read and Delete when resource is manually deleted ``` \ No newline at end of file