ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6328 from hashicorp/b-aws-kms-alias-fix 

provider/aws: Use ID in lookup for AWS KMS Aliases
This commit is contained in:
Clint 2016-04-25 11:53:27 -05:00
parent 4445507da3 e138a0756b
commit 9ffe792de9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/providers/aws/resource_aws_kms_alias.go
View File

@ -89,14 +89,13 @@ func resourceAwsKmsAliasCreate(d *schema.ResourceData, meta interface{}) error {
func resourceAwsKmsAliasRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsKmsAliasRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).kmsconn conn := meta.(*AWSClient).kmsconn
name := d.Get("name").(string)
alias, err := findKmsAliasByName(conn, name, nil) alias, err := findKmsAliasByName(conn, d.Id(), nil)
if err != nil { if err != nil {
return err return err
} }
if alias == nil { if alias == nil {
log.Printf("[DEBUG] Removing KMS Alias %q as it's already gone", name) log.Printf("[DEBUG] Removing KMS Alias (%s) as it's already gone", d.Id())
d.SetId("") d.SetId("")
return nil return nil
} }
@ -138,17 +137,16 @@ func resourceAwsKmsAliasTargetUpdate(conn *kms.KMS, d *schema.ResourceData) erro
func resourceAwsKmsAliasDelete(d *schema.ResourceData, meta interface{}) error { func resourceAwsKmsAliasDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).kmsconn conn := meta.(*AWSClient).kmsconn
name := d.Get("name").(string)
req := &kms.DeleteAliasInput{ req := &kms.DeleteAliasInput{
AliasName: aws.String(name), AliasName: aws.String(d.Id()),
} }
_, err := conn.DeleteAlias(req) _, err := conn.DeleteAlias(req)
if err != nil { if err != nil {
return err return err
} }
log.Printf("[DEBUG] KMS Alias: %s deleted.", name) log.Printf("[DEBUG] KMS Alias: (%s) deleted.", d.Id())
d.SetId("") d.SetId("")
return nil return nil
} }