Swagger changes for connectors: Google AdWords, Oracle Service Cloud,…

… OData, Rest Service, Dynamics AX and support for wildcardPath. (#4258) * Zhenquan Xu: swaager for connector Google AdWords. * Zhenquan Xu: swagger for connector Oracle Service Cloud. * Zhenquan Xu: swagger changes for existing OData connector. * David Zhao: swagger for connector Rest Service. * Charles Gu: Delete required property in StoredProcedureParameter. * Tina Hu: swagger changes to support WildcardPath. * Zhenquan Xu: swagger for connector Dynamics AX.
Azure · Oct 18, 2018 · c7b8602 · c7b8602
1 parent fc9b3f1
commit c7b8602
Show file tree

Hide file tree

Showing 3 changed files with 507 additions and 21 deletions.
diff --git a/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
@@ -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)."
@@ -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"
@@ -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.",
@@ -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",
@@ -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"
@@ -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.",
@@ -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.", 
@@ -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": [ 
         {