Skip to content

Commit 55ef0dd

Browse files
authored
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
1 parent 1996b29 commit 55ef0dd

File tree

17 files changed

+76
-121
lines changed

17 files changed

+76
-121
lines changed

specification/azurefleet/AzureFleet.Management/fleet.tsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ model FleetUpdate {
4646
}
4747

4848
model ManagedServiceIdentityUpdate
49-
is OptionalProperties<UpdateableProperties<Azure.ResourceManager.Foundations.ManagedServiceIdentity>>;
49+
is OptionalProperties<UpdateableProperties<Azure.ResourceManager.Legacy.ManagedServiceIdentityV4>>;
5050

5151
model ResourcePlanUpdate
5252
is OptionalProperties<UpdateableProperties<Azure.ResourceManager.Foundations.Plan>>;

specification/azurefleet/AzureFleet.Management/main.tsp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@ using Azure.ResourceManager;
1616
@service({
1717
title: "Microsoft.AzureFleet",
1818
})
19-
@armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5)
2019
@versioned(Versions)
2120
namespace Microsoft.AzureFleet;
2221

2322
/** Api versions */
2423
enum Versions {
2524
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
25+
@armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5)
2626
@doc("Private Preview Api version")
2727
v2023_11_01_preview: "2023-11-01-preview",
2828

2929
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
30+
@armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5)
3031
@doc("Public Preview Api version")
3132
v2024_05_01_preview: "2024-05-01-preview",
3233
}

