From 2f60414fe261f232bcb08a86e0d3cea5491d9c49 Mon Sep 17 00:00:00 2001 From: Anand Bulusu <71119784+anand-bulusu@users.noreply.github.com> Date: Fri, 24 May 2024 13:10:43 +0530 Subject: [PATCH 1/6] Update Pipeline.json with continuation settings for execute dataflow activity --- .../2018-06-01/entityTypes/Pipeline.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) 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 d094cd8aa3c1..1f73570ff601 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 @@ -8359,6 +8359,10 @@ "description": "The integration runtime reference.", "$ref": "../datafactory.json#/definitions/IntegrationRuntimeReference" }, + "continuationSettings": { + "description": "Continuation settings for execute data flow activity.", + "$ref": "#/definitions/ContinuationSettingsReference" + }, "compute": { "description": "Compute properties for data flow activity.", "type": "object", @@ -8400,6 +8404,27 @@ "dataFlow" ] }, + "ContinuationSettingsReference": { + "description": "Continuation settings for execute data flow activity.", + "type": "object", + "properties": { + "continuationTTLInMinutes": { + "description": "Continuation TTL in minutes.", + "x-ms-format": "dfe-int", + "type": "object" + }, + "idleCondition": { + "description": "Idle condition.", + "x-ms-format": "dfe-string", + "type": "object" + }, + "customizedCheckpointKey": { + "description": "Customized checkpoint key.", + "x-ms-format": "dfe-string", + "type": "object" + } + } + }, "ExecutePowerQueryActivityTypeProperties": { "description": "Execute power query data flow activity properties.", "type": "object", From 7bd9228fe16d3c2ee4ed6eb5f9e32fbbe15a8c0e Mon Sep 17 00:00:00 2001 From: Anand Bulusu <71119784+anand-bulusu@users.noreply.github.com> Date: Fri, 24 May 2024 13:17:43 +0530 Subject: [PATCH 2/6] Update continuation settings for dataflow - Synapse --- .../2020-12-01/entityTypes/Pipeline.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json index e7fe05e9e3e5..c746034321e0 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json @@ -7411,6 +7411,10 @@ "description": "The integration runtime reference.", "$ref": "../artifacts.json#/definitions/IntegrationRuntimeReference" }, + "continuationSettings": { + "description": "Continuation settings for execute data flow activity.", + "$ref": "#/definitions/ContinuationSettingsReference" + }, "compute": { "description": "Compute properties for data flow activity.", "type": "object", @@ -7446,6 +7450,27 @@ "dataflow" ] }, + "ContinuationSettingsReference": { + "description": "Continuation settings for execute data flow activity.", + "type": "object", + "properties": { + "continuationTTLInMinutes": { + "description": "Continuation TTL in minutes.", + "x-ms-format": "dfe-int", + "type": "object" + }, + "idleCondition": { + "description": "Idle condition.", + "x-ms-format": "dfe-string", + "type": "object" + }, + "customizedCheckpointKey": { + "description": "Customized checkpoint key.", + "x-ms-format": "dfe-string", + "type": "object" + } + } + }, "DataFlowComputeType": { "description": "All available DataFlowComputeType values.", "type": "string", From 32a9333686e58dc2b8bbb52dce14a91642194490 Mon Sep 17 00:00:00 2001 From: Anand Bulusu <71119784+anand-bulusu@users.noreply.github.com> Date: Fri, 24 May 2024 15:26:23 +0530 Subject: [PATCH 3/6] Lint fix --- .../stable/2018-06-01/entityTypes/Pipeline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f73570ff601..3194e596dea1 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 @@ -8408,7 +8408,7 @@ "description": "Continuation settings for execute data flow activity.", "type": "object", "properties": { - "continuationTTLInMinutes": { + "continuationTtlInMinutes": { "description": "Continuation TTL in minutes.", "x-ms-format": "dfe-int", "type": "object" From 3a3965bc920904aadf5f431d693ebe68eced5aab Mon Sep 17 00:00:00 2001 From: Anand Bulusu <71119784+anand-bulusu@users.noreply.github.com> Date: Fri, 24 May 2024 15:27:29 +0530 Subject: [PATCH 4/6] Lint fix --- .../stable/2020-12-01/entityTypes/Pipeline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json index c746034321e0..a205b41769fe 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json @@ -7454,7 +7454,7 @@ "description": "Continuation settings for execute data flow activity.", "type": "object", "properties": { - "continuationTTLInMinutes": { + "continuationTtlInMinutes": { "description": "Continuation TTL in minutes.", "x-ms-format": "dfe-int", "type": "object" From b475a823fdcb87c943c7d1d8b799ea3b112cf6e2 Mon Sep 17 00:00:00 2001 From: Anand Bulusu Date: Fri, 24 May 2024 17:49:07 +0530 Subject: [PATCH 5/6] Prettier fix --- .../stable/2018-06-01/entityTypes/Pipeline.json | 2 +- .../stable/2020-12-01/entityTypes/Pipeline.json | 2 +- 2 files changed, 2 insertions(+), 2 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 3194e596dea1..3914b9560d42 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 @@ -8408,7 +8408,7 @@ "description": "Continuation settings for execute data flow activity.", "type": "object", "properties": { - "continuationTtlInMinutes": { + "continuationTtlInMinutes": { "description": "Continuation TTL in minutes.", "x-ms-format": "dfe-int", "type": "object" diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json index a205b41769fe..24811dc2c7af 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json @@ -7454,7 +7454,7 @@ "description": "Continuation settings for execute data flow activity.", "type": "object", "properties": { - "continuationTtlInMinutes": { + "continuationTtlInMinutes": { "description": "Continuation TTL in minutes.", "x-ms-format": "dfe-int", "type": "object" From 309c68f3be6e755397b44d175e78a15c43a43f91 Mon Sep 17 00:00:00 2001 From: Anand Bulusu <71119784+anand-bulusu@users.noreply.github.com> Date: Mon, 27 May 2024 12:00:42 +0530 Subject: [PATCH 6/6] Removed x-ms-format for synapse swagger --- .../stable/2020-12-01/entityTypes/Pipeline.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json index 24811dc2c7af..ebed021dcfb7 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json @@ -7456,17 +7456,14 @@ "properties": { "continuationTtlInMinutes": { "description": "Continuation TTL in minutes.", - "x-ms-format": "dfe-int", "type": "object" }, "idleCondition": { "description": "Idle condition.", - "x-ms-format": "dfe-string", "type": "object" }, "customizedCheckpointKey": { "description": "Customized checkpoint key.", - "x-ms-format": "dfe-string", "type": "object" } }