From 66eb7c605500bd0b81c06a9c5b32de2505d25c73 Mon Sep 17 00:00:00 2001 From: clint shryock Date: Fri, 11 Mar 2016 12:16:29 -0600 Subject: [PATCH] provider/aws: Guard against Nil Reference in Redshift Endpoints --- builtin/providers/aws/resource_aws_redshift_cluster.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_redshift_cluster.go b/builtin/providers/aws/resource_aws_redshift_cluster.go index ef1807612..ea08ac1ef 100644 --- a/builtin/providers/aws/resource_aws_redshift_cluster.go +++ b/builtin/providers/aws/resource_aws_redshift_cluster.go @@ -317,7 +317,13 @@ func resourceAwsRedshiftClusterRead(d *schema.ResourceData, meta interface{}) er d.Set("encrypted", rsc.Encrypted) d.Set("automated_snapshot_retention_period", rsc.AutomatedSnapshotRetentionPeriod) d.Set("preferred_maintenance_window", rsc.PreferredMaintenanceWindow) - d.Set("endpoint", aws.String(fmt.Sprintf("%s:%d", *rsc.Endpoint.Address, *rsc.Endpoint.Port))) + if rsc.Endpoint != nil && rsc.Endpoint.Address != nil { + endpoint := *rsc.Endpoint.Address + if rsc.Endpoint.Port != nil { + endpoint = fmt.Sprintf("%s:%d", endpoint, *rsc.Endpoint.Port) + } + d.Set("endpoint", endpoint) + } d.Set("cluster_parameter_group_name", rsc.ClusterParameterGroups[0].ParameterGroupName) if len(rsc.ClusterNodes) > 1 { d.Set("cluster_type", "multi-node")