specification/azurefleet/resource-manager/Microsoft.AzureFleet/preview/2023-11-01-preview/azurefleet.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,9 @@
492492
}
493493
},
494494
"definitions": {
495-
"Azure.ResourceManager.Foundations.ManagedServiceIdentityType": {
495+
"Azure.ResourceManager.Legacy.ManagedServiceIdentityType": {
496496
"type": "string",
497-
"description": "The kind of managed identity assigned to this resource.",
497+
"description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
498498
"enum": [
499499
"None",
500500
"SystemAssigned",
@@ -744,7 +744,7 @@
744744
"description": "The template for adding optional properties.",
745745
"properties": {
746746
"type": {
747-
"$ref": "#/definitions/Azure.ResourceManager.Foundations.ManagedServiceIdentityType",
747+
"$ref": "#/definitions/Azure.ResourceManager.Legacy.ManagedServiceIdentityType",
748748
"description": "The type of managed identity assigned to this resource."
749749
},
750750
"userAssignedIdentities": {
@@ -865,7 +865,7 @@
865865
},
866866
"product": {
867867
"type": "string",
868-
"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. "
868+
"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."
869869
},
870870
"promotionCode": {
871871
"type": "string",

specification/azurefleet/resource-manager/Microsoft.AzureFleet/preview/2024-05-01-preview/azurefleet.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,9 @@
468468
}
469469
},
470470
"definitions": {
471-
"Azure.ResourceManager.Foundations.ManagedServiceIdentityType": {
471+
"Azure.ResourceManager.Legacy.ManagedServiceIdentityType": {
472472
"type": "string",
473-
"description": "The kind of managed identity assigned to this resource.",
473+
"description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
474474
"enum": [
475475
"None",
476476
"SystemAssigned",
@@ -730,7 +730,7 @@
730730
"description": "The template for adding optional properties.",
731731
"properties": {
732732
"type": {
733-
"$ref": "#/definitions/Azure.ResourceManager.Foundations.ManagedServiceIdentityType",
733+
"$ref": "#/definitions/Azure.ResourceManager.Legacy.ManagedServiceIdentityType",
734734
"description": "The type of managed identity assigned to this resource."
735735
},
736736
"userAssignedIdentities": {
@@ -857,7 +857,7 @@
857857
},
858858
"product": {
859859
"type": "string",
860-
"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. "
860+
"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."
861861
},
862862
"promotionCode": {
863863
"type": "string",

specification/containerservice/Fleet.Management/fleet.tsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ model Fleet is TrackedResource<FleetProperties> {
3333
#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "https://github.com/Azure/typespec-azure/issues/2840"
3434
@added(Versions.v2023_06_15_preview)
3535
@doc("Managed identity.")
36-
identity?: Azure.ResourceManager.Foundations.ManagedServiceIdentity;
36+
identity?: Azure.ResourceManager.Legacy.ManagedServiceIdentityV4;
3737
}
3838

3939
@doc("Fleet properties.")
@@ -154,7 +154,7 @@ model FleetPatch {
154154
#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "https://github.com/Azure/typespec-azure/issues/2840"
155155
@added(Versions.v2023_06_15_preview)
156156
@doc("Managed identity.")
157-
identity?: Azure.ResourceManager.Foundations.ManagedServiceIdentity;
157+
identity?: Azure.ResourceManager.Legacy.ManagedServiceIdentityV4;
158158
}
159159

160160
@doc("One credential result item.")

specification/containerstorage/ContainerStorage.Management/pool.tsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ model Encryption {
192192
@doc("The URI of the key vault.")
193193
keyVaultUri: string;
194194

195-
...ManagedServiceIdentityProperty;
195+
...Legacy.ManagedServiceIdentityV4Property;
196196
}
197197

198198
@doc("Elastic San Pool Properties")

specification/databasewatcher/DatabaseWatcher.Management/watcher.tsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ model Watcher is TrackedResource<WatcherProperties> {
4040
@segment("watchers")
4141
name: string;
4242

43-
...ManagedServiceIdentityProperty;
43+
...Legacy.ManagedServiceIdentityV4Property;
4444
}
4545

4646
@doc("The RP specific properties of the resource.")

specification/deviceregistry/DeviceRegistry.Management/main.tsp

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,8 @@ interface OperationStatus {
4646
provider: "Microsoft.DeviceRegistry",
4747

4848
...LocationParameter,
49-
50-
@path
51-
@segment("operationStatuses")
52-
@minLength(1)
53-
@doc("The ID of an ongoing async operation.")
54-
@armCommonParameter(
55-
"OperationIdParameter",
56-
Azure.ResourceManager.CommonTypes.Versions.v3
57-
)
58-
@armCommonParameter(
59-
"OperationIdParameter",
60-
Azure.ResourceManager.CommonTypes.Versions.v4
61-
)
62-
@armCommonParameter(
63-
"OperationIdParameter",
64-
Azure.ResourceManager.CommonTypes.Versions.v5
65-
)
66-
operationId: string,
49+
...Foundations.OperationIdParameter,
6750
): ArmResponse<OperationStatusResult> | ErrorResponse;
6851
}
52+
53+
@@segment(OperationStatus.get::parameters.operationId, "operationStatuses");

specification/liftrastronomer/Astronomer.Astro.Management/main.tsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ model OrganizationResource is TrackedResource<OrganizationProperties> {
4141
@path
4242
name: string;
4343

44-
...ManagedServiceIdentityProperty;
44+
...Legacy.ManagedServiceIdentityV4Property;
4545
}
4646

4747
@armResourceOperations

specification/mongocluster/resource-manager/Microsoft.DocumentDB/preview/2024-03-01-preview/mongoCluster.json

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,21 +1119,6 @@
11191119
}
11201120
},
11211121
"definitions": {
1122-
"Azure.ResourceManager.PrivateEndpointConnection": {
1123-
"type": "object",
1124-
"description": "The private endpoint connection resource",
1125-
"properties": {
1126-
"properties": {
1127-
"$ref": "../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateEndpointConnectionProperties",
1128-
"description": "The private endpoint connection properties"
1129-
}
1130-
},
1131-
"allOf": [
1132-
{
1133-
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
1134-
}
1135-
]
1136-
},
11371122
"ConnectionString": {
11381123
"type": "object",
11391124
"description": "Connection string for the mongo cluster",
@@ -1365,7 +1350,7 @@
13651350
"type": "array",
13661351
"description": "List of private endpoint connections.",
13671352
"items": {
1368-
"$ref": "#/definitions/Azure.ResourceManager.PrivateEndpointConnection"
1353+
"$ref": "../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateEndpointConnection"
13691354
},
13701355
"readOnly": true
13711356
}

0 commit comments

Comments
 (0)