Merge pull request #373 from vmware/bangerar/fix-npe

Fix the NPE issue in provisioner resource/datasource
vmware · Jan 19, 2024 · 4dfb7a3 · 4dfb7a3
2 parents ee9e28b + 25c9eca
commit 4dfb7a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/internal/resources/provisioner/data_source_provisioner.go b/internal/resources/provisioner/data_source_provisioner.go
@@ -62,6 +62,8 @@ func dataSourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m in
 				_ = schema.RemoveFromState(d, m)
 				return
 			}
+
+			return
 		}
 
 		for i := range resp.Provisioners {
@@ -78,6 +80,7 @@ func dataSourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m in
 				_ = schema.RemoveFromState(d, m)
 				return
 			}
+			return
 		}
 
 		d.SetId(resp.Provisioner.Meta.UID)

diff --git a/internal/resources/provisioner/resource_provisioner.go b/internal/resources/provisioner/resource_provisioner.go
@@ -147,6 +147,8 @@ func resourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m inte
 			_ = schema.RemoveFromState(d, m)
 			return
 		}
+
+		return
 	}
 
 	d.SetId(resp.Provisioner.Meta.UID)