From af9505ffa24da7eb2e77bec0400de5dfb50ca0fd Mon Sep 17 00:00:00 2001 From: "Michael S. Fischer" Date: Sun, 1 Jan 2017 12:17:43 -0800 Subject: [PATCH] aws_key_pair: Ensure key_name attribute is set Ensure that the `key_name` attribute is available to `aws_key_pair` resource dependents, even when the attribute is not specifically set (i.e., when `key_name_prefix` or automatic naming is performed). Fixes #10983. --- builtin/providers/aws/resource_aws_key_pair.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/providers/aws/resource_aws_key_pair.go b/builtin/providers/aws/resource_aws_key_pair.go index 51ffec7521..02050c7af9 100644 --- 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)