diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json index b40feaed11..a0b81da0ea 100644 --- a/schemas/2018-06-01/Microsoft.DataFactory.json +++ b/schemas/2018-06-01/Microsoft.DataFactory.json @@ -1612,6 +1612,110 @@ }, "description": "Azure Blob Storage linked service properties." }, + "AzureDatabricksDeltaLakeDataset": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "AzureDatabricksDeltaLakeDataset" + ] + }, + "typeProperties": { + "oneOf": [ + { + "$ref": "#/definitions/AzureDatabricksDeltaLakeDatasetTypeProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Azure Databricks Delta Lake Dataset Properties" + } + }, + "required": [ + "type" + ], + "description": "Azure Databricks Delta Lake dataset." + }, + "AzureDatabricksDeltaLakeDatasetTypeProperties": { + "type": "object", + "properties": { + "database": { + "type": "object", + "properties": {}, + "description": "The database name of delta table. Type: string (or Expression with resultType string)." + }, + "table": { + "type": "object", + "properties": {}, + "description": "The name of delta table. Type: string (or Expression with resultType string)." + } + }, + "description": "Azure Databricks Delta Lake Dataset Properties" + }, + "AzureDatabricksDeltaLakeLinkedService": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "AzureDatabricksDeltaLake" + ] + }, + "typeProperties": { + "oneOf": [ + { + "$ref": "#/definitions/AzureDatabricksDetltaLakeLinkedServiceTypeProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Azure Databricks Delta Lake linked service properties." + } + }, + "required": [ + "type", + "typeProperties" + ], + "description": "Azure Databricks Delta Lake linked service." + }, + "AzureDatabricksDetltaLakeLinkedServiceTypeProperties": { + "type": "object", + "properties": { + "accessToken": { + "oneOf": [ + { + "$ref": "#/definitions/SecretBase" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The base definition of a secret type." + }, + "clusterId": { + "type": "object", + "properties": {}, + "description": "The id of an existing interactive cluster that will be used for all runs of this job. Type: string (or Expression with resultType string)." + }, + "domain": { + "type": "object", + "properties": {}, + "description": ".azuredatabricks.net, domain name of your Databricks deployment. Type: string (or Expression with resultType string)." + }, + "encryptedCredential": { + "type": "object", + "properties": {}, + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "domain" + ], + "description": "Azure Databricks Delta Lake linked service properties." + }, "AzureDatabricksLinkedService": { "type": "object", "properties": { @@ -3926,6 +4030,16 @@ }, "description": "Cassandra dataset properties." }, + "CMKIdentityDefinition": { + "type": "object", + "properties": { + "userAssignedIdentity": { + "type": "string", + "description": "The resource id of the user assigned identity to authenticate to customer's key vault." + } + }, + "description": "Managed Identity used for CMK." + }, "CommonDataServiceForAppsEntityDataset": { "type": "object", "properties": { @@ -5758,6 +5872,9 @@ }, { "$ref": "#/definitions/SharePointOnlineListResourceDataset" + }, + { + "$ref": "#/definitions/AzureDatabricksDeltaLakeDataset" } ], "properties": { @@ -7155,6 +7272,39 @@ ], "description": "Eloqua server dataset." }, + "EncryptionConfiguration": { + "type": "object", + "properties": { + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/CMKIdentityDefinition" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Managed Identity used for CMK." + }, + "keyName": { + "type": "string", + "description": "The name of the key in Azure Key Vault to use as Customer Managed Key." + }, + "keyVersion": { + "type": "string", + "description": "The version of the key used for CMK. If not provided, latest version will be used." + }, + "vaultBaseUrl": { + "type": "string", + "description": "The url of the Azure Key Vault used for CMK." + } + }, + "required": [ + "keyName", + "vaultBaseUrl" + ], + "description": "Definition of CMK for the factory." + }, "EntityReference": { "type": "object", "properties": { @@ -8179,14 +8329,32 @@ { "type": "string", "enum": [ - "SystemAssigned" + "SystemAssigned", + "UserAssigned", + "SystemAssigned,UserAssigned" ] }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "The identity type. Currently the only supported type is 'SystemAssigned'." + "description": "The identity type." + }, + "userAssignedIdentities": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "object", + "properties": {} + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Definition of all user assigned identities for a factory." } }, "required": [ @@ -8197,6 +8365,17 @@ "FactoryProperties": { "type": "object", "properties": { + "encryption": { + "oneOf": [ + { + "$ref": "#/definitions/EncryptionConfiguration" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Definition of CMK for the factory." + }, "globalParameters": { "oneOf": [ { @@ -12316,6 +12495,9 @@ { "$ref": "#/definitions/AzureDatabricksLinkedService" }, + { + "$ref": "#/definitions/AzureDatabricksDeltaLakeLinkedService" + }, { "$ref": "#/definitions/ResponsysLinkedService" },