FIx cloud instance service account update (#1355)

Closes #1354
Seems like the update doesn't work here. However, changing it to `ForceNew` fixes the issue

Author: julienduchesne

internal/resources/cloud/resource_cloud_stack_service_account.go

@@ -58,6 +58,7 @@ This can be used to bootstrap a management service account for a new stack
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Default:     false,
+				ForceNew:    true,
 				Description: "The disabled status for the service account.",
 			},
 		},
@@ -136,17 +137,12 @@ func updateStackServiceAccount(ctx context.Context, d *schema.ResourceData, meta
 	}
 
 	updateRequest := service_accounts.NewUpdateServiceAccountParams().
-		WithBody(&models.UpdateServiceAccountForm{}).
+		WithBody(&models.UpdateServiceAccountForm{
+			Name:       d.Get("name").(string),
+			Role:       d.Get("role").(string),
+			IsDisabled: d.Get("is_disabled").(bool),
+		}).
 		WithServiceAccountID(id)
-	if d.HasChange("name") {
-		updateRequest.Body.Name = d.Get("name").(string)
-	}
-	if d.HasChange("role") {
-		updateRequest.Body.Role = d.Get("role").(string)
-	}
-	if d.HasChange("is_disabled") {
-		updateRequest.Body.IsDisabled = d.Get("is_disabled").(bool)
-	}
 
 	if _, err := client.ServiceAccounts.UpdateServiceAccount(updateRequest); err != nil {
 		return diag.FromErr(err)

internal/resources/cloud/resource_cloud_stack_service_account_test.go

@@ -30,18 +30,24 @@ func TestAccGrafanaServiceAccountFromCloud(t *testing.T) {
 		CheckDestroy:      testAccStackCheckDestroy(&stack),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccGrafanaServiceAccountFromCloud(slug, slug),
+				Config: testAccGrafanaServiceAccountFromCloud(slug, slug, true),
 				Check: resource.ComposeTestCheckFunc(
 					testAccStackCheckExists("grafana_cloud_stack.test", &stack),
 					testAccGrafanaAuthCheckServiceAccounts(&stack, []string{"management-sa"}),
 					resource.TestCheckResourceAttr("grafana_cloud_stack_service_account.management", "name", "management-sa"),
 					resource.TestCheckResourceAttr("grafana_cloud_stack_service_account.management", "role", "Admin"),
-					resource.TestCheckResourceAttr("grafana_cloud_stack_service_account.management", "is_disabled", "false"),
+					resource.TestCheckResourceAttr("grafana_cloud_stack_service_account.management", "is_disabled", "true"),
 					resource.TestCheckResourceAttr("grafana_cloud_stack_service_account_token.management_token", "name", "management-sa-token"),
 					resource.TestCheckNoResourceAttr("grafana_cloud_stack_service_account_token.management_token", "expiration"),
 					resource.TestCheckResourceAttrSet("grafana_cloud_stack_service_account_token.management_token", "key"),
 				),
 			},
+			{
+				Config: testAccGrafanaServiceAccountFromCloud(slug, slug, false),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("grafana_cloud_stack_service_account.management", "is_disabled", "false"),
+				),
+			},
 			{
 				Config: testAccStackConfigBasic(slug, slug, "description"),
 				Check:  testAccGrafanaAuthCheckServiceAccounts(&stack, []string{}),
@@ -50,20 +56,21 @@ func TestAccGrafanaServiceAccountFromCloud(t *testing.T) {
 	})
 }
 
-func testAccGrafanaServiceAccountFromCloud(name, slug string) string {
-	return testAccStackConfigBasic(name, slug, "description") + `
+func testAccGrafanaServiceAccountFromCloud(name, slug string, disabled bool) string {
+	return testAccStackConfigBasic(name, slug, "description") + fmt.Sprintf(`
 	resource "grafana_cloud_stack_service_account" "management" {
 		stack_slug = grafana_cloud_stack.test.slug
-		name       = "management-sa"
-		role       = "Admin"
+		name        = "management-sa"
+		role        = "Admin"
+		is_disabled = %t
 	}
 
 	resource "grafana_cloud_stack_service_account_token" "management_token" {
 		stack_slug = grafana_cloud_stack.test.slug
 		service_account_id = grafana_cloud_stack_service_account.management.id
 		name       = "management-sa-token"
 	}
-	`
+	`, disabled)
 }
 
 func testAccGrafanaAuthCheckServiceAccounts(stack *gcom.FormattedApiInstance, expectedSAs []string) resource.TestCheckFunc {