Skip to content

Commit f265515

Browse files
Jingshu918AzureRestAPISpecReview
authored and
zman-ms
committed
[Hub Generated] Publish private branch 'datafactory/dev/wangbow/UpdateSwagger' (#26507)
* [AutoSync] b2e188ef0d Update Swagger data type * [AutoSync] 5824affc79 Updated LinkedService.json * [AutoSync] b8b8dd4b81 Updated LinkedService.json --------- Co-authored-by: swagger-automation <[email protected]>
1 parent 0a93531 commit f265515

File tree

4 files changed

+43
-13
lines changed

4 files changed

+43
-13
lines changed

‎specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Credential.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"properties": {
6262
"servicePrincipalId": {
6363
"type": "object",
64+
"x-ms-format": "dfe-string",
6465
"description": "The app ID of the service principal used to authenticate"
6566
},
6667
"servicePrincipalKey": {
@@ -69,6 +70,7 @@
6970
},
7071
"tenant": {
7172
"type": "object",
73+
"x-ms-format": "dfe-string",
7274
"description": "The ID of the tenant to which the service principal belongs"
7375
}
7476
}

‎specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,7 @@
773773
},
774774
"compressionLevel": {
775775
"type": "object",
776+
"x-ms-format": "dfe-string",
776777
"description": "The data compression method used for DelimitedText."
777778
},
778779
"quoteChar": {
@@ -1092,6 +1093,7 @@
10921093
"properties": {
10931094
"tableName": {
10941095
"type": "object",
1096+
"x-ms-format": "dfe-string",
10951097
"description": "This property will be retired. Please consider using schema + table properties instead."
10961098
},
10971099
"schema": {
@@ -1128,6 +1130,7 @@
11281130
"properties": {
11291131
"tableName": {
11301132
"type": "object",
1133+
"x-ms-format": "dfe-string",
11311134
"description": "This property will be retired. Please consider using schema + table properties instead."
11321135
},
11331136
"schema": {
@@ -1164,6 +1167,7 @@
11641167
"properties": {
11651168
"tableName": {
11661169
"type": "object",
1170+
"x-ms-format": "dfe-string",
11671171
"description": "This property will be retired. Please consider using schema + table properties instead."
11681172
},
11691173
"schema": {
@@ -1727,6 +1731,7 @@
17271731
"properties": {
17281732
"tableName": {
17291733
"type": "object",
1734+
"x-ms-format": "dfe-string",
17301735
"description": "This property will be retired. Please consider using schema + table properties instead."
17311736
},
17321737
"schema": {
@@ -1863,6 +1868,7 @@
18631868
"properties": {
18641869
"tableName": {
18651870
"type": "object",
1871+
"x-ms-format": "dfe-string",
18661872
"description": "This property will be retired. Please consider using schema + table properties instead."
18671873
},
18681874
"table": {
@@ -1899,6 +1905,7 @@
18991905
"properties": {
19001906
"tableName": {
19011907
"type": "object",
1908+
"x-ms-format": "dfe-string",
19021909
"description": "This property will be retired. Please consider using schema + table properties instead."
19031910
},
19041911
"schema": {
@@ -2043,6 +2050,7 @@
20432050
"properties": {
20442051
"tableName": {
20452052
"type": "object",
2053+
"x-ms-format": "dfe-string",
20462054
"description": "This property will be retired. Please consider using schema + table properties instead."
20472055
},
20482056
"table": {
@@ -3304,6 +3312,7 @@
33043312
"properties": {
33053313
"tableName": {
33063314
"type": "object",
3315+
"x-ms-format": "dfe-string",
33073316
"description": "This property will be retired. Please consider using schema + table properties instead."
33083317
},
33093318
"table": {

‎specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,8 @@
17571757
"properties": {
17581758
"connectionString": {
17591759
"description": "Teradata ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
1760-
"type": "object"
1760+
"type": "object",
1761+
"x-ms-format": "dfe-string"
17611762
},
17621763
"server": {
17631764
"type": "object",
@@ -4673,7 +4674,7 @@
46734674
},
46744675
"requestGoogleDriveScope": {
46754676
"description": "Whether to request access to Google Drive. Allowing Google Drive access enables support for federated tables that combine BigQuery data with data from Google Drive. The default value is false. Type: string (or Expression with resultType string).",
4676-
"x-ms-format": "dfe-string",
4677+
"x-ms-format": "dfe-bool",
46774678
"type": "object"
46784679
},
46794680
"authenticationType": {
@@ -4757,7 +4758,8 @@
47574758
"properties": {
47584759
"connectionString": {
47594760
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
4760-
"type": "object"
4761+
"type": "object",
4762+
"x-ms-format": "dfe-string"
47614763
},
47624764
"pwd": {
47634765
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
@@ -5777,7 +5779,8 @@
57775779
"properties": {
57785780
"endpoint": {
57795781
"description": "The endpoint of the ServiceNow server. (i.e. <instance>.service-now.com)",
5780-
"type": "object"
5782+
"type": "object",
5783+
"x-ms-format": "dfe-string"
57815784
},
57825785
"authenticationType": {
57835786
"description": "The authentication type to use.",
@@ -6860,6 +6863,7 @@
68606863
"type": "object",
68616864
"properties": {
68626865
"endpoint": {
6866+
"x-ms-format": "dfe-string",
68636867
"description": "The endpoint of the Responsys server.",
68646868
"type": "object"
68656869
},
@@ -6923,6 +6927,7 @@
69236927
"type": "object",
69246928
"properties": {
69256929
"url": {
6930+
"x-ms-format": "dfe-string",
69266931
"description": "The Dynamics AX (or Dynamics 365 Finance and Operations) instance OData endpoint.",
69276932
"type": "object"
69286933
},
@@ -6985,11 +6990,13 @@
69856990
"properties": {
69866991
"host": {
69876992
"description": "The URL of the Oracle Service Cloud instance.",
6988-
"type": "object"
6993+
"type": "object",
6994+
"x-ms-format": "dfe-string"
69896995
},
69906996
"username": {
69916997
"description": "The user name that you use to access Oracle Service Cloud server.",
6992-
"type": "object"
6998+
"type": "object",
6999+
"x-ms-format": "dfe-string"
69937000
},
69947001
"password": {
69957002
"description": "The password corresponding to the user name that you provided in the username key.",

‎specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,8 @@
11131113
},
11141114
"copyBehavior": {
11151115
"description": "The type of copy behavior for copy sink.",
1116-
"type": "object"
1116+
"type": "object",
1117+
"x-ms-format": "dfe-string"
11171118
}
11181119
},
11191120
"additionalProperties": {
@@ -1351,6 +1352,7 @@
13511352
},
13521353
"namespacePrefixes": {
13531354
"type": "object",
1355+
"x-ms-format": "dfe-key-value-pairs",
13541356
"description": "Namespace uri to prefix mappings to override the prefixes in column names when namespace is enabled, if no prefix is defined for a namespace uri, the prefix of xml element/attribute name in the xml data file will be used. Example: \"{\"http://www.example.com/xml\":\"prefix\"}\" Type: object (or Expression with resultType object)."
13551357
}
13561358
}
@@ -1503,6 +1505,7 @@
15031505
"properties": {
15041506
"filePattern": {
15051507
"type": "object",
1508+
"x-ms-format": "dfe-string",
15061509
"description": "File pattern of JSON. This setting controls the way a collection of JSON objects will be treated. The default value is 'setOfObjects'. It is case-sensitive."
15071510
}
15081511
}
@@ -2396,7 +2399,8 @@
23962399
},
23972400
"partitionOption": {
23982401
"description": "The partition mechanism that will be used for SAP HANA read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"SapHanaDynamicRange\". ",
2399-
"type": "object"
2402+
"type": "object",
2403+
"x-ms-format": "dfe-string"
24002404
},
24012405
"partitionSettings": {
24022406
"description": "The settings that will be leveraged for SAP HANA source partitioning.",
@@ -3032,7 +3036,8 @@
30323036
},
30333037
"partitionOption": {
30343038
"description": "The partition mechanism that will be used for Oracle read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".",
3035-
"type": "object"
3039+
"type": "object",
3040+
"x-ms-format": "dfe-string"
30363041
},
30373042
"partitionSettings": {
30383043
"description": "The settings that will be leveraged for Oracle source partitioning.",
@@ -3166,7 +3171,8 @@
31663171
},
31673172
"partitionOption": {
31683173
"description": "The partition mechanism that will be used for teradata read in parallel. Possible values include: \"None\", \"Hash\", \"DynamicRange\".",
3169-
"type": "object"
3174+
"type": "object",
3175+
"x-ms-format": "dfe-string"
31703176
},
31713177
"partitionSettings": {
31723178
"description": "The settings that will be leveraged for teradata source partitioning.",
@@ -3987,7 +3993,8 @@
39873993
},
39883994
"partitionOption": {
39893995
"description": "The partition mechanism that will be used for Netezza read in parallel. Possible values include: \"None\", \"DataSlice\", \"DynamicRange\".",
3990-
"type": "object"
3996+
"type": "object",
3997+
"x-ms-format": "dfe-string"
39913998
},
39923999
"partitionSettings": {
39934000
"description": "The settings that will be leveraged for Netezza source partitioning.",
@@ -4570,7 +4577,8 @@
45704577
"properties": {
45714578
"copyBehavior": {
45724579
"description": "The type of copy behavior for copy sink.",
4573-
"type": "object"
4580+
"type": "object",
4581+
"x-ms-format": "dfe-string"
45744582
}
45754583
}
45764584
},
@@ -4871,11 +4879,13 @@
48714879
},
48724880
"writeBehavior": {
48734881
"type": "object",
4882+
"x-ms-format": "dfe-string",
48744883
"description": "Write behavior when copying data into azure SQL DW. Type: SqlDWWriteBehaviorEnum (or Expression with resultType SqlDWWriteBehaviorEnum)"
48754884
},
48764885
"upsertSettings": {
48774886
"description": "SQL DW upsert settings.",
48784887
"type": "object",
4888+
"x-ms-format": "dfe-list-string",
48794889
"$ref": "#/definitions/SqlDWUpsertSettings"
48804890
}
48814891
}
@@ -4890,6 +4900,7 @@
48904900
},
48914901
"rejectValue": {
48924902
"type": "object",
4903+
"x-ms-format": "dfe-int",
48934904
"description": "Specifies the value or the percentage of rows that can be rejected before the query fails. Type: number (or Expression with resultType number), minimum: 0."
48944905
},
48954906
"rejectSampleValue": {
@@ -5282,7 +5293,8 @@
52825293
},
52835294
"enableAdlsSingleFileParallel": {
52845295
"description": "Single File Parallel.",
5285-
"type": "object"
5296+
"type": "object",
5297+
"x-ms-format": "dfe-bool"
52865298
}
52875299
}
52885300
},

0 commit comments

Comments
 (0)