Merge pull request #10987 from zendesk/fix_10983

aws_key_pair: Ensure key_name attribute is set
2017-01-04 16:18:31 -06:00 · 2017-01-04 16:18:31 -06:00 · 3b4866042b
parent cfb597d42d af9505ffa2
commit 3b4866042b
1 changed files with 2 additions and 0 deletions
--- a/builtin/providers/aws/resource_aws_key_pair.go
+++ b/builtin/providers/aws/resource_aws_key_pair.go
@ -75,8 +75,10 @@ func resourceAwsKeyPairCreate(d *schema.ResourceData, meta interface{}) error {
 		keyName = v.(string)
 	} else if v, ok := d.GetOk("key_name_prefix"); ok {
 		keyName = resource.PrefixedUniqueId(v.(string))
+		d.Set("key_name", keyName)
 	} else {
 		keyName = resource.UniqueId()
+		d.Set("key_name", keyName)
 	}

 	publicKey := d.Get("public_key").(string)