@azure-tools/typespec-azure-resource-manager 0.43.0-dev.0 → 0.43.0-dev.10

package/lib/arm.tsp

@@ -3,17 +3,11 @@ import "@typespec/openapi";
 import "@typespec/http";
 import "@typespec/rest";
 import "@typespec/versioning";
-import "@azure-tools/typespec-autorest";
 import "@azure-tools/typespec-azure-core";
 
-import "./arm.foundations.tsp";
+import "./foundations/arm.foundations.tsp";
 import "./common-types/common-types.tsp";
-import "./common-types/backcompat.tsp";
-import "./common-types/types.tsp";
-import "./common-types/managed-identity.tsp";
-import "./common-types/private-links.tsp";
-import "./common-types/customer-managed-keys.tsp";
-import "./common-types/extended-location.tsp";
+import "./backcompat.tsp";
 import "./private.decorators.tsp";
 import "./models.tsp";
 import "./operations.tsp";
@@ -26,7 +20,6 @@ using TypeSpec.Http;
 using TypeSpec.Rest;
 using TypeSpec.Versioning;
 using TypeSpec.OpenAPI;
-using Autorest;
 using Azure.ResourceManager.Foundations;
 
 @versioned(Azure.ResourceManager.Versions)

package/lib/backcompat.tsp

@@ -0,0 +1,27 @@
+using Azure.ResourceManager.CommonTypes;
+
+namespace Azure.ResourceManager;
+
+// customer-managed-keys
+alias InfrastructureEncryption = CommonTypes.InfrastructureEncryption;
+alias KeyEncryptionIdentity = CommonTypes.KeyEncryptionKeyIdentity;
+alias KeyEncryptionKeyIdentity = CommonTypes.KeyEncryptionKeyIdentity;
+alias CustomerManagedKeyEncryption = CommonTypes.CustomerManagedKeyEncryption;
+alias EncryptionConfiguration = CommonTypes.Encryption;
+
+// private-links
+alias PrivateEndpoint = CommonTypes.PrivateEndpoint;
+alias PrivateEndpointConnection = CommonTypes.PrivateEndpointConnection;
+alias PrivateEndpointConnectionProperties = CommonTypes.PrivateEndpointConnectionProperties;
+alias PrivateLinkServiceConnectionState = CommonTypes.PrivateLinkServiceConnectionState;
+alias PrivateEndpointConnectionProvisioningState = CommonTypes.PrivateEndpointConnectionProvisioningState;
+alias PrivateEndpointServiceConnectionStatus = CommonTypes.PrivateEndpointServiceConnectionStatus;
+alias PrivateEndpointConnectionParameter = CommonTypes.PrivateEndpointConnectionParameter;
+alias PrivateLinkResource = CommonTypes.PrivateLinkResource;
+alias PrivateLinkResourceProperties = CommonTypes.PrivateLinkResourceProperties;
+alias PrivateLinkResourceParameter = CommonTypes.PrivateLinkResourceParameter;
+alias PrivateEndpointConnectionResourceListResult = CommonTypes.PrivateEndpointConnectionListResult;
+alias PrivateLinkResourceListResult = CommonTypes.PrivateLinkResourceListResult;
+
+// types
+alias ErrorResponse = CommonTypes.ErrorResponse;

package/lib/common-types/common-types.tsp

@@ -1,10 +1,20 @@
 import "@typespec/versioning";
+import "@azure-tools/typespec-azure-core";
+import "./common-types.tsp";
+import "./types-ref.tsp";
+import "./managed-identity-ref.tsp";
+import "./private-links-ref.tsp";
+import "./customer-managed-keys-ref.tsp";
+import "./extended-location-ref.tsp";
+import "./internal.tsp";
+import "./commontypes.private.decorators.tsp";
 
 using TypeSpec.Versioning;
 
+@versioned(Versions)
 namespace Azure.ResourceManager.CommonTypes;
 
