Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@
},
"Create a disk encryption set with key vault from a different subscription.": {
"$ref": "./examples/diskEncryptionSetExamples/DiskEncryptionSet_Create_WithKeyVaultFromADifferentSubscription.json"
},
"Create a disk encryption set with key vault from a different tenant.": {
"$ref": "./examples/diskEncryptionSetExamples/DiskEncryptionSet_Create_WithKeyVaultFromADifferentTenant.json"
}
},
"x-ms-long-running-operation": true
Expand Down Expand Up @@ -411,6 +414,10 @@
"readOnly": true,
"$ref": "../common.json#/definitions/ApiError",
"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."
},
"federatedClientId": {
"type": "string",
"description": "Multi-tenant application client id to access key vault in a different tenant. Setting the value to 'None' will clear the property."
}
}
},
Expand All @@ -420,6 +427,8 @@
"type": "string",
"enum": [
"SystemAssigned",
"UserAssigned",
"SystemAssigned, UserAssigned",
"None"
],
"x-ms-enum": {
Expand All @@ -437,6 +446,26 @@
"readOnly": true,
"type": "string",
"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"
},
"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 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}'."
}
},
"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."
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "myResourceGroup",
"api-version": "2022-03-02",
"diskEncryptionSetName": "myDiskEncryptionSet",
"diskEncryptionSet": {
"location": "West US",
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}": {}
}
},
"properties": {
"activeKey": {
"keyUrl": "https://myvaultdifferenttenant.vault-int.azure-int.net/keys/{key}"
},
"encryptionType": "EncryptionAtRestWithCustomerKey",
"federatedClientId": "00000000-0000-0000-0000-000000000000"
}
}
},
"responses": {
"202": {
"body": {
"name": "myDiskEncryptionSet",
"location": "West US",
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}": {}
}
},
"properties": {
"activeKey": {
"keyUrl": "https://myvaultdifferenttenant.vault-int.azure-int.net/keys/{key}"
},
"encryptionType": "EncryptionAtRestWithCustomerKey",
"federatedClientId": "00000000-0000-0000-0000-000000000000",
"previousKeys": []
}
}
},
"200": {
"body": {
"name": "myDiskEncryptionSet",
"location": "West US",
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}": {}
}
},
"properties": {
"activeKey": {
"keyUrl": "https://myvaultdifferenttenant.vault-int.azure-int.net/keys/{key}"
},
"encryptionType": "EncryptionAtRestWithCustomerKey",
"federatedClientId": "00000000-0000-0000-0000-000000000000",
"previousKeys": []
}
}
}
}
}