Skip to content

Commit 10875b0

Browse files
author
SDKAuto
committed
CodeGen from PR 13669 in Azure/azure-rest-api-specs
Merge 2f881fcb7113b48b154e32ad678ae427331dad45 into 9fbd9c69e95c30c0805b34d8b6e23a385dc0d6cc
1 parent 2d61c58 commit 10875b0

File tree

2 files changed

+121
-2
lines changed

2 files changed

+121
-2
lines changed

schemas/2017-09-01-preview/Microsoft.DataFactory.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12175,4 +12175,4 @@
1217512175
"description": "Zoho server dataset."
1217612176
}
1217712177
}
12178-
}
12178+
}

schemas/2018-06-01/Microsoft.DataFactory.json

Lines changed: 120 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4812,6 +4812,17 @@
48124812
"AzureSqlDatabaseLinkedServiceTypeProperties": {
48134813
"type": "object",
48144814
"properties": {
4815+
"alwaysEncryptedSettings": {
4816+
"oneOf": [
4817+
{
4818+
"$ref": "#/definitions/SqlAlwaysEncryptedProperties"
4819+
},
4820+
{
4821+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4822+
}
4823+
],
4824+
"description": "Sql always encrypted properties."
4825+
},
48154826
"azureCloudType": {
48164827
"type": "object",
48174828
"properties": {},
@@ -5025,6 +5036,17 @@
50255036
"AzureSqlMILinkedServiceTypeProperties": {
50265037
"type": "object",
50275038
"properties": {
5039+
"alwaysEncryptedSettings": {
5040+
"oneOf": [
5041+
{
5042+
"$ref": "#/definitions/SqlAlwaysEncryptedProperties"
5043+
},
5044+
{
5045+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
5046+
}
5047+
],
5048+
"description": "Sql always encrypted properties."
5049+
},
50285050
"azureCloudType": {
50295051
"type": "object",
50305052
"properties": {},
@@ -6961,6 +6983,12 @@
69616983
{
69626984
"$ref": "#/definitions/SalesforceServiceCloudSink"
69636985
},
6986+
{
6987+
"$ref": "#/definitions/MongoDbAtlasSink"
6988+
},
6989+
{
6990+
"$ref": "#/definitions/MongoDbV2Sink"
6991+
},
69646992
{
69656993
"$ref": "#/definitions/CosmosDbMongoDbApiSink"
69666994
}
@@ -18280,6 +18308,26 @@
1828018308
],
1828118309
"description": "MongoDB Atlas linked service properties."
1828218310
},
18311+
"MongoDbAtlasSink": {
18312+
"type": "object",
18313+
"properties": {
18314+
"type": {
18315+
"type": "string",
18316+
"enum": [
18317+
"MongoDbAtlasSink"
18318+
]
18319+
},
18320+
"writeBehavior": {
18321+
"type": "object",
18322+
"properties": {},
18323+
"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)."
18324+
}
18325+
},
18326+
"required": [
18327+
"type"
18328+
],
18329+
"description": "A copy activity MongoDB Atlas sink."
18330+
},
1828318331
"MongoDbAtlasSource": {
1828418332
"type": "object",
1828518333
"properties": {
@@ -18643,6 +18691,26 @@
1864318691
],
1864418692
"description": "MongoDB linked service properties."
1864518693
},
18694+
"MongoDbV2Sink": {
18695+
"type": "object",
18696+
"properties": {
18697+
"type": {
18698+
"type": "string",
18699+
"enum": [
18700+
"MongoDbV2Sink"
18701+
]
18702+
},
18703+
"writeBehavior": {
18704+
"type": "object",
18705+
"properties": {},
18706+
"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)."
18707+
}
18708+
},
18709+
"required": [
18710+
"type"
18711+
],
18712+
"description": "A copy activity MongoDB sink."
18713+
},
1864618714
"MongoDbV2Source": {
1864718715
"type": "object",
1864818716
"properties": {
@@ -25259,6 +25327,46 @@
2525925327
],
2526025328
"description": "A copy activity Spark Server source."
2526125329
},
25330+
"SqlAlwaysEncryptedProperties": {
25331+
"type": "object",
25332+
"properties": {
25333+
"alwaysEncryptedAkvAuthType": {
25334+
"oneOf": [
25335+
{
25336+
"type": "string",
25337+
"enum": [
25338+
"ServicePrincipal",
25339+
"ManagedIdentity"
25340+
]
25341+
},
25342+
{
25343+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25344+
}
25345+
],
25346+
"description": "Sql always encrypted AKV authentication type. Type: string (or Expression with resultType string)."
25347+
},
25348+
"servicePrincipalId": {
25349+
"type": "object",
25350+
"properties": {},
25351+
"description": "The client ID of the application in Azure Active Directory used for Azure Key Vault authentication. Type: string (or Expression with resultType string)."
25352+
},
25353+
"servicePrincipalKey": {
25354+
"oneOf": [
25355+
{
25356+
"$ref": "#/definitions/SecretBase"
25357+
},
25358+
{
25359+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25360+
}
25361+
],
25362+
"description": "The base definition of a secret type."
25363+
}
25364+
},
25365+
"required": [
25366+
"alwaysEncryptedAkvAuthType"
25367+
],
25368+
"description": "Sql always encrypted properties."
25369+
},
2526225370
"SqlDWSink": {
2526325371
"type": "object",
2526425372
"properties": {
@@ -25529,6 +25637,17 @@
2552925637
"SqlServerLinkedServiceTypeProperties": {
2553025638
"type": "object",
2553125639
"properties": {
25640+
"alwaysEncryptedSettings": {
25641+
"oneOf": [
25642+
{
25643+
"$ref": "#/definitions/SqlAlwaysEncryptedProperties"
25644+
},
25645+
{
25646+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25647+
}
25648+
],
25649+
"description": "Sql always encrypted properties."
25650+
},
2553225651
"connectionString": {
2553325652
"type": "object",
2553425653
"properties": {},
@@ -28861,4 +28980,4 @@
2886128980
"description": "A copy activity Zoho server source."
2886228981
}
2886328982
}
28864-
}
28983+
}

0 commit comments

Comments
 (0)