Fix AWS VPC Peering Pending to Delete Issue

pkg/controller/vpcpeering/peering.go

@@ -528,15 +528,9 @@ func (e *external) Delete(ctx context.Context, mg cpresource.Managed) error { //
 		}
 	}
 
-	_, err = e.client.DeleteVpcPeeringConnectionRequest(&ec2.DeleteVpcPeeringConnectionInput{
-		VpcPeeringConnectionId: cr.Status.AtProvider.VPCPeeringConnectionID,
-	}).Send(ctx)
-
-	if err != nil && isAWSErr(err, "InvalidVpcPeeringConnectionID.NotFound", "") {
-		return awsclient.Wrap(err, "errDelete")
-	}
+	err = e.deleteVPCPeeringConnection(ctx, cr)
 
-	return nil
+	return err
 }
 
 func isAWSErr(err error, code string, message string) bool {
@@ -545,3 +539,25 @@ func isAWSErr(err error, code string, message string) bool {
 	}
 	return false
 }
+
+func (e *external) deleteVPCPeeringConnection(ctx context.Context, cr *svcapitypes.VPCPeeringConnection) error {
+	input := peering.GenerateDescribeVpcPeeringConnectionsInput(cr)
+	resp, err := e.client.DescribeVpcPeeringConnectionsRequest(input).Send(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, peering := range resp.VpcPeeringConnections {
+		if peering.Status.Code == ec2.VpcPeeringConnectionStateReasonCodeInitiatingRequest || peering.Status.Code == ec2.VpcPeeringConnectionStateReasonCodePendingAcceptance || peering.Status.Code == ec2.VpcPeeringConnectionStateReasonCodeActive || peering.Status.Code == ec2.VpcPeeringConnectionStateReasonCodeExpired || peering.Status.Code == ec2.VpcPeeringConnectionStateReasonCodeRejected {
+			_, err := e.client.DeleteVpcPeeringConnectionRequest(&ec2.DeleteVpcPeeringConnectionInput{
+				VpcPeeringConnectionId: peering.VpcPeeringConnectionId,
+			}).Send(ctx)
+
+			if err != nil && !isAWSErr(err, "InvalidVpcPeeringConnectionID.NotFound", "") {
+				return awsclient.Wrap(err, "errDelete")
+			}
+		}
+	}
+
+	return nil
+}

pkg/controller/vpcpeering/peering_test.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	"github.com/aws/aws-sdk-go-v2/service/route53"
 	"github.com/crossplane/crossplane-runtime/pkg/test"
 
 	svcapitypes "github.com/crossplane/provider-aws/apis/vpcpeering/v1alpha1"
@@ -269,6 +270,94 @@ func TestCreate(t *testing.T) {
 	}
 }
 
+func TestDelete(t *testing.T) {
+	g := NewGomegaWithT(t)
+
+	type want struct {
+		err error
+	}
+
+	cases := map[string]struct {
+		args
+		want
+	}{
+		"Delete": {
+			args: args{
+				kube: &test.MockClient{
+					MockDelete: test.NewMockClient().Delete,
+				},
+				route53Cli: &fake.MockRoute53Client{
+					DeleteVPCAssociationAuthorizationRequestFun: func(input *route53.DeleteVPCAssociationAuthorizationInput) route53.DeleteVPCAssociationAuthorizationRequest {
+						g.Expect(*input.HostedZoneId).Should(Equal("owner"))
+						g.Expect(*input.VPC.VPCId).Should(Equal("peerVpc"))
+						g.Expect(string(input.VPC.VPCRegion)).Should(Equal("peerRegion"))
+
+						return route53.DeleteVPCAssociationAuthorizationRequest{
+							Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &route53.DeleteVPCAssociationAuthorizationOutput{}},
+						}
+					},
+				},
+				cr: buildVPCPeerConnection("test"),
+				client: &fake.MockEC2Client{
+					DescribeRouteTablesRequestFun: func(input *ec2.DescribeRouteTablesInput) ec2.DescribeRouteTablesRequest {
+						return ec2.DescribeRouteTablesRequest{
+							Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &ec2.DescribeRouteTablesOutput{
+								RouteTables: make([]ec2.RouteTable, 0),
+							}},
+						}
+					},
+					DescribeVpcPeeringConnectionsRequestFun: func(input *ec2.DescribeVpcPeeringConnectionsInput) ec2.DescribeVpcPeeringConnectionsRequest {
+						return ec2.DescribeVpcPeeringConnectionsRequest{
+							Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &ec2.DescribeVpcPeeringConnectionsOutput{
+								//Attributes: attributes,
+								VpcPeeringConnections: []ec2.VpcPeeringConnection{
+									{
+										Status: &ec2.VpcPeeringConnectionStateReason{
+											Code: ec2.VpcPeeringConnectionStateReasonCodePendingAcceptance,
+										},
+
+										Tags: []ec2.Tag{
+											{
+												Key:   aws.String("Name"),
+												Value: aws.String("test"),
+											},
+										},
+										VpcPeeringConnectionId: aws.String("pcx-xxx"),
+									},
+								},
+							}},
+						}
+					},
+					DeleteVpcPeeringConnectionRequestFun: func(input *ec2.DeleteVpcPeeringConnectionInput) ec2.DeleteVpcPeeringConnectionRequest {
+						return ec2.DeleteVpcPeeringConnectionRequest{
+							Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &ec2.DeleteVpcPeeringConnectionOutput{}},
+						}
+					},
+				},
+			},
+			want: want{
+				err: nil,
+			},
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			e := &external{
+				client:        tc.client,
+				kube:          tc.kube,
+				route53Client: tc.route53Cli,
+			}
+
+			err := e.Delete(context.Background(), tc.args.cr)
+
+			if diff := cmp.Diff(tc.want.err, err, test.EquateErrors()); diff != "" {
+				t.Errorf("r: -want, +got:\n%s", diff)
+			}
+		})
+	}
+}
+
 func buildVPCPeerConnection(name string) *svcapitypes.VPCPeeringConnection {
 	cr := &svcapitypes.VPCPeeringConnection{
 		ObjectMeta: v1.ObjectMeta{