From 157caa36da18d1cd5dd296bfb317c9c281fd0b5b Mon Sep 17 00:00:00 2001 From: Navy Aziz Date: Thu, 9 May 2019 11:57:20 -0700 Subject: [PATCH 1/7] Add location based deleted Web Apps --- .../stable/2018-02-01/DeletedWebApps.json | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/DeletedWebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/DeletedWebApps.json index 6e3ffb106287..34b5008f2dac 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/DeletedWebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/DeletedWebApps.json @@ -49,6 +49,92 @@ "nextLinkName": "nextLink" } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Web/locations/{location}/deletedSites": { + "get": { + "tags": [ + "DeletedWebApps" + ], + "summary": "Get all deleted apps for a subscription at location", + "description": "Get all deleted apps for a subscription at location", + "operationId": "DeletedWebApps_ListByLocation", + "parameters": [ + { + "name": "location", + "in": "path", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DeletedWebAppCollection" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Web/locations/{location}/deletedSites/{deletedSiteId}": { + "get": { + "tags": [ + "DeletedWebApps" + ], + "summary": "Get deleted app for a subscription at location.", + "description": "Get deleted app for a subscription at location.", + "operationId": "DeletedWebApps_GetDeletedWebAppByLocation", + "parameters": [ + { + "name": "location", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "deletedSiteId", + "in": "path", + "description": "The numeric ID of the deleted app, e.g. 12345", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DeletedSite" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + } + } } }, "definitions": { From 310b5ada2616fb0b8f5808d6d1422df350d459e6 Mon Sep 17 00:00:00 2001 From: Navy Aziz Date: Thu, 9 May 2019 18:31:39 -0700 Subject: [PATCH 2/7] Add examples --- .../stable/2018-02-01/DeletedWebApps.json | 10 ++++++ .../examples/GetDeletedWebAppByLocation.json | 29 +++++++++++++++ .../ListDeletedWebAppsByLocation.json | 35 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/DeletedWebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/DeletedWebApps.json index 34b5008f2dac..48cba3ea56bc 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/DeletedWebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/DeletedWebApps.json @@ -86,6 +86,11 @@ } } }, + "x-ms-examples": { + "List Deleted Web App by Location": { + "$ref": "./examples/ListDeletedWebAppsByLocation.json" + } + }, "x-ms-pageable": { "nextLinkName": "nextLink" } @@ -133,6 +138,11 @@ "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" } } + }, + "x-ms-examples": { + "Get Deleted Web App by Location": { + "$ref": "./examples/GetDeletedWebAppByLocation.json" + } } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json new file mode 100644 index 000000000000..85af349c0800 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "2018-02-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/locations/West US 2/deletedSites/9", + "name": "wussite6", + "type": "Microsoft.Web/locations/deletedSites", + "properties": { + "deletedSiteId": 9, + "deletedTimestamp": "2019-05-09T22:29:05.1337007", + "subscription": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroup": "rg1", + "webSpace": "rg1-WestUS2webspace", + "stamp": "naveeda1", + "deletedSiteName": "wussite6", + "slot": "Production", + "kind": "app", + "geoRegionName": "West US 2", + "correlationId": null + } + } + } + } +} \ No newline at end of file diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json new file mode 100644 index 000000000000..e4dc79b957b7 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "2018-02-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/locations/West US 2/deletedSites/9", + "name": "wussite6", + "type": "Microsoft.Web/locations/deletedSites", + "properties": { + "deletedSiteId": 9, + "deletedTimestamp": "2019-05-09T22:29:05.1337007", + "subscription": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroup": "rg1", + "webSpace": "rg1-WestUS2webspace", + "stamp": "naveeda1", + "deletedSiteName": "wussite6", + "slot": "Production", + "kind": "app", + "geoRegionName": "West US 2", + "correlationId": null + } + } + ], + "nextLink": null, + "id": null + } + } + } +} \ No newline at end of file From 12fc2172b9ada283ce0a819baf6900593624186d Mon Sep 17 00:00:00 2001 From: Navy Aziz Date: Thu, 9 May 2019 18:54:57 -0700 Subject: [PATCH 3/7] Fix examples --- .../stable/2018-02-01/examples/GetDeletedWebAppByLocation.json | 2 ++ .../2018-02-01/examples/ListDeletedWebAppsByLocation.json | 1 + 2 files changed, 3 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json index 85af349c0800..ecc88d91d0d7 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json @@ -1,6 +1,8 @@ { "parameters": { "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "locations": "West US 2", + "deletedSiteId": "9", "api-version": "2018-02-01" }, "responses": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json index e4dc79b957b7..22919f4d5889 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json @@ -1,6 +1,7 @@ { "parameters": { "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "locations": "West US 2", "api-version": "2018-02-01" }, "responses": { From ac4495f9806d9d9ce33aad30f016b0d3d4ed6ed7 Mon Sep 17 00:00:00 2001 From: Navy Aziz Date: Thu, 9 May 2019 19:14:38 -0700 Subject: [PATCH 4/7] Remove additional properties. --- .../stable/2018-02-01/examples/GetDeletedWebAppByLocation.json | 2 -- .../2018-02-01/examples/ListDeletedWebAppsByLocation.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json index ecc88d91d0d7..f84cb14653e2 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json @@ -17,8 +17,6 @@ "deletedTimestamp": "2019-05-09T22:29:05.1337007", "subscription": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroup": "rg1", - "webSpace": "rg1-WestUS2webspace", - "stamp": "naveeda1", "deletedSiteName": "wussite6", "slot": "Production", "kind": "app", diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json index 22919f4d5889..dadc5580413b 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json @@ -18,8 +18,6 @@ "deletedTimestamp": "2019-05-09T22:29:05.1337007", "subscription": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroup": "rg1", - "webSpace": "rg1-WestUS2webspace", - "stamp": "naveeda1", "deletedSiteName": "wussite6", "slot": "Production", "kind": "app", From 2069a9836b230f8615e619e6babfd05dec08ba4e Mon Sep 17 00:00:00 2001 From: Navy Aziz Date: Thu, 9 May 2019 19:17:38 -0700 Subject: [PATCH 5/7] Fix typo in parameters --- .../stable/2018-02-01/examples/GetDeletedWebAppByLocation.json | 2 +- .../2018-02-01/examples/ListDeletedWebAppsByLocation.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json index f84cb14653e2..6f9597cc28de 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "locations": "West US 2", + "location": "West US 2", "deletedSiteId": "9", "api-version": "2018-02-01" }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json index dadc5580413b..470dd0ff1ca0 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "locations": "West US 2", + "location": "West US 2", "api-version": "2018-02-01" }, "responses": { From db3d9c6ef99776bfd93356f2a53788e470513d30 Mon Sep 17 00:00:00 2001 From: Navy Aziz Date: Thu, 9 May 2019 19:19:27 -0700 Subject: [PATCH 6/7] Remove more additional properties --- .../2018-02-01/examples/GetDeletedWebAppByLocation.json | 4 +--- .../2018-02-01/examples/ListDeletedWebAppsByLocation.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json index 6f9597cc28de..0f2997f9d2c3 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/GetDeletedWebAppByLocation.json @@ -9,7 +9,6 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/locations/West US 2/deletedSites/9", "name": "wussite6", "type": "Microsoft.Web/locations/deletedSites", "properties": { @@ -20,8 +19,7 @@ "deletedSiteName": "wussite6", "slot": "Production", "kind": "app", - "geoRegionName": "West US 2", - "correlationId": null + "geoRegionName": "West US 2" } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json index 470dd0ff1ca0..22bcd782b049 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json @@ -10,7 +10,6 @@ "body": { "value": [ { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/locations/West US 2/deletedSites/9", "name": "wussite6", "type": "Microsoft.Web/locations/deletedSites", "properties": { @@ -21,8 +20,7 @@ "deletedSiteName": "wussite6", "slot": "Production", "kind": "app", - "geoRegionName": "West US 2", - "correlationId": null + "geoRegionName": "West US 2" } } ], From 34b4dce6664ee1fabbbc44547c562848dc5ab128 Mon Sep 17 00:00:00 2001 From: Navy Aziz Date: Thu, 9 May 2019 19:25:16 -0700 Subject: [PATCH 7/7] Remove additional id property --- .../2018-02-01/examples/ListDeletedWebAppsByLocation.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json index 22bcd782b049..5bf67b152a92 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/examples/ListDeletedWebAppsByLocation.json @@ -24,8 +24,7 @@ } } ], - "nextLink": null, - "id": null + "nextLink": null } } }