Merge pull request hashicorp#1050 from Noel-Jones/bugfix/sp-owner-rem…

…oval Bugfix: serviceprincipal owner removal hashicorp#1049
alexwilcox9 · Mar 21, 2023 · 432ffb9 · 432ffb9
2 parents 0a250c5 + 6966539
commit 432ffb9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/internal/services/serviceprincipals/service_principal_resource.go b/internal/services/serviceprincipals/service_principal_resource.go
@@ -539,13 +539,13 @@ func servicePrincipalResourceUpdate(ctx context.Context, d *schema.ResourceData,
 		return tf.ErrorDiagF(err, "Updating service principal with object ID: %q", d.Id())
 	}
 
-	if v, ok := d.GetOk("owners"); ok && d.HasChange("owners") {
+	if d.HasChange("owners") {
 		owners, _, err := client.ListOwners(ctx, d.Id())
 		if err != nil {
 			return tf.ErrorDiagF(err, "Could not retrieve owners for service principal with object ID: %q", d.Id())
 		}
 
-		desiredOwners := *tf.ExpandStringSlicePtr(v.(*schema.Set).List())
+		desiredOwners := *tf.ExpandStringSlicePtr(d.Get("owners").(*schema.Set).List())
 		existingOwners := *owners
 		ownersForRemoval := utils.Difference(existingOwners, desiredOwners)
 		ownersToAdd := utils.Difference(desiredOwners, existingOwners)

diff --git a/internal/services/serviceprincipals/service_principal_resource_test.go b/internal/services/serviceprincipals/service_principal_resource_test.go
@@ -235,7 +235,7 @@ func TestAccServicePrincipal_owners(t *testing.T) {
 		},
 		data.ImportStep(),
 		{
-			Config: r.basic(data),
+			Config: r.noOwners(data),
 			Check: resource.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 				check.That(data.ResourceName).Key("owners.#").HasValue("0"),
@@ -534,19 +534,19 @@ resource "azuread_user" "testC" {
 `, data.RandomInteger, data.RandomPassword)
 }
 
-func (ServicePrincipalResource) noOwners(data acceptance.TestData) string {
+func (r ServicePrincipalResource) noOwners(data acceptance.TestData) string {
 	return fmt.Sprintf(`
-provider "azuread" {}
+%[1]s
 
 resource "azuread_application" "test" {
-  display_name = "acctestServicePrincipal-%[1]d"
+  display_name = "acctestServicePrincipal-%[2]d"
 }
 
 resource "azuread_service_principal" "test" {
   application_id = azuread_application.test.application_id
   owners         = []
 }
-`, data.RandomInteger)
+`, r.templateThreeUsers(data), data.RandomInteger)
 }
 
 func (r ServicePrincipalResource) singleOwner(data acceptance.TestData) string {