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.

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

Added Common Types, Managed Identity v6 #29155

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4e9a2b1
Copy original v4 types and managedidentity defintions
almat-msft May 18, 2024
61157af
Rename to V6
almat-msft May 18, 2024
f06cf29
Remove obsolete identity definition
almat-msft May 18, 2024
4f59e1d
Test new identity changes using 2024-03-06-preview DesktopVirtualization
almat-msft May 18, 2024
befd114
Revert "Test new identity changes using 2024-03-06-preview DesktopVir…
almat-msft May 18, 2024
e660dbd
Fix reference path
almat-msft May 18, 2024
e743562
Copy original v4 types and managedidentity defintions
almat-msft May 18, 2024
23d8ca3
Rename to V6
almat-msft May 18, 2024
777f613
Remove obsolete identity definition
almat-msft May 18, 2024
019f360
Test new identity changes using 2024-03-06-preview DesktopVirtualization
almat-msft May 18, 2024
85bc353
Revert "Test new identity changes using 2024-03-06-preview DesktopVir…
almat-msft May 18, 2024
69117b3
Fix reference path
almat-msft May 18, 2024
1bae34f
Remove v4 types and create a new copy from v6
almat-msft May 22, 2024
d2b87d2
Copy v5 types
almat-msft May 22, 2024
e14be64
Rename to V6
almat-msft May 22, 2024
f257258
Remove obsolete identity definition
almat-msft May 22, 2024
aa5f476
Merge branch 'user/almat-msft/identity-commontype-v6' of https://gith…
almat-msft May 22, 2024
7d735ab
Remove redundant 'allof'
almat-msft May 22, 2024
20c26a0
Move "userAssignedIdentities" defintion in-place to not encourage reuse
almat-msft May 23, 2024
2ed9f99
Merge branch 'main' into user/almat-msft/identity-commontype-v6
almat-msft May 23, 2024
b056cfe
Run prettier
almat-msft May 23, 2024
ae1cbf4
Remove redundant 'allof' (part 2)
almat-msft May 23, 2024
eacc777
Remove redundant 'allof' (part 3)
almat-msft May 24, 2024
8823258
Merge branch 'main' into user/almat-msft/identity-commontype-v6
almat-msft May 24, 2024
d494c0d
Update specification/common-types/resource-management/v6/managedident…
almat-msft May 24, 2024
8ad3d7a
Merge branch 'main' into user/almat-msft/identity-commontype-v6
almat-msft May 28, 2024
5f2b8c2
Merge branch 'main' into user/almat-msft/identity-commontype-v6
almat-msft May 30, 2024
2c95093
Merge branch 'main' into user/almat-msft/identity-commontype-v6
almat-msft May 30, 2024
b9a8866
Merge branch 'main' into user/almat-msft/identity-commontype-v6
rkmanda May 31, 2024
8e3aabb
Merge branch 'main' into user/almat-msft/identity-commontype-v6
rkmanda May 31, 2024
a5969d5
Merge branch 'main' into user/almat-msft/identity-commontype-v6
gary-x-li May 31, 2024
81aa2e8
Merge branch 'main' into user/almat-msft/identity-commontype-v6
almat-msft May 31, 2024
27da251
Merge branch 'main' into user/almat-msft/identity-commontype-v6
almat-msft May 31, 2024
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
110 changes: 110 additions & 0 deletions specification/common-types/resource-management/v6/managedidentity.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
{
"swagger": "2.0",
"info": {
"version": "6.0",
"title": "Common types"
},
"paths": {},
"definitions": {
"UserAssignedIdentity": {
"type": "object",
"description": "User assigned identity properties",
"properties": {
"principalId": {
"description": "The principal ID of the assigned identity.",
"format": "uuid",
"type": "string",
"readOnly": true
},
"clientId": {
"description": "The client ID of the assigned identity.",
"format": "uuid",
"type": "string",
"readOnly": true
}
}
},
"ManagedServiceIdentityType": {
"description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
"enum": [
"None",
"SystemAssigned",
"UserAssigned",
"SystemAssigned,UserAssigned"
],
"type": "string",
"x-ms-enum": {
"name": "ManagedServiceIdentityType",
"modelAsString": true
}
},
"ManagedServiceIdentity": {
"description": "Managed service identity (system assigned and/or user assigned identities)",
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"tenantId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"type": {
"$ref": "#/definitions/ManagedServiceIdentityType"
},
"userAssignedIdentities": {
"description": "The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests.",
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/UserAssignedIdentity",
"x-nullable": true
}
}
},
"required": [
"type"
]
},
"SystemAssignedServiceIdentityType": {
"description": "Type of managed service identity (either system assigned, or none).",
"enum": [
"None",
"SystemAssigned"
],
"type": "string",
"x-ms-enum": {
"name": "SystemAssignedServiceIdentityType",
"modelAsString": true
}
},
"SystemAssignedServiceIdentity": {
"description": "Managed service identity (either system assigned, or none)",
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"tenantId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"type": {
"$ref": "#/definitions/SystemAssignedServiceIdentityType"
}
},
"required": [
"type"
]
}
}
}
Loading