From 3d966288694cc430995ccb6cb5e78ce7a0663d07 Mon Sep 17 00:00:00 2001 From: James Davis Date: Mon, 6 May 2019 09:01:21 -0700 Subject: [PATCH 01/12] Updating WorkItemConfig API to define GET and PATCH --- .../componentWorkItemConfigs_API.json | 79 ++++++++++++++++++- .../examples/WorkItemConfigGet.json | 14 ++++ .../examples/WorkItemConfigUpdate.json | 15 ++++ 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigGet.json create mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index 519047579653..7bb282625f16 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -173,7 +173,7 @@ "responses": { "200": { "description": "The work item configuration that was successfully deleted.", - "schema": { + "schema": { } } }, @@ -182,6 +182,83 @@ "$ref": "./examples/WorkItemConfigDelete.json" } } + }, + "get": { + "description": "Gets specified work item configuration for an Application Insights component.", + "operationId": "WorkItemConfiguration_GetItem", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + }, + { + "$ref": "#/parameters/WorkItemConfigIdParameter" + } + ], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "$ref": "#/definitions/WorkItemConfiguration" + } + } + }, + "x-ms-examples": { + "WorkItemConfigurationsGetDefault": { + "$ref": "./examples/WorkItemConfigGet.json" + } + } + }, + "patch" : { + "description": "Update a work item configuration for an Application Insights component.", + "operationId": "WorkItemConfiguration_Update", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + }, + { + "$ref": "#/parameters/WorkItemConfigIdParameter" + }, + { + "name": "WorkItemConfigurationProperties", + "description": "Properties that need to be specified to update a work item configuration for this Application Insights component.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/WorkItemCreateConfiguration" + } + } + ], + "responses": { + "200": { + "description": "Successful operation indicating the config updated by this PATCH call.", + "schema": { + "$ref": "#/definitions/WorkItemConfiguration" + } + } + }, + "x-ms-examples": { + "WorkItemConfigurationsCreate": { + "$ref": "./examples/WorkItemConfigUpdate.json" + } + } } } }, diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigGet.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigGet.json new file mode 100644 index 000000000000..95109efeb9a0 --- /dev/null +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigGet.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "api-version": "2015-05-01", + "subscriptionId": "subid", + "resourceGroupName": "my-resource-group", + "resourceName": "my-component", + "workItemConfigId" : "Visual Studio Team Services" + }, + "responses": { + "200": { + "body": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","IsDefault":true,"ConfigDisplayName":"Visual Studio Team Services","Id":"Visual Studio Team Services","ConfigProperties":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}"} + } + } +} \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json new file mode 100644 index 000000000000..2e1cff8332e5 --- /dev/null +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "api-version": "2015-05-01", + "subscriptionId": "subid", + "resourceGroupName": "my-resource-group", + "resourceName": "my-component", + "workItemConfigId" : "Visual Studio Team Services", + "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":{"VSOAccountBaseUrl":"https://testtodelete.visualstudio.com","ProjectCollection":"DefaultCollection","Project":"todeletefirst","ResourceId":"d0662b05-439a-4a1b-840b-33a7f8b42ebf","Custom":"{\"/fields/System.WorkItemType\":\"Bug\",\"/fields/System.AreaPath\":\"todeletefirst\",\"/fields/System.AssignedTo\":\"\"}"},"WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":"true"} + }, + "responses": { + "200": { + "body": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","IsDefault":true,"ConfigDisplayName":"Visual Studio Team Services","Id":"Visual Studio Team Services","ConfigProperties":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}"} + } + } +} \ No newline at end of file From ef49556f5d9fc8c8d73e47af7a493dc4a9b7e26c Mon Sep 17 00:00:00 2001 From: James Davis Date: Mon, 6 May 2019 09:04:58 -0700 Subject: [PATCH 02/12] Quick clean up of DELETED schema --- .../stable/2015-05-01/componentWorkItemConfigs_API.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index 7bb282625f16..286ad17f2598 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -173,8 +173,7 @@ "responses": { "200": { "description": "The work item configuration that was successfully deleted.", - "schema": { - } + "schema": { } } }, "x-ms-examples": { From 98bdd2f82aafc437907850860b9a81ab8e7fc097 Mon Sep 17 00:00:00 2001 From: James Davis Date: Mon, 6 May 2019 09:18:57 -0700 Subject: [PATCH 03/12] Updating based on Lint recommendation --- .../stable/2015-05-01/componentWorkItemConfigs_API.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index 286ad17f2598..9dcf8d206e0d 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -184,7 +184,7 @@ }, "get": { "description": "Gets specified work item configuration for an Application Insights component.", - "operationId": "WorkItemConfiguration_GetItem", + "operationId": "WorkItemConfigurations_GetItem", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" @@ -218,7 +218,7 @@ }, "patch" : { "description": "Update a work item configuration for an Application Insights component.", - "operationId": "WorkItemConfiguration_Update", + "operationId": "WorkItemConfigurations_UpdateItem", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" From f72b3b5522afdd709efc95d06de391af9e4172f0 Mon Sep 17 00:00:00 2001 From: James Davis Date: Mon, 6 May 2019 10:01:29 -0700 Subject: [PATCH 04/12] Fixing examples errors --- .../stable/2015-05-01/componentWorkItemConfigs_API.json | 2 +- .../stable/2015-05-01/examples/WorkItemConfigUpdate.json | 2 +- .../stable/2015-05-01/examples/WorkItemConfigsCreate.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index 9dcf8d206e0d..fa5ada27c955 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -318,7 +318,7 @@ "description": "Boolean indicating validate only" }, "WorkItemProperties": { - "type": "string", + "type": "array", "description": "Custom work item properties" } } diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json index 2e1cff8332e5..2e9529ca4a99 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json @@ -5,7 +5,7 @@ "resourceGroupName": "my-resource-group", "resourceName": "my-component", "workItemConfigId" : "Visual Studio Team Services", - "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":{"VSOAccountBaseUrl":"https://testtodelete.visualstudio.com","ProjectCollection":"DefaultCollection","Project":"todeletefirst","ResourceId":"d0662b05-439a-4a1b-840b-33a7f8b42ebf","Custom":"{\"/fields/System.WorkItemType\":\"Bug\",\"/fields/System.AreaPath\":\"todeletefirst\",\"/fields/System.AssignedTo\":\"\"}"},"WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":"true"} + "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"Custom\":\"{\\\"/fields/System.WorkItemType\\\":\\\"Bug\\\",\\\"/fields/System.AreaPath\\\":\\\"todeletefirst\\\",\\\"/fields/System.AssignedTo\\\":\\\"\\\"}\"}","WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":"true"} }, "responses": { "200": { diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json index 48be36a02728..be4324779535 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json @@ -4,7 +4,7 @@ "subscriptionId": "subid", "resourceGroupName": "my-resource-group", "resourceName": "my-component", - "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":{"VSOAccountBaseUrl":"https://testtodelete.visualstudio.com","ProjectCollection":"DefaultCollection","Project":"todeletefirst","ResourceId":"d0662b05-439a-4a1b-840b-33a7f8b42ebf","Custom":"{\"/fields/System.WorkItemType\":\"Bug\",\"/fields/System.AreaPath\":\"todeletefirst\",\"/fields/System.AssignedTo\":\"\"}"},"WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":"true"} + "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"Custom\":\"{\\\"/fields/System.WorkItemType\\\":\\\"Bug\\\",\\\"/fields/System.AreaPath\\\":\\\"todeletefirst\\\",\\\"/fields/System.AssignedTo\\\":\\\"\\\"}\"}","WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":true} }, "responses": { "200": { From 3adf0cd5a308f942814c0c0c2778d1579dbc0fd3 Mon Sep 17 00:00:00 2001 From: James Davis Date: Mon, 6 May 2019 10:06:25 -0700 Subject: [PATCH 05/12] Fixing Config Object to allow freeform dictionary --- .../stable/2015-05-01/componentWorkItemConfigs_API.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index fa5ada27c955..1709ae4a7e88 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -314,11 +314,12 @@ "description": "Serialized JSON object for detailed properties" }, "ValidateOnly": { - "type": "boolean", - "description": "Boolean indicating validate only" + "type": "string", + "description": "True or false string indicating validate only" }, "WorkItemProperties": { - "type": "array", + "type": "object", + "additionalProperties" : "string", "description": "Custom work item properties" } } From 760ab4c62f8d4cfaefc42a8857accae8a09f3b36 Mon Sep 17 00:00:00 2001 From: James Davis Date: Mon, 6 May 2019 10:11:21 -0700 Subject: [PATCH 06/12] Fixing Config Object to allow freeform dictionary --- .../stable/2015-05-01/componentWorkItemConfigs_API.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index 1709ae4a7e88..40fbf3a1f31e 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -319,7 +319,9 @@ }, "WorkItemProperties": { "type": "object", - "additionalProperties" : "string", + "additionalProperties": { + "type": "string" + }, "description": "Custom work item properties" } } From dba45619b38251efd81f7e3c35f4f9bd4cb77f6f Mon Sep 17 00:00:00 2001 From: James Davis Date: Mon, 6 May 2019 10:11:37 -0700 Subject: [PATCH 07/12] Fixing Config Object to allow freeform dictionary --- .../stable/2015-05-01/examples/WorkItemConfigsCreate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json index be4324779535..c56eb00e4506 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json @@ -4,7 +4,7 @@ "subscriptionId": "subid", "resourceGroupName": "my-resource-group", "resourceName": "my-component", - "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"Custom\":\"{\\\"/fields/System.WorkItemType\\\":\\\"Bug\\\",\\\"/fields/System.AreaPath\\\":\\\"todeletefirst\\\",\\\"/fields/System.AssignedTo\\\":\\\"\\\"}\"}","WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":true} + "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"Custom\":\"{\\\"/fields/System.WorkItemType\\\":\\\"Bug\\\",\\\"/fields/System.AreaPath\\\":\\\"todeletefirst\\\",\\\"/fields/System.AssignedTo\\\":\\\"\\\"}\"}","WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":"true"} }, "responses": { "200": { From d56af842e6fbf4fbec4d487faed8cf84eb028262 Mon Sep 17 00:00:00 2001 From: James Davis Date: Thu, 9 May 2019 12:09:05 -0700 Subject: [PATCH 08/12] Suggestions by Tom and Marcin --- .../componentWorkItemConfigs_API.json | 6 ++-- .../examples/WorkItemConfigCreate.json | 28 +++++++++++++++++++ .../examples/WorkItemConfigDefaultGet.json | 8 +++++- .../examples/WorkItemConfigDelete.json | 2 +- .../examples/WorkItemConfigGet.json | 8 +++++- .../examples/WorkItemConfigUpdate.json | 26 +++++++++++++++-- .../examples/WorkItemConfigsCreate.json | 14 ---------- .../examples/WorkItemConfigsGet.json | 17 ++++++++++- 8 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigCreate.json delete mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index 40fbf3a1f31e..62f403bf4108 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -111,7 +111,7 @@ }, "x-ms-examples": { "WorkItemConfigurationsCreate": { - "$ref": "./examples/WorkItemConfigsCreate.json" + "$ref": "./examples/WorkItemConfigCreate.json" } } } @@ -314,8 +314,8 @@ "description": "Serialized JSON object for detailed properties" }, "ValidateOnly": { - "type": "string", - "description": "True or false string indicating validate only" + "type": "boolean", + "description": "Boolean indicating validate only" }, "WorkItemProperties": { "type": "object", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigCreate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigCreate.json new file mode 100644 index 000000000000..161dcccd6e33 --- /dev/null +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigCreate.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "api-version": "2015-05-01", + "subscriptionId": "subid", + "resourceGroupName": "my-resource-group", + "resourceName": "my-component", + "WorkItemConfigurationProperties": { + "ConnectorId": "d334e2a4-6733-488e-8645-a9fdc1694f41", + "ConnectorDataConfiguration": "{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"Custom\":\"{\\\"/fields/System.WorkItemType\\\":\\\"Bug\\\",\\\"/fields/System.AreaPath\\\":\\\"todeletefirst\\\",\\\"/fields/System.AssignedTo\\\":\\\"\\\"}\"}", + "WorkItemProperties": [ + { + "name": "Title", + "value": "Validate Only Title" + }, + { + "name": "Description", + "value": "Validate Only Description" + } + ], + "ValidateOnly": "true" + } + }, + "responses": { + "200": { + "body": {} + } + } +} \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDefaultGet.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDefaultGet.json index 0091ef21820a..c64e4f26b047 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDefaultGet.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDefaultGet.json @@ -7,7 +7,13 @@ }, "responses": { "200": { - "body": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","IsDefault":true,"ConfigDisplayName":"Visual Studio Team Services","Id":"Visual Studio Team Services","ConfigProperties":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}"} + "body": { + "ConnectorId": "d334e2a4-6733-488e-8645-a9fdc1694f41", + "IsDefault": true, + "ConfigDisplayName": "Visual Studio Team Services", + "Id": "Visual Studio Team Services", + "ConfigProperties": "{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}" + } } } } \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json index 015d47baa0a8..05db542a77bb 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json @@ -8,7 +8,7 @@ }, "responses": { "200": { - "body": {} + "body": { } } } } \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigGet.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigGet.json index 95109efeb9a0..113066f65184 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigGet.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigGet.json @@ -8,7 +8,13 @@ }, "responses": { "200": { - "body": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","IsDefault":true,"ConfigDisplayName":"Visual Studio Team Services","Id":"Visual Studio Team Services","ConfigProperties":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}"} + "body": { + "ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41", + "IsDefault":true, + "ConfigDisplayName":"Visual Studio Team Services", + "Id":"Visual Studio Team Services", + "ConfigProperties":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}" + } } } } \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json index 2e9529ca4a99..957c7d892feb 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json @@ -4,12 +4,32 @@ "subscriptionId": "subid", "resourceGroupName": "my-resource-group", "resourceName": "my-component", - "workItemConfigId" : "Visual Studio Team Services", - "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"Custom\":\"{\\\"/fields/System.WorkItemType\\\":\\\"Bug\\\",\\\"/fields/System.AreaPath\\\":\\\"todeletefirst\\\",\\\"/fields/System.AssignedTo\\\":\\\"\\\"}\"}","WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":"true"} + "workItemConfigId": "Visual Studio Team Services", + "WorkItemConfigurationProperties": { + "ConnectorId": "d334e2a4-6733-488e-8645-a9fdc1694f41", + "ConnectorDataConfiguration": "{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"Custom\":\"{\\\"/fields/System.WorkItemType\\\":\\\"Bug\\\",\\\"/fields/System.AreaPath\\\":\\\"todeletefirst\\\",\\\"/fields/System.AssignedTo\\\":\\\"\\\"}\"}", + "WorkItemProperties": [ + { + "name": "Title", + "value": "Validate Only Title" + }, + { + "name": "Description", + "value": "Validate Only Description" + } + ], + "ValidateOnly": "true" + } }, "responses": { "200": { - "body": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","IsDefault":true,"ConfigDisplayName":"Visual Studio Team Services","Id":"Visual Studio Team Services","ConfigProperties":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}"} + "body": { + "ConnectorId": "d334e2a4-6733-488e-8645-a9fdc1694f41", + "IsDefault": true, + "ConfigDisplayName": "Visual Studio Team Services", + "Id": "Visual Studio Team Services", + "ConfigProperties": "{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}" + } } } } \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json deleted file mode 100644 index c56eb00e4506..000000000000 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "api-version": "2015-05-01", - "subscriptionId": "subid", - "resourceGroupName": "my-resource-group", - "resourceName": "my-component", - "WorkItemConfigurationProperties": {"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","ConnectorDataConfiguration":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"d0662b05-439a-4a1b-840b-33a7f8b42ebf\",\"Custom\":\"{\\\"/fields/System.WorkItemType\\\":\\\"Bug\\\",\\\"/fields/System.AreaPath\\\":\\\"todeletefirst\\\",\\\"/fields/System.AssignedTo\\\":\\\"\\\"}\"}","WorkItemProperties":[{"name":"Title","value":"Validate Only Title"},{"name":"Description","value":"Validate Only Description"}],"ValidateOnly":"true"} - }, - "responses": { - "200": { - "body": {} - } - } -} \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsGet.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsGet.json index 7ad77c1dfc2f..4e954674ced9 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsGet.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsGet.json @@ -7,7 +7,22 @@ }, "responses": { "200": { - "body": [{"ConnectorId":"d334e2a4-6733-488e-8645-a9fdc1694f41","IsDefault":true,"ConfigDisplayName":"Visual Studio Team Services","Id":"Visual Studio Team Services","ConfigProperties":"{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"b370eeb2-5dff-4838-8253-ec3014b2c706\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}"},{"ConnectorId":"4C89E219-D47E-4C14-866A-018D6D634CF3","IsDefault":false,"ConfigDisplayName":"GitHub","Id":"GitHub","ConfigProperties":"{\"GitHubAccountUrl\":\"https://github.com/jpiyali/testrepository\",\"ResourceId\":\"b370eeb2-5dff-4838-8253-ec3014b2c706\"}"}] + "body": [ + { + "ConnectorId": "d334e2a4-6733-488e-8645-a9fdc1694f41", + "IsDefault": true, + "ConfigDisplayName": "Visual Studio Team Services", + "Id": "Visual Studio Team Services", + "ConfigProperties": "{\"VSOAccountBaseUrl\":\"https://testtodelete.visualstudio.com\",\"ProjectCollection\":\"DefaultCollection\",\"Project\":\"todeletefirst\",\"ResourceId\":\"b370eeb2-5dff-4838-8253-ec3014b2c706\",\"ConfigurationType\":\"Standard\",\"WorkItemType\":\"Bug\",\"AreaPath\":\"todeletefirst\",\"AssignedTo\":\"\"}" + }, + { + "ConnectorId": "4C89E219-D47E-4C14-866A-018D6D634CF3", + "IsDefault": false, + "ConfigDisplayName": "GitHub", + "Id": "GitHub", + "ConfigProperties": "{\"GitHubAccountUrl\":\"https://github.com/jpiyali/testrepository\",\"ResourceId\":\"b370eeb2-5dff-4838-8253-ec3014b2c706\"}" + } + ] } } } \ No newline at end of file From afbfaa9d7efc1a0ae5867abbe94cdc2b9606265d Mon Sep 17 00:00:00 2001 From: James Davis Date: Thu, 9 May 2019 12:17:57 -0700 Subject: [PATCH 09/12] Removing extra file from merge --- .../examples/WorkItemConfigsCreate.json | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json deleted file mode 100644 index aa1a78b8ea77..000000000000 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigsCreate.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parameters": { - "api-version": "2015-05-01", - "subscriptionId": "subid", - "resourceGroupName": "my-resource-group", - "resourceName": "my-component", - "WorkItemConfigurationProperties": { - "ConnectorId": "d334e2a4-6733-488e-8645-a9fdc1694f41", - "ConnectorDataConfiguration": { - "VSOAccountBaseUrl": "https://testtodelete.visualstudio.com", - "ProjectCollection": "DefaultCollection", - "Project": "todeletefirst", - "ResourceId": "d0662b05-439a-4a1b-840b-33a7f8b42ebf", - "Custom": "{\"/fields/System.WorkItemType\":\"Bug\",\"/fields/System.AreaPath\":\"todeletefirst\",\"/fields/System.AssignedTo\":\"\"}" - }, - "WorkItemProperties": [ - { - "name": "Title", - "value": "Validate Only Title" - }, - { - "name": "Description", - "value": "Validate Only Description" - } - ], - "ValidateOnly": "true" - } - }, - "responses": { - "200": { - "body": {} - } - } -} From 0e5712a6f54b62481679ec07d3f63857934c676e Mon Sep 17 00:00:00 2001 From: James Davis Date: Thu, 9 May 2019 12:20:19 -0700 Subject: [PATCH 10/12] Merge dumbness --- .../stable/2015-05-01/examples/WorkItemConfigDelete.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json index 29d5b9ded4a4..23bca180c1de 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json @@ -8,11 +8,7 @@ }, "responses": { "200": { -<<<<<<< HEAD "body": { } -======= - "body": {} ->>>>>>> b0102148dfca8881e7144a4dd902f9d7aa022aea } } } From 9e4b98fcdd0e04fe19dfed9a7af6f82529297ab0 Mon Sep 17 00:00:00 2001 From: James Davis Date: Thu, 9 May 2019 12:20:35 -0700 Subject: [PATCH 11/12] Merge fix --- .../stable/2015-05-01/componentWorkItemConfigs_API.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index 490cfbb14b2b..0767f24e563d 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -173,11 +173,7 @@ "responses": { "200": { "description": "The work item configuration that was successfully deleted.", -<<<<<<< HEAD "schema": { } -======= - "schema": {} ->>>>>>> b0102148dfca8881e7144a4dd902f9d7aa022aea } }, "x-ms-examples": { From f02d2102feffe4bb803287aa5f77444d726a6af5 Mon Sep 17 00:00:00 2001 From: James Davis Date: Thu, 9 May 2019 13:31:55 -0700 Subject: [PATCH 12/12] Fixing validation --- .../stable/2015-05-01/examples/WorkItemConfigCreate.json | 2 +- .../stable/2015-05-01/examples/WorkItemConfigUpdate.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigCreate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigCreate.json index 161dcccd6e33..7ac6f85ef5e2 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigCreate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigCreate.json @@ -17,7 +17,7 @@ "value": "Validate Only Description" } ], - "ValidateOnly": "true" + "ValidateOnly": true } }, "responses": { diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json index 957c7d892feb..7240cc900859 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigUpdate.json @@ -18,7 +18,7 @@ "value": "Validate Only Description" } ], - "ValidateOnly": "true" + "ValidateOnly": true } }, "responses": {