Moved role def sp assingment test

hashicorp · Nov 7, 2018 · 63fc501 · 63fc501
1 parent 0b36ba7
commit 63fc501
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 47 deletions.
diff --git a/azurerm/resource_arm_azuread_service_principal_test.go b/azurerm/resource_arm_azuread_service_principal_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
-	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
@@ -33,31 +32,6 @@ func TestAccAzureRMActiveDirectoryServicePrincipal_basic(t *testing.T) {
 	})
 }
 
-func TestAccAzureRMActiveDirectoryServicePrincipal_roleAssignment(t *testing.T) {
-	resourceName := "azurerm_azuread_service_principal.test"
-
-	ri := acctest.RandInt()
-	id := uuid.New().String()
-	config := testAccAzureRMActiveDirectoryServicePrincipal_roleAssignment(ri, id)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testCheckAzureRMActiveDirectoryServicePrincipalDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: config,
-				Check: resource.ComposeTestCheckFunc(
-					testCheckAzureRMActiveDirectoryServicePrincipalExists(resourceName),
-					testCheckAzureRMRoleAssignmentExists("azurerm_role_assignment.test"),
-					resource.TestCheckResourceAttrSet(resourceName, "display_name"),
-					resource.TestCheckResourceAttrSet(resourceName, "application_id"),
-				),
-			},
-		},
-	})
-}
-
 func testCheckAzureRMActiveDirectoryServicePrincipalExists(name string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[name]
@@ -115,24 +89,3 @@ resource "azurerm_azuread_service_principal" "test" {
 }
 `, id)
 }
-
-func testAccAzureRMActiveDirectoryServicePrincipal_roleAssignment(rInt int, roleAssignmentID string) string {
-	return fmt.Sprintf(`
-data "azurerm_subscription" "current" {}
-
-resource "azurerm_azuread_application" "test" {
-  name     = "acctestspa-%d"
-}
-
-resource "azurerm_azuread_service_principal" "test" {
-  application_id = "${azurerm_azuread_application.test.application_id}"
-}
-
-resource "azurerm_role_assignment" "test" {
-  name                 = "%s"
-  scope                = "${data.azurerm_subscription.current.id}"
-  role_definition_name = "Reader"
-  principal_id         = "${azurerm_azuread_service_principal.test.id}"
-}
-`, rInt, roleAssignmentID)
-}
diff --git a/azurerm/resource_arm_role_assignment_test.go b/azurerm/resource_arm_role_assignment_test.go
@@ -22,6 +22,9 @@ func TestAccAzureRMRoleAssignment(t *testing.T) {
 			"builtin":     testAccAzureRMRoleAssignment_builtin,
 			"custom":      testAccAzureRMRoleAssignment_custom,
 		},
+		"assingment": {
+			"sp": testAccAzureRMActiveDirectoryServicePrincipal_roleAssignment,
+		},
 		"import": {
 			"basic":  testAccAzureRMRoleAssignment_importBasic,
 			"custom": testAccAzureRMRoleAssignment_importCustom,
@@ -195,6 +198,31 @@ func testCheckAzureRMRoleAssignmentDestroy(s *terraform.State) error {
 	return nil
 }
 
+func testAccAzureRMActiveDirectoryServicePrincipal_roleAssignment(t *testing.T) {
+	resourceName := "azurerm_azuread_service_principal.test"
+
+	ri := acctest.RandInt()
+	id := uuid.New().String()
+	config := testAccAzureRMActiveDirectoryServicePrincipal_roleAssignment(ri, id)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMActiveDirectoryServicePrincipalDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMActiveDirectoryServicePrincipalExists(resourceName),
+					testCheckAzureRMRoleAssignmentExists("azurerm_role_assignment.test"),
+					resource.TestCheckResourceAttrSet(resourceName, "display_name"),
+					resource.TestCheckResourceAttrSet(resourceName, "application_id"),
+				),
+			},
+		},
+	})
+}
+
 func testAccAzureRMRoleAssignment_emptyNameConfig() string {
 	return `
 data "azurerm_subscription" "primary" {}
@@ -292,3 +320,24 @@ resource "azurerm_role_assignment" "test" {
 }
 `, roleDefinitionId, rInt, roleAssignmentId)
 }
+
+func testAccAzureRMActiveDirectoryServicePrincipal_roleAssignment(rInt int, roleAssignmentID string) string {
+	return fmt.Sprintf(`
+data "azurerm_subscription" "current" {}
+
+resource "azurerm_azuread_application" "test" {
+  name     = "acctestspa-%d"
+}
+
+resource "azurerm_azuread_service_principal" "test" {
+  application_id = "${azurerm_azuread_application.test.application_id}"
+}
+
+resource "azurerm_role_assignment" "test" {
+  name                 = "%s"
+  scope                = "${data.azurerm_subscription.current.id}"
+  role_definition_name = "Reader"
+  principal_id         = "${azurerm_azuread_service_principal.test.id}"
+}
+`, rInt, roleAssignmentID)
+}