404 poll error fix

Author: Uddipaan Hazarika

internal/provider/resource_appdata_dsource.go

@@ -500,6 +500,12 @@ func resourceDsourceRead(ctx context.Context, d *schema.ResourceData, meta inter
 		return client.DSourcesAPI.GetDsourceById(ctx, dsource_id).Execute()
 	})
 
+	if res == nil {
+		tflog.Error(ctx, DLPX+ERROR+"Dsource not found: "+dsource_id+", removing from state. ")
+		d.SetId("")
+		return nil
+	}
+
 	if diags != nil {
 		_, diags := PollForObjectDeletion(ctx, func() (interface{}, *http.Response, error) {
 			return client.DSourcesAPI.GetDsourceById(ctx, dsource_id).Execute()

internal/provider/resource_database_postgresql.go

@@ -190,6 +190,12 @@ func resourceDatabasePostgressqlRead(ctx context.Context, d *schema.ResourceData
 		return client.SourcesAPI.GetSourceById(ctx, source_id).Execute()
 	})
 
+	if res == nil {
+		tflog.Error(ctx, DLPX+ERROR+"PostgreSQL source not found: "+source_id+", removing from state. ")
+		d.SetId("")
+		return nil
+	}
+
 	if diags != nil {
 		_, diags := PollForObjectDeletion(ctx, func() (interface{}, *http.Response, error) {
 			return client.SourcesAPI.GetSourceById(ctx, source_id).Execute()

internal/provider/resource_environment.go

@@ -419,6 +419,12 @@ func resourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta i
 		return client.EnvironmentsAPI.GetEnvironmentById(ctx, envId).Execute()
 	})
 
+	if apiRes == nil {
+		tflog.Error(ctx, DLPX+ERROR+"Environment not found: "+envId+", removing from state. ")
+		d.SetId("")
+		return nil
+	}
+
 	if diags != nil {
 		_, diags := PollForObjectDeletion(ctx, func() (interface{}, *http.Response, error) {
 			return client.EnvironmentsAPI.GetEnvironmentById(ctx, envId).Execute()

internal/provider/resource_vdb.go

@@ -1536,6 +1536,12 @@ func resourceVdbRead(ctx context.Context, d *schema.ResourceData, meta interface
 		return client.VDBsAPI.GetVdbById(ctx, vdbId).Execute()
 	})
 
+	if res == nil {
+		tflog.Error(ctx, DLPX+ERROR+"VDB not found: "+vdbId+", removing from state. ")
+		d.SetId("")
+		return nil
+	}
+
 	if diags != nil {
 		_, diags := PollForObjectDeletion(ctx, func() (interface{}, *http.Response, error) {
 			return client.VDBsAPI.GetVdbById(ctx, vdbId).Execute()

internal/provider/utility.go

@@ -85,9 +85,13 @@ func PollForStatusCode(ctx context.Context, apiCall func() (interface{}, *http.R
 	var httpRes *http.Response
 	var err error
 	for i := 0; maxRetry == 0 || i < maxRetry; i++ {
-		if res, httpRes, err = apiCall(); httpRes.StatusCode == statusCode {
+		res, httpRes, err = apiCall()
+		if httpRes.StatusCode == statusCode {
 			tflog.Info(ctx, DLPX+INFO+"[OK] Breaking poll - Status "+strconv.Itoa(statusCode)+" reached.")
 			return res, nil
+		} else if httpRes.StatusCode == http.StatusNotFound {
+			tflog.Info(ctx, DLPX+INFO+"[404 Not found] Breaking poll - Status "+strconv.Itoa(statusCode)+" reached.")
+			break
 		}
 		time.Sleep(time.Duration(STATUS_POLL_SLEEP_TIME) * time.Second)
 	}