Skip to content

Commit 5e3a7ca

Browse files
parkhyukjun89haagha
authored andcommitted
add cross-tenant feature (#18718)
* add cross-tenant feature * fix filename typo * prettier
1 parent de6ecf5 commit 5e3a7ca

File tree

2 files changed

+95
-0
lines changed

2 files changed

+95
-0
lines changed

specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-02/DiskRP/diskEncryptionSet.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@
9090
},
9191
"Create a disk encryption set with key vault from a different subscription.": {
9292
"$ref": "./examples/diskEncryptionSetExamples/DiskEncryptionSet_Create_WithKeyVaultFromADifferentSubscription.json"
93+
},
94+
"Create a disk encryption set with key vault from a different tenant.": {
95+
"$ref": "./examples/diskEncryptionSetExamples/DiskEncryptionSet_Create_WithKeyVaultFromADifferentTenant.json"
9396
}
9497
},
9598
"x-ms-long-running-operation": true
@@ -411,6 +414,10 @@
411414
"readOnly": true,
412415
"$ref": "../common.json#/definitions/ApiError",
413416
"description": "The error that was encountered during auto-key rotation. If an error is present, then auto-key rotation will not be attempted until the error on this disk encryption set is fixed."
417+
},
418+
"federatedClientId": {
419+
"type": "string",
420+
"description": "Multi-tenant application client id to access key vault in a different tenant. Setting the value to 'None' will clear the property."
414421
}
415422
}
416423
},
@@ -420,6 +427,8 @@
420427
"type": "string",
421428
"enum": [
422429
"SystemAssigned",
430+
"UserAssigned",
431+
"SystemAssigned, UserAssigned",
423432
"None"
424433
],
425434
"x-ms-enum": {
@@ -437,6 +446,26 @@
437446
"readOnly": true,
438447
"type": "string",
439448
"description": "The tenant id of the Managed Identity Resource. This will be sent to the RP from ARM via the x-ms-client-tenant-id header in the PUT request if the resource has a systemAssigned(implicit) identity"
449+
},
450+
"userAssignedIdentities": {
451+
"type": "object",
452+
"additionalProperties": {
453+
"type": "object",
454+
"x-ms-client-name": "userAssignedIdentitiesValue",
455+
"properties": {
456+
"principalId": {
457+
"readOnly": true,
458+
"type": "string",
459+
"description": "The principal id of user assigned identity."
460+
},
461+
"clientId": {
462+
"readOnly": true,
463+
"type": "string",
464+
"description": "The client id of user assigned identity."
465+
}
466+
}
467+
},
468+
"description": "The list of user identities associated with the disk encryption set. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
440469
}
441470
},
442471
"description": "The managed identity for the disk encryption set. It should be given permission on the key vault before it can be used to encrypt disks."
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "{subscription-id}",
4+
"resourceGroupName": "myResourceGroup",
5+
"api-version": "2022-03-02",
6+
"diskEncryptionSetName": "myDiskEncryptionSet",
7+
"diskEncryptionSet": {
8+
"location": "West US",
9+
"identity": {
10+
"type": "UserAssigned",
11+
"userAssignedIdentities": {
12+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}": {}
13+
}
14+
},
15+
"properties": {
16+
"activeKey": {
17+
"keyUrl": "https://myvaultdifferenttenant.vault-int.azure-int.net/keys/{key}"
18+
},
19+
"encryptionType": "EncryptionAtRestWithCustomerKey",
20+
"federatedClientId": "00000000-0000-0000-0000-000000000000"
21+
}
22+
}
23+
},
24+
"responses": {
25+
"202": {
26+
"body": {
27+
"name": "myDiskEncryptionSet",
28+
"location": "West US",
29+
"identity": {
30+
"type": "UserAssigned",
31+
"userAssignedIdentities": {
32+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}": {}
33+
}
34+
},
35+
"properties": {
36+
"activeKey": {
37+
"keyUrl": "https://myvaultdifferenttenant.vault-int.azure-int.net/keys/{key}"
38+
},
39+
"encryptionType": "EncryptionAtRestWithCustomerKey",
40+
"federatedClientId": "00000000-0000-0000-0000-000000000000",
41+
"previousKeys": []
42+
}
43+
}
44+
},
45+
"200": {
46+
"body": {
47+
"name": "myDiskEncryptionSet",
48+
"location": "West US",
49+
"identity": {
50+
"type": "UserAssigned",
51+
"userAssignedIdentities": {
52+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}": {}
53+
}
54+
},
55+
"properties": {
56+
"activeKey": {
57+
"keyUrl": "https://myvaultdifferenttenant.vault-int.azure-int.net/keys/{key}"
58+
},
59+
"encryptionType": "EncryptionAtRestWithCustomerKey",
60+
"federatedClientId": "00000000-0000-0000-0000-000000000000",
61+
"previousKeys": []
62+
}
63+
}
64+
}
65+
}
66+
}

0 commit comments

Comments
 (0)