Dataproc Cluster: add more nil handling following API-side change (#11592) (#8129)

modular-magician · web-flow · commit c97591969ba3 · 2024-09-06T10:52:55.000-07:00
[upstream:d17814cf2e547c0b1010a46e76ea130822f412ac]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/11592.txt b/.changelog/11592.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+dataproc: updated `google_dataproc_cluster` to protect against handling nil KerberosConfig values
+```
diff --git a/google-beta/services/dataproc/resource_dataproc_cluster.go b/google-beta/services/dataproc/resource_dataproc_cluster.go
@@ -2893,6 +2893,9 @@ func flattenSecurityConfig(d *schema.ResourceData, sc *dataproc.SecurityConfig)
 }
 
 func flattenKerberosConfig(d *schema.ResourceData, kfg *dataproc.KerberosConfig) []map[string]interface{} {
+	if kfg == nil {
+		return nil
+	}
 	data := map[string]interface{}{
 		"enable_kerberos":                       kfg.EnableKerberos,
 		"root_principal_password_uri":           kfg.RootPrincipalPasswordUri,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+dataproc: updated `google_dataproc_cluster` to protect against handling nil KerberosConfig values
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -2893,6 +2893,9 @@ func flattenSecurityConfig(d schema.ResourceData, sc dataproc.SecurityConfig)`
`2893`	`2893`	`}`
`2894`	`2894`
`2895`	`2895`	`func flattenKerberosConfig(d schema.ResourceData, kfg dataproc.KerberosConfig) []map[string]interface{} {`
	`2896`	`+ if kfg == nil {`
	`2897`	`+ return nil`
	`2898`	`+ }`
`2896`	`2899`	`data := map[string]interface{}{`
`2897`	`2900`	`"enable_kerberos": kfg.EnableKerberos,`
`2898`	`2901`	`"root_principal_password_uri": kfg.RootPrincipalPasswordUri,`