From ab26f917739922a38be9cdea4c0b68f27438bc9a Mon Sep 17 00:00:00 2001 From: swagger-automation Date: Fri, 19 May 2023 06:34:16 +0000 Subject: [PATCH 1/3] [AutoSync] 4844c5088f Add OutputColumnsElement For Track2 Upgrade --- .../2018-06-01/entityTypes/Pipeline.json | 38 ++++++------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 34bad42a6fb8..51ee1e4d2bdb 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -116,31 +116,6 @@ "description": "Activity description.", "type": "string" }, - "state": { - "description": "Activity state. This is an optional property and if not provided, the state will be Active by default.", - "type": "string", - "enum": [ - "Active", - "Inactive" - ], - "x-ms-enum": { - "name": "ActivityState", - "modelAsString": true - } - }, - "onInactiveMarkAs": { - "description": "Status result of the activity when the state is set to Inactive. This is an optional property and if not provided when the activity is inactive, the status will be Succeeded by default.", - "type": "string", - "enum": [ - "Succeeded", - "Failed", - "Skipped" - ], - "x-ms-enum": { - "name": "ActivityOnInactiveMarkAs", - "modelAsString": true - } - }, "dependsOn": { "type": "array", "description": "Activity depends on condition.", @@ -3417,11 +3392,22 @@ "outputColumns": { "type": "object", "x-ms-format": "dfe-list-generic", - "x-ms-format-element-type": "object", + "x-ms-format-element-type": "OutputColumnsElement", "description": "The columns to be read out from the Office 365 table. Type: array of objects (or Expression with resultType array of objects). Example: [ { \"name\": \"Id\" }, { \"name\": \"CreatedDateTime\" } ]" } } }, + "OutputColumnsElement": { + "description": "The columns to be read out from the Office 365 table.", + "type": "object", + "properties": { + "name": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "Name of the table column. Type: string (or Expression with resultType string)." + } + } + }, "AzureDataLakeStoreSource": { "description": "A copy activity Azure Data Lake source.", "type": "object", From 032f5fd3b92b53d9609862d9c83d853e61f22d70 Mon Sep 17 00:00:00 2001 From: swagger-automation Date: Fri, 19 May 2023 06:44:53 +0000 Subject: [PATCH 2/3] [AutoSync] 0fe3e1a701 update --- .../stable/2018-06-01/entityTypes/Pipeline.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 51ee1e4d2bdb..0fe65e9d95cd 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -3393,7 +3393,7 @@ "type": "object", "x-ms-format": "dfe-list-generic", "x-ms-format-element-type": "OutputColumnsElement", - "description": "The columns to be read out from the Office 365 table. Type: array of objects (or Expression with resultType array of objects). Example: [ { \"name\": \"Id\" }, { \"name\": \"CreatedDateTime\" } ]" + "description": "The columns to be read out from the Office 365 table. Type: array of objects (or Expression with resultType array of objects). itemType: OutputColumnsElement. Example: [ { \"name\": \"Id\" }, { \"name\": \"CreatedDateTime\" } ]" } } }, @@ -3402,9 +3402,8 @@ "type": "object", "properties": { "name": { - "type": "object", - "x-ms-format": "dfe-string", - "description": "Name of the table column. Type: string (or Expression with resultType string)." + "type": "string", + "description": "Name of the table column. Type: string." } } }, From f271d4ee2256b0bd660d47b739daf7fc05a48fe1 Mon Sep 17 00:00:00 2001 From: swagger-automation Date: Fri, 19 May 2023 06:50:39 +0000 Subject: [PATCH 3/3] [AutoSync] 39056bdca3 update --- .../2018-06-01/entityTypes/Pipeline.json | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 0fe65e9d95cd..4009b9a57d49 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -116,6 +116,31 @@ "description": "Activity description.", "type": "string" }, + "state": { + "description": "Activity state. This is an optional property and if not provided, the state will be Active by default.", + "type": "string", + "enum": [ + "Active", + "Inactive" + ], + "x-ms-enum": { + "name": "ActivityState", + "modelAsString": true + } + }, + "onInactiveMarkAs": { + "description": "Status result of the activity when the state is set to Inactive. This is an optional property and if not provided when the activity is inactive, the status will be Succeeded by default.", + "type": "string", + "enum": [ + "Succeeded", + "Failed", + "Skipped" + ], + "x-ms-enum": { + "name": "ActivityOnInactiveMarkAs", + "modelAsString": true + } + }, "dependsOn": { "type": "array", "description": "Activity depends on condition.", @@ -3392,12 +3417,12 @@ "outputColumns": { "type": "object", "x-ms-format": "dfe-list-generic", - "x-ms-format-element-type": "OutputColumnsElement", - "description": "The columns to be read out from the Office 365 table. Type: array of objects (or Expression with resultType array of objects). itemType: OutputColumnsElement. Example: [ { \"name\": \"Id\" }, { \"name\": \"CreatedDateTime\" } ]" + "x-ms-format-element-type": "OutputColumn", + "description": "The columns to be read out from the Office 365 table. Type: array of objects (or Expression with resultType array of objects). itemType: OutputColumn. Example: [ { \"name\": \"Id\" }, { \"name\": \"CreatedDateTime\" } ]" } } }, - "OutputColumnsElement": { + "OutputColumn": { "description": "The columns to be read out from the Office 365 table.", "type": "object", "properties": {