From 2843040a2d787d73725b8f21a369c2ef198554aa Mon Sep 17 00:00:00 2001 From: Naveed Aziz Date: Fri, 10 Feb 2017 16:04:44 -0800 Subject: [PATCH] Removed the publishingcredentials API and re-added the publishingUsers API (#925) * Fixes for code review comments * Make resourcegroup the first parameter if applicable. * Address CR comments from https://github.com/Azure/azure-rest-api-specs/pull/761 * Address more comments on PR * Fix HTTP status codes for start/stop/restart app and deployment slots. Make SCM type read/write. Add Linux App Fx version. * Rename operation parameters with name options to avoid conflict with Node CLI SDK. Add config snapshots API. Add valid values for SCMType. * Fix CR recommendations. Remove obsolete siteAuthSettings properties * Surface the correct publishing user API * Expose hosttype for hostnames * Fix folder structure according to convention * Fix paths in composite swagger json * CR comment fix: Changed parameter name to userDetails. --- arm-web/2015-04-01/{ => swagger}/Domains.json | 0 .../{ => swagger}/TopLevelDomains.json | 0 .../AppServiceCertificateOrders.json | 0 .../{ => swagger}/Certificates.json | 0 .../{ => swagger}/DeletedWebApps.json | 12 ++ .../{ => swagger}/Recommendations.json | 0 .../{ => swagger}/ResourceProvider.json | 136 +++++++++--------- arm-web/2016-08-01/{ => swagger}/WebApps.json | 12 ++ .../{ => swagger}/AppServiceEnvironments.json | 12 ++ .../{ => swagger}/AppServicePlans.json | 12 ++ arm-web/compositeWebAppClient.json | 20 +-- 11 files changed, 123 insertions(+), 81 deletions(-) rename arm-web/2015-04-01/{ => swagger}/Domains.json (100%) rename arm-web/2015-04-01/{ => swagger}/TopLevelDomains.json (100%) rename arm-web/2015-08-01/{ => swagger}/AppServiceCertificateOrders.json (100%) rename arm-web/2016-03-01/{ => swagger}/Certificates.json (100%) rename arm-web/2016-03-01/{ => swagger}/DeletedWebApps.json (99%) rename arm-web/2016-03-01/{ => swagger}/Recommendations.json (100%) rename arm-web/2016-03-01/{ => swagger}/ResourceProvider.json (97%) rename arm-web/2016-08-01/{ => swagger}/WebApps.json (99%) rename arm-web/2016-09-01/{ => swagger}/AppServiceEnvironments.json (99%) rename arm-web/2016-09-01/{ => swagger}/AppServicePlans.json (99%) diff --git a/arm-web/2015-04-01/Domains.json b/arm-web/2015-04-01/swagger/Domains.json similarity index 100% rename from arm-web/2015-04-01/Domains.json rename to arm-web/2015-04-01/swagger/Domains.json diff --git a/arm-web/2015-04-01/TopLevelDomains.json b/arm-web/2015-04-01/swagger/TopLevelDomains.json similarity index 100% rename from arm-web/2015-04-01/TopLevelDomains.json rename to arm-web/2015-04-01/swagger/TopLevelDomains.json diff --git a/arm-web/2015-08-01/AppServiceCertificateOrders.json b/arm-web/2015-08-01/swagger/AppServiceCertificateOrders.json similarity index 100% rename from arm-web/2015-08-01/AppServiceCertificateOrders.json rename to arm-web/2015-08-01/swagger/AppServiceCertificateOrders.json diff --git a/arm-web/2016-03-01/Certificates.json b/arm-web/2016-03-01/swagger/Certificates.json similarity index 100% rename from arm-web/2016-03-01/Certificates.json rename to arm-web/2016-03-01/swagger/Certificates.json diff --git a/arm-web/2016-03-01/DeletedWebApps.json b/arm-web/2016-03-01/swagger/DeletedWebApps.json similarity index 99% rename from arm-web/2016-03-01/DeletedWebApps.json rename to arm-web/2016-03-01/swagger/DeletedWebApps.json index e4b1ee74171c..4e5656290c41 100644 --- a/arm-web/2016-03-01/DeletedWebApps.json +++ b/arm-web/2016-03-01/swagger/DeletedWebApps.json @@ -577,6 +577,18 @@ "toUpdate": { "description": "Set to true to update existing hostname.", "type": "boolean" + }, + "hostType": { + "description": "Indicates whether the hostname is a standard or repository hostname.", + "enum": [ + "Standard", + "Repository" + ], + "type": "string", + "x-ms-enum": { + "name": "HostType", + "modelAsString": false + } } } }, diff --git a/arm-web/2016-03-01/Recommendations.json b/arm-web/2016-03-01/swagger/Recommendations.json similarity index 100% rename from arm-web/2016-03-01/Recommendations.json rename to arm-web/2016-03-01/swagger/Recommendations.json diff --git a/arm-web/2016-03-01/ResourceProvider.json b/arm-web/2016-03-01/swagger/ResourceProvider.json similarity index 97% rename from arm-web/2016-03-01/ResourceProvider.json rename to arm-web/2016-03-01/swagger/ResourceProvider.json index 883974fb2994..bd002be0c7f8 100644 --- a/arm-web/2016-03-01/ResourceProvider.json +++ b/arm-web/2016-03-01/swagger/ResourceProvider.json @@ -9,6 +9,70 @@ "https" ], "paths": { + "/providers/Microsoft.Web/publishingUsers/web": { + "get": { + "summary": "Gets publishing user", + "description": "Gets publishing user", + "operationId": "GetPublishingUser", + "produces": [ + "application/json", + "text/json", + "application/xml", + "text/xml" + ], + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/User" + } + } + } + }, + "put": { + "summary": "Updates publishing user", + "description": "Updates publishing user", + "operationId": "UpdatePublishingUser", + "consumes": [ + "application/json", + "text/json", + "application/x-www-form-urlencoded" + ], + "produces": [ + "application/json", + "text/json", + "application/xml", + "text/xml" + ], + "parameters": [ + { + "name": "userDetails", + "in": "body", + "description": "Details of publishing user", + "required": true, + "schema": { + "$ref": "#/definitions/User" + } + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/User" + } + } + } + } + }, "/providers/Microsoft.Web/sourcecontrols": { "get": { "summary": "Gets the source controls available for Azure websites.", @@ -130,7 +194,7 @@ } }, "/subscriptions/{subscriptionId}/providers/Microsoft.Web/geoRegions": { - "post": { + "get": { "summary": "Get a list of available geographical regions.", "description": "Get a list of available geographical regions.", "operationId": "ListGeoRegions", @@ -207,76 +271,6 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Web/publishingCredentials": { - "get": { - "summary": "Get the publishing credentials for the subscription owner.", - "description": "Get the publishing credentials for the subscription owner.", - "operationId": "GetPublishingCredentials", - "produces": [ - "application/json", - "text/json", - "application/xml", - "text/xml" - ], - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/User" - } - } - } - }, - "put": { - "summary": "Update the publishing credentials for the subscription owner.", - "description": "Update the publishing credentials for the subscription owner.", - "operationId": "UpdatePublishingCredentials", - "consumes": [ - "application/json", - "text/json", - "application/x-www-form-urlencoded" - ], - "produces": [ - "application/json", - "text/json", - "application/xml", - "text/xml" - ], - "parameters": [ - { - "name": "requestMessage", - "in": "body", - "description": "A request message with the new publishing credentials.", - "required": true, - "schema": { - "$ref": "#/definitions/User" - } - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/User" - } - } - } - } - }, "/subscriptions/{subscriptionId}/providers/Microsoft.Web/skus": { "get": { "summary": "List all SKUs.", diff --git a/arm-web/2016-08-01/WebApps.json b/arm-web/2016-08-01/swagger/WebApps.json similarity index 99% rename from arm-web/2016-08-01/WebApps.json rename to arm-web/2016-08-01/swagger/WebApps.json index c001dca77151..f8c923fc70f2 100644 --- a/arm-web/2016-08-01/WebApps.json +++ b/arm-web/2016-08-01/swagger/WebApps.json @@ -11992,6 +11992,18 @@ "toUpdate": { "description": "Set to true to update existing hostname.", "type": "boolean" + }, + "hostType": { + "description": "Indicates whether the hostname is a standard or repository hostname.", + "enum": [ + "Standard", + "Repository" + ], + "type": "string", + "x-ms-enum": { + "name": "HostType", + "modelAsString": false + } } } }, diff --git a/arm-web/2016-09-01/AppServiceEnvironments.json b/arm-web/2016-09-01/swagger/AppServiceEnvironments.json similarity index 99% rename from arm-web/2016-09-01/AppServiceEnvironments.json rename to arm-web/2016-09-01/swagger/AppServiceEnvironments.json index e5377c075103..3b208e20aba3 100644 --- a/arm-web/2016-09-01/AppServiceEnvironments.json +++ b/arm-web/2016-09-01/swagger/AppServiceEnvironments.json @@ -2599,6 +2599,18 @@ "toUpdate": { "description": "Set to true to update existing hostname.", "type": "boolean" + }, + "hostType": { + "description": "Indicates whether the hostname is a standard or repository hostname.", + "enum": [ + "Standard", + "Repository" + ], + "type": "string", + "x-ms-enum": { + "name": "HostType", + "modelAsString": false + } } } }, diff --git a/arm-web/2016-09-01/AppServicePlans.json b/arm-web/2016-09-01/swagger/AppServicePlans.json similarity index 99% rename from arm-web/2016-09-01/AppServicePlans.json rename to arm-web/2016-09-01/swagger/AppServicePlans.json index 8cb842d04d85..cd135254b66e 100644 --- a/arm-web/2016-09-01/AppServicePlans.json +++ b/arm-web/2016-09-01/swagger/AppServicePlans.json @@ -1752,6 +1752,18 @@ "toUpdate": { "description": "Set to true to update existing hostname.", "type": "boolean" + }, + "hostType": { + "description": "Indicates whether the hostname is a standard or repository hostname.", + "enum": [ + "Standard", + "Repository" + ], + "type": "string", + "x-ms-enum": { + "name": "HostType", + "modelAsString": false + } } } }, diff --git a/arm-web/compositeWebAppClient.json b/arm-web/compositeWebAppClient.json index 1bb2203862d9..f84682a76f5e 100644 --- a/arm-web/compositeWebAppClient.json +++ b/arm-web/compositeWebAppClient.json @@ -4,15 +4,15 @@ "description": "Composite Swagger for WebSite Management Client" }, "documents": [ - "./2015-08-01/AppServiceCertificateOrders.json", - "./2016-09-01/AppServiceEnvironments.json", - "./2016-09-01/AppServicePlans.json", - "./2016-03-01/Certificates.json", - "./2015-04-01/Domains.json", - "./2016-03-01/Recommendations.json", - "./2016-03-01/ResourceProvider.json", - "./2015-04-01/TopLevelDomains.json", - "./2016-08-01/WebApps.json", - "./2016-03-01/DeletedWebApps.json" + "./2015-08-01/swagger/AppServiceCertificateOrders.json", + "./2016-09-01/swagger/AppServiceEnvironments.json", + "./2016-09-01/swagger/AppServicePlans.json", + "./2016-03-01/swagger/Certificates.json", + "./2015-04-01/swagger/Domains.json", + "./2016-03-01/swagger/Recommendations.json", + "./2016-03-01/swagger/ResourceProvider.json", + "./2015-04-01/swagger/TopLevelDomains.json", + "./2016-08-01/swagger/WebApps.json", + "./2016-03-01/swagger/DeletedWebApps.json" ] }