-@Private.armCommonTypesVersions
+@CommonTypes.Private.armCommonTypesVersions
 @doc("The Azure Resource Manager common-types versions.")
 enum Versions {
   @doc("The Azure Resource Manager v3 common types.")

package/lib/common-types/commontypes.private.decorators.tsp

@@ -0,0 +1,43 @@
+import "../../dist/src/commontypes.private.decorators.js";
+
+namespace Azure.ResourceManager.CommonTypes.Private;
+
+using TypeSpec.Reflection;
+
+/**
+ * Describes the shape of model literals accepted by the `version` parameter of
+ * the `armCommonDefinition` and `armCommonParameter` decorators.
+ */
+alias ArmCommonTypeVersionSpec = {
+  version: string | EnumMember;
+  isDefault: boolean;
+};
+
+/**
+ * @param definitionName Definition name
+ * @param version Azure Resource Manager Version
+ * @param referenceFile Reference file
+ */
+extern dec armCommonDefinition(
+  target: Model,
+  definitionName?: valueof string,
+  version?: valueof EnumMember | ArmCommonTypeVersionSpec | string,
+  referenceFile?: valueof string
+);
+
+/**
+ * @param definitionName Definition name
+ * @param version Azure Resource Manager Version
+ * @param referenceFile Reference file
+ */
+extern dec armCommonParameter(
+  target: ModelProperty,
+  definitionName?: valueof string,
+  version?: valueof EnumMember | ArmCommonTypeVersionSpec | string,
+  referenceFile?: valueof string
+);
+
+/**
+ * Marks an enum as representing the valid `common-types` versions.
+ */
+extern dec armCommonTypesVersions(target: Enum);

package/lib/common-types/customer-managed-keys-ref.tsp

@@ -0,0 +1,27 @@
+import "./customer-managed-keys.tsp";
+
+using Azure.ResourceManager.CommonTypes.Private;
+
+namespace Azure.ResourceManager.CommonTypes;
+
+@@armCommonDefinition(Encryption,
+  "encryption",
+  #{ version: Azure.ResourceManager.CommonTypes.Versions.v4, isDefault: true },
+  "customermanagedkeys.json"
+);
+@@armCommonDefinition(Encryption,
+  "encryption",
+  Azure.ResourceManager.CommonTypes.Versions.v5,
+  "customermanagedkeys.json"
+);
+
+@@armCommonDefinition(CustomerManagedKeyEncryption,
+  "customerManagedKeyEncryption",
+  #{ version: Azure.ResourceManager.CommonTypes.Versions.v4, isDefault: true },
+  "customermanagedkeys.json"
+);
+@@armCommonDefinition(CustomerManagedKeyEncryption,
+  "customerManagedKeyEncryption",
+  Azure.ResourceManager.CommonTypes.Versions.v5,
+  "customermanagedkeys.json"
+);

package/lib/common-types/customer-managed-keys.tsp

@@ -1,84 +1,75 @@
 using Azure.Core;
-using Azure.ResourceManager.Private;
+using TypeSpec.Versioning;
 
-namespace Azure.ResourceManager;
+namespace Azure.ResourceManager.CommonTypes;
 
-@doc("(Optional) Discouraged to include in resource definition. Only needed where it is possible to disable platform (AKA infrastructure) encryption. Azure SQL TDE is an example of this. Values are enabled and disabled.")
+/** (Optional) Discouraged to include in resource definition. Only needed where it is possible to disable platform (AKA infrastructure) encryption. Azure SQL TDE is an example of this. Values are enabled and disabled. */
+@added(Versions.v4)
 union InfrastructureEncryption {
-  @doc("Encryption is enabled")
+  /** Encryption is enabled */
   Enabled: "enabled",
 
-  @doc("Encryption is disabled")
+  /** Encryption is disabled */
   Disabled: "disabled",
 
   string,
 }
 
-/** Alias of keyEncryptionKeyIdentity for back compatibility. Please change to keyEncryptionKeyIdentity. */
-alias KeyEncryptionIdentity = KeyEncryptionKeyIdentity;
-
-@doc("The type of identity to use.")
-union KeyEncryptionKeyIdentity {
-  @doc("System assigned identity")
+/** The type of identity to use. */
+@added(Versions.v4)
+union KeyEncryptionKeyIdentityType {
+  /** System assigned identity */
   SystemAssignedIdentity: "systemAssignedIdentity",
 
-  @doc("User assigned identity")
+  /** User assigned identity */
   UserAssignedIdentity: "userAssignedIdentity",
 
-  @doc("Delegated identity")
+  /** Delegated identity */
   DelegatedResourceIdentity: "delegatedResourceIdentity",
 
   string,
 }
 
-@doc("Customer-managed key encryption properties for the resource.")
-model CustomerManagedKeyEncryption {
-  @doc("The type of identity to use. Values can be systemAssignedIdentity, userAssignedIdentity, or delegatedResourceIdentity.")
-  keyEncryptionKeyIdentity?: KeyEncryptionKeyIdentity;
+/** All identity configuration for Customer-managed key settings defining which identity should be used to auth to Key Vault. */
+@added(Versions.v4)
+model KeyEncryptionKeyIdentity {
+  /** The type of identity to use. Values can be systemAssignedIdentity, userAssignedIdentity, or delegatedResourceIdentity. */
+  identityType?: KeyEncryptionKeyIdentityType;
 
-  @doc("User assigned identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity.")
+  /** User assigned identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity. */
   userAssignedIdentityResourceId?: Azure.Core.armResourceIdentifier<[
     {
       type: "Microsoft.ManagedIdentity/userAssignedIdentities";
     }
   ]>;
 
-  @doc("application client identity to use for accessing key encryption key Url in a different tenant. Ex: f83c6b1b-4d34-47e4-bb34-9d83df58b540")
+  /** application client identity to use for accessing key encryption key Url in a different tenant. Ex: f83c6b1b-4d34-47e4-bb34-9d83df58b540 */
+  @added(Versions.v5)
   federatedClientId?: uuid;
 
-  @doc("delegated identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity and userAssignedIdentity - internal use only.")
+  /** delegated identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity and userAssignedIdentity - internal use only. */
   delegatedIdentityClientId?: uuid;
 }
 
-@doc("All encryption configuration for a resource.")
-@armCommonDefinition(
-  "encryption",
-  Azure.ResourceManager.CommonTypes.Versions.v5,
-  "customermanagedkeys.json"
-)
-model EncryptionConfiguration {
-  @doc("Indicates if infrastructure encryption is enabled or disabled.")
-  infrastructureEncryption?: InfrastructureEncryption;
-
-  @doc("All customer-managed key encryption properties for the resource.")
-  customerManagedKeyEncryption?: CustomerManagedKeyEncryption;
+/** Customer-managed key encryption properties for the resource. */
+@added(Versions.v4)
+model CustomerManagedKeyEncryption {
+  /** All identity configuration for Customer-managed key settings defining which identity should be used to auth to Key Vault. */
+  keyEncryptionKeyIdentity?: KeyEncryptionKeyIdentity;
 
-  @doc("key encryption key Url, versioned or unversioned. Ex: https://contosovault.vault.azure.net/keys/contosokek/562a4bb76b524a1493a6afe8e536ee78 or https://contosovault.vault.azure.net/keys/contosokek.")
+  /** key encryption key Url, versioned or non-versioned. Ex: https://contosovault.vault.azure.net/keys/contosokek/562a4bb76b524a1493a6afe8e536ee78 or https://contosovault.vault.azure.net/keys/contosokek. */
   keyEncryptionKeyUrl?: string;
 }
 
-/**
- * Model used only to spread in the `encryption` envelope property for a resource.
- * @example
- *
- * ```typespec
- * model Foo is TrackedResource<FooProperties> {
- *   ...Encryption;
- * }
- * ```
- */
-@doc("All encryption configuration for a resource.")
+/** (Optional) Discouraged to include in resource definition. Only needed where it is possible to disable platform (AKA infrastructure) encryption. Azure SQL TDE is an example of this. Values are enabled and disabled. */
+@added(Versions.v4)
+@encodedName("application/json", "encryption")
 model Encryption {
-  @doc("All encryption configuration for a resource.")
-  encryption: EncryptionConfiguration;
+  /** Values are enabled and disabled. */
+  infrastructureEncryption?: InfrastructureEncryption;
+
+  /** All Customer-managed key encryption properties for the resource. */
+  @added(Versions.v4)
+  @removed(Versions.v5)
+  customerManagedKeyEncryption?: CustomerManagedKeyEncryption;
 }

package/lib/common-types/extended-location-ref.tsp

@@ -0,0 +1 @@
+import "./extended-location.tsp";

package/lib/common-types/extended-location.tsp

@@ -1,21 +1,20 @@
-namespace Azure.ResourceManager.Foundations {
-  /** The complex type of the extended location. */
-  model ExtendedLocation {
-    /** The name of the extended location. */
-    name: string;
+namespace Azure.ResourceManager.CommonTypes;
+/** The complex type of the extended location. */
+model ExtendedLocation {
+  /** The name of the extended location. */
+  name: string;
 
-    /** The type of the extended location. */
-    type: ExtendedLocationType;
-  }
+  /** The type of the extended location. */
+  type: ExtendedLocationType;
+}
 
-  /** The supported ExtendedLocation types. */
-  union ExtendedLocationType {
-    /** Azure Edge Zones location type */
-    EdgeZone: "EdgeZone",
+/** The supported ExtendedLocation types. */
+union ExtendedLocationType {
+  /** Azure Edge Zones location type */
+  EdgeZone: "EdgeZone",
 
-    /** Azure Custom Locations type */
-    CustomLocation: "CustomLocation",
+  /** Azure Custom Locations type */
+  CustomLocation: "CustomLocation",
 
-    string,
-  }
+  string,
 }

package/lib/common-types/internal.tsp

@@ -0,0 +1,24 @@
+namespace Azure.ResourceManager.CommonTypes;
+
+/**
+ * An internal enum to indicate the resource support for various path types
+ */
+enum ResourceHome {
+  @doc("The resource is bound to a tenant")
+  Tenant,
+
+  @doc("The resource is bound to a subscription")
+  Subscription,
+
+  @doc("The resource is bound to a location")
+  Location,
+
+  @doc("The resource is bound to a resource group")
+  ResourceGroup,
+
+  @doc("The resource is bound to an extension")
+  Extension,
+}
+
+/** Alias of keyEncryptionKeyIdentity for back compatibility. Please change to keyEncryptionKeyIdentity. */
+alias KeyEncryptionIdentity = KeyEncryptionKeyIdentity;

package/lib/common-types/managed-identity-ref.tsp

@@ -0,0 +1,79 @@
+import "./managed-identity.tsp";
+
+using Azure.ResourceManager.CommonTypes.Private;
+
+namespace Azure.ResourceManager.CommonTypes;
+
+/**
+ * The properties of the managed service identities assigned to this resource.
+ */
+@@armCommonDefinition(ManagedServiceIdentity,
+  "ManagedServiceIdentity",
+  #{ version: Azure.ResourceManager.CommonTypes.Versions.v3, isDefault: true },
+  "managedidentity.json"
+);
+@@armCommonDefinition(ManagedServiceIdentity,
+  "ManagedServiceIdentity",
+  Azure.ResourceManager.CommonTypes.Versions.v4,
+  "managedidentity.json"
+);
+@@armCommonDefinition(ManagedServiceIdentity,
+  "ManagedServiceIdentity",
+  Azure.ResourceManager.CommonTypes.Versions.v5,
+  "managedidentity.json"
+);
+
+/** The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests.", */
+@@armCommonDefinition(UserAssignedIdentities,
+  "UserAssignedIdentities",
+  #{ version: Azure.ResourceManager.CommonTypes.Versions.v3, isDefault: true },
+  "managedidentity.json"
+);
+@@armCommonDefinition(UserAssignedIdentities,
+  "UserAssignedIdentities",
+  Azure.ResourceManager.CommonTypes.Versions.v4,
+  "managedidentity.json"
+);
+@@armCommonDefinition(UserAssignedIdentities,
+  "UserAssignedIdentities",
+  Azure.ResourceManager.CommonTypes.Versions.v5,
+  "managedidentity.json"
+);
+
+/**
+ * The properties of the service-assigned identity associated with this resource.
+ */
+@@armCommonDefinition(SystemAssignedServiceIdentity,
+  "SystemAssignedServiceIdentity",
+  #{ version: Azure.ResourceManager.CommonTypes.Versions.v3, isDefault: true },
+  "managedidentity.json"
+);
+@@armCommonDefinition(SystemAssignedServiceIdentity,
+  "SystemAssignedServiceIdentity",
+  Azure.ResourceManager.CommonTypes.Versions.v4,
+  "managedidentity.json"
+);
+@@armCommonDefinition(SystemAssignedServiceIdentity,
+  "SystemAssignedServiceIdentity",
+  Azure.ResourceManager.CommonTypes.Versions.v5,
+  "managedidentity.json"
+);
+
+/**
+ * A managed identity assigned by the user.
+ */
+@@armCommonDefinition(UserAssignedIdentity,
+  "UserAssignedIdentity",
+  #{ version: Azure.ResourceManager.CommonTypes.Versions.v3, isDefault: true },
+  "managedidentity.json"
+);
+@@armCommonDefinition(UserAssignedIdentity,
+  "UserAssignedIdentity",
+  Azure.ResourceManager.CommonTypes.Versions.v4,
+  "managedidentity.json"
+);
+@@armCommonDefinition(UserAssignedIdentity,
+  "UserAssignedIdentity",
+  Azure.ResourceManager.CommonTypes.Versions.v5,
+  "managedidentity.json"
+);

package/lib/common-types/managed-identity.tsp

@@ -1,122 +1,100 @@
-using Azure.ResourceManager.Private;
+using Azure.Core;
+using TypeSpec.Versioning;
 
-namespace Azure.ResourceManager.Foundations;
+namespace Azure.ResourceManager.CommonTypes;
+
+/** The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests. */
+#deprecated "Do not use this model. Instead, use Record<UserAssignedIdentity> directly. Using this model will result in a different client SDK when generated from TypeSpec compared to the Swagger."
+model UserAssignedIdentities is Record<UserAssignedIdentity>;
 
-#deprecated "Please change ManagedIdentityProperties to ManagedServiceIdentity."
-alias ManagedIdentityProperties = ManagedServiceIdentity;
 /**
- * The properties of the managed service identities assigned to this resource.
+ * Managed service identity (system assigned and/or user assigned identities)
  */
-@armCommonDefinition(
-  "ManagedServiceIdentity",
-  {
-    version: Azure.ResourceManager.CommonTypes.Versions.v4,
-    isDefault: true,
-  },
-  "managedidentity.json"
-)
-@armCommonDefinition(
-  "ManagedServiceIdentity",
-  Azure.ResourceManager.CommonTypes.Versions.v5,
-  "managedidentity.json"
-)
 model ManagedServiceIdentity {
-  @doc("The Active Directory tenant id of the principal.")
+  /** The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity. */
   @visibility("read")
-  tenantId?: string;
+  principalId?: uuid;
 
-  @doc("The active directory identifier of this principal.")
+  /** The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity. */
   @visibility("read")
-  principalId?: string;
+  tenantId?: uuid;
 
-  @doc("The type of managed identity assigned to this resource.")
+  /** The type of managed identity assigned to this resource. */
   type: ManagedServiceIdentityType;
 
-  @doc("The identities assigned to this resource by the user.")
-  userAssignedIdentities?: UserAssignedIdentities;
+  /** The identities assigned to this resource by the user. */
+  @typeChangedFrom(Versions.v5, Record<UserAssignedIdentity>)
+  userAssignedIdentities?: Record<UserAssignedIdentity> | null;
 }
 
-/** The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests.", */
-model UserAssignedIdentities is Record<UserAssignedIdentity>;
-
-#deprecated "Please change ManagedSystemIdentityProperties to SystemAssignedServiceIdentity."
-alias ManagedSystemIdentityProperties = SystemAssignedServiceIdentity;
 /**
- * The properties of the service-assigned identity associated with this resource.
+ * Managed service identity (either system assigned, or none)
  */
-@armCommonDefinition(
-  "SystemAssignedServiceIdentity",
-  {
-    version: Azure.ResourceManager.CommonTypes.Versions.v4,
-    isDefault: true,
-  },
-  "managedidentity.json"
-)
-@armCommonDefinition(
-  "SystemAssignedServiceIdentity",
-  Azure.ResourceManager.CommonTypes.Versions.v5,
-  "managedidentity.json"
-)
 model SystemAssignedServiceIdentity {
-  @doc("The Active Directory tenant id of the principal.")
+  /** The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity. */
   @visibility("read")
-  tenantId?: string;
+  principalId?: uuid;
 
-  @doc("The active directory identifier of this principal.")
+  /** The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity. */
   @visibility("read")
-  principalId?: string;
+  tenantId?: uuid;
 
-  @doc("The type of managed identity assigned to this resource.")
+  /** The type of managed identity assigned to this resource. */
   type: SystemAssignedServiceIdentityType;
 }
 
-/** Alias of ManagedServiceIdentityType for back compatability. Please change to ManagedServiceIdentityType. */
-#deprecated "Please change to ManagedServiceIdentityType."
-alias ManagedIdentityType = ManagedServiceIdentityType;
 /**
- * A managed identity assigned by the user.
+ * User assigned identity properties
  */
-@doc("A managed identity assigned by the user.")
 model UserAssignedIdentity {
-  @doc("The active directory client identifier for this principal.")
-  clientId?: string;
+  /** The principal ID of the assigned identity. */
+  @visibility("read")
+  principalId?: uuid;
 
-  @doc("The active directory identifier for this principal.")
-  principalId?: string;
+  /** The client ID of the assigned identity. */
+  @visibility("read")
+  clientId?: uuid;
 }
 
 /**
- * The kind of managed identity assigned to this resource.
+ * Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).
  */
-@doc("The kind of managed identity assigned to this resource.")
 union ManagedServiceIdentityType {
-  @doc("No managed identity.")
+  /** No managed identity. */
   None: "None",
 
-  @doc("System assigned managed identity.")
+  /** System assigned managed identity. */
   SystemAssigned: "SystemAssigned",
 
-  @doc("User assigned managed identity.")
+  /** User assigned managed identity. */
   UserAssigned: "UserAssigned",
 
-  @doc("System and user assigned managed identity.")
-  SystemAndUserAssigned: "SystemAssigned, UserAssigned",
+  /** System and user assigned managed identity. */
+  @renamedFrom(Versions.v3, "SystemAndUserAssigned")
+  @removed(Versions.v4)
+  SystemAndUserAssignedV3: "SystemAssigned,UserAssigned",
+
+  /** System and user assigned managed identity. */
+  @added(Versions.v4)
+  @renamedFrom(Versions.v4, "SystemAndUserAssigned")
+  @removed(Versions.v5)
+  SystemAndUserAssignedV4: "SystemAssigned, UserAssigned",
+
+  /** System and user assigned managed identity. */
+  @added(Versions.v5)
+  SystemAndUserAssigned: "SystemAssigned,UserAssigned",
 
   string,
 }
 
-/** Alias of SystemAssignedServiceIdentityType for back compatability. Please change to SystemAssignedServiceIdentityType. */
-alias ManagedSystemIdentityType = SystemAssignedServiceIdentityType;
-
 /**
- * The kind of managemed identity assigned to this resource.
+ * Type of managed service identity (either system assigned, or none).
  */
-@doc("The kind of managemed identity assigned to this resource.")
 union SystemAssignedServiceIdentityType {
-  @doc("No managed system identity.")
+  /** No managed system identity. */
   None: "None",
 
-  @doc("System assigned managed system identity.")
+  /** System assigned managed system identity. */
   SystemAssigned: "SystemAssigned",
 
   string,