Skip to content

Commit 489ad60

Browse files
Jingshu923Leiwang3SQL
Jingshu923
authored and
Leiwang3SQL
committed
[Synaspe] Sync changes from DataFactory (Azure#15801)
* [Synaspe] Sync changes from DataFactory * update * update * update * update
1 parent 4c7fa1a commit 489ad60

File tree

6 files changed

+226
-254
lines changed

6 files changed

+226
-254
lines changed

‎specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json‎

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@
336336
],
337337
"properties": {
338338
"filePattern": {
339-
"description": "File pattern of JSON. To be more specific, the way of separating a collection of JSON objects. The default value is 'setOfObjects'. It is case-sensitive.",
340-
"$ref": "#/definitions/JsonFormatFilePattern"
339+
"type": "object",
340+
"description": "File pattern of JSON. To be more specific, the way of separating a collection of JSON objects. The default value is 'setOfObjects'. It is case-sensitive."
341341
},
342342
"nestingSeparator": {
343343
"type": "object",
@@ -435,8 +435,8 @@
435435
],
436436
"properties": {
437437
"level": {
438-
"description": "The GZip compression level.",
439-
"$ref": "#/definitions/CompressionLevel"
438+
"type": "object",
439+
"description": "The GZip compression level. Type: string (or Expression with resultType string)."
440440
}
441441
}
442442
},
@@ -451,8 +451,8 @@
451451
],
452452
"properties": {
453453
"level": {
454-
"description": "The Deflate compression level.",
455-
"$ref": "#/definitions/CompressionLevel"
454+
"type": "object",
455+
"description": "The Deflate compression level. Type: string (or Expression with resultType string)."
456456
}
457457
}
458458
},
@@ -467,8 +467,8 @@
467467
],
468468
"properties": {
469469
"level": {
470-
"description": "The ZipDeflate compression level.",
471-
"$ref": "#/definitions/CompressionLevel"
470+
"type": "object",
471+
"description": "The ZipDeflate compression level. Type: string (or Expression with resultType string)."
472472
}
473473
}
474474
},
@@ -494,8 +494,8 @@
494494
],
495495
"properties": {
496496
"level": {
497-
"description": "The TarGZip compression level.",
498-
"$ref": "#/definitions/CompressionLevel"
497+
"type": "object",
498+
"description": "The TarGZip compression level. Type: string (or Expression with resultType string)."
499499
}
500500
}
501501
},
@@ -765,25 +765,12 @@
765765
"description": "The code page name of the preferred encoding. If miss, the default value is UTF-8, unless BOM denotes another Unicode encoding. Refer to the name column of the table in the following link to set supported values: https://msdn.microsoft.com/library/system.text.encoding.aspx. Type: string (or Expression with resultType string)."
766766
},
767767
"compressionCodec": {
768-
"type": "string",
769-
"enum": [
770-
"bzip2",
771-
"gzip",
772-
"deflate",
773-
"zipDeflate",
774-
"snappy",
775-
"lz4",
776-
"tar",
777-
"tarGZip"
778-
],
779-
"x-ms-enum": {
780-
"name": "compressionCodec",
781-
"modelAsString": true
782-
}
768+
"type": "object",
769+
"description": "The data compressionCodec. Type: string (or Expression with resultType string)."
783770
},
784771
"compressionLevel": {
785-
"description": "The data compression method used for DelimitedText.",
786-
"$ref": "#/definitions/CompressionLevel"
772+
"type": "object",
773+
"description": "The data compression method used for DelimitedText."
787774
},
788775
"quoteChar": {
789776
"type": "object",
@@ -806,6 +793,26 @@
806793
"location"
807794
]
808795
},
796+
"CompressionCodec": {
797+
"description": "All available compressionCodec values.",
798+
"type": "string",
799+
"enum": [
800+
"none",
801+
"lzo",
802+
"bzip2",
803+
"gzip",
804+
"deflate",
805+
"zipDeflate",
806+
"snappy",
807+
"lz4",
808+
"tar",
809+
"tarGZip"
810+
],
811+
"x-ms-enum": {
812+
"name": "CompressionCodec",
813+
"modelAsString": true
814+
}
815+
},
809816
"JsonDataset": {
810817
"x-ms-discriminator-value": "Json",
811818
"description": "Json dataset.",
@@ -912,23 +919,27 @@
912919
"description": "The location of the ORC data storage."
913920
},
914921
"orcCompressionCodec": {
915-
"type": "string",
916-
"enum": [
917-
"none",
918-
"zlib",
919-
"snappy",
920-
"lzo"
921-
],
922-
"x-ms-enum": {
923-
"name": "orcCompressionCodec",
924-
"modelAsString": true
925-
}
922+
"type": "object",
923+
"description": "The data orcCompressionCodec. Type: string (or Expression with resultType string)."
926924
}
927925
},
928926
"required": [
929927
"location"
930928
]
931929
},
930+
"OrcCompressionCodec": {
931+
"type": "string",
932+
"enum": [
933+
"none",
934+
"zlib",
935+
"snappy",
936+
"lzo"
937+
],
938+
"x-ms-enum": {
939+
"name": "orcCompressionCodec",
940+
"modelAsString": true
941+
}
942+
},
932943
"BinaryDataset": {
933944
"x-ms-discriminator-value": "Binary",
934945
"description": "Binary dataset.",

‎specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json‎

Lines changed: 50 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@
168168
"type": "object",
169169
"description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)."
170170
},
171+
"accountKind": {
172+
"type": "string",
173+
"description": "Specify the kind of your storage account. Allowed values are: Storage (general purpose v1), StorageV2 (general purpose v2), BlobStorage, or BlockBlobStorage. Type: string (or Expression with resultType string)."
174+
},
171175
"encryptedCredential": {
172176
"type": "string",
173177
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
@@ -595,15 +599,7 @@
595599
"type": "object",
596600
"properties": {
597601
"deploymentType": {
598-
"x-ms-enum": {
599-
"name": "DynamicsDeploymentType",
600-
"modelAsString": true
601-
},
602-
"enum": [
603-
"Online",
604-
"OnPremisesWithIfd"
605-
],
606-
"type": "string",
602+
"type": "object",
607603
"description": "The deployment type of the Dynamics instance. 'Online' for Dynamics Online and 'OnPremisesWithIfd' for Dynamics on-premises with Ifd. Type: string (or Expression with resultType string)."
608604
},
609605
"hostName": {
@@ -623,16 +619,7 @@
623619
"description": "The organization name of the Dynamics instance. The property is required for on-prem and required for online when there are more than one Dynamics instances associated with the user. Type: string (or Expression with resultType string)."
624620
},
625621
"authenticationType": {
626-
"x-ms-enum": {
627-
"name": "DynamicsAuthenticationType",
628-
"modelAsString": true
629-
},
630-
"enum": [
631-
"Office365",
632-
"Ifd",
633-
"AADServicePrincipal"
634-
],
635-
"type": "string",
622+
"type": "object",
636623
"description": "The authentication type to connect to Dynamics 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)."
637624
},
638625
"username": {
@@ -648,14 +635,6 @@
648635
"description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)."
649636
},
650637
"servicePrincipalCredentialType": {
651-
"x-ms-enum": {
652-
"name": "DynamicsServicePrincipalCredentialType",
653-
"modelAsString": true
654-
},
655-
"enum": [
656-
"ServicePrincipalKey",
657-
"ServicePrincipalCert"
658-
],
659638
"type": "object",
660639
"description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)."
661640
},
@@ -673,6 +652,31 @@
673652
"authenticationType"
674653
]
675654
},
655+
"DynamicsDeploymentType": {
656+
"description": "All available dynamicsDeploymentType values.",
657+
"type": "string",
658+
"enum": [
659+
"Online",
660+
"OnPremisesWithIfd"
661+
],
662+
"x-ms-enum": {
663+
"name": "DynamicsDeploymentType",
664+
"modelAsString": true
665+
}
666+
},
667+
"DynamicsAuthenticationType": {
668+
"description": "All available dynamicsAuthenticationType values.",
669+
"type": "string",
670+
"enum": [
671+
"Office365",
672+
"Ifd",
673+
"AADServicePrincipal"
674+
],
675+
"x-ms-enum": {
676+
"name": "DynamicsAuthenticationType",
677+
"modelAsString": true
678+
}
679+
},
676680
"DynamicsCrmLinkedService": {
677681
"x-ms-discriminator-value": "DynamicsCrm",
678682
"description": "Dynamics CRM linked service.",
@@ -698,15 +702,7 @@
698702
"type": "object",
699703
"properties": {
700704
"deploymentType": {
701-
"x-ms-enum": {
702-
"name": "DynamicsDeploymentType",
703-
"modelAsString": true
704-
},
705-
"enum": [
706-
"Online",
707-
"OnPremisesWithIfd"
708-
],
709-
"type": "string",
705+
"type": "object",
710706
"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)."
711707
},
712708
"hostName": {
@@ -726,16 +722,7 @@
726722
"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)."
727723
},
728724
"authenticationType": {
729-
"x-ms-enum": {
730-
"name": "DynamicsAuthenticationType",
731-
"modelAsString": true
732-
},
733-
"enum": [
734-
"Office365",
735-
"Ifd",
736-
"AADServicePrincipal"
737-
],
738-
"type": "string",
725+
"type": "object",
739726
"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)."
740727
},
741728
"username": {
@@ -805,15 +792,7 @@
805792
"type": "object",
806793
"properties": {
807794
"deploymentType": {
808-
"x-ms-enum": {
809-
"name": "DynamicsDeploymentType",
810-
"modelAsString": true
811-
},
812-
"enum": [
813-
"Online",
814-
"OnPremisesWithIfd"
815-
],
816-
"type": "string",
795+
"type": "object",
817796
"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)."
818797
},
819798
"hostName": {
@@ -833,16 +812,7 @@
833812
"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)."
834813
},
835814
"authenticationType": {
836-
"x-ms-enum": {
837-
"name": "DynamicsAuthenticationType",
838-
"modelAsString": true
839-
},
840-
"enum": [
841-
"Office365",
842-
"Ifd",
843-
"AADServicePrincipal"
844-
],
845-
"type": "string",
815+
"type": "object",
846816
"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)."
847817
},
848818
"username": {
@@ -5391,16 +5361,7 @@
53915361
"description": "The URI for the script action."
53925362
},
53935363
"roles": {
5394-
"x-ms-enum": {
5395-
"name": "HdiNodeTypes",
5396-
"modelAsString": true
5397-
},
5398-
"enum": [
5399-
"Headnode",
5400-
"Workernode",
5401-
"Zookeeper"
5402-
],
5403-
"type": "string",
5364+
"type": "object",
54045365
"description": "The node types on which the script action should be executed."
54055366
},
54065367
"parameters": {
@@ -5414,6 +5375,19 @@
54145375
"roles"
54155376
]
54165377
},
5378+
"HdiNodeTypes": {
5379+
"description": "All available HdiNodeTypes values.",
5380+
"type": "string",
5381+
"enum": [
5382+
"Headnode",
5383+
"Workernode",
5384+
"Zookeeper"
5385+
],
5386+
"x-ms-enum": {
5387+
"name": "HdiNodeTypes",
5388+
"modelAsString": true
5389+
}
5390+
},
54175391
"AzureDataLakeAnalyticsLinkedService": {
54185392
"x-ms-discriminator-value": "AzureDataLakeAnalytics",
54195393
"description": "Azure Data Lake Analytics linked service.",
@@ -6029,10 +6003,7 @@
60296003
},
60306004
"required": [
60316005
"endpoint",
6032-
"servicePrincipalId",
6033-
"servicePrincipalKey",
6034-
"database",
6035-
"tenant"
6006+
"database"
60366007
]
60376008
},
60386009
"AzureFunctionLinkedService": {

‎specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Pipeline.json‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,19 +1157,23 @@
11571157
],
11581158
"properties": {
11591159
"filePattern": {
1160-
"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.",
1161-
"type": "string",
1162-
"enum": [
1163-
"setOfObjects",
1164-
"arrayOfObjects"
1165-
],
1166-
"x-ms-enum": {
1167-
"name": "JsonWriteFilePattern",
1168-
"modelAsString": true
1169-
}
1160+
"type": "object",
1161+
"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."
11701162
}
11711163
}
11721164
},
1165+
"JsonWriteFilePattern": {
1166+
"description": "All available filePatterns.",
1167+
"type": "string",
1168+
"enum": [
1169+
"setOfObjects",
1170+
"arrayOfObjects"
1171+
],
1172+
"x-ms-enum": {
1173+
"name": "JsonWriteFilePattern",
1174+
"modelAsString": true
1175+
}
1176+
},
11731177
"AvroSource": {
11741178
"description": "A copy activity Avro source.",
11751179
"type": "object",

0 commit comments

Comments
 (0)