From 15fba84de155c8510df2da4de1b59790029b59ea Mon Sep 17 00:00:00 2001 From: Simon Halsey Date: Wed, 5 Aug 2020 19:14:36 +0100 Subject: [PATCH] Fixed parsing of management group id --- .../managementgroup/parse/management_group.go | 2 +- .../managementgroup/parse/management_group_test.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/managementgroup/parse/management_group.go b/azurerm/internal/services/managementgroup/parse/management_group.go index 01021b47bfd5..46dfab265779 100644 --- a/azurerm/internal/services/managementgroup/parse/management_group.go +++ b/azurerm/internal/services/managementgroup/parse/management_group.go @@ -11,7 +11,7 @@ type ManagementGroupId struct { } func ManagementGroupID(input string) (*ManagementGroupId, error) { - regex := regexp.MustCompile(`^/providers/[Mm]icrosoft\.[Mm]anagement/management[Gg]roups/`) + regex := regexp.MustCompile(`^/providers/[Mm]icrosoft\.[Mm]anagement/[Mm]anagement[Gg]roups/`) if !regex.MatchString(input) { return nil, fmt.Errorf("Unable to parse Management Group ID %q", input) } diff --git a/azurerm/internal/services/managementgroup/parse/management_group_test.go b/azurerm/internal/services/managementgroup/parse/management_group_test.go index c852424b4bf4..6e8e7a0ac0e0 100644 --- a/azurerm/internal/services/managementgroup/parse/management_group_test.go +++ b/azurerm/internal/services/managementgroup/parse/management_group_test.go @@ -38,6 +38,13 @@ func TestManagementGroupID(t *testing.T) { Name: "myGroup", }, }, + { + Name: "Management Group ID in Readable ID", + Input: "/providers/Microsoft.Management/ManagementGroups/myGroup", + Expected: &ManagementGroupId{ + Name: "myGroup", + }, + }, { Name: "Management Group ID in UUID with wrong casing", Input: "/providers/microsoft.management/managementgroups/00000000-0000-0000-0000-000000000000", @@ -45,6 +52,13 @@ func TestManagementGroupID(t *testing.T) { Name: "00000000-0000-0000-0000-000000000000", }, }, + { + Name: "Management Group ID in UUID with wrong casing", + Input: "/providers/microsoft.management/Managementgroups/00000000-0000-0000-0000-000000000000", + Expected: &ManagementGroupId{ + Name: "00000000-0000-0000-0000-000000000000", + }, + }, { Name: "Management Group ID in Readable ID with wrong casing", Input: "/providers/microsoft.management/managementgroups/group1",