add some error handling

aruba-uxi · Oct 24, 2024 · 6b93d32 · 6b93d32
1 parent e1c71a6
commit 6b93d32
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/pkg/config-api-provider/provider/resources/service_group_assignment.go b/pkg/config-api-provider/provider/resources/service_group_assignment.go
@@ -161,9 +161,15 @@ func (r *serviceTestGroupAssignmentResource) Delete(ctx context.Context, req res
 		return
 	}
 
-	r.client.ConfigurationAPI.
-		DeleteServiceTestGroupAssignmentUxiV1alpha1ServiceTestGroupAssignmentsIdDelete(ctx, state.ID.ValueString()).
-		Execute()
+	request := r.client.ConfigurationAPI.DeleteServiceTestGroupAssignmentUxiV1alpha1ServiceTestGroupAssignmentsIdDelete(ctx, state.ID.ValueString())
+
+	_, response, err := util.RetryFor429(request.Execute)
+	errorPresent, errorDetail := util.RaiseForStatus(response, err)
+
+	if errorPresent {
+		resp.Diagnostics.AddError(util.GenerateErrorSummary("delete", "uxi_service_test_group_assignment"), errorDetail)
+		return
+	}
 }
 
 func (r *serviceTestGroupAssignmentResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {

diff --git a/pkg/config-api-provider/test/resources/service_test_group_assignment_test.go b/pkg/config-api-provider/test/resources/service_test_group_assignment_test.go
@@ -101,6 +101,9 @@ func TestServiceTestGroupAssignmentResource(t *testing.T) {
 						3,
 					)
 
+					// required for deleting existing group
+					util.MockDeleteServiceTestGroupAssignment("service_test_group_assignment", 1)
+
 					// required for creating another group
 					util.MockPostGroup(util.StructToMap(util.GenerateGroupResponseModel("group_uid_2", "_2", "_2")), 1)
 
@@ -176,8 +179,7 @@ func TestServiceTestGroupAssignmentResource(t *testing.T) {
 
 					util.MockDeleteGroup("group_uid", 1)
 					util.MockDeleteGroup("group_uid_2", 1)
-					util.MockDeleteServiceTestGroupAssignment("service_test_group_assignment", 1)
-					util.MockDeleteServiceTestGroupAssignment("service_test_group_assignment_2", 1)
+					util.MockDeleteServiceTestGroupAssignment("service_test_group_assignment_uid_2", 1)
 				},
 				Config: provider.ProviderConfig + `
 					removed {
@@ -279,6 +281,7 @@ func TestServiceTestGroupAssignmentResource429Handling(t *testing.T) {
 					)
 
 					util.MockDeleteGroup("group_uid", 1)
+					util.MockDeleteServiceTestGroupAssignment("service_test_group_assignment", 1)
 				},
 				Config: provider.ProviderConfig + `
 					removed {