d/api_management: switching to use a separate identity block flatte…

…n func for the Data Source

azurerm/internal/services/apimanagement/api_management_data_source.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz"
+	msiparse "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/msi/parse"
 
 	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2019-12-01/apimanagement"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -237,7 +238,7 @@ func dataSourceApiManagementRead(d *schema.ResourceData, meta interface{}) error
 		d.Set("location", azure.NormalizeLocation(*location))
 	}
 
-	identity, err := flattenAzureRmApiManagementMachineIdentity(resp.Identity)
+	identity, err := flattenApiManagementDataSourceIdentity(resp.Identity)
 	if err != nil {
 		return err
 	}
@@ -363,6 +364,37 @@ func flattenDataSourceApiManagementAdditionalLocations(input *[]apimanagement.Ad
 	return results
 }
 
+func flattenApiManagementDataSourceIdentity(identity *apimanagement.ServiceIdentity) ([]interface{}, error) {
+	if identity == nil || identity.Type == apimanagement.None {
+		return make([]interface{}, 0), nil
+	}
+
+	result := make(map[string]interface{})
+	result["type"] = string(identity.Type)
+
+	if identity.PrincipalID != nil {
+		result["principal_id"] = identity.PrincipalID.String()
+	}
+
+	if identity.TenantID != nil {
+		result["tenant_id"] = identity.TenantID.String()
+	}
+
+	identityIds := make([]interface{}, 0)
+	if identity.UserAssignedIdentities != nil {
+		for key := range identity.UserAssignedIdentities {
+			parsedId, err := msiparse.UserAssignedIdentityID(key)
+			if err != nil {
+				return nil, err
+			}
+			identityIds = append(identityIds, parsedId.ID())
+		}
+		result["identity_ids"] = identityIds
+	}
+
+	return []interface{}{result}, nil
+}
+
 func apiManagementDataSourceHostnameSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"host_name": {

azurerm/internal/services/apimanagement/api_management_resource.go

@@ -1203,8 +1203,7 @@ func flattenAzureRmApiManagementMachineIdentity(identity *apimanagement.ServiceI
 			}
 			identityIds = append(identityIds, parsedId.ID())
 		}
-		// not casting to a Set since this is a List in the DS and a Set in the Resource
-		result["identity_ids"] = identityIds
+		result["identity_ids"] = schema.NewSet(schema.HashString, identityIds)
 	}
 
 	return []interface{}{result}, nil