issue #4566 add new attribute dns_name in aws_redshift_cluster

aws/resource_aws_redshift_cluster.go

@@ -193,6 +193,12 @@ func resourceAwsRedshiftCluster() *schema.Resource {
 				Computed: true,
 			},
 
+			"dns_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+
 			"cluster_public_key": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -567,6 +573,7 @@ func resourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) er
 		if rsc.Endpoint.Port != nil {
 			endpoint = fmt.Sprintf("%s:%d", endpoint, *rsc.Endpoint.Port)
 		}
+		d.Set("dns_name", rsc.Endpoint.Address)
 		d.Set("port", rsc.Endpoint.Port)
 		d.Set("endpoint", endpoint)
 	}

aws/resource_aws_redshift_cluster_test.go

@@ -126,6 +126,32 @@ func TestAccAWSRedshiftCluster_basic(t *testing.T) {
 	})
 }
 
+func TestAccAWSRedshiftCluster_dnsName(t *testing.T) {
+	var v redshift.Cluster
+
+	ri := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
+	config := testAccAWSRedshiftClusterConfig_basic(ri)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSRedshiftClusterDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSRedshiftClusterExists("aws_redshift_cluster.default", &v),
+					resource.TestCheckResourceAttr(
+						"aws_redshift_cluster.default", "cluster_type", "single-node"),
+					resource.TestCheckResourceAttr(
+						"aws_redshift_cluster.default", "publicly_accessible", "true"),
+					testAccCheckAWSRedshiftClusterDNSName(&v, ri),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAWSRedshiftCluster_withFinalSnapshot(t *testing.T) {
 	var v redshift.Cluster
 
@@ -630,6 +656,23 @@ func testAccCheckAWSRedshiftClusterMasterUsername(c *redshift.Cluster, value str
 	}
 }
 
+func testAccCheckAWSRedshiftClusterDNSName(c *redshift.Cluster, rInt int) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		if c.Endpoint == nil {
+			return fmt.Errorf("Expected cluster Endpoint to be set, got nil")
+		}
+
+		//validate the cluster address
+		str := fmt.Sprintf("tf-redshift-cluster-%d.?[a-zA-Z0-9].*?.us-west-2.redshift.amazonaws.com", rInt)
+		re := regexp.MustCompile(str)
+		if !re.MatchString(*c.Endpoint.Address) {
+			return fmt.Errorf("Expected cluster DNS name, got %s", *c.Endpoint.Address)
+		}
+
+		return nil
+	}
+}
+
 func TestResourceAWSRedshiftClusterIdentifierValidation(t *testing.T) {
 	cases := []struct {
 		Value    string

website/docs/r/redshift_cluster.html.markdown

@@ -104,6 +104,7 @@ The following attributes are exported:
 * `encrypted` - Whether the data in the cluster is encrypted
 * `cluster_security_groups` - The security groups associated with the cluster
 * `vpc_security_group_ids` - The VPC security group Ids associated with the cluster
+* `dns_name` - The DNS name of the cluster
 * `port` - The Port the cluster responds on
 * `cluster_version` - The version of Redshift engine software
 * `cluster_parameter_group_name` - The name of the parameter group to be associated with this cluster