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

[DataFactory]: Add CMK Properties #10867

Merged
merged 5 commits into from
Dec 4, 2020
Merged

[DataFactory]: Add CMK Properties #10867

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2497968
[DataFactory]: Add CMK Properties
Pacodel Sep 21, 2020
1d502e6
Prettier validation
Pacodel Sep 21, 2020
f3cf75a
Model Identity Type as string
Pacodel Sep 30, 2020
4348ed0
Merge with master
Pacodel Sep 30, 2020
daf7ed6
RemoveEnumChanges
Pacodel Dec 2, 2020
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
56 changes: 55 additions & 1 deletion ...ion/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4887,6 +4887,10 @@
"$ref": "#/definitions/GlobalParameterDefinitionSpecification",
"description": "List of parameters for factory."
},
"encryption": {
"$ref": "#/definitions/EncryptionConfiguration",
"description": "Properties to enable Customer Managed Key for the factory."
},
"publicNetworkAccess": {
"description": "Whether or not public network access is allowed for the data factory.",
"enum": [
Expand All @@ -4901,6 +4905,40 @@
}
}
},
"EncryptionConfiguration": {
"description": "Definition of CMK for the factory.",
"properties": {
"keyName": {
"type": "string",
"description": "The name of the key in Azure Key Vault to use as Customer Managed Key."
},
"vaultBaseUrl": {
"type": "string",
"description": "The url of the Azure Key Vault used for CMK."
},
"keyVersion": {
"type": "string",
"description": "The version of the key used for CMK. If not provided, latest version will be used."
},
"identity": {
"$ref": "#/definitions/CMKIdentityDefinition",
"description": "User assigned identity to use to authenticate to customer's key vault. If not provided Managed Service Identity will be used."
}
},
"required": [
"keyName",
"vaultBaseUrl"
]
},
"CMKIdentityDefinition": {
"description": "Managed Identity used for CMK.",
"properties": {
"userAssignedIdentity": {
"type": "string",
"description": "The resource id of the user assigned identity to authenticate to customer's key vault."
}
}
},
"GlobalParameterDefinitionSpecification": {
"description": "Definition of all parameters for an entity.",
"type": "object",
Expand Down Expand Up @@ -5058,7 +5096,7 @@
"properties": {
"type": {
"type": "string",
"description": "The identity type. Currently the only supported type is 'SystemAssigned'.",
"description": "The identity type.",
"enum": [
"SystemAssigned"
],
Expand All @@ -5078,12 +5116,28 @@
"format": "uuid",
"readOnly": true,
"description": "The client tenant id of the identity."
},
"userAssignedIdentities": {
"$ref": "#/definitions/UserAssignedIdentitiesDefinitionSpecification",
"description": "List of user assigned identities for the factory."
}
},
"required": [
"type"
]
},
"UserAssignedIdentitiesDefinitionSpecification": {
"description": "Definition of all user assigned identities for a factory.",
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/UserAssignedIdentitySpecification"
}
},
"UserAssignedIdentitySpecification": {
shawnxzq marked this conversation as resolved.
Show resolved Hide resolved
"description": "Definition of a single user assigned identity for a factory.",
"type": "object",
"properties": {}
},
"DatasetReference": {
"description": "Dataset reference type.",
"properties": {
Expand Down