replacing APi call for custom profiles, handling 409/429 errors slightly better

Author: David Kraushuber

provider/assignmentGroup_resource.go

@@ -503,7 +503,6 @@ func (r *assignment_groupResource) Update(ctx context.Context, req resource.Upda
 	}
 
 	//remove any left over apps in state
-
 	for _, stateApp := range state.Apps {
 		found := false
 		for _, planApp := range plan.Apps {
@@ -656,8 +655,8 @@ func (r *assignment_groupResource) Update(ctx context.Context, req resource.Upda
 		err := r.client.AssignmentGroupUnAssignObject(plan.ID.ValueString(), deviceId, "devices")
 		if err != nil {
 			resp.Diagnostics.AddError(
-				"Error updating assignment group device group assignment",
-				"Could not update assignment group device group, unexpected error: "+err.Error(),
+				"Error updating assignment group device assignment",
+				"Could not update assignment group device assignment, unexpected error: "+err.Error(),
 			)
 			return
 		}
@@ -667,8 +666,8 @@ func (r *assignment_groupResource) Update(ctx context.Context, req resource.Upda
 		err := r.client.AssignmentGroupUpdateInstalledApps(plan.ID.ValueString())
 		if err != nil {
 			resp.Diagnostics.AddError(
-				"Error updating assignment group profile assignment",
-				"Could not update assignment group profile assignment, unexpected error: "+err.Error(),
+				"Error updating assignment App update failed",
+				"Could not update assignment App update failed, unexpected error: "+err.Error(),
 			)
 			return
 		}
@@ -678,8 +677,8 @@ func (r *assignment_groupResource) Update(ctx context.Context, req resource.Upda
 		err := r.client.AssignmentGroupPushApps(plan.ID.ValueString())
 		if err != nil {
 			resp.Diagnostics.AddError(
-				"Error updating assignment group profile assignment",
-				"Could not update assignment group profile assignment, unexpected error: "+err.Error(),
+				"Error updating assignment App push failed",
+				"Could not update assignment App push failed, unexpected error: "+err.Error(),
 			)
 			return
 		}
@@ -689,8 +688,8 @@ func (r *assignment_groupResource) Update(ctx context.Context, req resource.Upda
 		err := r.client.AssignmentGroupSyncProfiles(plan.ID.ValueString())
 		if err != nil {
 			resp.Diagnostics.AddError(
-				"Error updating assignment group profile assignment",
-				"Could not update assignment group profile assignment, unexpected error: "+err.Error(),
+				"Error updating assignment group profile sync",
+				"Could not update assignment group profile sync, unexpected error: "+err.Error(),
 			)
 			return
 		}

provider/customProfile_data_source.go

@@ -61,33 +61,18 @@ func (d *customProfileDataSource) Read(ctx context.Context, req datasource.ReadR
 	diags := req.Config.Get(ctx, &state)
 	resp.Diagnostics.Append(diags...)
 
-	profiles, err := d.client.CustomProfileGetAll()
+	profile, err := d.client.ProfileGet(state.ID.ValueString())
 	if err != nil {
-		resp.Diagnostics.AddError(
-			"Unable to Read SimpleMDM profile",
-			err.Error(),
-		)
-		return
-	}
-
-	profilefound := false
-	for _, profile := range profiles.Data {
-		if state.ID.ValueString() == strconv.Itoa(profile.ID) {
-			state.Name = types.StringValue(profile.Attributes.Name)
-			profilefound = true
-			break
-		}
-	}
-
-	if !profilefound {
 		resp.Diagnostics.AddError(
 			"Error Reading SimpleMDM custom profile",
-			"Could not read custom profles ID %s from array:"+state.ID.ValueString(),
+			"Could not read custom profile ID "+state.ID.ValueString()+": "+err.Error(),
 		)
 		return
 	}
 
 	// Set state
+	state.Name = types.StringValue(profile.Data.Attributes.Name)
+	state.ID = types.StringValue(strconv.Itoa(profile.Data.ID))
 
 	diags = resp.State.Set(ctx, &state)
 	resp.Diagnostics.Append(diags...)

provider/customProfile_resourse.go

@@ -156,34 +156,22 @@ func (r *customProfileResource) Read(ctx context.Context, req resource.ReadReque
 		return
 	}
 
-	//retrive one needs to be implemented first
 	// Get refreshed profile values from SimpleMDM
-	profiles, err := r.client.CustomProfileGetAll()
+
+	profile, err := r.client.ProfileGet(state.ID.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(
 			"Error Reading SimpleMDM custom profile",
-			"Could not read custom profles ID "+state.ID.ValueString()+": "+err.Error(),
+			"Could not read custom profile ID "+state.ID.ValueString()+": "+err.Error(),
 		)
 		return
 	}
 
-	profilefound := false
-	for _, profile := range profiles.Data {
-		if state.ID.ValueString() == strconv.Itoa(profile.ID) {
-			state.Name = types.StringValue(profile.Attributes.Name)
-			state.UserScope = types.BoolValue(profile.Attributes.UserScope)
-			state.AttributeSupport = types.BoolValue(profile.Attributes.AttributeSupport)
-			state.EscapeAttributes = types.BoolValue(profile.Attributes.EscapeAttributes)
-			state.ReinstallAfterOSUpdate = types.BoolValue(profile.Attributes.ReinstallAfterOsUpdate)
-			profilefound = true
-			break
-		}
-	}
-
-	if !profilefound {
-		resp.State.RemoveResource(ctx)
-		return
-	}
+	state.Name = types.StringValue(profile.Data.Attributes.Name)
+	state.UserScope = types.BoolValue(profile.Data.Attributes.UserScope)
+	state.AttributeSupport = types.BoolValue(profile.Data.Attributes.AttributeSupport)
+	state.EscapeAttributes = types.BoolValue(profile.Data.Attributes.EscapeAttributes)
+	state.ReinstallAfterOSUpdate = types.BoolValue(profile.Data.Attributes.ReinstallAfterOsUpdate)
 
 	_, body, err := r.client.CustomProfileSHA(state.ID.ValueString())
 	if err != nil {