fix: resource read should remove from state on resource not found (#100)

Author: floreks

internal/resource/cloud_connection.go

@@ -163,6 +163,11 @@ func (r *CloudConnectionResource) Read(ctx context.Context, req resource.ReadReq
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read cloud connection, got error: %s", err))
 		return
 	}
+	if response == nil || response.CloudConnection == nil {
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
+		return
+	}
 
 	data.From(response.CloudConnection, ctx, &resp.Diagnostics)
 	resp.Diagnostics.Append(resp.State.Set(ctx, data)...)

internal/resource/cluster.go

@@ -98,7 +98,8 @@ func (r *clusterResource) Read(ctx context.Context, req resource.ReadRequest, re
 		return
 	}
 	if result == nil || result.Cluster == nil {
-		resp.Diagnostics.AddError("Not Found", "Unable to find cluster, it looks like it was deleted manually")
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
 		return
 	}
 

internal/resource/git_repository.go

@@ -173,9 +173,9 @@ func (r *GitRepositoryResource) Read(ctx context.Context, req resource.ReadReque
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to get GitRepository, got error: %s", err))
 		return
 	}
-
 	if response == nil || response.GitRepository == nil {
-		resp.Diagnostics.AddError("Client Error", "Unable to find GitRepository")
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
 		return
 	}
 

internal/resource/group.go

@@ -115,9 +115,9 @@ func (r *GroupResource) Read(ctx context.Context, req resource.ReadRequest, resp
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to get group, got error: %s", err))
 		return
 	}
-
 	if response == nil || response.Group == nil {
-		resp.Diagnostics.AddError("Client Error", "Unable to find group")
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
 		return
 	}
 

internal/resource/infrastructure_stack.go

@@ -86,6 +86,11 @@ func (r *InfrastructureStackResource) Read(ctx context.Context, req resource.Rea
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read infrastructure stack, got error: %s", err))
 		return
 	}
+	if response == nil || response.InfrastructureStack == nil {
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
+		return
+	}
 
 	data.From(response.InfrastructureStack, ctx, &resp.Diagnostics)
 	resp.Diagnostics.Append(resp.State.Set(ctx, data)...)

internal/resource/observability_webhook.go

@@ -125,8 +125,9 @@ func (r *ObservabilityWebhookResource) Read(ctx context.Context, req resource.Re
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read observability webhook, got error: %s", err))
 		return
 	}
-	if response.ObservabilityWebhook == nil {
-		resp.Diagnostics.AddError("Client Error", "Unable to find observability webhook, got no error")
+	if response == nil || response.ObservabilityWebhook == nil {
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
 		return
 	}
 

internal/resource/project.go

@@ -158,6 +158,11 @@ func (r *ProjectResource) Read(ctx context.Context, req resource.ReadRequest, re
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read project, got error: %s", err))
 		return
 	}
+	if response == nil || response.Project == nil {
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
+		return
+	}
 
 	data.From(response.Project, ctx, &resp.Diagnostics)
 	resp.Diagnostics.Append(resp.State.Set(ctx, data)...)

internal/resource/provider.go

@@ -227,7 +227,8 @@ func (r *providerResource) Read(ctx context.Context, req resource.ReadRequest, r
 		return
 	}
 	if result == nil || result.ClusterProvider == nil {
-		resp.Diagnostics.AddError("Not Found", "Unable to find provider, it looks like it was deleted manually")
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
 		return
 	}
 

internal/resource/scm_webhook.go

@@ -131,8 +131,9 @@ func (r *SCMWebhookResource) Read(ctx context.Context, req resource.ReadRequest,
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read SCM webhook, got error: %s", err))
 		return
 	}
-	if response.ScmWebhook == nil {
-		resp.Diagnostics.AddError("Client Error", "Unable to find SCM webhook, got no error")
+	if response == nil || response.ScmWebhook == nil {
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
 		return
 	}
 

internal/resource/service_context.go

@@ -112,8 +112,9 @@ func (r *ServiceContextResource) Read(ctx context.Context, req resource.ReadRequ
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read service context, got error: %s", err))
 		return
 	}
-	if response.ServiceContext == nil {
-		resp.Diagnostics.AddError("Client Error", "Unable to find service context, got no error")
+	if response == nil || response.ServiceContext == nil {
+		// Resource not found, remove from state
+		resp.State.RemoveResource(ctx)
 		return
 	}