Skip to content

Commit f0d2268

Browse files
markcowlCopilot
markcowl
and
Copilot
committed
Regenerate OpenAPI for DevCenter and Maps after removing armCommonDefinition
The @armCommonDefinition decorators for CustomerManagedKeyEncryption and Encryption types have been removed in the typespec-azure-resource-manager package. Add clientName decorators to strip namespace qualification from emitted type names. Rename local DevCenter KeyEncryptionKeyIdentity model to KeyEncryptionKeyIdentityUpdate to avoid name clash. Depends on: Azure/typespec-azure#4627 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 711c07e commit f0d2268

10 files changed

Lines changed: 1008 additions & 2649 deletions

File tree

‎package-lock.json‎

Lines changed: 655 additions & 2633 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"@azure-tools/spec-gen-sdk": "~0.9.1",
77
"@azure-tools/specs-shared": "file:.github/shared",
88
"@azure-tools/typespec-apiview": "0.7.2",
9-
"@azure-tools/typespec-autorest": "next",
9+
"@azure-tools/typespec-autorest": "https://pkg.pr.new/@azure-tools/typespec-autorest@4627",
1010
"@azure-tools/typespec-azure-core": "next",
1111
"@azure-tools/typespec-azure-portal-core": "next",
12-
"@azure-tools/typespec-azure-resource-manager": "next",
13-
"@azure-tools/typespec-azure-rulesets": "next",
12+
"@azure-tools/typespec-azure-resource-manager": "https://pkg.pr.new/@azure-tools/typespec-azure-resource-manager@4627",
13+
"@azure-tools/typespec-azure-rulesets": "https://pkg.pr.new/@azure-tools/typespec-azure-rulesets@4627",
1414
"@azure-tools/typespec-client-generator-cli": "0.27.0",
1515
"@azure-tools/typespec-client-generator-core": "next",
1616
"@azure-tools/typespec-liftr-base": "0.13.0",
@@ -32,12 +32,12 @@
3232
"typescript": "~6.0.2"
3333
},
3434
"overrides": {
35-
"@azure-tools/typespec-autorest": "next",
35+
"@azure-tools/typespec-autorest": "https://pkg.pr.new/@azure-tools/typespec-autorest@4627",
3636
"@azure-tools/typespec-azure-core": "next",
3737
"@azure-tools/typespec-azure-portal-core": "next",
38-
"@azure-tools/typespec-azure-resource-manager": "next",
38+
"@azure-tools/typespec-azure-resource-manager": "https://pkg.pr.new/@azure-tools/typespec-azure-resource-manager@4627",
3939
"@azure-tools/typespec-client-generator-core": "next",
40-
"@azure-tools/typespec-azure-rulesets": "next",
40+
"@azure-tools/typespec-azure-rulesets": "https://pkg.pr.new/@azure-tools/typespec-azure-rulesets@4627",
4141
"@typespec/asset-emitter": "next",
4242
"@typespec/compiler": "next",
4343
"@typespec/http": "next",

‎specification/devcenter/DevCenter.Management/back-compatible.tsp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@ import "@azure-tools/typespec-azure-resource-manager";
44
using Azure.ClientGenerator.Core;
55
using Microsoft.DevCenter;
66

7+
// Remove namespace qualification from CommonTypes encryption types for OpenAPI compatibility
8+
@@clientName(
9+
Azure.ResourceManager.CommonTypes.CustomerManagedKeyEncryption,
10+
"CustomerManagedKeyEncryption"
11+
);
12+
@@clientName(
13+
Azure.ResourceManager.CommonTypes.KeyEncryptionKeyIdentity,
14+
"KeyEncryptionKeyIdentity"
15+
);
16+
@@clientName(
17+
Azure.ResourceManager.CommonTypes.KeyEncryptionKeyIdentityType,
18+
"KeyEncryptionKeyIdentityType"
19+
);
20+
721
@@clientName(DevCenters.createOrUpdate::parameters.resource, "body");
822
@@clientName(DevCenters.update::parameters.properties, "body");
923
@@clientLocation(DevCenters.listByDevCenter, Images);

‎specification/devcenter/DevCenter.Management/client.tsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ using Microsoft.DevCenter;
2323
);
2424

