provider/aws: Update testAccCheckAWSVpcPeeringConnectionDestroy to correctly check the destroyed state

builtin/providers/aws/resource_aws_vpc_peering_connection_test.go

@@ -70,14 +70,32 @@ func testAccCheckAWSVpcPeeringConnectionDestroy(s *terraform.State) error {
 				VpcPeeringConnectionIds: []*string{aws.String(rs.Primary.ID)},
 			})
 
-		if err == nil {
+		if err != nil {
-			if len(describe.VpcPeeringConnections) != 0 {
+			return err
-				return fmt.Errorf("vpc peering connection still exists")
 		}
+
+		var pc *ec2.VpcPeeringConnection
+		for _, c := range describe.VpcPeeringConnections {
+			if rs.Primary.ID == *c.VpcPeeringConnectionId {
+				pc = c
 			}
 		}
 
+		if pc == nil {
+			// not found
 			return nil
+		}
+
+		if pc.Status != nil {
+			if *pc.Status.Code == "deleted" {
+				return nil
+			}
+			return fmt.Errorf("Found vpc peering connection in unexpected state: %s", pc)
+		}
+
+	}
+
+	return fmt.Errorf("Fall through error for testAccCheckAWSVpcPeeringConnectionDestroy")
 }
 
 func testAccCheckAWSVpcPeeringConnectionExists(n string, connection *ec2.VpcPeeringConnection) resource.TestCheckFunc {