From d7f5567289add61a8368ce9bf1a710264183366c Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Thu, 12 Apr 2018 14:36:16 -0700 Subject: [PATCH 01/10] add configure repo api swagger --- .../2017-09-01-preview/datafactory.json | 109 ++++++++++++++++++ .../examples/Factories_CreateOrUpdate.json | 24 +++- .../examples/Factories_UpdateRepo.json | 51 ++++++++ 3 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index 5033dedf7769..ad08ac432633 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -105,6 +105,54 @@ } } }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/locations/{locationId}/configureFactoryRepo": { + "post": { + "tags": [ + "configureFactoryRepo" + ], + "operationId": "ConfigureFactoryRepo_Update", + "x-ms-examples": { + "Factories_CreateOrUpdate": { + "$ref": "./examples/Factories_UpdateRepo.json" + } + }, + "description": "Updates a factory's repo information.", + "parameters": [ + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/locationId" + }, + { + "$ref": "#/parameters/api-version" + }, + { + "name": "factoryRepoUpdate", + "description": "Update factory repo request definition.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FactoryRepoUpdate" + } + } + ], + "responses": { + "200": { + "description": "OK.", + "schema": { + "$ref": "#/definitions/Factory" + } + }, + "default": { + "description": "An error response received from the Azure Data Factory service.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories": { "get": { "tags": [ @@ -2854,6 +2902,56 @@ "type": "object" } }, + "FactoryVSTSConfiguration": { + "description": "Factory's VSTS repo information.", + "properties": { + "accountName": { + "description": "VSTS account name.", + "type": "string" + }, + "projectName": { + "description": "VSTS project name.", + "type": "string" + }, + "repositoryName": { + "description": "VSTS repository name.", + "type": "string" + }, + "collaborationBranch": { + "description": "VSTS collaboration branch.", + "type": "string" + }, + "rootFolder": { + "description": "VSTS root folder.", + "type": "string" + }, + "lastCommitId": { + "description": "VSTS last commit id.", + "type": "string" + }, + "tenantId": { + "description": "VSTS tenant id.", + "type": "string" + } + } + }, + "FactoryRepoUpdate": { + "description": "Factory's VSTS repo information.", + "properties": { + "factoryId": { + "description": "The factory id.", + "type": "string" + }, + "resourceGroupName": { + "description": "The resource group name.", + "type": "string" + }, + "vstsConfiguration": { + "$ref": "#/definitions/FactoryVSTSConfiguration", + "description": "VSTS repo information of the factory." + } + } + }, "FactoryProperties": { "description": "Factory resource properties.", "properties": { @@ -2872,6 +2970,10 @@ "description": "Version of the factory.", "type": "string", "readOnly": true + }, + "vstsConfiguration": { + "$ref": "#/definitions/FactoryVSTSConfiguration", + "description": "VSTS repo information of the factory." } } }, @@ -3698,6 +3800,13 @@ "maxLength": 63, "x-ms-parameter-location": "method" }, + "locationId": { + "name": "locationId", + "description": "The location identifier.", + "in": "path", + "required": true, + "type": "string" + }, "linkedServiceName": { "name": "linkedServiceName", "description": "The linked service name.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_CreateOrUpdate.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_CreateOrUpdate.json index aa231c3c90a4..4f258178de19 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_CreateOrUpdate.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_CreateOrUpdate.json @@ -4,7 +4,18 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "factory": { - "location": "East US" + "location": "East US", + "properties": { + "vstsConfiguration": { + "accountName": "msdata", + "projectName": "datafactory", + "repositoryName": "exampleRepo", + "collaborationBranch": "master", + "rootFolder": "/", + "lastCommitId": "", + "tenantId": "12f988bf-86d1-41af-91ab-2d7cd011db49" + } + } }, "api-version": "2017-09-01-preview" }, @@ -23,7 +34,16 @@ "properties": { "provisioningState": "Succeeded", "createTime": "2017-09-13T17:33:54.0294655Z", - "version": "2017-09-01-preview" + "version": "2017-09-01-preview", + "vstsConfiguration": { + "accountName": "msdata", + "projectName": "datafactory", + "repositoryName": "exampleRepo", + "collaborationBranch": "master", + "rootFolder": "/", + "lastCommitId": "", + "tenantId": "12f988bf-86d1-41af-91ab-2d7cd011db49" + } }, "id": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", "type": "Microsoft.DataFactory/factories", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json new file mode 100644 index 000000000000..7136cc26128c --- /dev/null +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "subscriptionId": "12345678-1234-1234-12345678abc", + "factoryRepoUpdate": { + "resourceGroupName": "exampleResourceGroup", + "factoryId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", + "vstsConfiguration": { + "accountName": "msdata", + "projectName": "datafactory", + "repositoryName": "exampleRepo", + "collaborationBranch": "master", + "rootFolder": "/", + "lastCommitId": "", + "tenantId": "12f988bf-86d1-41af-91ab-2d7cd011db49" + } + }, + "api-version": "2017-09-01-preview" + }, + "responses": { + "200": { + "headers": { + "Date": "Wed, 13 Sep 2017 17:33:54 GMT", + "x-ms-request-id": "dc1954ed-a1d3-4437-bd73-480ffdf1ea5a", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-writes": "1198", + "x-ms-correlation-request-id": "8d66d31c-23f3-4ac1-bc8c-1b6464342ad1" + }, + "body": { + "name": "exampleFactoryName", + "tags": {}, + "properties": { + "provisioningState": "Succeeded", + "createTime": "2017-09-13T17:33:54.0294655Z", + "version": "2017-09-01-preview", + "vstsConfiguration": { + "accountName": "msdata", + "projectName": "datafactory", + "repositoryName": "exampleRepo", + "collaborationBranch": "master", + "rootFolder": "/", + "lastCommitId": "", + "tenantId": "12f988bf-86d1-41af-91ab-2d7cd011db49" + } + }, + "id": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", + "type": "Microsoft.DataFactory/factories", + "location": "East US" + } + } + } +} From 42b127de426d2e7e62893799af31cfac6a58b07d Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Thu, 12 Apr 2018 16:09:11 -0700 Subject: [PATCH 02/10] fixing autorest issue --- .../preview/2017-09-01-preview/datafactory.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index ad08ac432633..279c411880c7 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -3805,7 +3805,8 @@ "description": "The location identifier.", "in": "path", "required": true, - "type": "string" + "type": "string", + "x-ms-parameter-location": "method" }, "linkedServiceName": { "name": "linkedServiceName", From c6c57b0da04ec7326464c1e36f9ac6ba12c1f37c Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Thu, 12 Apr 2018 16:30:56 -0700 Subject: [PATCH 03/10] add missing parameter --- .../2017-09-01-preview/examples/Factories_UpdateRepo.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json index 7136cc26128c..01f4de632836 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json @@ -1,6 +1,7 @@ { "parameters": { "subscriptionId": "12345678-1234-1234-12345678abc", + "locationId": "eastus", "factoryRepoUpdate": { "resourceGroupName": "exampleResourceGroup", "factoryId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", From 27d71a427c73a4adfd90f2347ba5c0a9e0403e7d Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Tue, 17 Apr 2018 18:06:59 -0700 Subject: [PATCH 04/10] change route --- .../2017-09-01-preview/datafactory.json | 73 ++++++++----------- .../examples/Factories_UpdateRepo.json | 4 +- 2 files changed, 34 insertions(+), 43 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index 279c411880c7..b2aee33ad1c1 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -105,43 +105,34 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/locations/{locationId}/configureFactoryRepo": { - "post": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories": { + "get": { "tags": [ - "configureFactoryRepo" + "factories" ], - "operationId": "ConfigureFactoryRepo_Update", + "operationId": "Factories_ListByResourceGroup", "x-ms-examples": { - "Factories_CreateOrUpdate": { - "$ref": "./examples/Factories_UpdateRepo.json" + "Factories_ListByResourceGroup": { + "$ref": "./examples/Factories_ListByResourceGroup.json" } }, - "description": "Updates a factory's repo information.", + "description": "Lists factories.", "parameters": [ { "$ref": "#/parameters/subscriptionId" }, { - "$ref": "#/parameters/locationId" + "$ref": "#/parameters/resourceGroupName" }, { "$ref": "#/parameters/api-version" - }, - { - "name": "factoryRepoUpdate", - "description": "Update factory repo request definition.", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/FactoryRepoUpdate" - } } ], "responses": { "200": { "description": "OK.", "schema": { - "$ref": "#/definitions/Factory" + "$ref": "#/definitions/FactoryListResponse" } }, "default": { @@ -150,21 +141,24 @@ "$ref": "#/definitions/ErrorResponse" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories": { - "get": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/configureRepo": { + "post": { "tags": [ - "factories" + "configureRepo" ], - "operationId": "Factories_ListByResourceGroup", + "operationId": "ConfigureRepo_Update", "x-ms-examples": { - "Factories_ListByResourceGroup": { - "$ref": "./examples/Factories_ListByResourceGroup.json" + "Factories_CreateOrUpdate": { + "$ref": "./examples/Factories_UpdateRepo.json" } }, - "description": "Lists factories.", + "description": "Updates a factory's repo information.", "parameters": [ { "$ref": "#/parameters/subscriptionId" @@ -172,15 +166,27 @@ { "$ref": "#/parameters/resourceGroupName" }, + { + "$ref": "#/parameters/factoryName" + }, { "$ref": "#/parameters/api-version" + }, + { + "name": "factoryRepoUpdate", + "description": "Update factory repo request definition.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FactoryRepoUpdate" + } } ], "responses": { "200": { "description": "OK.", "schema": { - "$ref": "#/definitions/FactoryListResponse" + "$ref": "#/definitions/Factory" } }, "default": { @@ -189,9 +195,6 @@ "$ref": "#/definitions/ErrorResponse" } } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } } }, @@ -2942,10 +2945,6 @@ "description": "The factory id.", "type": "string" }, - "resourceGroupName": { - "description": "The resource group name.", - "type": "string" - }, "vstsConfiguration": { "$ref": "#/definitions/FactoryVSTSConfiguration", "description": "VSTS repo information of the factory." @@ -3800,14 +3799,6 @@ "maxLength": 63, "x-ms-parameter-location": "method" }, - "locationId": { - "name": "locationId", - "description": "The location identifier.", - "in": "path", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" - }, "linkedServiceName": { "name": "linkedServiceName", "description": "The linked service name.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json index 01f4de632836..b338b9a0a455 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json @@ -1,9 +1,9 @@ { "parameters": { "subscriptionId": "12345678-1234-1234-12345678abc", - "locationId": "eastus", + "resourceGroupName": "exampleResourceGroup", + "factoryName": "exampleFactoryName", "factoryRepoUpdate": { - "resourceGroupName": "exampleResourceGroup", "factoryId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", "vstsConfiguration": { "accountName": "msdata", From 2c233a59f11801e38916d47e13019b26ea4566ed Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Wed, 18 Apr 2018 10:08:55 -0700 Subject: [PATCH 05/10] fix per comments --- .../preview/2017-09-01-preview/datafactory.json | 6 +++--- ...ctories_UpdateRepo.json => Factories_ConfigureRepo.json} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/{Factories_UpdateRepo.json => Factories_ConfigureRepo.json} (100%) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index b2aee33ad1c1..828612f5ff27 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -152,10 +152,10 @@ "tags": [ "configureRepo" ], - "operationId": "ConfigureRepo_Update", + "operationId": "Factories_ConfigureRepo", "x-ms-examples": { - "Factories_CreateOrUpdate": { - "$ref": "./examples/Factories_UpdateRepo.json" + "Factories_ConfigureRepo": { + "$ref": "./examples/Factories_ConfigureRepo.json" } }, "description": "Updates a factory's repo information.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json similarity index 100% rename from specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json rename to specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json From fa5757e279b6732dedc799857b4b8cbaac22a663 Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Wed, 18 Apr 2018 11:35:03 -0700 Subject: [PATCH 06/10] change factoryId for factoryResourceId --- .../preview/2017-09-01-preview/datafactory.json | 4 ++-- .../2017-09-01-preview/examples/Factories_ConfigureRepo.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index 828612f5ff27..b3789fe839f5 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -2941,8 +2941,8 @@ "FactoryRepoUpdate": { "description": "Factory's VSTS repo information.", "properties": { - "factoryId": { - "description": "The factory id.", + "factoryResourceId": { + "description": "The factory resource id.", "type": "string" }, "vstsConfiguration": { diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json index b338b9a0a455..105b04242c96 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json @@ -4,7 +4,7 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "factoryRepoUpdate": { - "factoryId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", + "factoryResourceId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", "vstsConfiguration": { "accountName": "msdata", "projectName": "datafactory", From d9d3d1e6d7e3fc8afeb9e5295b43153876110f5a Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Mon, 23 Apr 2018 13:49:01 -0700 Subject: [PATCH 07/10] Revert "change factoryId for factoryResourceId" This reverts commit fa5757e279b6732dedc799857b4b8cbaac22a663. --- .../preview/2017-09-01-preview/datafactory.json | 4 ++-- .../2017-09-01-preview/examples/Factories_ConfigureRepo.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index b3789fe839f5..828612f5ff27 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -2941,8 +2941,8 @@ "FactoryRepoUpdate": { "description": "Factory's VSTS repo information.", "properties": { - "factoryResourceId": { - "description": "The factory resource id.", + "factoryId": { + "description": "The factory id.", "type": "string" }, "vstsConfiguration": { diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json index 105b04242c96..b338b9a0a455 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json @@ -4,7 +4,7 @@ "resourceGroupName": "exampleResourceGroup", "factoryName": "exampleFactoryName", "factoryRepoUpdate": { - "factoryResourceId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", + "factoryId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", "vstsConfiguration": { "accountName": "msdata", "projectName": "datafactory", From 0628a8805aca5f9009229ff53640aa7bf8052db5 Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Mon, 23 Apr 2018 13:49:18 -0700 Subject: [PATCH 08/10] Revert "fix per comments" This reverts commit 2c233a59f11801e38916d47e13019b26ea4566ed. --- .../preview/2017-09-01-preview/datafactory.json | 6 +++--- ...ctories_ConfigureRepo.json => Factories_UpdateRepo.json} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/{Factories_ConfigureRepo.json => Factories_UpdateRepo.json} (100%) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index 828612f5ff27..b2aee33ad1c1 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -152,10 +152,10 @@ "tags": [ "configureRepo" ], - "operationId": "Factories_ConfigureRepo", + "operationId": "ConfigureRepo_Update", "x-ms-examples": { - "Factories_ConfigureRepo": { - "$ref": "./examples/Factories_ConfigureRepo.json" + "Factories_CreateOrUpdate": { + "$ref": "./examples/Factories_UpdateRepo.json" } }, "description": "Updates a factory's repo information.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json similarity index 100% rename from specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureRepo.json rename to specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json From 7fd89d29e7cdcd5ecd60ddc4bba96bed48bde2dd Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Mon, 23 Apr 2018 13:49:29 -0700 Subject: [PATCH 09/10] Revert "change route" This reverts commit 27d71a427c73a4adfd90f2347ba5c0a9e0403e7d. --- .../2017-09-01-preview/datafactory.json | 73 +++++++++++-------- .../examples/Factories_UpdateRepo.json | 4 +- 2 files changed, 43 insertions(+), 34 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index b2aee33ad1c1..279c411880c7 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -105,34 +105,43 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories": { - "get": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/locations/{locationId}/configureFactoryRepo": { + "post": { "tags": [ - "factories" + "configureFactoryRepo" ], - "operationId": "Factories_ListByResourceGroup", + "operationId": "ConfigureFactoryRepo_Update", "x-ms-examples": { - "Factories_ListByResourceGroup": { - "$ref": "./examples/Factories_ListByResourceGroup.json" + "Factories_CreateOrUpdate": { + "$ref": "./examples/Factories_UpdateRepo.json" } }, - "description": "Lists factories.", + "description": "Updates a factory's repo information.", "parameters": [ { "$ref": "#/parameters/subscriptionId" }, { - "$ref": "#/parameters/resourceGroupName" + "$ref": "#/parameters/locationId" }, { "$ref": "#/parameters/api-version" + }, + { + "name": "factoryRepoUpdate", + "description": "Update factory repo request definition.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FactoryRepoUpdate" + } } ], "responses": { "200": { "description": "OK.", "schema": { - "$ref": "#/definitions/FactoryListResponse" + "$ref": "#/definitions/Factory" } }, "default": { @@ -141,24 +150,21 @@ "$ref": "#/definitions/ErrorResponse" } } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/configureRepo": { - "post": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories": { + "get": { "tags": [ - "configureRepo" + "factories" ], - "operationId": "ConfigureRepo_Update", + "operationId": "Factories_ListByResourceGroup", "x-ms-examples": { - "Factories_CreateOrUpdate": { - "$ref": "./examples/Factories_UpdateRepo.json" + "Factories_ListByResourceGroup": { + "$ref": "./examples/Factories_ListByResourceGroup.json" } }, - "description": "Updates a factory's repo information.", + "description": "Lists factories.", "parameters": [ { "$ref": "#/parameters/subscriptionId" @@ -166,27 +172,15 @@ { "$ref": "#/parameters/resourceGroupName" }, - { - "$ref": "#/parameters/factoryName" - }, { "$ref": "#/parameters/api-version" - }, - { - "name": "factoryRepoUpdate", - "description": "Update factory repo request definition.", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/FactoryRepoUpdate" - } } ], "responses": { "200": { "description": "OK.", "schema": { - "$ref": "#/definitions/Factory" + "$ref": "#/definitions/FactoryListResponse" } }, "default": { @@ -195,6 +189,9 @@ "$ref": "#/definitions/ErrorResponse" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, @@ -2945,6 +2942,10 @@ "description": "The factory id.", "type": "string" }, + "resourceGroupName": { + "description": "The resource group name.", + "type": "string" + }, "vstsConfiguration": { "$ref": "#/definitions/FactoryVSTSConfiguration", "description": "VSTS repo information of the factory." @@ -3799,6 +3800,14 @@ "maxLength": 63, "x-ms-parameter-location": "method" }, + "locationId": { + "name": "locationId", + "description": "The location identifier.", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, "linkedServiceName": { "name": "linkedServiceName", "description": "The linked service name.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json index b338b9a0a455..01f4de632836 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json @@ -1,9 +1,9 @@ { "parameters": { "subscriptionId": "12345678-1234-1234-12345678abc", - "resourceGroupName": "exampleResourceGroup", - "factoryName": "exampleFactoryName", + "locationId": "eastus", "factoryRepoUpdate": { + "resourceGroupName": "exampleResourceGroup", "factoryId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname", "vstsConfiguration": { "accountName": "msdata", From 47d1905337fe73deee6e623add5eaafb62caf5d0 Mon Sep 17 00:00:00 2001 From: "REDMOND\\fgutierr" Date: Thu, 26 Apr 2018 15:11:00 -0700 Subject: [PATCH 10/10] rename example --- .../preview/2017-09-01-preview/datafactory.json | 10 +++++----- ...teRepo.json => Factories_ConfigureFactoryRepo.json} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/{Factories_UpdateRepo.json => Factories_ConfigureFactoryRepo.json} (100%) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json index 279c411880c7..13c5e57b598a 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/datafactory.json @@ -110,10 +110,10 @@ "tags": [ "configureFactoryRepo" ], - "operationId": "ConfigureFactoryRepo_Update", + "operationId": "Factories_ConfigureFactoryRepo", "x-ms-examples": { - "Factories_CreateOrUpdate": { - "$ref": "./examples/Factories_UpdateRepo.json" + "Factories_ConfigureFactoryRepo": { + "$ref": "./examples/Factories_ConfigureFactoryRepo.json" } }, "description": "Updates a factory's repo information.", @@ -2938,8 +2938,8 @@ "FactoryRepoUpdate": { "description": "Factory's VSTS repo information.", "properties": { - "factoryId": { - "description": "The factory id.", + "factoryResourceId": { + "description": "The factory resource id.", "type": "string" }, "resourceGroupName": { diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureFactoryRepo.json similarity index 100% rename from specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_UpdateRepo.json rename to specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/examples/Factories_ConfigureFactoryRepo.json