Add check for Environment proto field before accessing in Dataflow provider (#10016) (#6999)

modular-magician · web-flow · commit 7eb7543bc1ca · 2024-02-21T11:11:32.000-08:00
[upstream:6aba2a9bda474112d1d59bf0b8e7b627afb2ee7a]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/10016.txt b/.changelog/10016.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+dataflow: fixes potential nil-pointer error if a job's Environment field is nil when reading job information in `google_dataflow_job`
+```
diff --git a/google-beta/services/dataflow/resource_dataflow_job.go b/google-beta/services/dataflow/resource_dataflow_job.go
@@ -372,6 +372,9 @@ func resourceDataflowJobRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("effective_labels", job.Labels); err != nil {
 		return fmt.Errorf("Error setting effective_labels: %s", err)
 	}
+	if job.Environment == nil {
+		return fmt.Errorf("Error accessing Environment proto: proto is nil")
+	}
 	if err := d.Set("kms_key_name", job.Environment.ServiceKmsKeyName); err != nil {
 		return fmt.Errorf("Error setting kms_key_name: %s", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+dataflow: fixes potential nil-pointer error if a job's Environment field is nil when reading job information in `google_dataflow_job`
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,9 @@ func resourceDataflowJobRead(d *schema.ResourceData, meta interface{}) error {`
`372`	`372`	`if err := d.Set("effective_labels", job.Labels); err != nil {`
`373`	`373`	`return fmt.Errorf("Error setting effective_labels: %s", err)`
`374`	`374`	`}`
	`375`	`+ if job.Environment == nil {`
	`376`	`+ return fmt.Errorf("Error accessing Environment proto: proto is nil")`
	`377`	`+ }`
`375`	`378`	`if err := d.Set("kms_key_name", job.Environment.ServiceKmsKeyName); err != nil {`
`376`	`379`	`return fmt.Errorf("Error setting kms_key_name: %s", err)`
`377`	`380`	`}`