Adjust ARM common type ManagedServiceIdentityType union versioned val…

…ue (#1551)
Azure · Sep 17, 2024 · e133911 · e133911
1 parent cdeb62c
commit e133911
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/.chronus/changes/commonTypeManagedId-2024-8-17-8-36-58.md b/.chronus/changes/commonTypeManagedId-2024-8-17-8-36-58.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Correct ManagedServiceIdentityType versioning issue
diff --git a/packages/samples/common-types/openapi/v3/managedidentity.json b/packages/samples/common-types/openapi/v3/managedidentity.json
@@ -67,7 +67,7 @@
             "description": "User assigned managed identity."
           },
           {
-            "name": "SystemAndUserAssignedV3",
+            "name": "SystemAssigned,UserAssigned",
             "value": "SystemAssigned,UserAssigned",
             "description": "System and user assigned managed identity."
           }

diff --git a/packages/samples/common-types/openapi/v4/managedidentity.json b/packages/samples/common-types/openapi/v4/managedidentity.json
@@ -67,7 +67,7 @@
             "description": "User assigned managed identity."
           },
           {
-            "name": "SystemAndUserAssignedV4",
+            "name": "SystemAssigned, UserAssigned",
             "value": "SystemAssigned, UserAssigned",
             "description": "System and user assigned managed identity."
           }

diff --git a/packages/samples/common-types/openapi/v5/managedidentity.json b/packages/samples/common-types/openapi/v5/managedidentity.json
@@ -73,7 +73,7 @@
             "description": "User assigned managed identity."
           },
           {
-            "name": "SystemAndUserAssigned",
+            "name": "SystemAssigned,UserAssigned",
             "value": "SystemAssigned,UserAssigned",
             "description": "System and user assigned managed identity."
           }

diff --git a/packages/typespec-azure-resource-manager/lib/common-types/managed-identity.tsp b/packages/typespec-azure-resource-manager/lib/common-types/managed-identity.tsp
@@ -61,28 +61,24 @@ model UserAssignedIdentity {
  */
 union ManagedServiceIdentityType {
   /** No managed identity. */
-  None: "None",
+  "None",
 
   /** System assigned managed identity. */
-  SystemAssigned: "SystemAssigned",
+  "SystemAssigned",
 
   /** User assigned managed identity. */
-  UserAssigned: "UserAssigned",
+  "UserAssigned",
 
   /** System and user assigned managed identity. */
-  @renamedFrom(Versions.v3, "SystemAndUserAssigned")
+  @added(Versions.v3)
   @removed(Versions.v4)
-  SystemAndUserAssignedV3: "SystemAssigned,UserAssigned",
+  @added(Versions.v5)
+  "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",
+  "SystemAssigned, UserAssigned",
 
   string,
 }