2525
@@clientName(
26-
Microsoft.DevCenter.KeyEncryptionKeyIdentity,
26+
Microsoft.DevCenter.KeyEncryptionKeyIdentityUpdate,
2727
"DevCenterKeyEncryptionKeyIdentity",
2828
"csharp"
2929
);

‎specification/devcenter/DevCenter.Management/models.tsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,11 +771,11 @@ model DevCenterEncryptionSetUpdateProperties {
771771
keyEncryptionKeyUrl?: url;
772772

773773
@doc("The managed identity configuration used for key vault access.")
774-
keyEncryptionKeyIdentity?: KeyEncryptionKeyIdentity;
774+
keyEncryptionKeyIdentity?: KeyEncryptionKeyIdentityUpdate;
775775
}
776776

777777
@doc("The managed identity configuration used for key vault access.")
778-
model KeyEncryptionKeyIdentity {
778+
model KeyEncryptionKeyIdentityUpdate {
779779
@doc("The type of managed identity to use for key vault access.")
780780
type?: CmkIdentityType;
781781

‎specification/devcenter/resource-manager/Microsoft.DevCenter/preview/2025-07-01-preview/DevCenterRP.json‎

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8978,6 +8978,11 @@
89788978
]
89798979
}
89808980
},
8981+
"Azure.Core.uuid": {
8982+
"type": "string",
8983+
"format": "uuid",
8984+
"description": "Universally Unique Identifier"
8985+
},
89818986
"AzureAiServicesMode": {
89828987
"type": "string",
89838988
"description": "Indicates whether Azure AI services are enabled for a project.",
@@ -9427,6 +9432,20 @@
94279432
]
94289433
}
94299434
},
9435+
"CustomerManagedKeyEncryption": {
9436+
"type": "object",
9437+
"description": "Customer-managed key encryption properties for the resource.",
9438+
"properties": {
9439+
"keyEncryptionKeyIdentity": {
9440+
"$ref": "#/definitions/KeyEncryptionKeyIdentity",
9441+
"description": "All identity configuration for Customer-managed key settings defining which identity should be used to auth to Key Vault."
9442+
},
9443+
"keyEncryptionKeyUrl": {
9444+
"type": "string",
9445+
"description": "key encryption key Url, versioned or non-versioned. Ex: https://contosovault.vault.azure.net/keys/contosokek/562a4bb76b524a1493a6afe8e536ee78 or https://contosovault.vault.azure.net/keys/contosokek."
9446+
}
9447+
}
9448+
},
94309449
"CustomizationTask": {
94319450
"type": "object",
94329451
"description": "Represents a Task to be used in customizing a Dev Box.",
@@ -9919,7 +9938,7 @@
99199938
"description": "Key encryption key Url, versioned or non-versioned. Ex: https://contosovault.vault.azure.net/keys/contosokek/562a4bb76b524a1493a6afe8e536ee78 or https://contosovault.vault.azure.net/keys/contosokek."
99209939
},
99219940
"keyEncryptionKeyIdentity": {
9922-
"$ref": "#/definitions/KeyEncryptionKeyIdentity",
9941+
"$ref": "#/definitions/KeyEncryptionKeyIdentityUpdate",
99239942
"description": "The managed identity configuration used for key vault access."
99249943
}
99259944
}
@@ -10170,7 +10189,7 @@
1017010189
"description": "Encryption properties.",
1017110190
"properties": {
1017210191
"customerManagedKeyEncryption": {
10173-
"$ref": "../../../../../common-types/resource-management/v4/customermanagedkeys.json#/definitions/customerManagedKeyEncryption",
10192+
"$ref": "#/definitions/CustomerManagedKeyEncryption",
1017410193
"description": "All Customer-managed key encryption properties for the resource."
1017510194
}
1017610195
}
@@ -11527,6 +11546,55 @@
1152711546
}
1152811547
},
1152911548
"KeyEncryptionKeyIdentity": {
11549+
"type": "object",
11550+
"description": "All identity configuration for Customer-managed key settings defining which identity should be used to auth to Key Vault.",
11551+
"properties": {
11552+
"identityType": {
11553+
"$ref": "#/definitions/KeyEncryptionKeyIdentityType",
11554+
"description": "The type of identity to use. Values can be systemAssignedIdentity, userAssignedIdentity, or delegatedResourceIdentity."
11555+
},
11556+
"userAssignedIdentityResourceId": {
11557+
"type": "string",
11558+
"format": "arm-id",
11559+
"description": "User assigned identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity."
11560+
},
11561+
"delegatedIdentityClientId": {
11562+
"$ref": "#/definitions/Azure.Core.uuid",
11563+
"description": "delegated identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity and userAssignedIdentity - internal use only."
11564+
}
11565+
}
11566+
},
11567+
"KeyEncryptionKeyIdentityType": {
11568+
"type": "string",
11569+
"description": "The type of identity to use.",
11570+
"enum": [
11571+
"systemAssignedIdentity",
11572+
"userAssignedIdentity",
11573+
"delegatedResourceIdentity"
11574+
],
11575+
"x-ms-enum": {
11576+
"name": "KeyEncryptionKeyIdentityType",
11577+
"modelAsString": true,
11578+
"values": [
11579+
{
11580+
"name": "SystemAssignedIdentity",
11581+
"value": "systemAssignedIdentity",
11582+
"description": "System assigned identity"
11583+
},
11584+
{
11585+
"name": "UserAssignedIdentity",
11586+
"value": "userAssignedIdentity",
11587+
"description": "User assigned identity"
11588+
},
11589+
{
11590+
"name": "DelegatedResourceIdentity",
11591+
"value": "delegatedResourceIdentity",
11592+
"description": "Delegated identity"
11593+
}
11594+
]
11595+
}
11596+
},
11597+
"KeyEncryptionKeyIdentityUpdate": {
1153011598
"type": "object",
1153111599
"description": "The managed identity configuration used for key vault access.",
1153211600
"properties": {

‎specification/devcenter/resource-manager/Microsoft.DevCenter/preview/2025-10-01-preview/DevCenterRP.json‎

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9558,6 +9558,20 @@
95589558
}
95599559
}
95609560
},
9561+
"CustomerManagedKeyEncryption": {
9562+
"type": "object",
9563+
"description": "Customer-managed key encryption properties for the resource.",
9564+
"properties": {
9565+
"keyEncryptionKeyIdentity": {
9566+
"$ref": "#/definitions/KeyEncryptionKeyIdentity",
9567+
"description": "All identity configuration for Customer-managed key settings defining which identity should be used to auth to Key Vault."
9568+
},
9569+
"keyEncryptionKeyUrl": {
9570+
"type": "string",
9571+
"description": "key encryption key Url, versioned or non-versioned. Ex: https://contosovault.vault.azure.net/keys/contosokek/562a4bb76b524a1493a6afe8e536ee78 or https://contosovault.vault.azure.net/keys/contosokek."
9572+
}
9573+
}
9574+
},
95619575
"CustomizationTask": {
95629576
"type": "object",
95639577
"description": "Represents a Task to be used in customizing a Dev Box.",
@@ -10070,7 +10084,7 @@
1007010084
"description": "Key encryption key Url, versioned or non-versioned. Ex: https://contosovault.vault.azure.net/keys/contosokek/562a4bb76b524a1493a6afe8e536ee78 or https://contosovault.vault.azure.net/keys/contosokek."
1007110085
},
1007210086
"keyEncryptionKeyIdentity": {
10073-
"$ref": "#/definitions/KeyEncryptionKeyIdentity",
10087+
"$ref": "#/definitions/KeyEncryptionKeyIdentityUpdate",
1007410088
"description": "The managed identity configuration used for key vault access."
1007510089
}
1007610090
}
@@ -10321,7 +10335,7 @@
1032110335
"description": "Encryption properties.",
1032210336
"properties": {
1032310337
"customerManagedKeyEncryption": {
10324-
"$ref": "../../../../../common-types/resource-management/v4/customermanagedkeys.json#/definitions/customerManagedKeyEncryption",
10338+
"$ref": "#/definitions/CustomerManagedKeyEncryption",
1032510339
"description": "All Customer-managed key encryption properties for the resource."
1032610340
}
1032710341
}
@@ -11826,6 +11840,55 @@
1182611840
}
1182711841
},
1182811842
"KeyEncryptionKeyIdentity": {
11843+
"type": "object",
11844+
"description": "All identity configuration for Customer-managed key settings defining which identity should be used to auth to Key Vault.",
11845+
"properties": {
11846+
"identityType": {
11847+
"$ref": "#/definitions/KeyEncryptionKeyIdentityType",
11848+
"description": "The type of identity to use. Values can be systemAssignedIdentity, userAssignedIdentity, or delegatedResourceIdentity."
11849+
},
11850+
"userAssignedIdentityResourceId": {
11851+
"type": "string",
11852+
"format": "arm-id",
11853+
"description": "User assigned identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity."
11854+
},
11855+
"delegatedIdentityClientId": {
11856+
"$ref": "#/definitions/Azure.Core.uuid",
11857+
"description": "delegated identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity and userAssignedIdentity - internal use only."
11858+
}
11859+
}
11860+
},
11861+
"KeyEncryptionKeyIdentityType": {
11862+
"type": "string",
11863+
"description": "The type of identity to use.",
11864+
"enum": [
11865+
"systemAssignedIdentity",
11866+
"userAssignedIdentity",
11867+
"delegatedResourceIdentity"
11868+
],
11869+
"x-ms-enum": {
11870+
"name": "KeyEncryptionKeyIdentityType",
11871+
"modelAsString": true,
11872+
"values": [
11873+
{
11874+
"name": "SystemAssignedIdentity",
11875+
"value": "systemAssignedIdentity",
11876+
"description": "System assigned identity"
11877+
},
11878+
{
11879+
"name": "UserAssignedIdentity",
11880+
"value": "userAssignedIdentity",
11881+
"description": "User assigned identity"
11882+
},
11883+
{
11884+
"name": "DelegatedResourceIdentity",
11885+
"value": "delegatedResourceIdentity",
11886+
"description": "Delegated identity"
11887+
}
11888+
]
11889+
}
11890+
},
11891+
"KeyEncryptionKeyIdentityUpdate": {
1182911892
"type": "object",
1183011893
"description": "The managed identity configuration used for key vault access.",
1183111894
"properties": {

‎specification/devcenter/resource-manager/Microsoft.DevCenter/preview/2026-01-01-preview/DevCenterRP.json‎

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9582,6 +9582,20 @@
95829582
}
95839583
}
95849584
},
9585+
"CustomerManagedKeyEncryption": {
9586+
"type": "object",
9587+
"description": "Customer-managed key encryption properties for the resource.",
9588+
"properties": {
9589+
"keyEncryptionKeyIdentity": {
9590+
"$ref": "#/definitions/KeyEncryptionKeyIdentity",
9591+
"description": "All identity configuration for Customer-managed key settings defining which identity should be used to auth to Key Vault."
9592+
},
9593+
"keyEncryptionKeyUrl": {
9594+
"type": "string",
9595+
"description": "key encryption key Url, versioned or non-versioned. Ex: https://contosovault.vault.azure.net/keys/contosokek/562a4bb76b524a1493a6afe8e536ee78 or https://contosovault.vault.azure.net/keys/contosokek."
9596+
}
9597+
}
9598+
},
95859599
"CustomizationTask": {
95869600
"type": "object",
95879601
"description": "Represents a Task to be used in customizing a Dev Box.",
@@ -10094,7 +10108,7 @@
1009410108
"description": "Key encryption key Url, versioned or non-versioned. Ex: https://contosovault.vault.azure.net/keys/contosokek/562a4bb76b524a1493a6afe8e536ee78 or https://contosovault.vault.azure.net/keys/contosokek."
1009510109
},
1009610110
"keyEncryptionKeyIdentity": {
10097-
"$ref": "#/definitions/KeyEncryptionKeyIdentity",
10111+
"$ref": "#/definitions/KeyEncryptionKeyIdentityUpdate",
1009810112
"description": "The managed identity configuration used for key vault access."
1009910113
}
1010010114
}
@@ -10345,7 +10359,7 @@
1034510359
"description": "Encryption properties.",
1034610360
"properties": {
1034710361
"customerManagedKeyEncryption": {
10348-
"$ref": "../../../../../common-types/resource-management/v4/customermanagedkeys.json#/definitions/customerManagedKeyEncryption",
10362+
"$ref": "#/definitions/CustomerManagedKeyEncryption",
1034910363
"description": "All Customer-managed key encryption properties for the resource."
1035010364
}
1035110365
}
@@ -11855,6 +11869,55 @@
1185511869
}
1185611870
},
1185711871
"KeyEncryptionKeyIdentity": {
11872+
"type": "object",
11873+
"description": "All identity configuration for Customer-managed key settings defining which identity should be used to auth to Key Vault.",
11874+
"properties": {
11875+
"identityType": {
11876+
"$ref": "#/definitions/KeyEncryptionKeyIdentityType",
11877+
"description": "The type of identity to use. Values can be systemAssignedIdentity, userAssignedIdentity, or delegatedResourceIdentity."
11878+
},
11879+
"userAssignedIdentityResourceId": {
11880+
"type": "string",
11881+
"format": "arm-id",
11882+
"description": "User assigned identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity."
11883+
},
11884+
"delegatedIdentityClientId": {
11885+
"$ref": "#/definitions/Azure.Core.uuid",
11886+
"description": "delegated identity to use for accessing key encryption key Url. Ex: /subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/<resource group>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myId. Mutually exclusive with identityType systemAssignedIdentity and userAssignedIdentity - internal use only."
11887+
}
11888+
}
11889+
},
11890+
"KeyEncryptionKeyIdentityType": {
11891+
"type": "string",
11892+
"description": "The type of identity to use.",
11893+
"enum": [
11894+
"systemAssignedIdentity",
11895+
"userAssignedIdentity",
11896+
"delegatedResourceIdentity"
11897+
],
11898+
"x-ms-enum": {
11899+
"name": "KeyEncryptionKeyIdentityType",
11900+
"modelAsString": true,
11901+
"values": [
11902+
{
11903+
"name": "SystemAssignedIdentity",
11904+
"value": "systemAssignedIdentity",
11905+
"description": "System assigned identity"
11906+
},
11907+
{
11908+
"name": "UserAssignedIdentity",
11909+
"value": "userAssignedIdentity",
11910+
"description": "User assigned identity"
11911+
},
11912+
{
11913+
"name": "DelegatedResourceIdentity",
11914+
"value": "delegatedResourceIdentity",
11915+
"description": "Delegated identity"
11916+
}
11917+
]
11918+
}
11919+
},
11920+
"KeyEncryptionKeyIdentityUpdate": {
1185811921
"type": "object",
1185911922
"description": "The managed identity configuration used for key vault access.",
1186011923
"properties": {

‎specification/maps/resource-manager/Microsoft.Maps/Maps/back-compatible.tsp‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,25 @@ import "@azure-tools/typespec-client-generator-core";
33
using Azure.ClientGenerator.Core;
44
using Microsoft.Maps;
55

6+
// Remove namespace qualification from CommonTypes encryption types for OpenAPI compatibility
7+
@@clientName(
8+
Azure.ResourceManager.CommonTypes.CustomerManagedKeyEncryption,
9+
"CustomerManagedKeyEncryption"
10+
);
11+
@@clientName(Azure.ResourceManager.CommonTypes.Encryption, "Encryption");
12+
@@clientName(
13+
Azure.ResourceManager.CommonTypes.InfrastructureEncryption,
14+
"InfrastructureEncryption"
15+
);
16+
@@clientName(
17+
Azure.ResourceManager.CommonTypes.KeyEncryptionKeyIdentity,
18+
"KeyEncryptionKeyIdentity"
19+
);
20+
@@clientName(
21+
Azure.ResourceManager.CommonTypes.KeyEncryptionKeyIdentityType,
22+
"KeyEncryptionKeyIdentityType"
23+
);
24+
625
#suppress "@azure-tools/typespec-azure-core/no-legacy-usage" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
726
@@Legacy.flattenProperty(MapsAccountUpdateParameters.properties);
827

0 commit comments

Comments
 (0)