resource/aws_kms_alias: Add target_key_arn attribute

aws/resource_aws_kms_alias.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/service/kms"
 )
 
@@ -25,18 +26,18 @@ func resourceAwsKmsAlias() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
-			"arn": &schema.Schema{
+			"arn": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"name": &schema.Schema{
+			"name": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				ForceNew:      true,
 				ConflictsWith: []string{"name_prefix"},
 				ValidateFunc:  validateAwsKmsName,
 			},
-			"name_prefix": &schema.Schema{
+			"name_prefix": {
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
@@ -49,10 +50,14 @@ func resourceAwsKmsAlias() *schema.Resource {
 					return
 				},
 			},
-			"target_key_id": &schema.Schema{
+			"target_key_id": {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"target_key_arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -113,6 +118,19 @@ func resourceAwsKmsAliasRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("arn", alias.AliasArn)
 	d.Set("target_key_id", alias.TargetKeyId)
 
+	aliasARN, err := arn.Parse(*alias.AliasArn)
+	if err != nil {
+		return err
+	}
+	targetKeyARN := arn.ARN{
+		Partition: aliasARN.Partition,
+		Service:   aliasARN.Service,
+		Region:    aliasARN.Region,
+		AccountID: aliasARN.AccountID,
+		Resource:  fmt.Sprintf("key/%s", *alias.TargetKeyId),
+	}
+	d.Set("target_key_arn", targetKeyARN.String())
+
 	return nil
 }
 
@@ -124,6 +142,7 @@ func resourceAwsKmsAliasUpdate(d *schema.ResourceData, meta interface{}) error {
 		if err != nil {
 			return err
 		}
+		return resourceAwsKmsAliasRead(d, meta)
 	}
 	return nil
 }

aws/resource_aws_kms_alias_test.go

@@ -22,6 +22,7 @@ func TestAccAWSKmsAlias_basic(t *testing.T) {
 				Config: testAccAWSKmsSingleAlias(rInt, kmsAliasTimestamp),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSKmsAliasExists("aws_kms_alias.single"),
+					resource.TestCheckResourceAttrSet("aws_kms_alias.single", "target_key_arn"),
 				),
 			},
 			{
@@ -46,6 +47,7 @@ func TestAccAWSKmsAlias_name_prefix(t *testing.T) {
 				Config: testAccAWSKmsSingleAlias(rInt, kmsAliasTimestamp),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSKmsAliasExists("aws_kms_alias.name_prefix"),
+					resource.TestCheckResourceAttrSet("aws_kms_alias.name_prefix", "target_key_arn"),
 				),
 			},
 		},
@@ -64,6 +66,7 @@ func TestAccAWSKmsAlias_no_name(t *testing.T) {
 				Config: testAccAWSKmsSingleAlias(rInt, kmsAliasTimestamp),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSKmsAliasExists("aws_kms_alias.nothing"),
+					resource.TestCheckResourceAttrSet("aws_kms_alias.nothing", "target_key_arn"),
 				),
 			},
 		},
@@ -82,7 +85,9 @@ func TestAccAWSKmsAlias_multiple(t *testing.T) {
 				Config: testAccAWSKmsMultipleAliases(rInt, kmsAliasTimestamp),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSKmsAliasExists("aws_kms_alias.one"),
+					resource.TestCheckResourceAttrSet("aws_kms_alias.one", "target_key_arn"),
 					testAccCheckAWSKmsAliasExists("aws_kms_alias.two"),
+					resource.TestCheckResourceAttrSet("aws_kms_alias.two", "target_key_arn"),
 				),
 			},
 		},

website/docs/r/kms_alias.html.markdown

@@ -35,9 +35,10 @@ The name must start with the word "alias" followed by a forward slash (alias/).
 
 ## Attributes Reference
 
-The following attributes are exported:
+The following additional attributes are exported:
 
 * `arn` - The Amazon Resource Name (ARN) of the key alias.
+* `target_key_arn` - The Amazon Resource Name (ARN) of the target key identifier.
 
 ## Import