Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Synaspe] Sync changes from DataFactory #15801

Merged
merged 5 commits into from
Sep 20, 2021
Merged

[Synaspe] Sync changes from DataFactory #15801

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9657cd
[Synaspe] Sync changes from DataFactory
Jingshu918 Aug 26, 2021
f086730
update
Jingshu918 Aug 26, 2021
11b2cce
update
Jingshu918 Aug 26, 2021
ad59e58
update
Jingshu918 Aug 27, 2021
3a113be
update
Jingshu918 Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 49 additions & 38 deletions .../synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@
],
"properties": {
"filePattern": {
"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.",
"$ref": "#/definitions/JsonFormatFilePattern"
"type": "object",
"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."
},
"nestingSeparator": {
"type": "object",
Expand Down Expand Up @@ -435,8 +435,8 @@
],
"properties": {
"level": {
"description": "The GZip compression level.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The GZip compression level."
}
}
},
Expand All @@ -451,8 +451,8 @@
],
"properties": {
"level": {
"description": "The Deflate compression level.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The Deflate compression level."
}
}
},
Expand All @@ -467,8 +467,8 @@
],
"properties": {
"level": {
"description": "The ZipDeflate compression level.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The ZipDeflate compression level."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused by this change, is it a "Expression or String" again? If that's the case, could you update the description to clarify it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, updated the description

}
}
},
Expand All @@ -494,8 +494,8 @@
],
"properties": {
"level": {
"description": "The TarGZip compression level.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The TarGZip compression level."
}
}
},
Expand Down Expand Up @@ -765,25 +765,12 @@
"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)."
},
"compressionCodec": {
"type": "string",
"enum": [
"bzip2",
"gzip",
"deflate",
"zipDeflate",
"snappy",
"lz4",
"tar",
"tarGZip"
],
"x-ms-enum": {
"name": "compressionCodec",
"modelAsString": true
}
"type": "object",
"description": "The data compressionCodec. Type: string (or Expression with resultType string)."
},
"compressionLevel": {
"description": "The data compression method used for DelimitedText.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The data compression method used for DelimitedText."
},
"quoteChar": {
"type": "object",
Expand All @@ -806,6 +793,26 @@
"location"
]
},
"CompressionCodec": {
"description": "All available compressionCodec values.",
"type": "string",
"enum": [
"none",
"lzo",
"bzip2",
"gzip",
"deflate",
"zipDeflate",
"snappy",
"lz4",
"tar",
"tarGZip"
],
"x-ms-enum": {
"name": "CompressionCodec",
"modelAsString": true
}
},
"JsonDataset": {
"x-ms-discriminator-value": "Json",
"description": "Json dataset.",
Expand Down Expand Up @@ -912,23 +919,27 @@
"description": "The location of the ORC data storage."
},
"orcCompressionCodec": {
"type": "string",
"enum": [
"none",
"zlib",
"snappy",
"lzo"
],
"x-ms-enum": {
"name": "orcCompressionCodec",
"modelAsString": true
}
"type": "object",
"description": "The data orcCompressionCodec. Type: string (or Expression with resultType string)."
}
},
"required": [
"location"
]
},
"OrcCompressionCodec": {
"type": "string",
"enum": [
"none",
"zlib",
"snappy",
"lzo"
],
"x-ms-enum": {
"name": "orcCompressionCodec",
"modelAsString": true
}
},
"BinaryDataset": {
"x-ms-discriminator-value": "Binary",
"description": "Binary dataset.",
Expand Down
129 changes: 50 additions & 79 deletions ...se/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@
"type": "object",
"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)."
},
"accountKind": {
"type": "string",
"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)."
},
"encryptedCredential": {
"type": "string",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -550,15 +554,7 @@
"type": "object",
"properties": {
"deploymentType": {
"x-ms-enum": {
"name": "DynamicsDeploymentType",
"modelAsString": true
},
"enum": [
"Online",
"OnPremisesWithIfd"
],
"type": "string",
"type": "object",
"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)."
},
"hostName": {
Expand All @@ -578,16 +574,7 @@
"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)."
},
"authenticationType": {
"x-ms-enum": {
"name": "DynamicsAuthenticationType",
"modelAsString": true
},
"enum": [
"Office365",
"Ifd",
"AADServicePrincipal"
],
"type": "string",
"type": "object",
"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)."
},
"username": {
Expand All @@ -603,14 +590,6 @@
"description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)."
},
"servicePrincipalCredentialType": {
"x-ms-enum": {
"name": "DynamicsServicePrincipalCredentialType",
"modelAsString": true
},
"enum": [
"ServicePrincipalKey",
"ServicePrincipalCert"
],
"type": "object",
"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)."
},
Expand All @@ -628,6 +607,31 @@
"authenticationType"
]
},
"DynamicsDeploymentType": {
"description": "All available dynamicsDeploymentType values.",
"type": "string",
"enum": [
"Online",
"OnPremisesWithIfd"
],
"x-ms-enum": {
"name": "DynamicsDeploymentType",
"modelAsString": true
}
},
"DynamicsAuthenticationType": {
"description": "All available dynamicsAuthenticationType values.",
"type": "string",
"enum": [
"Office365",
"Ifd",
"AADServicePrincipal"
],
"x-ms-enum": {
"name": "DynamicsAuthenticationType",
"modelAsString": true
}
},
"DynamicsCrmLinkedService": {
"x-ms-discriminator-value": "DynamicsCrm",
"description": "Dynamics CRM linked service.",
Expand All @@ -653,15 +657,7 @@
"type": "object",
"properties": {
"deploymentType": {
"x-ms-enum": {
"name": "DynamicsDeploymentType",
"modelAsString": true
},
"enum": [
"Online",
"OnPremisesWithIfd"
],
"type": "string",
"type": "object",
"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)."
},
"hostName": {
Expand All @@ -681,16 +677,7 @@
"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)."
},
"authenticationType": {
"x-ms-enum": {
"name": "DynamicsAuthenticationType",
"modelAsString": true
},
"enum": [
"Office365",
"Ifd",
"AADServicePrincipal"
],
"type": "string",
"type": "object",
"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)."
},
"username": {
Expand Down Expand Up @@ -760,15 +747,7 @@
"type": "object",
"properties": {
"deploymentType": {
"x-ms-enum": {
"name": "DynamicsDeploymentType",
"modelAsString": true
},
"enum": [
"Online",
"OnPremisesWithIfd"
],
"type": "string",
"type": "object",
"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)."
},
"hostName": {
Expand All @@ -788,16 +767,7 @@
"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)."
},
"authenticationType": {
"x-ms-enum": {
"name": "DynamicsAuthenticationType",
"modelAsString": true
},
"enum": [
"Office365",
"Ifd",
"AADServicePrincipal"
],
"type": "string",
"type": "object",
"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)."
},
"username": {
Expand Down Expand Up @@ -5346,16 +5316,7 @@
"description": "The URI for the script action."
},
"roles": {
"x-ms-enum": {
"name": "HdiNodeTypes",
"modelAsString": true
},
"enum": [
"Headnode",
"Workernode",
"Zookeeper"
],
"type": "string",
"type": "object",
"description": "The node types on which the script action should be executed."
},
"parameters": {
Expand All @@ -5369,6 +5330,19 @@
"roles"
]
},
"HdiNodeTypes": {
"description": "All available HdiNodeTypes values.",
"type": "string",
"enum": [
"Headnode",
"Workernode",
"Zookeeper"
],
"x-ms-enum": {
"name": "HdiNodeTypes",
"modelAsString": true
}
},
"AzureDataLakeAnalyticsLinkedService": {
"x-ms-discriminator-value": "AzureDataLakeAnalytics",
"description": "Azure Data Lake Analytics linked service.",
Expand Down Expand Up @@ -5984,10 +5958,7 @@
},
"required": [
"endpoint",
"servicePrincipalId",
"servicePrincipalKey",
"database",
"tenant"
"database"
]
},
"AzureFunctionLinkedService": {
Expand Down
24 changes: 14 additions & 10 deletions ...synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,19 +1157,23 @@
],
"properties": {
"filePattern": {
"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.",
"type": "string",
"enum": [
"setOfObjects",
"arrayOfObjects"
],
"x-ms-enum": {
"name": "JsonWriteFilePattern",
"modelAsString": true
}
"type": "object",
"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."
}
}
},
"JsonWriteFilePattern": {
"description": "All available filePatterns.",
"type": "string",
"enum": [
"setOfObjects",
"arrayOfObjects"
],
"x-ms-enum": {
"name": "JsonWriteFilePattern",
"modelAsString": true
}
},
"AvroSource": {
"description": "A copy activity Avro source.",
"type": "object",
Expand Down
Loading