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

[DataFactory] Improve enum with object type in LS and DS swagger #14160

Merged
merged 7 commits into from
May 12, 2021
Merged

[DataFactory] Improve enum with object type in LS and DS swagger #14160

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d744ec1
[DataFactory] Improve enum with object type in LS and DS swagger
Jingshu918 Apr 28, 2021
5432f39
Add 1 change
Jingshu918 May 6, 2021
3959e31
Update 2
Jingshu918 May 6, 2021
b94a5f3
Fix errors
Jingshu918 May 7, 2021
4986082
Revert "Fix errors"
Jingshu918 May 7, 2021
e291ad4
Fix one
Jingshu918 May 11, 2021
38bc3fb
Fix comments
Jingshu918 May 11, 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
74 changes: 36 additions & 38 deletions ...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,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 All @@ -408,7 +408,7 @@
},
"JsonFormatFilePattern": {
"description": "JSON format file pattern. A property of JsonFormat.",
"type": "object",
"type": "string",
"enum": [
"setOfObjects",
"arrayOfObjects"
Expand Down Expand Up @@ -484,8 +484,8 @@
],
"properties": {
"level": {
"description": "The GZip compression level.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The GZip compression level."
}
}
},
Expand All @@ -500,8 +500,8 @@
],
"properties": {
"level": {
"description": "The Deflate compression level.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The Deflate compression level."
}
}
},
Expand All @@ -516,8 +516,8 @@
],
"properties": {
"level": {
"description": "The ZipDeflate compression level.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The ZipDeflate compression level."
}
}
},
Expand All @@ -543,15 +543,15 @@
],
"properties": {
"level": {
"description": "The TarGZip compression level.",
"$ref": "#/definitions/CompressionLevel"
"type": "object",
"description": "The TarGZip compression level."
}
}
},
"CompressionLevel": {
"title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel",
"description": "All available compression levels.",
"type": "object",
"type": "string",
"enum": [
"Optimal",
"Fastest"
Expand Down Expand Up @@ -748,16 +748,7 @@
},
"compressionCodec": {
"type": "object",
"enum": [
"none",
"gzip",
"snappy",
"lzo"
],
"x-ms-enum": {
"name": "compressionCodec",
"modelAsString": true
}
"description": "The data compressionCodec. Type: string (or Expression with resultType string)."
}
},
"required": [
Expand Down Expand Up @@ -802,24 +793,11 @@
},
"compressionCodec": {
"type": "object",
"enum": [
"bzip2",
"gzip",
"deflate",
"zipDeflate",
"snappy",
"lz4",
"tar",
"tarGZip"
],
"x-ms-enum": {
"name": "compressionCodec",
"modelAsString": true
}
"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 @@ -842,6 +820,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
142 changes: 54 additions & 88 deletions ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,14 +635,6 @@
"description": "Dynamics linked service properties.",
"properties": {
"deploymentType": {
"x-ms-enum": {
"name": "DynamicsDeploymentType",
"modelAsString": true
},
"enum": [
"Online",
"OnPremisesWithIfd"
],
"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)."
},
Expand All @@ -663,15 +655,6 @@
"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": "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)."
},
Expand All @@ -688,14 +671,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 @@ -713,6 +688,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 @@ -737,15 +737,7 @@
"description": "Dynamics CRM linked service properties.",
"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 @@ -765,16 +757,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 All @@ -790,14 +773,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 @@ -815,6 +790,18 @@
"authenticationType"
]
},
"DynamicsServicePrincipalCredentialType": {
Jingshu923 marked this conversation as resolved.
Show resolved Hide resolved
"description": "All available dynamicsServicePrincipalCredentialType values.",
"type": "string",
"enum": [
"ServicePrincipalKey",
"ServicePrincipalCert"
],
"x-ms-enum": {
"name": "DynamicsServicePrincipalCredentialType",
"modelAsString": true
}
},
"CommonDataServiceForAppsLinkedService": {
"x-ms-discriminator-value": "CommonDataServiceForApps",
"description": "Common Data Service for Apps linked service.",
Expand All @@ -839,15 +826,7 @@
"description": "Common Data Service for Apps linked service properties.",
"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 @@ -867,16 +846,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 All @@ -892,14 +862,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 Down Expand Up @@ -5380,15 +5342,6 @@
"description": "The URI for the script action."
},
"roles": {
"x-ms-enum": {
"name": "HdiNodeTypes",
"modelAsString": true
},
"enum": [
"Headnode",
"Workernode",
"Zookeeper"
],
"type": "object",
"description": "The node types on which the script action should be executed."
},
Expand All @@ -5403,6 +5356,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
Loading