Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Compute] Disk 2022-03-02 #19116

Merged
merged 37 commits into from
May 30, 2022
Merged

[Compute] Disk 2022-03-02 #19116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4c41769
new version folder
grizzlytheodore Feb 24, 2022
f9be196
new version folder
grizzlytheodore Feb 24, 2022
d7378eb
sync with diskRP 2021-12-01 changes
grizzlytheodore Feb 28, 2022
770c366
sync with diskRP 2021-12-01
grizzlytheodore Feb 28, 2022
768d270
Update creationData description (#18050)
grizzlytheodore Mar 14, 2022
908c4ee
adding SecurityProfile in DiskRestorePointProperties (#18826)
anshulsolanki21 Apr 28, 2022
3ccee3b
add cross-tenant feature (#18718)
parkhyukjun89 Apr 29, 2022
ad5a64a
Swagger changes for PremiumV2 in DiskRP (#18786)
akashpargat Apr 29, 2022
cc7ce72
Add new Azure Compute Gallery image ids to ImageDiskReference for Put…
jerryc3 May 3, 2022
dddf6b9
Feature/cplat 2022 03 02 (#18945)
parkhyukjun89 May 10, 2022
1ae2c99
Merge branch 'main' into feature/cplat-2022-03-02
haagha May 13, 2022
9110499
New ApI Version
haagha May 17, 2022
6197531
Readme changes
haagha May 17, 2022
de6ecf5
adding SecurityProfile in DiskRestorePointProperties (#18826)
anshulsolanki21 Apr 28, 2022
5e3a7ca
add cross-tenant feature (#18718)
parkhyukjun89 Apr 29, 2022
2d473c8
Swagger changes for PremiumV2 in DiskRP (#18786)
akashpargat Apr 29, 2022
67c8a68
Add new Azure Compute Gallery image ids to ImageDiskReference for Put…
jerryc3 May 3, 2022
7cee4de
Feature/cplat 2022 03 02 (#18945)
parkhyukjun89 May 10, 2022
ef3caf6
GET snapshot-Changed CopyCompletionError enum name (#19160)
kkaran27 May 20, 2022
ed7d8bd
move UserAssignedIdentities to common.json to fix duplicate definition
May 25, 2022
6fab9b9
Merge branch 'main' into feature/cplat-2022-03-02
grizzlytheodore May 25, 2022
1a822d1
update readme with gallery 2022-01-03
May 25, 2022
f7c5e2b
merge 2022-01-03 into readme
May 25, 2022
a3cc187
sync with past updates
May 25, 2022
c121025
update with description for object
May 25, 2022
293877b
merge diskrp-2022-03-02 to this branch
May 25, 2022
a62dfb5
fix readme
May 25, 2022
9e39aae
GET snapshot-Changed CopyCompletionError enum name (#19227)
haagha May 25, 2022
d4e9c3f
fixing readme.md
haagha May 25, 2022
789e6bc
Merge branch 'diskrp-2022-03-02' of https://github.com/Azure/azure-re…
haagha May 25, 2022
c793e06
Merge branch 'feature/cplat-2022-03-02' into cplat_fixDup
grizzlytheodore May 25, 2022
909c20c
Merge branch 'diskrp-2022-03-02' into cplat_fixDup
haagha May 25, 2022
2041dba
merging main
haagha May 25, 2022
aa4c465
merging
haagha May 26, 2022
e471994
fix vmss userAssignedIdentities duplicate definition
May 27, 2022
719702d
Merge branch 'cplat_fixDup' of https://github.com/Azure/azure-rest-ap…
May 27, 2022
8a9dd11
Merge remote-tracking branch 'upstream/cplat_fixDup' into diskrp-2022…
haagha May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2022-01-03/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,26 @@
"description": "The type of the extended location."
}
}
},
"UserAssignedIdentities": {
"type": "object",
"additionalProperties": {
"type": "object",
"x-ms-client-name": "userAssignedIdentitiesValue",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal id of user assigned identity."
},
"clientId": {
"readOnly": true,
"type": "string",
"description": "The client id of user assigned identity."
}
}
},
"description": "The list of user identities associated with the Virtual Machine. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
}
},
"parameters": {
Expand Down
18 changes: 1 addition & 17 deletions ...ompute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2852,23 +2852,7 @@
}
},
"userAssignedIdentities": {
"type": "object",
"additionalProperties": {
"type": "object",
"x-ms-client-name": "userAssignedIdentitiesValue",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal id of user assigned identity."
},
"clientId": {
"readOnly": true,
"type": "string",
"description": "The client id of user assigned identity."
}
}
},
"$ref": "../common.json#/definitions/UserAssignedIdentities",
"description": "The list of user identities associated with the Virtual Machine. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
}
},
Expand Down
18 changes: 1 addition & 17 deletions ...esource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3657,23 +3657,7 @@
}
},
"userAssignedIdentities": {
"type": "object",
"additionalProperties": {
"type": "object",
"x-ms-client-name": "VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal id of user assigned identity."
},
"clientId": {
"readOnly": true,
"type": "string",
"description": "The client id of user assigned identity."
}
}
},
"$ref": "../common.json#/definitions/UserAssignedIdentities",
"description": "The list of user identities associated with the virtual machine scale set. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
}
},
Expand Down
20 changes: 20 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,26 @@
"description": "The type of the extended location."
}
}
},
"UserAssignedIdentities": {
"type": "object",
"additionalProperties": {
"type": "object",
"x-ms-client-name": "userAssignedIdentitiesValue",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal id of user assigned identity."
},
"clientId": {
"readOnly": true,
"type": "string",
"description": "The client id of user assigned identity."
}
}
},
"description": "The list of user identities associated with the Virtual Machine. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
}
},
"parameters": {
Expand Down
Loading