Fix the NPE issue in provisioner resource/datasource

Added the fix to return without trying to parse the nil response in case of any error. Signed-off-by: Ramya Bangera <bangerar@vmware.com>
vmware · Jan 19, 2024 · 99582ee · 99582ee
1 parent e782184
commit 99582ee
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
@@ -57,11 +57,13 @@ func dataSourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m in
 
 	if model.FullName.Name == "" {
 		resp, err := config.TMCConnection.ProvisionerResourceService.ProvisionerResourceServiceList(model.FullName)
+
 		if err != nil {
 			if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) {
 				_ = 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
@@ -142,11 +142,13 @@ func resourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m inte
 	}
 
 	resp, err := config.TMCConnection.ProvisionerResourceService.ProvisionerResourceServiceGet(model.FullName)
+
 	if err != nil {
 		if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) {
 			_ = schema.RemoveFromState(d, m)
 			return
 		}
+		return
 	}
 
 	d.SetId(resp.Provisioner.Meta.UID)