From 47c4e1924eb0b2688ec89567283db9f059512d3e Mon Sep 17 00:00:00 2001 From: Kalyan C Kesireddy Date: Sat, 6 Feb 2021 14:01:25 -0800 Subject: [PATCH 1/9] Add pipeline policy and ElapsedTime Policy --- .../stable/2018-06-01/entityTypes/Pipeline.json | 6 ++++++ 1 file changed, 6 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 1fcf5e134fb2..bd89754e8831 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 @@ -70,8 +70,14 @@ } } } + }, + "policy": { + "description": "Pipeline Policy", + "type": "object", + "$ref": "#/definitions/PipelinePolicy" } }, + "Activity": { "discriminator": "type", "description": "A pipeline activity.", From 4587af41670de8dc7c3ececf6bf7f602f9ec7adc Mon Sep 17 00:00:00 2001 From: Kalyan C Kesireddy Date: Sat, 6 Feb 2021 14:06:16 -0800 Subject: [PATCH 2/9] adding missing objects --- .../2018-06-01/entityTypes/Pipeline.json | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 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 bd89754e8831..00257d1c40e4 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 @@ -77,7 +77,27 @@ "$ref": "#/definitions/PipelinePolicy" } }, - + "PipelinePolicy": { + "description": "Pipeline Policy.", + "type": "object", + "properties": { + "elapsedTimeMetric": { + "description": "Pipeline ElapsedTime Metric Policy.", + "type": "object", + "$ref": "#/definitions/PipelineElapsedTimeMetricPolicy" + } + } + }, + "PipelineElapsedTimeMetricPolicy": { + "description": "Pipeline ElapsedTime Metric Policy.", + "type": "object", + "properties": { + "duration": { + "description": "TimeSpan value, after which an Azure Monitoring Metric is fired.", + "type": "object" + } + } + }, "Activity": { "discriminator": "type", "description": "A pipeline activity.", From a5ebf7f09771367529c0b05890dcd15b1a9e85d6 Mon Sep 17 00:00:00 2001 From: Kalyan C Kesireddy Date: Thu, 18 Feb 2021 12:12:22 -0800 Subject: [PATCH 3/9] fix schema validation --- .../stable/2018-06-01/entityTypes/Pipeline.json | 12 ++++-------- .../stable/2018-06-01/examples/Pipelines_Create.json | 5 +++++ .../stable/2018-06-01/examples/Pipelines_Get.json | 5 +++++ .../stable/2018-06-01/examples/Pipelines_Update.json | 5 +++++ 4 files changed, 19 insertions(+), 8 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 00257d1c40e4..8d30e9b62024 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 @@ -69,12 +69,10 @@ "type": "string" } } + }, + "policy": { + "$ref": "#/definitions/PipelinePolicy" } - }, - "policy": { - "description": "Pipeline Policy", - "type": "object", - "$ref": "#/definitions/PipelinePolicy" } }, "PipelinePolicy": { @@ -82,8 +80,6 @@ "type": "object", "properties": { "elapsedTimeMetric": { - "description": "Pipeline ElapsedTime Metric Policy.", - "type": "object", "$ref": "#/definitions/PipelineElapsedTimeMetricPolicy" } } @@ -7017,4 +7013,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json index 244732eeda4b..15d83fd35d9c 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json @@ -76,6 +76,11 @@ "value": "@pipeline().parameters.JobId", "type": "Expression" } + }, + "policy": { + "elapsedTimeMetric": { + "duration": "0.00:10:00" + } } } }, diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Get.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Get.json index 82a21a869f01..a4f1a93c68c0 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Get.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Get.json @@ -83,6 +83,11 @@ "TestVariableArray": { "type": "Array" } + }, + "policy": { + "elapsedTimeMetric": { + "duration": "0.00:10:00" + } } }, "etag": "1500504f-0000-0200-0000-5cbe090f0000" diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Update.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Update.json index d8f17d97dca1..423cdd1bd882 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Update.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Update.json @@ -63,6 +63,11 @@ "OutputBlobNameList": { "type": "Array" } + }, + "policy": { + "elapsedTimeMetric": { + "duration": "0.00:10:00" + } } } }, From 497733c5b83b52578840daeb3f0a6c3755082898 Mon Sep 17 00:00:00 2001 From: Kalyan C Kesireddy Date: Thu, 18 Feb 2021 22:58:25 -0800 Subject: [PATCH 4/9] fix prettier issues --- .../stable/2018-06-01/entityTypes/Pipeline.json | 2 +- .../stable/2018-06-01/examples/Pipelines_Create.json | 2 +- .../stable/2018-06-01/examples/Pipelines_Get.json | 2 +- .../stable/2018-06-01/examples/Pipelines_Update.json | 2 +- 4 files changed, 4 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 8d30e9b62024..5d527f70fc10 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 @@ -7013,4 +7013,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json index 15d83fd35d9c..1a041c5457ba 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json @@ -79,7 +79,7 @@ }, "policy": { "elapsedTimeMetric": { - "duration": "0.00:10:00" + "duration": "0.00:10:00" } } } diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Get.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Get.json index a4f1a93c68c0..f49ec1dd6d7f 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Get.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Get.json @@ -86,7 +86,7 @@ }, "policy": { "elapsedTimeMetric": { - "duration": "0.00:10:00" + "duration": "0.00:10:00" } } }, diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Update.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Update.json index 423cdd1bd882..ccecef5ec9de 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Update.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Update.json @@ -66,7 +66,7 @@ }, "policy": { "elapsedTimeMetric": { - "duration": "0.00:10:00" + "duration": "0.00:10:00" } } } From 8de2b2c8d231a9b9b8f05c4b2dd90af795cc1ae1 Mon Sep 17 00:00:00 2001 From: Kalyan Kesireddy Date: Thu, 18 Nov 2021 14:23:38 -0800 Subject: [PATCH 5/9] add disable cert validation property --- .../preview/2017-09-01-preview/entityTypes/Pipeline.json | 4 ++++ .../stable/2018-06-01/entityTypes/Pipeline.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json index cea78b86fdfb..11b3ae797b93 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json @@ -2535,6 +2535,10 @@ "description": "Authentication method used for calling the endpoint.", "$ref": "#/definitions/WebActivityAuthentication" }, + "disableCertValidation": { + "type": "boolean", + "description": "When set to true, Certificate validation will be disabled." + }, "datasets": { "type": "array", "description": "List of datasets passed to web endpoint.", 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 5e26933b60db..60ef56a1b1c3 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 @@ -6232,6 +6232,10 @@ "description": "Authentication method used for calling the endpoint.", "$ref": "#/definitions/WebActivityAuthentication" }, + "disableCertValidation": { + "type": "boolean", + "description": "When set to true, Certificate validation will be disabled." + }, "datasets": { "type": "array", "description": "List of datasets passed to web endpoint.", From 7e36774efb06c26cdac402abf8e232fe72d2406a Mon Sep 17 00:00:00 2001 From: Kalyan Kesireddy Date: Tue, 1 Feb 2022 12:45:17 -0800 Subject: [PATCH 6/9] fix data type --- .../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 60ef56a1b1c3..0b81016fa983 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 @@ -260,7 +260,7 @@ "description": "The maximum concurrent connection count for the source data store. Type: integer (or Expression with resultType integer)." }, "disableMetricsCollection": { - "type": "object", + "type": "boolean", "description": "If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean)." } }, From 6aa5d9b50dd5b8ce804efa5c08d898f69fcb8aa7 Mon Sep 17 00:00:00 2001 From: Kalyan Kesireddy Date: Tue, 1 Feb 2022 12:56:32 -0800 Subject: [PATCH 7/9] touch the file --- .../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 0b81016fa983..60ef56a1b1c3 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 @@ -260,7 +260,7 @@ "description": "The maximum concurrent connection count for the source data store. Type: integer (or Expression with resultType integer)." }, "disableMetricsCollection": { - "type": "boolean", + "type": "object", "description": "If true, disable data store metrics collection. Default is false. Type: boolean (or Expression with resultType boolean)." } }, From 84728dc18abbab8a37a19a852866ac993f4998a5 Mon Sep 17 00:00:00 2001 From: Kalyan C Kesireddy Date: Mon, 14 Mar 2022 23:59:19 -0700 Subject: [PATCH 8/9] fix extra spaces --- .../preview/2017-09-01-preview/entityTypes/Pipeline.json | 2 +- .../stable/2018-06-01/entityTypes/Pipeline.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json index 11b3ae797b93..9d8f338a8e7d 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json @@ -2538,7 +2538,7 @@ "disableCertValidation": { "type": "boolean", "description": "When set to true, Certificate validation will be disabled." - }, + }, "datasets": { "type": "array", "description": "List of datasets passed to web endpoint.", 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 60ef56a1b1c3..a1d9b956bad2 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 @@ -6235,7 +6235,7 @@ "disableCertValidation": { "type": "boolean", "description": "When set to true, Certificate validation will be disabled." - }, + }, "datasets": { "type": "array", "description": "List of datasets passed to web endpoint.", From 69d8bed26d4257f22a8cfdd0373664ade6c10d4e Mon Sep 17 00:00:00 2001 From: Kalyan Kesireddy Date: Tue, 15 Mar 2022 21:28:56 -0700 Subject: [PATCH 9/9] fix the recommandation from LeiNei and Binlu --- .../preview/2017-09-01-preview/entityTypes/Pipeline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json index 11b3ae797b93..e5dc74a37e2e 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json @@ -1594,7 +1594,7 @@ "type": "object", "properties": { "type": { - "type": "object", + "type": "string", "description": "Copy translator type." } },