From e13391164369c4592e9f0b01ed9a7b57abc05962 Mon Sep 17 00:00:00 2001
From: Allen Zhang <allenzhang@live.com>
Date: Tue, 17 Sep 2024 09:35:37 -0700
Subject: [PATCH] Adjust ARM common type ManagedServiceIdentityType union
 versioned value (#1551)

---
 .../commonTypeManagedId-2024-8-17-8-36-58.md   |  7 +++++++
 .../openapi/v3/managedidentity.json            |  2 +-
 .../openapi/v4/managedidentity.json            |  2 +-
 .../openapi/v5/managedidentity.json            |  2 +-
 .../lib/common-types/managed-identity.tsp      | 18 +++++++-----------
 5 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 .chronus/changes/commonTypeManagedId-2024-8-17-8-36-58.md

diff --git a/.chronus/changes/commonTypeManagedId-2024-8-17-8-36-58.md b/.chronus/changes/commonTypeManagedId-2024-8-17-8-36-58.md
new file mode 100644
index 0000000000..5db0d3bca9
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/packages/samples/common-types/openapi/v3/managedidentity.json b/packages/samples/common-types/openapi/v3/managedidentity.json
index bfa962da7e..a775b5fd23 100644
--- 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
index 9d7f1803d7..17b2def937 100644
--- 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
index 4007844219..6c3046e250 100644
--- 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
index df4b2f46d9..a4f52a2b97 100644
--- 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,
 }