Skip to content

Commit b94a5f3

Browse files
committed
Fix errors
1 parent 3959e31 commit b94a5f3

File tree

2 files changed

+48
-18
lines changed

2 files changed

+48
-18
lines changed

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

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,15 @@
737737
"description": "Dynamics CRM linked service properties.",
738738
"properties": {
739739
"deploymentType": {
740-
"type": "object",
740+
"x-ms-enum": {
741+
"name": "DynamicsDeploymentType",
742+
"modelAsString": true
743+
},
744+
"enum": [
745+
"Online",
746+
"OnPremisesWithIfd"
747+
],
748+
"type": "string",
741749
"description": "The deployment type of the Dynamics CRM instance. 'Online' for Dynamics CRM Online and 'OnPremisesWithIfd' for Dynamics CRM on-premises with Ifd. Type: string (or Expression with resultType string)."
742750
},
743751
"hostName": {
@@ -757,7 +765,16 @@
757765
"description": "The organization name of the Dynamics CRM instance. The property is required for on-prem and required for online when there are more than one Dynamics CRM instances associated with the user. Type: string (or Expression with resultType string)."
758766
},
759767
"authenticationType": {
760-
"type": "object",
768+
"x-ms-enum": {
769+
"name": "DynamicsAuthenticationType",
770+
"modelAsString": true
771+
},
772+
"enum": [
773+
"Office365",
774+
"Ifd",
775+
"AADServicePrincipal"
776+
],
777+
"type": "string",
761778
"description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)."
762779
},
763780
"username": {
@@ -826,7 +843,15 @@
826843
"description": "Common Data Service for Apps linked service properties.",
827844
"properties": {
828845
"deploymentType": {
829-
"type": "object",
846+
"x-ms-enum": {
847+
"name": "DynamicsDeploymentType",
848+
"modelAsString": true
849+
},
850+
"enum": [
851+
"Online",
852+
"OnPremisesWithIfd"
853+
],
854+
"type": "string",
830855
"description": "The deployment type of the Common Data Service for Apps instance. 'Online' for Common Data Service for Apps Online and 'OnPremisesWithIfd' for Common Data Service for Apps on-premises with Ifd. Type: string (or Expression with resultType string)."
831856
},
832857
"hostName": {
@@ -846,7 +871,16 @@
846871
"description": "The organization name of the Common Data Service for Apps instance. The property is required for on-prem and required for online when there are more than one Common Data Service for Apps instances associated with the user. Type: string (or Expression with resultType string)."
847872
},
848873
"authenticationType": {
849-
"type": "object",
874+
"x-ms-enum": {
875+
"name": "DynamicsAuthenticationType",
876+
"modelAsString": true
877+
},
878+
"enum": [
879+
"Office365",
880+
"Ifd",
881+
"AADServicePrincipal"
882+
],
883+
"type": "string",
850884
"description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)."
851885
},
852886
"username": {

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,23 +1290,19 @@
12901290
],
12911291
"properties": {
12921292
"filePattern": {
1293-
"type": "object",
1294-
"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."
1293+
"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.",
1294+
"type": "string",
1295+
"enum": [
1296+
"setOfObjects",
1297+
"arrayOfObjects"
1298+
],
1299+
"x-ms-enum": {
1300+
"name": "JsonWriteFilePattern",
1301+
"modelAsString": true
1302+
}
12951303
}
12961304
}
12971305
},
1298-
"JsonWriteFilePattern": {
1299-
"description": "All available filePatterns.",
1300-
"type": "string",
1301-
"enum": [
1302-
"setOfObjects",
1303-
"arrayOfObjects"
1304-
],
1305-
"x-ms-enum": {
1306-
"name": "JsonWriteFilePattern",
1307-
"modelAsString": true
1308-
}
1309-
},
13101306
"AvroSource": {
13111307
"description": "A copy activity Avro source.",
13121308
"type": "object",

0 commit comments

Comments
 (0)