Fixing typespec-next for June 2024 release (#29427)

* green typespec-next * Fix DeviceRegistry * upgrade monitor to v4. Taking arm-id and subId uuid SDK breaking change. This should get rid of ModelValidation error
Azure · Jun 13, 2024 · 55ef0dd · 55ef0dd
1 parent 1996b29
commit 55ef0dd
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 121 deletions.
diff --git a/specification/azurefleet/AzureFleet.Management/fleet.tsp b/specification/azurefleet/AzureFleet.Management/fleet.tsp
@@ -46,7 +46,7 @@ model FleetUpdate {
 }
 
 model ManagedServiceIdentityUpdate
-  is OptionalProperties<UpdateableProperties<Azure.ResourceManager.Foundations.ManagedServiceIdentity>>;
+  is OptionalProperties<UpdateableProperties<Azure.ResourceManager.Legacy.ManagedServiceIdentityV4>>;
 
 model ResourcePlanUpdate
   is OptionalProperties<UpdateableProperties<Azure.ResourceManager.Foundations.Plan>>;

diff --git a/specification/azurefleet/AzureFleet.Management/main.tsp b/specification/azurefleet/AzureFleet.Management/main.tsp
@@ -16,17 +16,18 @@ using Azure.ResourceManager;
 @service({
   title: "Microsoft.AzureFleet",
 })
-@armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5)
 @versioned(Versions)
 namespace Microsoft.AzureFleet;
 
 /** Api versions */
 enum Versions {
   @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
+  @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5)
   @doc("Private Preview Api version")
   v2023_11_01_preview: "2023-11-01-preview",
 
   @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
+  @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5)
   @doc("Public Preview Api version")
   v2024_05_01_preview: "2024-05-01-preview",
 }

