Skip to content

Commit 2a47e2c

Browse files
authored
Merge pull request #31772 from sklirg/fix/31407-redshift-data-source-panic-during-modify
fix(redshift): Nil-check before reading from Endpoint
2 parents bbee9ae + 2b09896 commit 2a47e2c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.changelog/31772.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
data-source/aws_redshift_cluster: Fix crash reading clusters in `modifying` state
3+
```

internal/service/redshift/cluster_data_source.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ func dataSourceClusterRead(ctx context.Context, d *schema.ResourceData, meta int
255255

256256
if rsc.Endpoint != nil {
257257
d.Set("endpoint", rsc.Endpoint.Address)
258+
d.Set("port", rsc.Endpoint.Port)
258259
}
259260

260261
d.Set("enhanced_vpc_routing", rsc.EnhancedVpcRouting)
@@ -269,7 +270,6 @@ func dataSourceClusterRead(ctx context.Context, d *schema.ResourceData, meta int
269270
d.Set("master_username", rsc.MasterUsername)
270271
d.Set("node_type", rsc.NodeType)
271272
d.Set("number_of_nodes", rsc.NumberOfNodes)
272-
d.Set("port", rsc.Endpoint.Port)
273273
d.Set("preferred_maintenance_window", rsc.PreferredMaintenanceWindow)
274274
d.Set("publicly_accessible", rsc.PubliclyAccessible)
275275
d.Set("default_iam_role_arn", rsc.DefaultIamRoleArn)

0 commit comments

Comments
 (0)