From 7e7bd63427085cd78b7ecb79ee52f00262b04dc2 Mon Sep 17 00:00:00 2001 From: Tom Bamford Date: Fri, 3 Dec 2021 12:28:25 +0000 Subject: [PATCH] Bugfix: parse User Assigned Identity ID insensitively --- .../services/apimanagement/api_management_data_source.go | 2 +- internal/services/apimanagement/api_management_resource.go | 2 +- internal/services/blueprints/blueprint.go | 2 +- internal/services/cognitive/cognitive_account_resource.go | 2 +- internal/services/containers/container_group_resource.go | 2 +- .../services/containers/kubernetes_cluster_data_source.go | 6 +++--- internal/services/containers/kubernetes_cluster_resource.go | 4 ++-- internal/services/datafactory/data_factory_resource.go | 2 +- internal/services/kusto/identity.go | 2 +- .../msi/migration/user_assigned_identity_V0_to_V1.go | 2 +- internal/services/mssql/mssql_server_resource.go | 4 ++-- internal/services/network/application_gateway_resource.go | 2 +- internal/services/storage/storage_account_resource.go | 2 +- internal/services/videoanalyzer/video_analyzer_resource.go | 2 +- internal/services/web/app_service.go | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/services/apimanagement/api_management_data_source.go b/internal/services/apimanagement/api_management_data_source.go index 104eca1974874..83a6bb194e282 100644 --- a/internal/services/apimanagement/api_management_data_source.go +++ b/internal/services/apimanagement/api_management_data_source.go @@ -382,7 +382,7 @@ func flattenApiManagementDataSourceIdentity(identity *apimanagement.ServiceIdent identityIds := make([]interface{}, 0) if identity.UserAssignedIdentities != nil { for key := range identity.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/apimanagement/api_management_resource.go b/internal/services/apimanagement/api_management_resource.go index b9ff9cfe34dd3..224577a1d4f86 100644 --- a/internal/services/apimanagement/api_management_resource.go +++ b/internal/services/apimanagement/api_management_resource.go @@ -1361,7 +1361,7 @@ func flattenAzureRmApiManagementMachineIdentity(identity *apimanagement.ServiceI identityIds := make([]interface{}, 0) if identity.UserAssignedIdentities != nil { for key := range identity.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/blueprints/blueprint.go b/internal/services/blueprints/blueprint.go index deda3f234732d..52344bc6f435c 100644 --- a/internal/services/blueprints/blueprint.go +++ b/internal/services/blueprints/blueprint.go @@ -160,7 +160,7 @@ func flattenArmBlueprintAssignmentIdentity(input *blueprint.ManagedServiceIdenti identityIds := make([]string, 0) if input.UserAssignedIdentities != nil { for key := range input.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/cognitive/cognitive_account_resource.go b/internal/services/cognitive/cognitive_account_resource.go index 9c4d855b086f4..8c3a8e5052c51 100644 --- a/internal/services/cognitive/cognitive_account_resource.go +++ b/internal/services/cognitive/cognitive_account_resource.go @@ -892,7 +892,7 @@ func flattenCognitiveAccountIdentity(identity *identity.SystemUserAssignedIdenti identityIds := make([]interface{}, 0) if identity.UserAssignedIdentities != nil { for key := range identity.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/containers/container_group_resource.go b/internal/services/containers/container_group_resource.go index 8291a07f93b1a..bccbeb673cf4b 100644 --- a/internal/services/containers/container_group_resource.go +++ b/internal/services/containers/container_group_resource.go @@ -1284,7 +1284,7 @@ func flattenContainerGroupIdentity(identity *containerinstance.ContainerGroupIde } */ for key := range identity.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/containers/kubernetes_cluster_data_source.go b/internal/services/containers/kubernetes_cluster_data_source.go index 65c0e27af9004..ed329fe631315 100644 --- a/internal/services/containers/kubernetes_cluster_data_source.go +++ b/internal/services/containers/kubernetes_cluster_data_source.go @@ -973,7 +973,7 @@ func flattenKubernetesClusterDataSourceAddOnIdentityProfile(profile *containerse userAssignedIdentityID := "" if resourceid := profile.ResourceID; resourceid != nil { - parsedId, err := msiparse.UserAssignedIdentityID(*resourceid) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(*resourceid) if err != nil { return nil, err } @@ -1118,7 +1118,7 @@ func flattenKubernetesClusterDataSourceIdentityProfile(profile map[string]*conta userAssignedIdentityId := "" if resourceid := kubeletidentity.ResourceID; resourceid != nil { - parsedId, err := msiparse.UserAssignedIdentityID(*resourceid) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(*resourceid) if err != nil { return nil, err } @@ -1281,7 +1281,7 @@ func flattenKubernetesClusterDataSourceManagedClusterIdentity(input *containerse keys = append(keys, key) } if len(keys) > 0 { - parsedId, err := msiparse.UserAssignedIdentityID(keys[0]) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(keys[0]) if err != nil { return nil, err } diff --git a/internal/services/containers/kubernetes_cluster_resource.go b/internal/services/containers/kubernetes_cluster_resource.go index 966687dc3fcfa..59e427eb94812 100644 --- a/internal/services/containers/kubernetes_cluster_resource.go +++ b/internal/services/containers/kubernetes_cluster_resource.go @@ -1877,7 +1877,7 @@ func flattenKubernetesClusterIdentityProfile(profile map[string]*containerservic userAssignedIdentityId := "" if resourceid := kubeletidentity.ResourceID; resourceid != nil { - parsedId, err := msiparse.UserAssignedIdentityID(*resourceid) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(*resourceid) if err != nil { return nil, err } @@ -2493,7 +2493,7 @@ func flattenKubernetesClusterManagedClusterIdentity(input *containerservice.Mana keys = append(keys, key) } if len(keys) > 0 { - parsedId, err := msiparse.UserAssignedIdentityID(keys[0]) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(keys[0]) if err != nil { return nil, err } diff --git a/internal/services/datafactory/data_factory_resource.go b/internal/services/datafactory/data_factory_resource.go index 9ffe35ca9a61c..e5b367f59b9fd 100644 --- a/internal/services/datafactory/data_factory_resource.go +++ b/internal/services/datafactory/data_factory_resource.go @@ -587,7 +587,7 @@ func flattenDataFactoryIdentity(identity *datafactory.FactoryIdentity) (interfac var identityIds []string if identity.UserAssignedIdentities != nil { for key := range identity.UserAssignedIdentities { - id, err := msiParse.UserAssignedIdentityID(key) + id, err := msiParse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/kusto/identity.go b/internal/services/kusto/identity.go index 521990a818bb1..13a67306f5bf5 100644 --- a/internal/services/kusto/identity.go +++ b/internal/services/kusto/identity.go @@ -92,7 +92,7 @@ func flattenIdentity(input *kusto.Identity) ([]interface{}, error) { identityIds := make([]string, 0) if input.UserAssignedIdentities != nil { for key := range input.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/msi/migration/user_assigned_identity_V0_to_V1.go b/internal/services/msi/migration/user_assigned_identity_V0_to_V1.go index 2db699342876f..a6f450a66cf77 100644 --- a/internal/services/msi/migration/user_assigned_identity_V0_to_V1.go +++ b/internal/services/msi/migration/user_assigned_identity_V0_to_V1.go @@ -53,7 +53,7 @@ func (UserAssignedIdentityV0ToV1) Schema() map[string]*pluginsdk.Schema { func (UserAssignedIdentityV0ToV1) UpgradeFunc() pluginsdk.StateUpgraderFunc { return func(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { oldId := rawState["id"].(string) - id, err := parse.UserAssignedIdentityID(oldId) + id, err := parse.UserAssignedIdentityIDInsensitively(oldId) if err != nil { return rawState, err } diff --git a/internal/services/mssql/mssql_server_resource.go b/internal/services/mssql/mssql_server_resource.go index e76b8fb3e0ec1..0a51d725e4648 100644 --- a/internal/services/mssql/mssql_server_resource.go +++ b/internal/services/mssql/mssql_server_resource.go @@ -511,7 +511,7 @@ func resourceMsSqlServerRead(d *pluginsdk.ResourceData, meta interface{}) error d.Set("public_network_access_enabled", props.PublicNetworkAccess == sql.ServerNetworkAccessFlagEnabled) primaryUserAssignedIdentityID := "" if props.PrimaryUserAssignedIdentityID != nil && *props.PrimaryUserAssignedIdentityID != "" { - parsedPrimaryUserAssignedIdentityID, err := msiparse.UserAssignedIdentityID(*props.PrimaryUserAssignedIdentityID) + parsedPrimaryUserAssignedIdentityID, err := msiparse.UserAssignedIdentityIDInsensitively(*props.PrimaryUserAssignedIdentityID) if err != nil { return err } @@ -611,7 +611,7 @@ func flattenSqlServerIdentity(identity *sql.ResourceIdentity) ([]interface{}, er identityIds := make([]string, 0) if identity.UserAssignedIdentities != nil { for key := range identity.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/network/application_gateway_resource.go b/internal/services/network/application_gateway_resource.go index 30eacfaddcb5e..cc72f98e9b8a1 100644 --- a/internal/services/network/application_gateway_resource.go +++ b/internal/services/network/application_gateway_resource.go @@ -1833,7 +1833,7 @@ func flattenRmApplicationGatewayIdentity(identity *network.ManagedServiceIdentit identityIds := make([]string, 0) if identity.UserAssignedIdentities != nil { for key := range identity.UserAssignedIdentities { - parsedId, err := msiParse.UserAssignedIdentityID(key) + parsedId, err := msiParse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/storage/storage_account_resource.go b/internal/services/storage/storage_account_resource.go index cb07c5457eb4c..731222b37db7b 100644 --- a/internal/services/storage/storage_account_resource.go +++ b/internal/services/storage/storage_account_resource.go @@ -2915,7 +2915,7 @@ func flattenAzureRmStorageAccountIdentity(identity *storage.Identity) ([]interfa identityIds := make([]interface{}, 0) if identity.UserAssignedIdentities != nil { for key := range identity.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/videoanalyzer/video_analyzer_resource.go b/internal/services/videoanalyzer/video_analyzer_resource.go index 4e3fc782655e3..4115f54a27a4f 100644 --- a/internal/services/videoanalyzer/video_analyzer_resource.go +++ b/internal/services/videoanalyzer/video_analyzer_resource.go @@ -290,7 +290,7 @@ func flattenAzureRmVideoServiceIdentity(identity *videoanalyzer.VideoAnalyzerIde } */ for key := range *identity.UserAssignedIdentities { - parsedId, err := msiparse.UserAssignedIdentityID(key) + parsedId, err := msiparse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err } diff --git a/internal/services/web/app_service.go b/internal/services/web/app_service.go index b29608a8a9860..44753373f4b67 100644 --- a/internal/services/web/app_service.go +++ b/internal/services/web/app_service.go @@ -1646,7 +1646,7 @@ func flattenAppServiceIdentity(identity *web.ManagedServiceIdentity) ([]interfac identityIds := make([]string, 0) if identity.UserAssignedIdentities != nil { for key := range identity.UserAssignedIdentities { - parsedId, err := parse.UserAssignedIdentityID(key) + parsedId, err := parse.UserAssignedIdentityIDInsensitively(key) if err != nil { return nil, err }