Merge pull request #4766 from terraform-providers/b-aws_eks_cluster-arn

aws_eks_cluster: Ensure arn is available as an attribute
hashicorp · Jun 6, 2018 · c4e687c · c4e687c
2 parents 1fc685c + 4237db6
commit c4e687c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/aws/data_source_aws_eks_cluster.go b/aws/data_source_aws_eks_cluster.go
@@ -15,6 +15,10 @@ func dataSourceAwsEksCluster() *schema.Resource {
 		Read: dataSourceAwsEksClusterRead,
 
 		Schema: map[string]*schema.Schema{
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"certificate_authority": {
 				Type:     schema.TypeList,
 				MaxItems: 1,

diff --git a/aws/data_source_aws_eks_cluster_test.go b/aws/data_source_aws_eks_cluster_test.go
@@ -21,6 +21,7 @@ func TestAccAWSEksClusterDataSource_basic(t *testing.T) {
 			{
 				Config: testAccAWSEksClusterDataSourceConfig_Basic(rName),
 				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceResourceName, "arn"),
 					resource.TestCheckResourceAttr(dataSourceResourceName, "certificate_authority.#", "1"),
 					resource.TestCheckResourceAttrPair(resourceName, "certificate_authority.0.data", dataSourceResourceName, "certificate_authority.0.data"),
 					resource.TestCheckResourceAttrPair(resourceName, "created_at", dataSourceResourceName, "created_at"),

diff --git a/aws/resource_aws_eks_cluster.go b/aws/resource_aws_eks_cluster.go
@@ -28,6 +28,10 @@ func resourceAwsEksCluster() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"certificate_authority": {
 				Type:     schema.TypeList,
 				MaxItems: 1,

diff --git a/aws/resource_aws_eks_cluster_test.go b/aws/resource_aws_eks_cluster_test.go
@@ -86,6 +86,7 @@ func TestAccAWSEksCluster_basic(t *testing.T) {
 				Config: testAccAWSEksClusterConfig_Required(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSEksClusterExists(resourceName, &cluster),
+					resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:eks:[^:]+:[^:]+:cluster/%s$", rName))),
 					resource.TestCheckResourceAttr(resourceName, "certificate_authority.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "certificate_authority.0.data"),
 					resource.TestMatchResourceAttr(resourceName, "endpoint", regexp.MustCompile(`^https://`)),