diff --git a/schemas/2017-09-01-preview/Microsoft.DataFactory.json b/schemas/2017-09-01-preview/Microsoft.DataFactory.json index bdfc2aa0e4..51ef6d0139 100644 --- a/schemas/2017-09-01-preview/Microsoft.DataFactory.json +++ b/schemas/2017-09-01-preview/Microsoft.DataFactory.json @@ -12175,4 +12175,4 @@ "description": "Zoho server dataset." } } -} \ No newline at end of file +} diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json index 93dea0e0e5..9aa9af7edb 100644 --- a/schemas/2018-06-01/Microsoft.DataFactory.json +++ b/schemas/2018-06-01/Microsoft.DataFactory.json @@ -4812,6 +4812,17 @@ "AzureSqlDatabaseLinkedServiceTypeProperties": { "type": "object", "properties": { + "alwaysEncryptedSettings": { + "oneOf": [ + { + "$ref": "#/definitions/SqlAlwaysEncryptedProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql always encrypted properties." + }, "azureCloudType": { "type": "object", "properties": {}, @@ -5025,6 +5036,17 @@ "AzureSqlMILinkedServiceTypeProperties": { "type": "object", "properties": { + "alwaysEncryptedSettings": { + "oneOf": [ + { + "$ref": "#/definitions/SqlAlwaysEncryptedProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql always encrypted properties." + }, "azureCloudType": { "type": "object", "properties": {}, @@ -6961,6 +6983,12 @@ { "$ref": "#/definitions/SalesforceServiceCloudSink" }, + { + "$ref": "#/definitions/MongoDbAtlasSink" + }, + { + "$ref": "#/definitions/MongoDbV2Sink" + }, { "$ref": "#/definitions/CosmosDbMongoDbApiSink" } @@ -18280,6 +18308,26 @@ ], "description": "MongoDB Atlas linked service properties." }, + "MongoDbAtlasSink": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "MongoDbAtlasSink" + ] + }, + "writeBehavior": { + "type": "object", + "properties": {}, + "description": "Specifies whether the document with same key to be overwritten (upsert) rather than throw exception (insert). The default value is \"insert\". Type: string (or Expression with resultType string). Type: string (or Expression with resultType string)." + } + }, + "required": [ + "type" + ], + "description": "A copy activity MongoDB Atlas sink." + }, "MongoDbAtlasSource": { "type": "object", "properties": { @@ -18643,6 +18691,26 @@ ], "description": "MongoDB linked service properties." }, + "MongoDbV2Sink": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "MongoDbV2Sink" + ] + }, + "writeBehavior": { + "type": "object", + "properties": {}, + "description": "Specifies whether the document with same key to be overwritten (upsert) rather than throw exception (insert). The default value is \"insert\". Type: string (or Expression with resultType string). Type: string (or Expression with resultType string)." + } + }, + "required": [ + "type" + ], + "description": "A copy activity MongoDB sink." + }, "MongoDbV2Source": { "type": "object", "properties": { @@ -25259,6 +25327,46 @@ ], "description": "A copy activity Spark Server source." }, + "SqlAlwaysEncryptedProperties": { + "type": "object", + "properties": { + "alwaysEncryptedAkvAuthType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "ServicePrincipal", + "ManagedIdentity" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql always encrypted AKV authentication type. Type: string (or Expression with resultType string)." + }, + "servicePrincipalId": { + "type": "object", + "properties": {}, + "description": "The client ID of the application in Azure Active Directory used for Azure Key Vault authentication. Type: string (or Expression with resultType string)." + }, + "servicePrincipalKey": { + "oneOf": [ + { + "$ref": "#/definitions/SecretBase" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The base definition of a secret type." + } + }, + "required": [ + "alwaysEncryptedAkvAuthType" + ], + "description": "Sql always encrypted properties." + }, "SqlDWSink": { "type": "object", "properties": { @@ -25529,6 +25637,17 @@ "SqlServerLinkedServiceTypeProperties": { "type": "object", "properties": { + "alwaysEncryptedSettings": { + "oneOf": [ + { + "$ref": "#/definitions/SqlAlwaysEncryptedProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql always encrypted properties." + }, "connectionString": { "type": "object", "properties": {}, @@ -28861,4 +28980,4 @@ "description": "A copy activity Zoho server source." } } -} \ No newline at end of file +}