Handle AWS keypairs which no longer exist

When refreshing a keypair, update state appropriately rather than crash if the keypair no longer exists on AWS. Likely fixes hashicorp#1851.
bitglue · May 18, 2015 · 8225727 · 8225727
1 parent db095e2
commit 8225727
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/builtin/providers/aws/resource_aws_key_pair.go b/builtin/providers/aws/resource_aws_key_pair.go
@@ -65,6 +65,11 @@ func resourceAwsKeyPairRead(d *schema.ResourceData, meta interface{}) error {
 	}
 	resp, err := conn.DescribeKeyPairs(req)
 	if err != nil {
+		awsErr, ok := err.(aws.APIError)
+		if ok && awsErr.Code == "InvalidKeyPair.NotFound" {
+			d.SetId("")
+			return nil
+		}
 		return fmt.Errorf("Error retrieving KeyPair: %s", err)
 	}