From 1ccaf71923e23401605f54957a18065911680128 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 31 Jul 2023 12:30:16 +0800 Subject: [PATCH 1/8] Sync expression Support From DataFactory To Synapse --- .../2020-12-01/entityTypes/Pipeline.json | 79 ++++++++----------- 1 file changed, 31 insertions(+), 48 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 a3a77dd31f70..6f3c14f4357b 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 @@ -291,8 +291,8 @@ "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", @@ -444,8 +444,8 @@ "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", @@ -491,8 +491,8 @@ "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", @@ -546,8 +546,8 @@ "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", @@ -616,8 +616,8 @@ "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", @@ -659,8 +659,8 @@ "description": "Ftp wildcardFileName. Type: string (or Expression with resultType string)." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", @@ -675,8 +675,8 @@ "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." }, "useBinaryTransfer": { - "type": "boolean", - "description": "Specify whether to use binary transfer mode for FTP stores." + "type": "object", + "description": "Specify whether to use binary transfer mode for FTP stores. Type: boolean (or Expression with resultType boolean)." }, "disableChunking": { "type": "object", @@ -706,8 +706,8 @@ "description": "Sftp wildcardFileName. Type: string (or Expression with resultType string)." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", @@ -736,7 +736,7 @@ } }, "HttpReadSettings": { - "description": "Sftp read settings.", + "description": "Http read settings.", "type": "object", "allOf": [ { @@ -761,12 +761,16 @@ "description": "Specifies the timeout for a HTTP client to get HTTP response from HTTP server." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "additionalColumns": { + "type": "object", + "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)." } } }, @@ -796,8 +800,8 @@ "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." }, "enablePartitionDiscovery": { - "type": "boolean", - "description": "Indicates whether to enable partition discovery." + "type": "object", + "description": "Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean)." }, "partitionRootPath": { "type": "object", @@ -2021,17 +2025,8 @@ "description": "The packet size of data read from SAP HANA. Type: integer(or Expression with resultType integer)." }, "partitionOption": { - "description": "The partition mechanism that will be used for SAP HANA read in parallel.", - "type": "string", - "enum": [ - "None", - "PhysicalPartitionsOfTable", - "SapHanaDynamicRange" - ], - "x-ms-enum": { - "name": "SapHanaPartitionOption", - "modelAsString": true - } + "description": "The partition mechanism that will be used for SAP HANA read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"SapHanaDynamicRange\". ", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for SAP HANA source partitioning.", @@ -2141,20 +2136,8 @@ "description": "The single character that will be used as delimiter passed to SAP RFC as well as splitting the output data retrieved. Type: string (or Expression with resultType string)." }, "partitionOption": { - "description": "The partition mechanism that will be used for SAP table read in parallel.", - "type": "string", - "enum": [ - "None", - "PartitionOnInt", - "PartitionOnCalendarYear", - "PartitionOnCalendarMonth", - "PartitionOnCalendarDate", - "PartitionOnTime" - ], - "x-ms-enum": { - "name": "SapTablePartitionOption", - "modelAsString": true - } + "description": "The partition mechanism that will be used for SAP table read in parallel. Possible values include: \"None\", \"PartitionOnInt\", \"PartitionOnCalendarYear\", \"PartitionOnCalendarMonth\", \"PartitionOnCalendarDate\", \"PartitionOnTime\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for SAP table source partitioning.", @@ -6058,8 +6041,8 @@ "$ref": "../artifacts.json#/definitions/SecretBase" }, "username": { - "description": "Web activity authentication user name for basic authentication.", - "type": "string" + "description": "Web activity authentication user name for basic authentication. Type: string (or Expression with resultType string).", + "type": "object" }, "password": { "description": "Password for the PFX file or basic authentication.", From 2e588026362e6e4dc51b958d2dcf115731289c6c Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 1 Aug 2023 19:11:01 +0800 Subject: [PATCH 2/8] add --- .../stable/2020-12-01/entityTypes/Pipeline.json | 4 ++++ 1 file changed, 4 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 6f3c14f4357b..94797ac53a01 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 @@ -7238,6 +7238,10 @@ "description": "Script activity properties.", "type": "object", "properties": { + "scriptBlockExecutionTimeout": { + "type": "object", + "description": "ScriptBlock execution timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, "scripts": { "type": "array", "description": "Array of script blocks. Type: array.", From 45f34e377937bdf31e04ac834ffc62d497ddbefa Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 4 Aug 2023 09:47:54 +0800 Subject: [PATCH 3/8] [DataFactory]Add Some SHIR Features In DataFatory --- .../entityTypes/IntegrationRuntime.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json index d2a8abd65d7d..c79aa9d5b6d3 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json @@ -223,6 +223,18 @@ "type": "integer", "format": "int32", "minimum": 5 + }, + "numberOfPipelineNodes": { + "description": "Number of the pipeline nodes, which should be greater than 0 and less than 11.", + "type": "integer", + "format": "int32", + "minimum": 1 + }, + "numberOfExternalNodes": { + "description": "Number of the the external nodes, which should be greater than 0 and less than 11.", + "type": "integer", + "format": "int32", + "minimum": 1 } }, "additionalProperties": { @@ -632,6 +644,10 @@ "properties": { "linkedInfo": { "$ref": "#/definitions/LinkedIntegrationRuntimeType" + }, + "selfContainedInteractiveAuthoringEnabled": { + "type": "boolean", + "description": "An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay." } } }, @@ -1107,6 +1123,11 @@ "type": "string", "format": "date-time", "readOnly": true + }, + "selfContainedInteractiveAuthoringEnabled": { + "type": "boolean", + "readOnly": true, + "description": "An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay." } } }, From 5b88907f83650592eba8dcfb5f41fe4a350416b2 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 4 Aug 2023 09:59:43 +0800 Subject: [PATCH 4/8] fix --- .../stable/2018-06-01/entityTypes/IntegrationRuntime.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json index c79aa9d5b6d3..0e5dc7dc7cf6 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json @@ -228,13 +228,15 @@ "description": "Number of the pipeline nodes, which should be greater than 0 and less than 11.", "type": "integer", "format": "int32", - "minimum": 1 + "minimum": 1, + "maximum": 10 }, "numberOfExternalNodes": { "description": "Number of the the external nodes, which should be greater than 0 and less than 11.", "type": "integer", "format": "int32", - "minimum": 1 + "minimum": 1, + "maximum": 10 } }, "additionalProperties": { From 9caf1ac03005884077fab9c1de3bf90bf1cbb25f Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 14 Aug 2023 10:57:36 +0800 Subject: [PATCH 5/8] add --- .../stable/2021-06-01/integrationRuntime.json | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json index 7cb4d8160657..4e1a2b17b8b6 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json @@ -1471,6 +1471,14 @@ "vNetProperties": { "description": "VNet properties for managed integration runtime.", "$ref": "#/definitions/IntegrationRuntimeVNetProperties" + }, + "copyComputeScaleProperties": { + "description": "CopyComputeScale properties for managed integration runtime.", + "$ref": "#/definitions/CopyComputeScaleProperties" + }, + "pipelineExternalComputeScaleProperties": { + "description": "PipelineExternalComputeScale properties for managed integration runtime.", + "$ref": "#/definitions/PipelineExternalComputeScaleProperties" } }, "additionalProperties": { @@ -1539,6 +1547,56 @@ "type": "object" } }, + "CopyComputeScaleProperties": { + "description": "CopyComputeScale properties for managed integration runtime.", + "type": "object", + "properties": { + "dataIntegrationUnit": { + "description": "DIU number setting reserved for copy activity execution. Supported values are multiples of 4 in range 4-256.", + "type": "integer", + "format": "int32", + "minimum": 4 + }, + "timeToLive": { + "description": "Time to live (in minutes) setting of integration runtime which will execute copy activity.", + "type": "integer", + "format": "int32", + "minimum": 5 + } + }, + "additionalProperties": { + "type": "object" + } + }, + "PipelineExternalComputeScaleProperties": { + "description": "PipelineExternalComputeScale properties for managed integration runtime.", + "type": "object", + "properties": { + "timeToLive": { + "description": "Time to live (in minutes) setting of integration runtime which will execute pipeline and external activity.", + "type": "integer", + "format": "int32", + "minimum": 5 + }, + "numberOfPipelineNodes": { + "description": "Number of the pipeline nodes, which should be greater than 0 and less than 11.", + "type": "integer", + "format": "int32", + "minimum": 1, + "maximum": 10 + }, + "numberOfExternalNodes": { + "description": "Number of the the external nodes, which should be greater than 0 and less than 11.", + "type": "integer", + "format": "int32", + "minimum": 1, + "maximum": 10 + } + }, + "additionalProperties": { + "type": "object" + } + }, "IntegrationRuntimeSsisProperties": { "description": "SSIS properties for managed integration runtime.", "type": "object", @@ -1879,6 +1937,10 @@ "linkedInfo": { "$ref": "#/definitions/LinkedIntegrationRuntimeType", "description": "Linked integration runtime type from data factory" + }, + "selfContainedInteractiveAuthoringEnabled": { + "type": "boolean", + "description": "An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay." } } }, @@ -2287,6 +2349,11 @@ "type": "string", "format": "date-time", "readOnly": true + }, + "selfContainedInteractiveAuthoringEnabled": { + "type": "boolean", + "readOnly": true, + "description": "An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay." } } }, From e1e86cee9cf75152496c6aa1d77b9ad6912db3eb Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 14 Aug 2023 13:10:59 +0800 Subject: [PATCH 6/8] fix --- .../examples/IntegrationRuntimeObjectMetadata_Refresh.json | 4 +++- .../2021-06-01/examples/IntegrationRuntimes_Delete.json | 4 ++++ .../examples/IntegrationRuntimes_DisableInteractiveQuery.json | 4 ++++ .../examples/IntegrationRuntimes_EnableInteractiveQuery.json | 4 ++++ .../stable/2021-06-01/examples/IntegrationRuntimes_Start.json | 4 +++- .../stable/2021-06-01/examples/IntegrationRuntimes_Stop.json | 4 ++++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimeObjectMetadata_Refresh.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimeObjectMetadata_Refresh.json index 2089ab7e4c32..9e0564b2ddac 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimeObjectMetadata_Refresh.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimeObjectMetadata_Refresh.json @@ -13,7 +13,9 @@ "X-Content-Type-Options": "nosniff", "x-ms-ratelimit-remaining-subscription-reads": "11999", "x-ms-request-id": "20708242-215c-4101-9437-44590b27cdbf", - "x-ms-correlation-request-id": "20708242-215c-4101-9437-44590b27cdbf" + "x-ms-correlation-request-id": "20708242-215c-4101-9437-44590b27cdbf", + "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" }, "body": { "status": "Succeeded", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Delete.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Delete.json index 0cb8c31248a5..9ad81dd8f3b4 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Delete.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Delete.json @@ -11,6 +11,10 @@ "202": {}, "204": {}, "default": { + "headers": { + "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" + }, "body": { "error": { "code": "Error code", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_DisableInteractiveQuery.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_DisableInteractiveQuery.json index b875674431b0..490b64305ed5 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_DisableInteractiveQuery.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_DisableInteractiveQuery.json @@ -10,6 +10,10 @@ "200": {}, "202": {}, "default": { + "headers": { + "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" + }, "body": { "error": { "code": "Error code", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_EnableInteractiveQuery.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_EnableInteractiveQuery.json index b875674431b0..490b64305ed5 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_EnableInteractiveQuery.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_EnableInteractiveQuery.json @@ -10,6 +10,10 @@ "200": {}, "202": {}, "default": { + "headers": { + "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" + }, "body": { "error": { "code": "Error code", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Start.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Start.json index 8a050848a76a..86fd2ca9430a 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Start.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Start.json @@ -13,7 +13,9 @@ "X-Content-Type-Options": "nosniff", "x-ms-ratelimit-remaining-subscription-reads": "14912", "x-ms-request-id": "2af47f9f-5625-4b01-a3a5-bccb576a4677", - "x-ms-correlation-request-id": "2af47f9f-5625-4b01-a3a5-bccb576a4677" + "x-ms-correlation-request-id": "2af47f9f-5625-4b01-a3a5-bccb576a4677", + "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" }, "body": { "name": "exampleManagedIntegrationRuntime", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Stop.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Stop.json index b875674431b0..490b64305ed5 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Stop.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Stop.json @@ -10,6 +10,10 @@ "200": {}, "202": {}, "default": { + "headers": { + "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" + }, "body": { "error": { "code": "Error code", From 3d1f7b0eb897c2c22e46e54dce30e4a11eb421f0 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 16 Aug 2023 09:39:58 +0800 Subject: [PATCH 7/8] Revert "add" This reverts commit 9caf1ac03005884077fab9c1de3bf90bf1cbb25f. --- .../stable/2021-06-01/integrationRuntime.json | 67 ------------------- 1 file changed, 67 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json index 4e1a2b17b8b6..7cb4d8160657 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json @@ -1471,14 +1471,6 @@ "vNetProperties": { "description": "VNet properties for managed integration runtime.", "$ref": "#/definitions/IntegrationRuntimeVNetProperties" - }, - "copyComputeScaleProperties": { - "description": "CopyComputeScale properties for managed integration runtime.", - "$ref": "#/definitions/CopyComputeScaleProperties" - }, - "pipelineExternalComputeScaleProperties": { - "description": "PipelineExternalComputeScale properties for managed integration runtime.", - "$ref": "#/definitions/PipelineExternalComputeScaleProperties" } }, "additionalProperties": { @@ -1547,56 +1539,6 @@ "type": "object" } }, - "CopyComputeScaleProperties": { - "description": "CopyComputeScale properties for managed integration runtime.", - "type": "object", - "properties": { - "dataIntegrationUnit": { - "description": "DIU number setting reserved for copy activity execution. Supported values are multiples of 4 in range 4-256.", - "type": "integer", - "format": "int32", - "minimum": 4 - }, - "timeToLive": { - "description": "Time to live (in minutes) setting of integration runtime which will execute copy activity.", - "type": "integer", - "format": "int32", - "minimum": 5 - } - }, - "additionalProperties": { - "type": "object" - } - }, - "PipelineExternalComputeScaleProperties": { - "description": "PipelineExternalComputeScale properties for managed integration runtime.", - "type": "object", - "properties": { - "timeToLive": { - "description": "Time to live (in minutes) setting of integration runtime which will execute pipeline and external activity.", - "type": "integer", - "format": "int32", - "minimum": 5 - }, - "numberOfPipelineNodes": { - "description": "Number of the pipeline nodes, which should be greater than 0 and less than 11.", - "type": "integer", - "format": "int32", - "minimum": 1, - "maximum": 10 - }, - "numberOfExternalNodes": { - "description": "Number of the the external nodes, which should be greater than 0 and less than 11.", - "type": "integer", - "format": "int32", - "minimum": 1, - "maximum": 10 - } - }, - "additionalProperties": { - "type": "object" - } - }, "IntegrationRuntimeSsisProperties": { "description": "SSIS properties for managed integration runtime.", "type": "object", @@ -1937,10 +1879,6 @@ "linkedInfo": { "$ref": "#/definitions/LinkedIntegrationRuntimeType", "description": "Linked integration runtime type from data factory" - }, - "selfContainedInteractiveAuthoringEnabled": { - "type": "boolean", - "description": "An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay." } } }, @@ -2349,11 +2287,6 @@ "type": "string", "format": "date-time", "readOnly": true - }, - "selfContainedInteractiveAuthoringEnabled": { - "type": "boolean", - "readOnly": true, - "description": "An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay." } } }, From f92698852c70d3d8900fb3558f2fca61ff72ca4c Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 16 Aug 2023 09:40:14 +0800 Subject: [PATCH 8/8] Revert "fix" This reverts commit e1e86cee9cf75152496c6aa1d77b9ad6912db3eb. --- .../examples/IntegrationRuntimeObjectMetadata_Refresh.json | 4 +--- .../2021-06-01/examples/IntegrationRuntimes_Delete.json | 4 ---- .../examples/IntegrationRuntimes_DisableInteractiveQuery.json | 4 ---- .../examples/IntegrationRuntimes_EnableInteractiveQuery.json | 4 ---- .../stable/2021-06-01/examples/IntegrationRuntimes_Start.json | 4 +--- .../stable/2021-06-01/examples/IntegrationRuntimes_Stop.json | 4 ---- 6 files changed, 2 insertions(+), 22 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimeObjectMetadata_Refresh.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimeObjectMetadata_Refresh.json index 9e0564b2ddac..2089ab7e4c32 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimeObjectMetadata_Refresh.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimeObjectMetadata_Refresh.json @@ -13,9 +13,7 @@ "X-Content-Type-Options": "nosniff", "x-ms-ratelimit-remaining-subscription-reads": "11999", "x-ms-request-id": "20708242-215c-4101-9437-44590b27cdbf", - "x-ms-correlation-request-id": "20708242-215c-4101-9437-44590b27cdbf", - "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" + "x-ms-correlation-request-id": "20708242-215c-4101-9437-44590b27cdbf" }, "body": { "status": "Succeeded", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Delete.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Delete.json index 9ad81dd8f3b4..0cb8c31248a5 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Delete.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Delete.json @@ -11,10 +11,6 @@ "202": {}, "204": {}, "default": { - "headers": { - "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" - }, "body": { "error": { "code": "Error code", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_DisableInteractiveQuery.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_DisableInteractiveQuery.json index 490b64305ed5..b875674431b0 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_DisableInteractiveQuery.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_DisableInteractiveQuery.json @@ -10,10 +10,6 @@ "200": {}, "202": {}, "default": { - "headers": { - "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" - }, "body": { "error": { "code": "Error code", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_EnableInteractiveQuery.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_EnableInteractiveQuery.json index 490b64305ed5..b875674431b0 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_EnableInteractiveQuery.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_EnableInteractiveQuery.json @@ -10,10 +10,6 @@ "200": {}, "202": {}, "default": { - "headers": { - "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" - }, "body": { "error": { "code": "Error code", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Start.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Start.json index 86fd2ca9430a..8a050848a76a 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Start.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Start.json @@ -13,9 +13,7 @@ "X-Content-Type-Options": "nosniff", "x-ms-ratelimit-remaining-subscription-reads": "14912", "x-ms-request-id": "2af47f9f-5625-4b01-a3a5-bccb576a4677", - "x-ms-correlation-request-id": "2af47f9f-5625-4b01-a3a5-bccb576a4677", - "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" + "x-ms-correlation-request-id": "2af47f9f-5625-4b01-a3a5-bccb576a4677" }, "body": { "name": "exampleManagedIntegrationRuntime", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Stop.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Stop.json index 490b64305ed5..b875674431b0 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Stop.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/IntegrationRuntimes_Stop.json @@ -10,10 +10,6 @@ "200": {}, "202": {}, "default": { - "headers": { - "Location": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01", - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2021-06-01" - }, "body": { "error": { "code": "Error code",