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

Swagger changes for connectors: Google AdWords, Oracle Service Cloud, OData, Rest Service, Dynamics AX and support for wildcardPath. #4258

Merged
merged 7 commits into from
Oct 18, 2018
Merged

Swagger changes for connectors: Google AdWords, Oracle Service Cloud, OData, Rest Service, Dynamics AX and support for wildcardPath. #4258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cdae21d
Zhenquan Xu: swaager for connector Google AdWords.
msxzq Oct 18, 2018
23b63e6
Zhenquan Xu: swagger for connector Oracle Service Cloud.
msxzq Oct 18, 2018
3c4ecad
Zhenquan Xu: swagger changes for existing OData connector.
msxzq Oct 18, 2018
812933b
David Zhao: swagger for connector Rest Service.
msxzq Oct 18, 2018
39b7808
Charles Gu: Delete required property in StoredProcedureParameter.
msxzq Oct 18, 2018
afdbac5
Tina Hu: swagger changes to support WildcardPath.
msxzq Oct 18, 2018
b0b2f8c
Zhenquan Xu: swagger for connector Dynamics AX.
msxzq Oct 18, 2018
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
126 changes: 120 additions & 6 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 @@ -337,6 +337,10 @@
"type": "object",
"description": "The prefix filter for the S3 object name. Type: string (or Expression with resultType string)."
},
"wildcardPath": {
"type": "object",
"description": "The path of the S3 object with wildcard supported. Type: string (or Expression with resultType string)."
},
"version": {
"type": "object",
"description": "The version for the S3 object. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -389,6 +393,10 @@
"type": "object",
"description": "The name of the Azure Blob. Type: string (or Expression with resultType string)."
},
"wildcardPath": {
"type": "object",
"description": "The whole path include file name of the Azure Blob storage with wildcard supported. Type: string (or Expression with resultType string)."
},
"format": {
"description": "The format of the Azure Blob storage.",
"$ref": "#/definitions/DatasetStorageFormat"
Expand Down Expand Up @@ -608,6 +616,38 @@
}
}
},
"DynamicsAXResourceDataset": {
"x-ms-discriminator-value": "DynamicsAXResource",
"description": "The path of the Dynamics AX OData entity.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
"typeProperties": {
"description": "Dynamics AX OData resource dataset properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/DynamicsAXResourceDatasetTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"DynamicsAXResourceDatasetTypeProperties": {
"description": "Dynamics AX OData resource dataset properties.",
"properties": {
"path": {
"type": "string",
"description": "The path of the Dynamics AX OData entity. Type: string (or Expression with resultType string)."
}
},
"required": [
"path"
]
},
"AzureDataLakeStoreDataset": {
"x-ms-discriminator-value": "AzureDataLakeStoreFile",
"description": "Azure Data Lake Store dataset.",
Expand Down Expand Up @@ -643,14 +683,15 @@
"description": "The format of the Data Lake Store.",
"$ref": "#/definitions/DatasetStorageFormat"
},
"wildcardPath": {
"type": "object",
"description": "The whole path include file name in the Azure Data Lake Store with wildcard supported. Type: string (or Expression with resultType string)."
},
"compression": {
"description": "The data compression method used for the item(s) in the Azure Data Lake Store.",
"$ref": "#/definitions/DatasetCompression"
}
},
"required": [
"folderPath"
]
}
},
"FileShareDataset": {
"x-ms-discriminator-value": "FileShare",
Expand Down Expand Up @@ -683,6 +724,10 @@
"type": "object",
"description": "The name of the on-premises file system. Type: string (or Expression with resultType string)."
},
"wildcardPath": {
"type": "object",
"description": "The whole path include file name of the on-premises file system with wildcard supported. Type: string (or Expression with resultType string)."
},
"format": {
"description": "The format of the files.",
"$ref": "#/definitions/DatasetStorageFormat"
Expand Down Expand Up @@ -790,6 +835,18 @@
"tableName"
]
},
"OracleServiceCloudObjectDataset" : {
"x-ms-discriminator-value": "OracleServiceCloudObject",
"description": "Oracle Service Cloud dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
}
},
"AzureMySqlTableDataset": {
"x-ms-discriminator-value": "AzureMySqlTable",
"description": "The Azure MySQL database dataset.",
Expand Down Expand Up @@ -1090,6 +1147,51 @@
}
}
},
"RestServiceDataset": {
"x-ms-discriminator-value": "RestResource",
"description": "A Rest service dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
"typeProperties": {
"description": "Properties specific to this dataset type.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/RestServiceDatasetTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"RestServiceDatasetTypeProperties": {
"description": "Properties specific to this dataset type.",
"properties": {
"relativeUrl": {
"type": "object",
"description": "The relative URL to the resource that the RESTful API provides. Type: string (or Expression with resultType string)."
},
"requestMethod": {
"type": "object",
"description": "The HTTP method used to call the RESTful API. The default is GET. Type: string (or Expression with resultType string)."
},
"requestBody": {
"type": "object",
"description": "The HTTP request body to the RESTful API if requestMethod is POST. Type: string (or Expression with resultType string)."
},
"additionalHeaders": {
"type": "object",
"description": "The additional HTTP headers in the request to the RESTful API. Type: string (or Expression with resultType string)."
},
"paginationRules": {
"description": "The pagination rules to compose next page requests.",
"type": "object"
}
}
},
"AmazonMWSObjectDataset" : {
"x-ms-discriminator-value": "AmazonMWSObject",
"description": "Amazon Marketplace Web Service dataset.",
Expand Down Expand Up @@ -1151,8 +1253,20 @@
}
},
"EloquaObjectDataset" : {
"x-ms-discriminator-value": "EloquaObject",
"description": "Eloqua server dataset.",
"x-ms-discriminator-value": "EloquaObject",
"description": "Eloqua server dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
}
},
"GoogleAdWordsObjectDataset" : {
"x-ms-discriminator-value": "GoogleAdWordsObject",
"description": "Google AdWords service dataset.",
"type": "object",
"allOf": [
{
Expand Down
Loading