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

ramya-bangera · web-flow · commit 4dfb7a3c97b5 · 2024-01-19T16:48:22.000+05:30
Fix the NPE issue in provisioner resource/datasource
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)

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ func dataSourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m in`
`62`	`62`	`_ = schema.RemoveFromState(d, m)`
`63`	`63`	`return`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ return`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`for i := range resp.Provisioners {`
`@@ -78,6 +80,7 @@ func dataSourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m in`
`78`	`80`	`_ = schema.RemoveFromState(d, m)`
`79`	`81`	`return`
`80`	`82`	`}`
	`83`	`+ return`
`81`	`84`	`}`
`82`	`85`
`83`	`86`	`d.SetId(resp.Provisioner.Meta.UID)`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ func resourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m inte`
`147`	`147`	`_ = schema.RemoveFromState(d, m)`
`148`	`148`	`return`
`149`	`149`	`}`
	`150`	`+`
	`151`	`+ return`
`150`	`152`	`}`
`151`	`153`
`152`	`154`	`d.SetId(resp.Provisioner.Meta.UID)`