diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json index 3ed43c0ab79b..67ea061ffc4d 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json @@ -204,6 +204,57 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/getFeatureValue": { + "post": { + "tags": [ + "exposureControl" + ], + "operationId": "ExposureControl_GetFeatureValueByFactory", + "x-ms-examples": { + "ExposureControl_GetFeatureValueByFactory": { + "$ref": "./examples/ExposureControl_GetFeatureValueByFactory.json" + } + }, + "description": "Get exposure control feature for specific factory.", + "parameters": [ + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/resourceGroupName" + }, + { + "$ref": "#/parameters/factoryName" + }, + { + "$ref": "#/parameters/api-version" + }, + { + "name": "exposureControlRequest", + "description": "The exposure control request.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ExposureControlRequest" + } + } + ], + "responses": { + "200": { + "description": "OK.", + "schema": { + "$ref": "#/definitions/ExposureControlResponse" + } + }, + "default": { + "description": "An error response received from the Azure Data Factory service.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories": { "get": { "tags": [ @@ -2864,7 +2915,7 @@ ], "operationId": "RerunTriggers_Start", "x-ms-examples": { - "Triggers_Start": { + "RerunTriggers_Start": { "$ref": "./examples/RerunTriggers_Start.json" } }, @@ -2910,7 +2961,7 @@ ], "operationId": "RerunTriggers_Stop", "x-ms-examples": { - "Triggers_Stop": { + "RerunTriggers_Stop": { "$ref": "./examples/RerunTriggers_Stop.json" } }, @@ -2956,7 +3007,7 @@ ], "operationId": "RerunTriggers_Cancel", "x-ms-examples": { - "Triggers_Cancel": { + "RerunTriggers_Cancel": { "$ref": "./examples/RerunTriggers_Cancel.json" } }, @@ -3002,7 +3053,7 @@ ], "operationId": "RerunTriggers_ListByTrigger", "x-ms-examples": { - "RerunTriggers_List": { + "RerunTriggers_ListByTrigger": { "$ref": "./examples/RerunTriggers_ListByTrigger.json" } }, diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Datasets_Get.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Datasets_Get.json index 90ecfb7b3b95..d99a0b7faa24 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Datasets_Get.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Datasets_Get.json @@ -4,17 +4,27 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "datasetName": "exampleDataset", - "ifNoneMatch": null, + "ifNoneMatch": "15004c4f-0000-0200-0000-5cbe090e0000", "api-version": "2018-06-01" }, "responses": { + "304": { + "headers": { + "Date": "Mon, 22 Apr 2019 18:33:50 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-reads": "11992", + "x-ms-request-id": "9db13e51-b9bb-4b29-89bf-2fb1636e7050", + "x-ms-correlation-request-id": "9db13e51-b9bb-4b29-89bf-2fb1636e7050" + }, + "body": null + }, "200": { "headers": { - "Date": "Sat, 16 Jun 2018 00:37:40 GMT", + "Date": "Mon, 22 Apr 2019 18:33:50 GMT", "X-Content-Type-Options": "nosniff", - "x-ms-ratelimit-remaining-subscription-reads": "14993", - "x-ms-request-id": "19ef529d-6aac-4997-a6af-87cdc02e88c5", - "x-ms-correlation-request-id": "19ef529d-6aac-4997-a6af-87cdc02e88c5" + "x-ms-ratelimit-remaining-subscription-reads": "11993", + "x-ms-request-id": "48983fb5-612a-44c6-8158-add7ffebb32b", + "x-ms-correlation-request-id": "48983fb5-612a-44c6-8158-add7ffebb32b" }, "body": { "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/datasets/exampleDataset", @@ -49,7 +59,7 @@ } } }, - "etag": "0a0068d4-0000-0000-0000-5b245bd30000" + "etag": "15004c4f-0000-0200-0000-5cbe090e0000" } } } diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/ExposureControl_GetFeatureValueByFactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/ExposureControl_GetFeatureValueByFactory.json new file mode 100644 index 000000000000..fd5b666467bd --- /dev/null +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/ExposureControl_GetFeatureValueByFactory.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "12345678-1234-1234-1234-12345678abc", + "resourceGroupName": "exampleResourceGroup", + "factoryName": "exampleFactoryName", + "exposureControlRequest": { + "featureName": "ADFIntegrationRuntimeSharingRbac", + "featureType": "Feature" + }, + "api-version": "2018-06-01" + }, + "responses": { + "200": { + "headers": { + "Date": "Sat, 22 Dec 2018 09:46:07 GMT", + "X-Content-Type-Options": "nosniff" + }, + "body": { + "featureName": "ADFIntegrationRuntimeSharingRbac", + "value": "False" + } + } + } +} \ No newline at end of file diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Factories_Get.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Factories_Get.json index 5ce72adc6147..5cfc600c634c 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Factories_Get.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Factories_Get.json @@ -3,9 +3,20 @@ "subscriptionId": "12345678-1234-1234-1234-12345678abc", "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", + "ifNoneMatch": "00004004-0000-0000-0000-5b28979e0000", "api-version": "2018-06-01" }, "responses": { + "304": { + "headers": { + "Date": "Mon, 22 Apr 2019 18:33:50 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-reads": "11992", + "x-ms-request-id": "9db13e51-b9bb-4b29-89bf-2fb1636e7050", + "x-ms-correlation-request-id": "9db13e51-b9bb-4b29-89bf-2fb1636e7050" + }, + "body": null + }, "200": { "headers": { "Date": "Tue, 19 Jun 2018 05:41:50 GMT", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimeObjectMetadata_Get.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimeObjectMetadata_Get.json index 7d701fa745b8..7863cd8198d7 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimeObjectMetadata_Get.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimeObjectMetadata_Get.json @@ -39,390 +39,6 @@ "id": 4, "name": "这是文件夹", "description": "" - }, - { - "id": 5, - "name": "1" - }, - { - "id": 6, - "name": "2" - }, - { - "id": 7, - "name": "3" - }, - { - "id": 8, - "name": "4" - }, - { - "id": 9, - "name": "5" - }, - { - "id": 10, - "name": "6" - }, - { - "id": 11, - "name": "7" - }, - { - "id": 12, - "name": "8" - }, - { - "id": 13, - "name": "9" - }, - { - "id": 14, - "name": "10" - }, - { - "id": 15, - "name": "11" - }, - { - "id": 16, - "name": "12" - }, - { - "id": 17, - "name": "13" - }, - { - "id": 18, - "name": "14" - }, - { - "id": 19, - "name": "15" - }, - { - "id": 20, - "name": "16" - }, - { - "id": 21, - "name": "17" - }, - { - "id": 22, - "name": "18" - }, - { - "id": 23, - "name": "19" - }, - { - "id": 24, - "name": "20" - }, - { - "id": 25, - "name": "21" - }, - { - "id": 26, - "name": "22" - }, - { - "id": 27, - "name": "23" - }, - { - "id": 28, - "name": "24" - }, - { - "id": 29, - "name": "25" - }, - { - "id": 30, - "name": "26" - }, - { - "id": 31, - "name": "27" - }, - { - "id": 32, - "name": "28" - }, - { - "id": 33, - "name": "29" - }, - { - "id": 34, - "name": "30" - }, - { - "id": 35, - "name": "31" - }, - { - "id": 36, - "name": "32" - }, - { - "id": 37, - "name": "33" - }, - { - "id": 38, - "name": "34" - }, - { - "id": 39, - "name": "35" - }, - { - "id": 40, - "name": "36" - }, - { - "id": 41, - "name": "37" - }, - { - "id": 42, - "name": "38" - }, - { - "id": 43, - "name": "39" - }, - { - "id": 44, - "name": "40" - }, - { - "id": 45, - "name": "41" - }, - { - "id": 46, - "name": "42" - }, - { - "id": 47, - "name": "43" - }, - { - "id": 48, - "name": "44" - }, - { - "id": 49, - "name": "45" - }, - { - "id": 50, - "name": "46" - }, - { - "id": 51, - "name": "47" - }, - { - "id": 52, - "name": "48" - }, - { - "id": 53, - "name": "49" - }, - { - "id": 54, - "name": "50" - }, - { - "id": 55, - "name": "51" - }, - { - "id": 56, - "name": "52" - }, - { - "id": 57, - "name": "53" - }, - { - "id": 58, - "name": "54" - }, - { - "id": 59, - "name": "55" - }, - { - "id": 60, - "name": "56" - }, - { - "id": 61, - "name": "57" - }, - { - "id": 62, - "name": "58" - }, - { - "id": 63, - "name": "59" - }, - { - "id": 64, - "name": "60" - }, - { - "id": 65, - "name": "61" - }, - { - "id": 66, - "name": "62" - }, - { - "id": 67, - "name": "63" - }, - { - "id": 68, - "name": "64" - }, - { - "id": 69, - "name": "65" - }, - { - "id": 70, - "name": "66" - }, - { - "id": 71, - "name": "67" - }, - { - "id": 72, - "name": "68" - }, - { - "id": 73, - "name": "69" - }, - { - "id": 74, - "name": "70" - }, - { - "id": 75, - "name": "71" - }, - { - "id": 76, - "name": "72" - }, - { - "id": 77, - "name": "73" - }, - { - "id": 78, - "name": "74" - }, - { - "id": 79, - "name": "75" - }, - { - "id": 80, - "name": "76" - }, - { - "id": 81, - "name": "77" - }, - { - "id": 82, - "name": "78" - }, - { - "id": 83, - "name": "79" - }, - { - "id": 84, - "name": "80" - }, - { - "id": 85, - "name": "81" - }, - { - "id": 86, - "name": "82" - }, - { - "id": 87, - "name": "83" - }, - { - "id": 88, - "name": "84" - }, - { - "id": 89, - "name": "85" - }, - { - "id": 90, - "name": "86" - }, - { - "id": 91, - "name": "87" - }, - { - "id": 92, - "name": "88" - }, - { - "id": 93, - "name": "89" - }, - { - "id": 94, - "name": "90" - }, - { - "id": 95, - "name": "91" - }, - { - "id": 96, - "name": "92" - }, - { - "id": 97, - "name": "93" - }, - { - "id": 98, - "name": "94" - }, - { - "id": 99, - "name": "95" - }, - { - "id": 100, - "name": "96" } ], "nextLink": "https://management.azure.com/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/integrationRuntimes/testactivityv2/getObjectMetadata?api-version=2018-06-01&%24skipToken=https%3a%2f%2fwcu.frontend.clouddatahub.net%2fsubscriptions%2f12345678-1234-1234-1234-12345678abc%2fdatafactories%2f6C8E7C90-FD45-4010-8B7C-B5227D0F0CB7%2fintegrationruntimes%2fTESTACTIVITYV2%2fgetSsisObjectMetadata%3f%24skipToken%3dc3Npc0ZvbGRlcnNAQDIwMTgtMTEtMjlUMDM6NTk6MzIuMDQ1Mzc1MiswMDowMEBAZm9sZGVyQEAwMDAwMDAwMDAwMDAwMDAwMTAx0%26api-version%3d1.0" diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Get.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Get.json index 27917ea79da7..072fb4d1e260 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Get.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Get.json @@ -4,16 +4,27 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "integrationRuntimeName": "exampleIntegrationRuntime", + "ifNoneMatch": "15003c4f-0000-0200-0000-5cbe090b0000", "api-version": "2018-06-01" }, "responses": { + "304": { + "headers": { + "Date": "Mon, 22 Apr 2019 18:33:47 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-reads": "11996", + "x-ms-request-id": "7b3673dc-aef9-411c-8138-e6778231c474", + "x-ms-correlation-request-id": "7b3673dc-aef9-411c-8138-e6778231c474" + }, + "body": null + }, "200": { "headers": { - "Date": "Wed, 13 Jun 2018 21:33:05 GMT", + "Date": "Mon, 22 Apr 2019 18:33:47 GMT", "X-Content-Type-Options": "nosniff", - "x-ms-ratelimit-remaining-subscription-reads": "14910", - "x-ms-request-id": "a453fdd5-2f17-4a84-b0c4-751151481ef3", - "x-ms-correlation-request-id": "a453fdd5-2f17-4a84-b0c4-751151481ef3" + "x-ms-ratelimit-remaining-subscription-reads": "11997", + "x-ms-request-id": "ad824326-e577-4a47-a092-2e621c4d59d9", + "x-ms-correlation-request-id": "ad824326-e577-4a47-a092-2e621c4d59d9" }, "body": { "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/integrationruntimes/exampleIntegrationRuntime", @@ -23,7 +34,7 @@ "type": "SelfHosted", "description": "A selfhosted integration runtime" }, - "etag": "0400f1a1-0000-0000-0000-5b2188640000" + "etag": "15003c4f-0000-0200-0000-5cbe090b0000" } } } diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Start.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Start.json index 21953e6e20b9..c4b7ae4cff12 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Start.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Start.json @@ -31,14 +31,11 @@ "name": "exampleManagedIntegrationRuntime", "properties": { "dataFactoryName": "exampleFactoryName", - "state": "Started", "type": "Managed", - "dataFactoryLocation": null, - "resourceUri": null, + "state": "Started", "typeProperties": { "nodes": [], "otherErrors": [], - "state": "Started", "createTime": "2018-06-13T21:11:01.8695494Z" } } diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Stop.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Stop.json index c629af7aa096..50c00081777e 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Stop.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/IntegrationRuntimes_Stop.json @@ -7,6 +7,18 @@ "api-version": "2018-06-01" }, "responses": { + "202": { + "headers": { + "Date": "Wed, 13 Jun 2018 21:11:03 GMT", + "Location": "https://api-dogfood.resources.windows-int.net/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/integrationRuntimes/exampleManagedIntegrationRuntime/stop/operationresults/301b9c4b1c43415594e11918e678385f?api-version=2018-06-01", + "Retry-After": "15", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-writes": "1194", + "x-ms-request-id": "cb03ccdd-9d7a-4ebe-a967-0edc96f33904", + "x-ms-correlation-request-id": "cb03ccdd-9d7a-4ebe-a967-0edc96f33904" + }, + "body": null + }, "200": { "headers": { "Date": "Wed, 13 Jun 2018 21:33:03 GMT", @@ -15,9 +27,7 @@ "x-ms-request-id": "87f6c2c7-92f1-40e6-bb01-769f9e6ca22f", "x-ms-correlation-request-id": "87f6c2c7-92f1-40e6-bb01-769f9e6ca22f" }, - "body": { - "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/integrationruntimes/exampleManagedIntegrationRuntime" - } + "body": null } } } \ No newline at end of file diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/LinkedServices_Get.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/LinkedServices_Get.json index fcdfeba9318d..2c3a1f7902f5 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/LinkedServices_Get.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/LinkedServices_Get.json @@ -4,17 +4,27 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "linkedServiceName": "exampleLinkedService", - "ifNoneMatch": null, + "ifNoneMatch": "1500474f-0000-0200-0000-5cbe090d0000", "api-version": "2018-06-01" }, "responses": { + "304": { + "headers": { + "Date": "Mon, 22 Apr 2019 18:33:49 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-reads": "11994", + "x-ms-request-id": "9a503b24-1b14-4242-9fab-598c81881370", + "x-ms-correlation-request-id": "9a503b24-1b14-4242-9fab-598c81881370" + }, + "body": null + }, "200": { "headers": { - "Date": "Sat, 16 Jun 2018 00:37:36 GMT", + "Date": "Mon, 22 Apr 2019 18:33:48 GMT", "X-Content-Type-Options": "nosniff", - "x-ms-ratelimit-remaining-subscription-reads": "14995", - "x-ms-request-id": "b57420cc-9476-4947-b54f-50b041b614ec", - "x-ms-correlation-request-id": "b57420cc-9476-4947-b54f-50b041b614ec" + "x-ms-ratelimit-remaining-subscription-reads": "11995", + "x-ms-request-id": "99e5d0d9-55e6-45a0-8bd2-cf39210f317c", + "x-ms-correlation-request-id": "99e5d0d9-55e6-45a0-8bd2-cf39210f317c" }, "body": { "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/linkedservices/exampleLinkedService", @@ -27,11 +37,11 @@ "type": "SecureString", "value": "**********" }, - "encryptedCredential": "ew0KICAiVmVyc2lvbiI6ICIyMDE3LTExLTMwIiwNCiAgIlByb3RlY3Rpb25Nb2RlIjogIktleSIsDQogICJTZWNyZXRDb250ZW50VHlwZSI6ICJQbGFpbnRleHQiLA0KICAiQ3JlZGVudGlhbElkIjogIkRGLURPR0ZPT0QtWUFOWkhBTkctV1VfMGI2M2EyMmYtMGEzNC00NDg2LWIzMDktNzM0NTlkODUyY2Q1Ig0KfQ==" + "encryptedCredential": "ew0KICAiVmVyc2lvbiI6ICIyMDE3LTExLTMwIiwNCiAgIlByb3RlY3Rpb25Nb2RlIjogIktleSIsDQogICJTZWNyZXRDb250ZW50VHlwZSI6ICJQbGFpbnRleHQiLA0KICAiQ3JlZGVudGlhbElkIjogIkhWVEVTVEVYQU1QTEVTXzg5MjU1NGY0LTViNGItNDFhOS1hYWYxLTg4ZWI5ZDBjOWIzMyINCn0=" }, "description": "Example description" }, - "etag": "0a0064d4-0000-0000-0000-5b245bd00000" + "etag": "1500474f-0000-0200-0000-5cbe090d0000" } } } 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 9dc1bf7c1790..2ff9004c5fe5 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 @@ -4,17 +4,27 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "pipelineName": "examplePipeline", - "ifNoneMatch": null, + "ifNoneMatch": "1500504f-0000-0200-0000-5cbe090f0000", "api-version": "2018-06-01" }, "responses": { + "304": { + "headers": { + "Date": "Mon, 22 Apr 2019 18:33:51 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-reads": "11990", + "x-ms-request-id": "819ef646-692f-4d1b-8717-0b4fe493e2aa", + "x-ms-correlation-request-id": "819ef646-692f-4d1b-8717-0b4fe493e2aa" + }, + "body": null + }, "200": { "headers": { - "Date": "Sat, 16 Jun 2018 00:37:43 GMT", + "Date": "Mon, 22 Apr 2019 18:33:51 GMT", "X-Content-Type-Options": "nosniff", - "x-ms-ratelimit-remaining-subscription-reads": "14991", - "x-ms-request-id": "e1e7bf40-37d4-4f38-92aa-4138cc1fa2fa", - "x-ms-correlation-request-id": "e1e7bf40-37d4-4f38-92aa-4138cc1fa2fa" + "x-ms-ratelimit-remaining-subscription-reads": "11991", + "x-ms-request-id": "f3865c61-4888-4b91-a617-9a985d9dd0fd", + "x-ms-correlation-request-id": "f3865c61-4888-4b91-a617-9a985d9dd0fd" }, "body": { "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/pipelines/examplePipeline", @@ -77,9 +87,14 @@ "OutputBlobNameList": { "type": "Array" } + }, + "variables": { + "TestVariableArray": { + "type": "Array" + } } }, - "etag": "0a006cd4-0000-0000-0000-5b245bd60000" + "etag": "1500504f-0000-0200-0000-5cbe090f0000" } } } diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Cancel.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Cancel.json index 24cab320bdfc..9506549b1bb8 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Cancel.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Cancel.json @@ -4,7 +4,7 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "triggerName": "exampleTrigger", - "triggerRerunName": "exampleRerunTrigger", + "rerunTriggerName": "exampleRerunTrigger", "api-version": "2018-06-01" }, "responses": { diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Create.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Create.json index fa73eb731c02..70c7c155f276 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Create.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Create.json @@ -4,13 +4,11 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "triggerName": "exampleTrigger", - "triggerRerunName": "exampleRerunTrigger", + "rerunTriggerName": "exampleRerunTrigger", "rerunTumblingWindowTriggerActionParameters": { - "properties": { - "startTime": "2018-06-16T00:39:13.8441801Z", - "endTime": "2018-06-16T00:55:13.8441801Z", - "maxConcurrency": 4 - } + "startTime": "2018-06-16T00:39:13.8441801Z", + "endTime": "2018-06-16T00:55:13.8441801Z", + "maxConcurrency": 4 }, "api-version": "2018-06-01" }, @@ -26,15 +24,13 @@ "body": { "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/triggers/exampleTrigger/rerunTriggers/exampleRerunTrigger", "name": "exampleRerunTrigger", - "type": "Microsoft.DataFactory/factories/triggers", + "type": "Microsoft.DataFactory/factories/triggers/rerunTriggers", "properties": { "type": "RerunTumblingWindowTrigger", "typeProperties": { - "properties": { - "requestedStartTime": "2018-06-16T00:39:13.8441801Z", - "requestedEndTime": "2018-06-16T00:55:13.8441801Z", - "maxConcurrency": 4 - } + "requestedStartTime": "2018-06-16T00:39:13.8441801Z", + "requestedEndTime": "2018-06-16T00:55:13.8441801Z", + "maxConcurrency": 4 } } } diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_ListByTrigger.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_ListByTrigger.json index a502c311b076..a08ff0b93fac 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_ListByTrigger.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_ListByTrigger.json @@ -20,15 +20,13 @@ { "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/triggers/exampleTrigger/rerunTriggers/exampleRerunTrigger", "name": "exampleRerunTrigger", - "type": "Microsoft.DataFactory/factories/triggers", + "type": "Microsoft.DataFactory/factories/triggers/rerunTriggers", "properties": { "type": "RerunTumblingWindowTrigger", "typeProperties": { - "properties": { - "requestedStartTime": "2018-06-16T00:39:14.905167Z", - "requestedEndTime": "2018-06-16T00:55:14.905167Z", - "maxConcurrency": 4 - } + "requestedStartTime": "2018-06-16T00:39:14.905167Z", + "requestedEndTime": "2018-06-16T00:55:14.905167Z", + "maxConcurrency": 4 }, "description": "Example description" } diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Start.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Start.json index d34b2e8e5164..662bcb719b5f 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Start.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Start.json @@ -4,7 +4,7 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "triggerName": "exampleTrigger", - "triggerRerunName": "exampleRerunTrigger", + "rerunTriggerName": "exampleRerunTrigger", "api-version": "2018-06-01" }, "responses": { diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Stop.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Stop.json index 24cab320bdfc..9506549b1bb8 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Stop.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Stop.json @@ -4,7 +4,7 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "triggerName": "exampleTrigger", - "triggerRerunName": "exampleRerunTrigger", + "rerunTriggerName": "exampleRerunTrigger", "api-version": "2018-06-01" }, "responses": { diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Triggers_Get.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Triggers_Get.json index 2594e0f18c53..849cc9d0cb4d 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Triggers_Get.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Triggers_Get.json @@ -4,17 +4,27 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "triggerName": "exampleTrigger", - "ifNoneMatch": null, + "ifNoneMatch": "1500544f-0000-0200-0000-5cbe09100000", "api-version": "2018-06-01" }, "responses": { + "304": { + "headers": { + "Date": "Mon, 22 Apr 2019 18:33:52 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-reads": "11988", + "x-ms-request-id": "ca7b5df3-83ee-42a1-88f3-e417baa37900", + "x-ms-correlation-request-id": "ca7b5df3-83ee-42a1-88f3-e417baa37900" + }, + "body": null + }, "200": { "headers": { - "Date": "Sat, 16 Jun 2018 00:40:17 GMT", + "Date": "Mon, 22 Apr 2019 18:33:52 GMT", "X-Content-Type-Options": "nosniff", - "x-ms-ratelimit-remaining-subscription-reads": "14987", - "x-ms-request-id": "060364d7-7980-4def-8bc1-800552a9b53d", - "x-ms-correlation-request-id": "060364d7-7980-4def-8bc1-800552a9b53d" + "x-ms-ratelimit-remaining-subscription-reads": "11989", + "x-ms-request-id": "8ad1759f-24c1-46a5-aef5-edd267e18870", + "x-ms-correlation-request-id": "8ad1759f-24c1-46a5-aef5-edd267e18870" }, "body": { "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/triggers/exampleTrigger", @@ -26,8 +36,8 @@ "recurrence": { "frequency": "Minute", "interval": 4, - "startTime": "2018-06-16T00:39:14.905167Z", - "endTime": "2018-06-16T00:55:14.905167Z", + "startTime": "2019-04-22T18:32:52.527912Z", + "endTime": "2019-04-22T18:48:52.5281747Z", "timeZone": "UTC" } }, @@ -44,10 +54,9 @@ } } ], - "description": "Example description", "runtimeState": "Stopped" }, - "etag": "0a008dd4-0000-0000-0000-5b245c6f0000" + "etag": "1500544f-0000-0200-0000-5cbe09100000" } } }