Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Management Group CreateUpdate Function #6668

Merged
merged 4 commits into from
May 21, 2020
Merged

Fix Management Group CreateUpdate Function #6668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffab090
Change response not found to response forbidden
Apr 28, 2020
78d7001
Merge branch 'master' into wifrick/managementgroup-createupdate-fix
May 13, 2020
a07b823
Address PR comments
May 14, 2020
f04d485
test fixes, status-403 bug changes
jackofallops May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azurerm/internal/services/managementgroup/management_group_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func dataSourceArmManagementGroupRead(d *schema.ResourceData, meta interface{})
recurse := true
resp, err := client.Get(ctx, groupName, "children", &recurse, "", managementGroupCacheControl)
if err != nil {
if utils.ResponseWasNotFound(resp.Response) {
if utils.ResponseWasForbidden(resp.Response) {
return fmt.Errorf("Management Group %q was not found", groupName)
}

Expand Down
20 changes: 12 additions & 8 deletions azurerm/internal/services/managementgroup/management_group_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,18 @@ func resourceArmManagementGroupCreateUpdate(d *schema.ResourceData, meta interfa
defer cancel()
armTenantID := meta.(*clients.Client).Account.TenantId

groupName := uuid.New().String()
if v, ok := d.GetOk("group_name"); ok {
var groupName string
if v := d.Get("group_id"); v != "" {
groupName = v.(string)
}
if v, ok := d.GetOk("group_id"); ok {
if v := d.Get("name"); v != "" {
groupName = v.(string)
}

if groupName == "" {
groupName = uuid.New().String()
}

parentManagementGroupId := d.Get("parent_management_group_id").(string)
if parentManagementGroupId == "" {
parentManagementGroupId = fmt.Sprintf("/providers/Microsoft.Management/managementGroups/%s", armTenantID)
Expand All @@ -107,11 +111,11 @@ func resourceArmManagementGroupCreateUpdate(d *schema.ResourceData, meta interfa
if d.IsNewResource() {
existing, err := client.Get(ctx, groupName, "children", &recurse, "", managementGroupCacheControl)
if err != nil {
if !utils.ResponseWasNotFound(existing.Response) {
// 403 is returned if group does not exist, bug tracked at: https://github.com/Azure/azure-rest-api-specs/issues/9549
if !utils.ResponseWasNotFound(existing.Response) && !utils.ResponseWasForbidden(existing.Response) {
return fmt.Errorf("unable to check for presence of existing Management Group %q: %s", groupName, err)
}
}

if existing.ID != nil && *existing.ID != "" {
return tf.ImportAsExistsError("azurerm_management_group", *existing.ID)
}
Expand All @@ -131,7 +135,7 @@ func resourceArmManagementGroupCreateUpdate(d *schema.ResourceData, meta interfa
},
}

if v, ok := d.GetOk("display_name"); ok {
if v := d.Get("display_name"); v != "" {
properties.CreateManagementGroupProperties.DisplayName = utils.String(v.(string))
}

Expand Down Expand Up @@ -199,7 +203,7 @@ func resourceArmManagementGroupRead(d *schema.ResourceData, meta interface{}) er
recurse := true
resp, err := client.Get(ctx, id.GroupId, "children", &recurse, "", managementGroupCacheControl)
if err != nil {
if utils.ResponseWasNotFound(resp.Response) {
if utils.ResponseWasForbidden(resp.Response) || utils.ResponseWasNotFound(resp.Response) {
log.Printf("[INFO] Management Group %q doesn't exist - removing from state", d.Id())
d.SetId("")
return nil
Expand Down Expand Up @@ -248,7 +252,7 @@ func resourceArmManagementGroupDelete(d *schema.ResourceData, meta interface{})
recurse := true
group, err := client.Get(ctx, id.GroupId, "children", &recurse, "", managementGroupCacheControl)
if err != nil {
if utils.ResponseWasNotFound(group.Response) {
if utils.ResponseWasNotFound(group.Response) || utils.ResponseWasForbidden(group.Response) {
log.Printf("[DEBUG] Management Group %q doesn't exist in Azure - nothing to do!", id.GroupId)
return nil
}
Expand Down
31 changes: 17 additions & 14 deletions azurerm/internal/services/managementgroup/tests/management_group_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
func TestAccAzureRMManagementGroup_basic(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_management_group", "test")

resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMManagementGroupDestroy,
Expand All @@ -34,7 +34,7 @@ func TestAccAzureRMManagementGroup_basic(t *testing.T) {
func TestAccAzureRMManagementGroup_requiresImport(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_management_group", "test")

resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMManagementGroupDestroy,
Expand All @@ -54,7 +54,7 @@ func TestAccAzureRMManagementGroup_requiresImport(t *testing.T) {
}

func TestAccAzureRMManagementGroup_nested(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMManagementGroupDestroy,
Expand All @@ -76,7 +76,7 @@ func TestAccAzureRMManagementGroup_nested(t *testing.T) {
}

func TestAccAzureRMManagementGroup_multiLevel(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMManagementGroupDestroy,
Expand All @@ -99,7 +99,7 @@ func TestAccAzureRMManagementGroup_multiLevel(t *testing.T) {
}

func TestAccAzureRMManagementGroup_multiLevelUpdated(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMManagementGroupDestroy,
Expand All @@ -126,7 +126,7 @@ func TestAccAzureRMManagementGroup_multiLevelUpdated(t *testing.T) {
func TestAccAzureRMManagementGroup_withName(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_management_group", "test")

resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMManagementGroupDestroy,
Expand All @@ -137,14 +137,15 @@ func TestAccAzureRMManagementGroup_withName(t *testing.T) {
testCheckAzureRMManagementGroupExists(data.ResourceName),
),
},
data.ImportStep(),
},
})
}

func TestAccAzureRMManagementGroup_updateName(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_management_group", "test")

resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMManagementGroupDestroy,
Expand All @@ -159,9 +160,10 @@ func TestAccAzureRMManagementGroup_updateName(t *testing.T) {
Config: testAzureRMManagementGroup_withName(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMManagementGroupExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "display_name", fmt.Sprintf("acctestmg-%d", data.RandomInteger)),
resource.TestCheckResourceAttr(data.ResourceName, "name", fmt.Sprintf("acctestmg-%d", data.RandomInteger)),
),
},
data.ImportStep(),
},
})
}
Expand All @@ -170,7 +172,7 @@ func TestAccAzureRMManagementGroup_withSubscriptions(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_management_group", "test")
subscriptionID := os.Getenv("ARM_SUBSCRIPTION_ID")

resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMManagementGroupDestroy,
Expand Down Expand Up @@ -218,8 +220,8 @@ func testCheckAzureRMManagementGroupExists(resourceName string) resource.TestChe
return fmt.Errorf("Bad: Get on managementGroupsClient: %s", err)
}

if resp.StatusCode == http.StatusNotFound {
return fmt.Errorf("Management Group does not exist: %s", groupName)
if resp.StatusCode == http.StatusForbidden {
return fmt.Errorf("Management Group does not exist or you do not have proper permissions: %s", groupName)
}

return nil
Expand All @@ -243,7 +245,7 @@ func testCheckAzureRMManagementGroupDestroy(s *terraform.State) error {
return nil
}

if resp.StatusCode != http.StatusNotFound {
if resp.StatusCode == http.StatusAccepted {
return fmt.Errorf("Management Group still exists: %s", *resp.Name)
}
}
Expand Down Expand Up @@ -318,9 +320,10 @@ provider "azurerm" {
}

resource "azurerm_management_group" "test" {
display_name = "acctestmg-%d"
name = "acctestmg-%d"
display_name = "accTestMG-%d"
}
`, data.RandomInteger)
`, data.RandomInteger, data.RandomInteger)
}

// TODO: switch this out for dynamically creating a subscription once that's supported in the future
Expand Down