Update Synapse with ADF swagger changes/2019-06-01-preview (#12924)

* initial changes * Fix CI pipeline issues * address comment * Fix CI pipeline errors * Fix syntax errors in example files * Fix CI pipeline errors * Resolve CI errors * Fix CI issues * Change dataFlow to dataflow * address review comments * address comment * fix enums that support expressions * Fix comment Co-authored-by: Dongwei Wang <dongwwa@microsoft.com>
Azure · Mar 17, 2021 · ba2d430 · ba2d430
1 parent ca05b27
commit ba2d430
Show file tree

Hide file tree

Showing 16 changed files with 2,554 additions and 124 deletions.
diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json
@@ -2661,6 +2661,7 @@
     },
     "SubResourceDebugResource": {
       "description": "Azure Synapse nested debug resource.",
+      "type": "object",
       "properties": {
         "name": {
           "type": "string",
@@ -2756,6 +2757,7 @@
     },
     "IntegrationRuntimeReference": {
       "description": "Integration runtime reference type.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -3349,6 +3351,7 @@
     },
     "PipelineReference": {
       "description": "Pipeline reference type.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -3377,6 +3380,7 @@
     },
     "TriggerPipelineReference": {
       "description": "Pipeline that needs to be triggered with the given parameters.",
+      "type": "object",
       "properties": {
         "pipelineReference": {
           "description": "Pipeline reference.",
@@ -3390,6 +3394,7 @@
     },
     "TriggerResource": {
       "description": "Trigger resource type.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResource"
@@ -3434,6 +3439,7 @@
     },
     "WorkspaceUpdateParameters": {
       "description": "Parameters for updating a workspace resource.",
+      "type": "object",
       "properties": {
         "tags": {
           "type": "object",
@@ -3450,6 +3456,7 @@
     },
     "WorkspaceIdentity": {
       "description": "Identity properties of the workspace resource.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -3479,6 +3486,7 @@
     },
     "DatasetReference": {
       "description": "Dataset reference type.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -3507,6 +3515,7 @@
     },
     "DatasetResource": {
       "description": "Dataset resource type.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResource"
@@ -3524,6 +3533,7 @@
     },
     "DatasetDebugResource": {
       "description": "Dataset debug resource.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResourceDebugResource"
@@ -3541,6 +3551,7 @@
     },
     "LinkedServiceReference": {
       "description": "Linked service reference type.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -3569,6 +3580,7 @@
     },
     "LinkedServiceResource": {
       "description": "Linked service resource type.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResource"
@@ -3586,6 +3598,7 @@
     },
     "LinkedServiceDebugResource": {
       "description": "Linked service debug resource.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResourceDebugResource"
@@ -3623,6 +3636,7 @@
     },
     "SqlScriptResource": {
       "description": "Sql Script resource type.",
+      "type": "object",
       "properties": {
         "id": {
           "readOnly": true,
@@ -3675,6 +3689,7 @@
     },
     "SparkJobDefinitionResource": {
       "description": "Spark job definition resource type.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResource"
@@ -3712,6 +3727,7 @@
     },
     "NotebookResource": {
       "description": "Notebook resource type.",
+      "type": "object",
       "properties": {
         "id": {
           "readOnly": true,
@@ -3744,6 +3760,7 @@
     },
     "DataFlowResource": {
       "description": "Data flow resource type.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResource"
@@ -3761,6 +3778,7 @@
     },
     "DataFlowReference": {
       "description": "Data flow reference type.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -3792,6 +3810,7 @@
     },
     "DataFlowStagingInfo": {
       "description": "Staging info for execute data flow activity.",
+      "type": "object",
       "properties": {
         "linkedService": {
           "description": "Staging linked service reference.",
@@ -3878,6 +3897,7 @@
     },
     "DataFlowDebugResource": {
       "description": "Data flow debug resource.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResourceDebugResource"
@@ -4398,6 +4418,7 @@
     },
     "RerunTriggerResource": {
       "description": "RerunTrigger resource type.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResource"
@@ -4477,6 +4498,7 @@
     },
     "SynapseNotebookReference": {
       "description": "Synapse notebook reference type.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -4501,6 +4523,7 @@
     },
     "SynapseSparkJobReference": {
       "description": "Synapse spark job reference type.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -4525,6 +4548,7 @@
     },
     "SqlPoolReference": {
       "description": "SQL pool reference type.",
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",

diff --git a/...synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/DataFlow.json b/...synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/DataFlow.json
@@ -60,6 +60,7 @@
     },
     "MappingDataFlowTypeProperties": {
       "description": "Mapping data flow type properties.",
+      "type": "object",
       "properties": {
         "sources": {
           "type": "array",
@@ -107,6 +108,7 @@
     },
     "DataFlowSource": {
       "description": "Transformation for data flow source.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/Transformation"
@@ -116,11 +118,20 @@
         "dataset": {
           "description": "Dataset reference.",
           "$ref": "../artifacts.json#/definitions/DatasetReference"
+        },
+        "linkedService": {
+          "description": "Linked service reference.",
+          "$ref": "../artifacts.json#/definitions/LinkedServiceReference"
+        },
+        "schemaLinkedService": {
+          "description": "Schema linked service reference.",
+          "$ref": "../artifacts.json#/definitions/LinkedServiceReference"
         }
       }
     },
     "DataFlowSink": {
       "description": "Transformation for data flow sink.",
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/Transformation"
@@ -130,6 +141,14 @@
         "dataset": {
           "description": "Dataset reference.",
           "$ref": "../artifacts.json#/definitions/DatasetReference"
+        },
+        "linkedService": {
+          "description": "Linked service reference.",
+          "$ref": "../artifacts.json#/definitions/LinkedServiceReference"
+        },
+        "schemaLinkedService": {
+          "description": "Schema linked service reference.",
+          "$ref": "../artifacts.json#/definitions/LinkedServiceReference"
         }
       }
     }