From 511a0e6112cad1078e9f621c786ba066fbb95460 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 18 May 2020 09:37:27 +0100 Subject: [PATCH] acctest cleanup --- .../tests/blueprint_assignment_resource_test.go | 17 ++--------------- .../blueprint_definition_data_source_test.go | 4 ---- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/azurerm/internal/services/blueprints/tests/blueprint_assignment_resource_test.go b/azurerm/internal/services/blueprints/tests/blueprint_assignment_resource_test.go index a5e6f5130268..e66c3e7d606f 100644 --- a/azurerm/internal/services/blueprints/tests/blueprint_assignment_resource_test.go +++ b/azurerm/internal/services/blueprints/tests/blueprint_assignment_resource_test.go @@ -25,11 +25,6 @@ func TestAccBlueprintAssignment_basic(t *testing.T) { Config: testAccBlueprintAssignment_basic(data, "testAcc_basicSubscription"), Check: resource.ComposeTestCheckFunc( testCheckBlueprintAssignmentExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "identity.0.type", "userAssigned"), // Casing bug in API? - resource.TestCheckResourceAttr(data.ResourceName, "lock_mode", "none"), // Casing bug in API? - resource.TestCheckResourceAttr(data.ResourceName, "name", "testAccBPAssignment"), - resource.TestCheckResourceAttr(data.ResourceName, "scope_type", "subscriptions"), - resource.TestCheckResourceAttr(data.ResourceName, "version_name", "v0.1_testAcc"), ), }, data.ImportStep(), @@ -50,13 +45,9 @@ func TestAccBlueprintAssignment_subscriptionComplete(t *testing.T) { Config: testAccBlueprintAssignment_subscriptionComplete(data, "testAcc_subscriptionComplete"), Check: resource.ComposeTestCheckFunc( testCheckBlueprintAssignmentExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "identity.0.type", "userAssigned"), // Casing bug in API? - resource.TestCheckResourceAttr(data.ResourceName, "lock_mode", "allResourcesDoNotDelete"), // Casing bug in API? - resource.TestCheckResourceAttr(data.ResourceName, "name", "testAccBPAssignment"), - resource.TestCheckResourceAttr(data.ResourceName, "scope_type", "subscriptions"), - resource.TestCheckResourceAttr(data.ResourceName, "version_name", "v0.1_testAcc"), ), }, + data.ImportStep(), }, }) } @@ -74,13 +65,9 @@ func TestAccBlueprintAssignment_managementGroup(t *testing.T) { Config: testAccBlueprintAssignment_rootManagementGroup(data, "testAcc_basicRootManagementGroup"), Check: resource.ComposeTestCheckFunc( testCheckBlueprintAssignmentExists(data.ResourceName), - resource.TestCheckResourceAttr(data.ResourceName, "identity.0.type", "userAssigned"), // Casing bug in API? - resource.TestCheckResourceAttr(data.ResourceName, "lock_mode", "none"), // Casing bug in API? - resource.TestCheckResourceAttr(data.ResourceName, "name", "testAccBPAssignment"), - resource.TestCheckResourceAttr(data.ResourceName, "scope_type", "subscriptions"), - resource.TestCheckResourceAttr(data.ResourceName, "version_name", "v0.1_testAcc"), ), }, + data.ImportStep(), }, }) } diff --git a/azurerm/internal/services/blueprints/tests/blueprint_definition_data_source_test.go b/azurerm/internal/services/blueprints/tests/blueprint_definition_data_source_test.go index 209a87bbbdae..2dd267fb120e 100644 --- a/azurerm/internal/services/blueprints/tests/blueprint_definition_data_source_test.go +++ b/azurerm/internal/services/blueprints/tests/blueprint_definition_data_source_test.go @@ -35,8 +35,6 @@ func TestAccDataSourceBlueprintDefinition_basic(t *testing.T) { func TestAccDataSourceBlueprintDefinition_basicAtRootManagementGroup(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_blueprint_definition", "test") - // TODO - Update when the AccTest environment is capable of supporting MG level testing. For now this will fail. - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, @@ -58,8 +56,6 @@ func TestAccDataSourceBlueprintDefinition_basicAtRootManagementGroup(t *testing. func TestAccDataSourceBlueprintDefinition_basicAtChildManagementGroup(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_blueprint_definition", "test") - // TODO - Update when the AccTest environment is capable of supporting MG level testing. For now this will fail. - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders,