Merge pull request #602 from hashicorp/bugfix/service-principal-no-fe…

…atures

Bugfix: allow service principal with no features / all features disabled

internal/services/serviceprincipals/service_principal_resource_test.go

@@ -136,6 +136,13 @@ func TestAccServicePrincipal_featuresUpdate(t *testing.T) {
 	r := ServicePrincipalResource{}
 
 	data.ResourceTest(t, r, []resource.TestStep{
+		{
+			Config: r.noFeatures(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep("use_existing"),
 		{
 			Config: r.basic(data),
 			Check: resource.ComposeTestCheckFunc(
@@ -178,6 +185,20 @@ func TestAccServicePrincipal_featuresUpdate(t *testing.T) {
 			),
 		},
 		data.ImportStep("use_existing"),
+		{
+			Config: r.noFeatures(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep("use_existing"),
+		{
+			Config: r.features(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep("use_existing"),
 	})
 }
 
@@ -464,6 +485,35 @@ resource "azuread_service_principal" "test" {
 `, r.templateComplete(data), data.RandomInteger)
 }
 
+func (r ServicePrincipalResource) noFeatures(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%[1]s
+
+resource "azuread_service_principal" "test" {
+  application_id = azuread_application.test.application_id
+
+  account_enabled               = false
+  alternative_names             = ["foo", "bar"]
+  app_role_assignment_required  = true
+  description                   = "An internal app for testing"
+  login_url                     = "https://test-%[2]d.internal/login"
+  notes                         = "Just testing something"
+  preferred_single_sign_on_mode = "saml"
+
+  features {
+    custom_single_sign_on_app = false
+    enterprise_application    = false
+    gallery_application       = false
+  }
+
+  notification_email_addresses = [
+    "[email protected]",
+    "[email protected]",
+  ]
+}
+`, r.templateComplete(data), data.RandomInteger)
+}
+
 func (ServicePrincipalResource) templateThreeUsers(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azuread" {}

internal/services/serviceprincipals/serviceprincipals.go

@@ -7,9 +7,11 @@ import (
 	"github.com/manicminer/hamilton/msgraph"
 )
 
-func expandFeatures(in []interface{}) (out []string) {
+func expandFeatures(in []interface{}) []string {
+	out := make([]string, 0)
+
 	if len(in) == 0 || in[0] == nil {
-		return
+		return out
 	}
 
 	features := in[0].(map[string]interface{})
@@ -30,7 +32,7 @@ func expandFeatures(in []interface{}) (out []string) {
 		out = append(out, "HideApp")
 	}
 
-	return
+	return out
 }
 
 func expandSamlSingleSignOn(in []interface{}) *msgraph.SamlSingleSignOnSettings {