fixes catalog item destroy failures when display name wasn't changed (#138)

Author: johnathanvidu

internal/provider/resources/space_ado_server_repository_resource.go

@@ -164,12 +164,16 @@ func (r *TorqueSpaceAdoServerRepositoryResource) Create(ctx context.Context, req
 		}
 	}
 	start := time.Now()
-	err := r.client.OnboardAdoServerRepoToSpace(data.SpaceName.ValueString(), data.RepositoryName.ValueString(),
+	onboardErr := r.client.OnboardAdoServerRepoToSpace(data.SpaceName.ValueString(), data.RepositoryName.ValueString(),
 		data.RepositoryUrl.ValueString(), data.Token.ValueStringPointer(), data.Branch.ValueString(), data.CredentialName.ValueString(), agents, data.UseAllAgents.ValueBool(), data.AutoRegisterEac.ValueBool())
-	if err != nil {
+	if onboardErr != nil {
 		repo, err := r.client.GetRepoDetails(data.SpaceName.ValueString(), data.RepositoryName.ValueString())
 		if repo == nil {
-			resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to onboard repository to space, got error: %s", err))
+			resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to onboard repository to space, got error: %s", onboardErr))
+			return
+		}
+		if err != nil {
+			resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to onboard repository to space, got error: %s", onboardErr))
 			return
 		}
 		if repo.Status == StatusSyncing {
@@ -189,7 +193,7 @@ func (r *TorqueSpaceAdoServerRepositoryResource) Create(ctx context.Context, req
 			resp.Diagnostics.AddError("Sync Timeout", "Timed out while syncing repository")
 			return
 		}
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to onboard repository to space, got error: %s", err))
+		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to onboard repository to space, got error: %s", onboardErr))
 		return
 	}
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)

internal/provider/resources/torque_catalog_item_resource.go

@@ -429,14 +429,20 @@ func (r *TorqueCatalogItemResource) Delete(ctx context.Context, req resource.Del
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to set blueprint policies, got error: %s", err))
 		return
 	}
-	err = r.client.UpdateBlueprintDisplayName(data.SpaceName.ValueString(), data.RepositoryName.ValueString(), data.BlueprintName.ValueString(), data.BlueprintName.ValueString())
-	if err != nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create Catalog Item, failed to set blueprint display name, got error: %s", err))
-		return
+	// Only reset the display name if the user had explicitly set a custom one.
+	// When display_name was never provided, it is stored in state as the blueprint name;
+	// calling the API with the same value causes a 422, so we skip the call.
+	// This is a temporary solution, ideally the API should allow idempotent calls to update the display name even when the value doesn't change.
+	if data.DisplayName.ValueString() != data.BlueprintName.ValueString() {
+		err = r.client.UpdateBlueprintDisplayName(data.SpaceName.ValueString(), data.RepositoryName.ValueString(), data.BlueprintName.ValueString(), data.BlueprintName.ValueString())
+		if err != nil {
+			resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to reset blueprint display name, got error: %s", err))
+			return
+		}
 	}
 	err = r.client.EditCatalogItemLabels(data.SpaceName.ValueString(), data.BlueprintName.ValueString(), data.RepositoryName.ValueString(), nil)
 	if err != nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to remove Catalog Item custom icon, failed to set catalog item custom icon, got error: %s", err))
+		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to remove Catalog Item labels, got error: %s", err))
 		return
 	}
 }