Fix examples for type updates. Add uuid type to uuid fields.

Azure · Mar 8, 2025 · a73b477 · a73b477
1 parent 087c53b
commit a73b477
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 26 deletions.
diff --git a/specification/mission/Mission.Management/examples/2024-06-01-preview/VirtualEnclave_Get.json b/specification/mission/Mission.Management/examples/2024-06-01-preview/VirtualEnclave_Get.json
@@ -50,8 +50,8 @@
             "diagnosticDestination": "Both"
           },
           "resourceCollection": [
-            "g"
-          ],
+            "/subscriptions/c64f6eca-bdc5-4bc2-88d6-f8f1dc23f86c/resourceGroups/TestMyRg"
+        ],
           "maintenanceModeConfiguration": {
             "mode": "Off",
             "principals": [

diff --git a/...ication/mission/Mission.Management/examples/2024-06-01-preview/VirtualEnclave_Update.json b/...ication/mission/Mission.Management/examples/2024-06-01-preview/VirtualEnclave_Update.json
@@ -98,8 +98,8 @@
             "diagnosticDestination": "Both"
           },
           "resourceCollection": [
-            "g"
-          ],
+            "/subscriptions/c64f6eca-bdc5-4bc2-88d6-f8f1dc23f86c/resourceGroups/TestMyRg"
+        ],
           "maintenanceModeConfiguration": {
             "mode": "Off",
             "principals": [

diff --git a/specification/mission/Mission.Management/examples/2024-12-01-preview/VirtualEnclave_Get.json b/specification/mission/Mission.Management/examples/2024-12-01-preview/VirtualEnclave_Get.json
@@ -50,8 +50,8 @@
             "diagnosticDestination": "Both"
           },
           "resourceCollection": [
-            "g"
-          ],
+            "/subscriptions/c64f6eca-bdc5-4bc2-88d6-f8f1dc23f86c/resourceGroups/TestMyRg"
+        ],
           "maintenanceModeConfiguration": {
             "mode": "Off",
             "principals": [

diff --git a/...ication/mission/Mission.Management/examples/2024-12-01-preview/VirtualEnclave_Update.json b/...ication/mission/Mission.Management/examples/2024-12-01-preview/VirtualEnclave_Update.json
@@ -142,8 +142,8 @@
             "diagnosticDestination": "Both"
           },
           "resourceCollection": [
-            "g"
-          ],
+            "/subscriptions/c64f6eca-bdc5-4bc2-88d6-f8f1dc23f86c/resourceGroups/TestMyRg"
+        ],
           "maintenanceModeConfiguration": {
             "mode": "Off",
             "principals": [

diff --git a/specification/mission/Mission.Management/resourcetypes/approvals/approvals.tsp b/specification/mission/Mission.Management/resourcetypes/approvals/approvals.tsp
@@ -8,6 +8,7 @@ import "../shared/provisioningstate.tsp";
 using TypeSpec.Http;
 using TypeSpec.Rest;
 using TypeSpec.Versioning;
+using Azure.Core;
 using Azure.ResourceManager;
 
 @doc("Microsoft Mission Resource Provider management API.")
@@ -68,7 +69,7 @@ model RequestMetadata {
 @doc("Approver Metadata for approvals request.")
 model Approver {
   @doc("EntraId of the approver")
-  approverEntraId: string;
+  approverEntraId: uuid;
 
   @doc("Action Performed by approver")
   actionPerformed: ActionPerformed;

diff --git a/specification/mission/Mission.Management/resourcetypes/community/community.tsp b/specification/mission/Mission.Management/resourcetypes/community/community.tsp
@@ -127,7 +127,7 @@ union ApprovalPolicy {
 @doc("Approver Metadata for approvals request.")
 model MandatoryApprover {
   @doc("EntraId of the approver")
-  approverEntraId: string;
+  approverEntraId: Azure.Core.uuid;
 }
 
 @added(Microsoft.Mission.Versions.v2024_12_01_preview)

diff --git a/specification/mission/Mission.Management/resourcetypes/postActions/approvalcallback.tsp b/specification/mission/Mission.Management/resourcetypes/postActions/approvalcallback.tsp
@@ -16,7 +16,7 @@ namespace Microsoft.Mission;
 model ApprovalCallbackRequest {
   @removed(Microsoft.Mission.Versions.v2024_12_01_preview)
   @doc("Resource Id of the item being approved or rejected")
-  resourceId: string;
+  resourceId: armResourceIdentifier;
 
   @doc("Resource request action indicating action which needed to be performed upon calling approval-callback post action")
   resourceRequestAction: "Create" | "Delete" | "Update" | "Reset" | string;

diff --git a/specification/mission/Mission.Management/resourcetypes/shared/principal.tsp b/specification/mission/Mission.Management/resourcetypes/shared/principal.tsp
@@ -1,5 +1,7 @@
 import "@typespec/versioning";
+import "@azure-tools/typespec-azure-core";
 
+using Azure.Core;
 using TypeSpec.Versioning;
 
 @doc("Microsoft Mission Resource Provider management API.")
@@ -9,7 +11,7 @@ namespace Microsoft.Mission;
 @doc("Principal for maintenance mode or role assignments")
 model Principal {
   @doc("The object id associated with the principal")
-  id: string;
+  id: uuid;
 
   @doc("The type of the object id. We currently allow users, groups, and service principals")
   type: "User" | "Group" | "ServicePrincipal" | string;

diff --git a/specification/mission/Mission.Management/resourcetypes/shared/roleassignmentitem.tsp b/specification/mission/Mission.Management/resourcetypes/shared/roleassignmentitem.tsp
@@ -1,5 +1,7 @@
 import "@typespec/versioning";
+import "@azure-tools/typespec-azure-core";
 
+using Azure.Core;
 using TypeSpec.Versioning;
 
 @doc("Microsoft Mission Resource Provider management API.")
@@ -9,7 +11,7 @@ namespace Microsoft.Mission;
 @doc("Role assignment item that indicates which principals should be assigned this role definition")
 model RoleAssignmentItem {
   @doc("Role definition identifier")
-  id: string;
+  id: uuid;
 
   @doc("List of principal IDs to which to assign this role definition")
   principals?: Principal[];

diff --git a/...rce-manager/Microsoft.Mission/preview/2024-06-01-preview/examples/VirtualEnclave_Get.json b/...rce-manager/Microsoft.Mission/preview/2024-06-01-preview/examples/VirtualEnclave_Get.json
@@ -50,8 +50,8 @@
             "diagnosticDestination": "Both"
           },
           "resourceCollection": [
-            "g"
-          ],
+            "/subscriptions/c64f6eca-bdc5-4bc2-88d6-f8f1dc23f86c/resourceGroups/TestMyRg"
+        ],
           "maintenanceModeConfiguration": {
             "mode": "Off",
             "principals": [

diff --git a/...-manager/Microsoft.Mission/preview/2024-06-01-preview/examples/VirtualEnclave_Update.json b/...-manager/Microsoft.Mission/preview/2024-06-01-preview/examples/VirtualEnclave_Update.json
@@ -98,8 +98,8 @@
             "diagnosticDestination": "Both"
           },
           "resourceCollection": [
-            "g"
-          ],
+            "/subscriptions/c64f6eca-bdc5-4bc2-88d6-f8f1dc23f86c/resourceGroups/TestMyRg"
+        ],
           "maintenanceModeConfiguration": {
             "mode": "Off",
             "principals": [

diff --git a/...cation/mission/resource-manager/Microsoft.Mission/preview/2024-06-01-preview/openapi.json b/...cation/mission/resource-manager/Microsoft.Mission/preview/2024-06-01-preview/openapi.json
@@ -4267,6 +4267,7 @@
       "properties": {
         "resourceId": {
           "type": "string",
+          "format": "arm-id",
           "description": "Resource Id of the item being approved or rejected"
         },
         "resourceRequestAction": {
@@ -4454,6 +4455,11 @@
       "type": "string",
       "description": "Represents an Azure geography region where supported resource providers live."
     },
+    "Azure.Core.uuid": {
+      "type": "string",
+      "format": "uuid",
+      "description": "Universally Unique Identifier"
+    },
     "Azure.ResourceManager.CommonTypes.ManagedServiceIdentityUpdate": {
       "type": "object",
       "description": "Managed service identity (system assigned and/or user assigned identities)",
@@ -6024,7 +6030,7 @@
       "description": "Principal for maintenance mode or role assignments",
       "properties": {
         "id": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.uuid",
           "description": "The object id associated with the principal"
         },
         "type": {

diff --git a/...rce-manager/Microsoft.Mission/preview/2024-12-01-preview/examples/VirtualEnclave_Get.json b/...rce-manager/Microsoft.Mission/preview/2024-12-01-preview/examples/VirtualEnclave_Get.json
@@ -50,8 +50,8 @@
             "diagnosticDestination": "Both"
           },
           "resourceCollection": [
-            "g"
-          ],
+            "/subscriptions/c64f6eca-bdc5-4bc2-88d6-f8f1dc23f86c/resourceGroups/TestMyRg"
+        ],
           "maintenanceModeConfiguration": {
             "mode": "Off",
             "principals": [

diff --git a/...-manager/Microsoft.Mission/preview/2024-12-01-preview/examples/VirtualEnclave_Update.json b/...-manager/Microsoft.Mission/preview/2024-12-01-preview/examples/VirtualEnclave_Update.json
@@ -142,8 +142,8 @@
             "diagnosticDestination": "Both"
           },
           "resourceCollection": [
-            "g"
-          ],
+            "/subscriptions/c64f6eca-bdc5-4bc2-88d6-f8f1dc23f86c/resourceGroups/TestMyRg"
+        ],
           "maintenanceModeConfiguration": {
             "mode": "Off",
             "principals": [

diff --git a/...cation/mission/resource-manager/Microsoft.Mission/preview/2024-12-01-preview/openapi.json b/...cation/mission/resource-manager/Microsoft.Mission/preview/2024-12-01-preview/openapi.json
@@ -5098,7 +5098,7 @@
       "description": "Approver Metadata for approvals request.",
       "properties": {
         "approverEntraId": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.uuid",
           "description": "EntraId of the approver"
         },
         "actionPerformed": {
@@ -5121,6 +5121,11 @@
       "type": "string",
       "description": "Represents an Azure geography region where supported resource providers live."
     },
+    "Azure.Core.uuid": {
+      "type": "string",
+      "format": "uuid",
+      "description": "Universally Unique Identifier"
+    },
     "Azure.ResourceManager.CommonTypes.ManagedServiceIdentityUpdate": {
       "type": "object",
       "description": "Managed service identity (system assigned and/or user assigned identities)",
@@ -6686,7 +6691,7 @@
       "description": "Approver Metadata for approvals request.",
       "properties": {
         "approverEntraId": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.uuid",
           "description": "EntraId of the approver"
         }
       },
@@ -6711,7 +6716,7 @@
       "description": "Principal for maintenance mode or role assignments",
       "properties": {
         "id": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.uuid",
           "description": "The object id associated with the principal"
         },
         "type": {
@@ -6869,7 +6874,7 @@
       "description": "Role assignment item that indicates which principals should be assigned this role definition",
       "properties": {
         "id": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.uuid",
           "description": "Role definition identifier"
         },
         "principals": {