diff --git a/...urefleet/resource-manager/Microsoft.AzureFleet/preview/2023-11-01-preview/azurefleet.json b/...urefleet/resource-manager/Microsoft.AzureFleet/preview/2023-11-01-preview/azurefleet.json
@@ -492,9 +492,9 @@
     }
   },
   "definitions": {
-    "Azure.ResourceManager.Foundations.ManagedServiceIdentityType": {
+    "Azure.ResourceManager.Legacy.ManagedServiceIdentityType": {
       "type": "string",
-      "description": "The kind of managed identity assigned to this resource.",
+      "description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
       "enum": [
         "None",
         "SystemAssigned",
@@ -744,7 +744,7 @@
       "description": "The template for adding optional properties.",
       "properties": {
         "type": {
-          "$ref": "#/definitions/Azure.ResourceManager.Foundations.ManagedServiceIdentityType",
+          "$ref": "#/definitions/Azure.ResourceManager.Legacy.ManagedServiceIdentityType",
           "description": "The type of managed identity assigned to this resource."
         },
         "userAssignedIdentities": {
@@ -865,7 +865,7 @@
         },
         "product": {
           "type": "string",
-          "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. "
+          "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding."
         },
         "promotionCode": {
           "type": "string",

diff --git a/...urefleet/resource-manager/Microsoft.AzureFleet/preview/2024-05-01-preview/azurefleet.json b/...urefleet/resource-manager/Microsoft.AzureFleet/preview/2024-05-01-preview/azurefleet.json
@@ -468,9 +468,9 @@
     }
   },
   "definitions": {
-    "Azure.ResourceManager.Foundations.ManagedServiceIdentityType": {
+    "Azure.ResourceManager.Legacy.ManagedServiceIdentityType": {
       "type": "string",
-      "description": "The kind of managed identity assigned to this resource.",
+      "description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
       "enum": [
         "None",
         "SystemAssigned",
@@ -730,7 +730,7 @@
       "description": "The template for adding optional properties.",
       "properties": {
         "type": {
-          "$ref": "#/definitions/Azure.ResourceManager.Foundations.ManagedServiceIdentityType",
+          "$ref": "#/definitions/Azure.ResourceManager.Legacy.ManagedServiceIdentityType",
           "description": "The type of managed identity assigned to this resource."
         },
         "userAssignedIdentities": {
@@ -857,7 +857,7 @@
         },
         "product": {
           "type": "string",
-          "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. "
+          "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding."
         },
         "promotionCode": {
           "type": "string",

diff --git a/specification/containerservice/Fleet.Management/fleet.tsp b/specification/containerservice/Fleet.Management/fleet.tsp
@@ -33,7 +33,7 @@ model Fleet is TrackedResource<FleetProperties> {
   #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "https://github.com/Azure/typespec-azure/issues/2840"
   @added(Versions.v2023_06_15_preview)
   @doc("Managed identity.")
-  identity?: Azure.ResourceManager.Foundations.ManagedServiceIdentity;
+  identity?: Azure.ResourceManager.Legacy.ManagedServiceIdentityV4;
 }
 
 @doc("Fleet properties.")
@@ -154,7 +154,7 @@ model FleetPatch {
   #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "https://github.com/Azure/typespec-azure/issues/2840"
   @added(Versions.v2023_06_15_preview)
   @doc("Managed identity.")
-  identity?: Azure.ResourceManager.Foundations.ManagedServiceIdentity;
+  identity?: Azure.ResourceManager.Legacy.ManagedServiceIdentityV4;
 }
 
 @doc("One credential result item.")

diff --git a/specification/containerstorage/ContainerStorage.Management/pool.tsp b/specification/containerstorage/ContainerStorage.Management/pool.tsp
@@ -192,7 +192,7 @@ model Encryption {
   @doc("The URI of the key vault.")
   keyVaultUri: string;
 
-  ...ManagedServiceIdentityProperty;
+  ...Legacy.ManagedServiceIdentityV4Property;
 }
 
 @doc("Elastic San Pool Properties")

diff --git a/specification/databasewatcher/DatabaseWatcher.Management/watcher.tsp b/specification/databasewatcher/DatabaseWatcher.Management/watcher.tsp
@@ -40,7 +40,7 @@ model Watcher is TrackedResource<WatcherProperties> {
   @segment("watchers")
   name: string;
 
-  ...ManagedServiceIdentityProperty;
+  ...Legacy.ManagedServiceIdentityV4Property;
 }
 
 @doc("The RP specific properties of the resource.")

diff --git a/specification/deviceregistry/DeviceRegistry.Management/main.tsp b/specification/deviceregistry/DeviceRegistry.Management/main.tsp
@@ -46,23 +46,8 @@ interface OperationStatus {
     provider: "Microsoft.DeviceRegistry",
 
     ...LocationParameter,
-
-    @path
-    @segment("operationStatuses")
-    @minLength(1)
-    @doc("The ID of an ongoing async operation.")
-    @armCommonParameter(
-      "OperationIdParameter",
-      Azure.ResourceManager.CommonTypes.Versions.v3
-    )
-    @armCommonParameter(
-      "OperationIdParameter",
-      Azure.ResourceManager.CommonTypes.Versions.v4
-    )
-    @armCommonParameter(
-      "OperationIdParameter",
-      Azure.ResourceManager.CommonTypes.Versions.v5
-    )
-    operationId: string,
+    ...Foundations.OperationIdParameter,
   ): ArmResponse<OperationStatusResult> | ErrorResponse;
 }
+
+@@segment(OperationStatus.get::parameters.operationId, "operationStatuses");
diff --git a/specification/liftrastronomer/Astronomer.Astro.Management/main.tsp b/specification/liftrastronomer/Astronomer.Astro.Management/main.tsp
@@ -41,7 +41,7 @@ model OrganizationResource is TrackedResource<OrganizationProperties> {
   @path
   name: string;
 
-  ...ManagedServiceIdentityProperty;
+  ...Legacy.ManagedServiceIdentityV4Property;
 }
 
 @armResourceOperations

diff --git a/...luster/resource-manager/Microsoft.DocumentDB/preview/2024-03-01-preview/mongoCluster.json b/...luster/resource-manager/Microsoft.DocumentDB/preview/2024-03-01-preview/mongoCluster.json
@@ -1119,21 +1119,6 @@
     }
   },
   "definitions": {
-    "Azure.ResourceManager.PrivateEndpointConnection": {
-      "type": "object",
-      "description": "The private endpoint connection resource",
-      "properties": {
-        "properties": {
-          "$ref": "../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateEndpointConnectionProperties",
-          "description": "The private endpoint connection properties"
-        }
-      },
-      "allOf": [
-        {
-          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
-        }
-      ]
-    },
     "ConnectionString": {
       "type": "object",
       "description": "Connection string for the mongo cluster",
@@ -1365,7 +1350,7 @@
           "type": "array",
           "description": "List of private endpoint connections.",
           "items": {
-            "$ref": "#/definitions/Azure.ResourceManager.PrivateEndpointConnection"
+            "$ref": "../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateEndpointConnection"
           },
           "readOnly": true
         }

diff --git a/specification/monitor/Microsoft.Monitor/typespec/azureMonitorWorkspace.tsp b/specification/monitor/Microsoft.Monitor/typespec/azureMonitorWorkspace.tsp
@@ -9,7 +9,6 @@ using TypeSpec.Rest;
 using TypeSpec.Versioning;
 using Azure.Core;
 using Azure.ResourceManager;
-using Azure.ResourceManager.Private;
 using OpenAPI;
 
 namespace Microsoft.Monitor;

diff --git a/specification/monitor/Microsoft.Monitor/typespec/pipelineGroup.tsp b/specification/monitor/Microsoft.Monitor/typespec/pipelineGroup.tsp
@@ -16,7 +16,6 @@ using TypeSpec.Rest;
 using TypeSpec.Versioning;
 using Azure.Core;
 using Azure.ResourceManager;
-using Azure.ResourceManager.Private;
 using OpenAPI;
 
 namespace Microsoft.Monitor;

diff --git a/specification/monitor/Microsoft.Monitor/typespec/service.tsp b/specification/monitor/Microsoft.Monitor/typespec/service.tsp
@@ -24,6 +24,7 @@ namespace Microsoft.Monitor;
 @doc("Microsoft.Monitor Versions")
 enum Versions {
   @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
+  @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v4)
   @doc("API Version 2023-10-01-preview")
   `2023-10-01-preview`,
 }