fix: Fix nil pointer in Cluster (#1358)

lantoli · web-flow · commit 99668cb1b720 · 2025-06-02T13:29:30.000+02:00
diff --git a/cfn-resources/cluster/cmd/resource/mappings.go b/cfn-resources/cluster/cmd/resource/mappings.go
@@ -201,7 +201,7 @@ func expandLabelSlice(labels []Labels) *[]admin.ComponentLabel {
 			key = *labels[i].Key
 		}
 		var value string
-		if labels[i].Key != nil {
+		if labels[i].Value != nil {
 			value = *labels[i].Value
 		}
 		res[i] = admin.ComponentLabel{
@@ -601,7 +601,9 @@ func setClusterRequest(currentModel *Model) (*admin.AdvancedClusterDescription,
 
 	clusterRequest.TerminationProtectionEnabled = currentModel.TerminationProtectionEnabled
 
-	clusterRequest.AdvancedConfiguration = expandClusterAdvancedConfiguration(*currentModel.AdvancedSettings)
+	if currentModel.AdvancedSettings != nil {
+		clusterRequest.AdvancedConfiguration = expandClusterAdvancedConfiguration(*currentModel.AdvancedSettings)
+	}
 	return clusterRequest, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func expandLabelSlice(labels []Labels) *[]admin.ComponentLabel {`
`201`	`201`	`key = *labels[i].Key`
`202`	`202`	`}`
`203`	`203`	`var value string`
`204`		`- if labels[i].Key != nil {`
	`204`	`+ if labels[i].Value != nil {`
`205`	`205`	`value = *labels[i].Value`
`206`	`206`	`}`
`207`	`207`	`res[i] = admin.ComponentLabel{`
`@@ -601,7 +601,9 @@ func setClusterRequest(currentModel Model) (admin.AdvancedClusterDescription,`
`601`	`601`
`602`	`602`	`clusterRequest.TerminationProtectionEnabled = currentModel.TerminationProtectionEnabled`
`603`	`603`
`604`		`- clusterRequest.AdvancedConfiguration = expandClusterAdvancedConfiguration(*currentModel.AdvancedSettings)`
	`604`	`+ if currentModel.AdvancedSettings != nil {`
	`605`	`+ clusterRequest.AdvancedConfiguration = expandClusterAdvancedConfiguration(*currentModel.AdvancedSettings)`
	`606`	`+ }`
`605`	`607`	`return clusterRequest, nil`
`606`	`608`	`}`
`607`	`609`