From 1b3bfe4471a84159d5e5fc3fa7da8136a2452872 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Fri, 15 Feb 2019 11:09:32 -0800 Subject: [PATCH 01/17] Create billing.json Adding swagger --- .../preview/2018-11-01-preview/billing.json | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json new file mode 100644 index 000000000000..aaf9912b5e3b --- /dev/null +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json @@ -0,0 +1,159 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-11-01-preview", + "title": "BillingManagementClient", + "description": "Billing client provides access to billing resources for Azure subscriptions." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/cancel": { + "post": { + "operationId": "CancelSubscription", + "description": "Cancels the subscription", + "parameters": [ + { + "name": "subscriptionId", + "in": "path", + "description": "Subscription Id.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "tags": [ + "SubscriptionController" + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/CancelSubscriptionResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "paths": { + "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { + "post": { + "operationId": "RenameSubscription", + "description": "Renames the subscription", + "parameters": [ + { + "name": "subscriptionId", + "in": "path", + "description": "Subscription Id.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "tags": [ + "SubscriptionController" + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/RenameSubscriptionResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "CancelSubscriptionResult": { + "description": "Canceled Subscription Id", + "properties": { + "value": { + "description": "Canceled Subscription Id", + "type": "string", + "readOnly": true + } + } + }, + "RenameSubscriptionResult": { + "description": "Renamed Subscription Id", + "properties": { + "value": { + "description": "Renamed Subscription Id", + "type": "string", + "readOnly": true + } + } + }, + "ErrorDetails": { + "description": "The details of the error.", + "properties": { + "code": { + "description": "Error code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Error message indicating why the operation failed.", + "type": "string", + "readOnly": true + }, + "target": { + "description": "The target of the particular error.", + "type": "string", + "readOnly": true + } + } + }, + "ErrorResponse": { + "description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message.", + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDetails" + } + } + } + }, + "parameters": { + "apiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Version of the API to be used with the client request. The current version is 2018-11-01-preview." + }, + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Azure Subscription ID.", + "required": true, + "type": "string" + } + } + } \ No newline at end of file From e217366f0c6eaabeae731509d856e98dd852e567 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Fri, 15 Feb 2019 14:04:35 -0800 Subject: [PATCH 02/17] Update billing.json fix error --- .../preview/2018-11-01-preview/billing.json | 66 +++++++++---------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json index aaf9912b5e3b..67dd19c8ef7f 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json @@ -50,45 +50,43 @@ } } } - } - }, - "paths": { - "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { - "post": { - "operationId": "RenameSubscription", - "description": "Renames the subscription", - "parameters": [ - { - "name": "subscriptionId", - "in": "path", - "description": "Subscription Id.", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/apiVersionParameter" + }, + "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { + "post": { + "operationId": "RenameSubscription", + "description": "Renames the subscription", + "parameters": [ + { + "name": "subscriptionId", + "in": "path", + "description": "Subscription Id.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "tags": [ + "SubscriptionController" + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/RenameSubscriptionResult" } - ], - "tags": [ - "SubscriptionController" - ], - "responses": { - "200": { - "description": "OK. The request has succeeded.", - "schema": { - "$ref": "#/definitions/RenameSubscriptionResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" } } } } - }, + } + }, "definitions": { "CancelSubscriptionResult": { "description": "Canceled Subscription Id", From f29e13dcd4c8ab3531d76ca8ceba444a9c41c489 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Tue, 19 Feb 2019 11:27:36 -0800 Subject: [PATCH 03/17] Feedback changes Feedback changes --- .../preview/2018-11-01-preview/billing.json | 157 ------------------ .../2018-11-01-preview/subscriptions.json | 100 ++++++++++- 2 files changed, 92 insertions(+), 165 deletions(-) delete mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json deleted file mode 100644 index 67dd19c8ef7f..000000000000 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2018-11-01-preview", - "title": "BillingManagementClient", - "description": "Billing client provides access to billing resources for Azure subscriptions." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/cancel": { - "post": { - "operationId": "CancelSubscription", - "description": "Cancels the subscription", - "parameters": [ - { - "name": "subscriptionId", - "in": "path", - "description": "Subscription Id.", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "tags": [ - "SubscriptionController" - ], - "responses": { - "200": { - "description": "OK. The request has succeeded.", - "schema": { - "$ref": "#/definitions/CancelSubscriptionResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { - "post": { - "operationId": "RenameSubscription", - "description": "Renames the subscription", - "parameters": [ - { - "name": "subscriptionId", - "in": "path", - "description": "Subscription Id.", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "tags": [ - "SubscriptionController" - ], - "responses": { - "200": { - "description": "OK. The request has succeeded.", - "schema": { - "$ref": "#/definitions/RenameSubscriptionResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "CancelSubscriptionResult": { - "description": "Canceled Subscription Id", - "properties": { - "value": { - "description": "Canceled Subscription Id", - "type": "string", - "readOnly": true - } - } - }, - "RenameSubscriptionResult": { - "description": "Renamed Subscription Id", - "properties": { - "value": { - "description": "Renamed Subscription Id", - "type": "string", - "readOnly": true - } - } - }, - "ErrorDetails": { - "description": "The details of the error.", - "properties": { - "code": { - "description": "Error code.", - "type": "string", - "readOnly": true - }, - "message": { - "description": "Error message indicating why the operation failed.", - "type": "string", - "readOnly": true - }, - "target": { - "description": "The target of the particular error.", - "type": "string", - "readOnly": true - } - } - }, - "ErrorResponse": { - "description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message.", - "type": "object", - "properties": { - "error": { - "$ref": "#/definitions/ErrorDetails" - } - } - } - }, - "parameters": { - "apiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Version of the API to be used with the client request. The current version is 2018-11-01-preview." - }, - "subscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Azure Subscription ID.", - "required": true, - "type": "string" - } - } - } \ No newline at end of file diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json index befc022f5aac..34d231f47a55 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json @@ -56,6 +56,12 @@ } }, "responses": { + "200": { + "description": "Successful completion of the asynchronous operation", + "schema": { + "$ref": "#/definitions/SubscriptionCreationResult" + } + }, "202": { "description": "Accepted. Subscription update is in progress.", "headers": { @@ -68,12 +74,6 @@ "type": "integer" } } - }, - "200": { - "description": "Successful completion of the asynchronous operation", - "schema": { - "$ref": "#/definitions/SubscriptionCreationResult" - } } }, "parameters": [ @@ -156,6 +156,70 @@ } ] } + }, + "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/cancel": { + "post": { + "operationId": "CancelSubscription", + "description": "Cancels the subscription", + "parameters": [ + { + "name": "subscriptionId", + "in": "path", + "description": "Subscription Id.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/CanceledSubscriptionId" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { + "post": { + "operationId": "RenameSubscription", + "description": "Renames the subscription", + "parameters": [ + { + "name": "subscriptionId", + "in": "path", + "description": "Subscription Id.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/RenamedSubscriptionId" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } } }, "definitions": { @@ -191,10 +255,10 @@ "description": "rbac owner of the subscription", "$ref": "#/definitions/AdPrincipal" }, - "additionalParameters": { + "additionalParameters": { "description": "Additional, untyped parameters to support custom subscription creation scenarios.", "type": "object", - "additionalProperties": { + "additionalProperties": { "type": "object" } } @@ -298,6 +362,26 @@ } } } + }, + "CanceledSubscriptionId": { + "description": "Canceled Subscription Id", + "properties": { + "value": { + "description": "Canceled Subscription Id", + "type": "string", + "readOnly": true + } + } + }, + "RenamedSubscriptionId": { + "description": "Renamed Subscription Id", + "properties": { + "value": { + "description": "Renamed Subscription Id", + "type": "string", + "readOnly": true + } + } } }, "parameters": { From 824a21bb35dc5cc8287ec52f67022b95db4fd94d Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Tue, 19 Feb 2019 18:08:42 -0800 Subject: [PATCH 04/17] Update subscriptions.json Changing rename API to patch --- .../preview/2018-11-01-preview/subscriptions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json index 34d231f47a55..22e6f98309e2 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json @@ -190,7 +190,7 @@ } }, "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { - "post": { + "patch": { "operationId": "RenameSubscription", "description": "Renames the subscription", "parameters": [ From 425c92a1e2e3ad195450db2c8a29a2dd13018ee4 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Thu, 21 Feb 2019 17:54:34 -0800 Subject: [PATCH 05/17] Update subscriptions.json feedback changes --- .../2018-11-01-preview/subscriptions.json | 46 ++++++++++++++----- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json index 22e6f98309e2..8d080f70927d 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json @@ -163,11 +163,7 @@ "description": "Cancels the subscription", "parameters": [ { - "name": "subscriptionId", - "in": "path", - "description": "Subscription Id.", - "required": true, - "type": "string" + "$ref": "#/parameters/subscriptionIdParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -190,16 +186,15 @@ } }, "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { - "patch": { + "post": { "operationId": "RenameSubscription", "description": "Renames the subscription", "parameters": [ { - "name": "subscriptionId", - "in": "path", - "description": "Subscription Id.", - "required": true, - "type": "string" + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/subscriptionNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -382,6 +377,16 @@ "readOnly": true } } + }, + "getSubscriptionName": { + "type": "object", + "description": "New name of the subscription.", + "properties": { + "subscriptionName": { + "type": "string", + "description": "New subscription name" + } + } } }, "parameters": { @@ -390,7 +395,24 @@ "in": "query", "required": true, "type": "string", - "description": "Version of the API to be used with the client request. Current version is 2015-06-01" + "description": "Version of the API to be used with the client request. Current version is 2018-11-01-preview" + }, + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription Id." + }, + "subscriptionNameParameter": { + "name": "body", + "x-ms-parameter-location": "method", + "in": "body", + "required": true, + "description": "Subscription Name", + "schema": { + "$ref": "#/definitions/getSubscriptionName" + } } }, "security": [ From 602709f705f9dc704d79d4dc3e1a8a5b48658aca Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Thu, 21 Feb 2019 18:24:03 -0800 Subject: [PATCH 06/17] Update subscriptions.json feedback change --- .../preview/2018-11-01-preview/subscriptions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json index 8d080f70927d..288391ef8331 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json @@ -378,7 +378,7 @@ } } }, - "getSubscriptionName": { + "SubscriptionName": { "type": "object", "description": "New name of the subscription.", "properties": { @@ -411,7 +411,7 @@ "required": true, "description": "Subscription Name", "schema": { - "$ref": "#/definitions/getSubscriptionName" + "$ref": "#/definitions/SubscriptionName" } } }, From ae5cd6cf02879405b6a05dfbeaa7590d72b5815a Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Tue, 26 Feb 2019 14:13:33 -0800 Subject: [PATCH 07/17] Version change Changing version to 2019-03-01-preview --- .../2018-11-01-preview/subscriptions.json | 106 ----------- .../2019-03-01-preview/subscriptions.json | 169 ++++++++++++++++++ 2 files changed, 169 insertions(+), 106 deletions(-) create mode 100644 specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json index 288391ef8331..ce41ae183aa1 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2018-11-01-preview/subscriptions.json @@ -156,65 +156,6 @@ } ] } - }, - "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/cancel": { - "post": { - "operationId": "CancelSubscription", - "description": "Cancels the subscription", - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK. The request has succeeded.", - "schema": { - "$ref": "#/definitions/CanceledSubscriptionId" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { - "post": { - "operationId": "RenameSubscription", - "description": "Renames the subscription", - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/subscriptionNameParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK. The request has succeeded.", - "schema": { - "$ref": "#/definitions/RenamedSubscriptionId" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } } }, "definitions": { @@ -357,36 +298,6 @@ } } } - }, - "CanceledSubscriptionId": { - "description": "Canceled Subscription Id", - "properties": { - "value": { - "description": "Canceled Subscription Id", - "type": "string", - "readOnly": true - } - } - }, - "RenamedSubscriptionId": { - "description": "Renamed Subscription Id", - "properties": { - "value": { - "description": "Renamed Subscription Id", - "type": "string", - "readOnly": true - } - } - }, - "SubscriptionName": { - "type": "object", - "description": "New name of the subscription.", - "properties": { - "subscriptionName": { - "type": "string", - "description": "New subscription name" - } - } } }, "parameters": { @@ -396,23 +307,6 @@ "required": true, "type": "string", "description": "Version of the API to be used with the client request. Current version is 2018-11-01-preview" - }, - "subscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "Subscription Id." - }, - "subscriptionNameParameter": { - "name": "body", - "x-ms-parameter-location": "method", - "in": "body", - "required": true, - "description": "Subscription Name", - "schema": { - "$ref": "#/definitions/SubscriptionName" - } } }, "security": [ diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json new file mode 100644 index 000000000000..3c574a3a8cf8 --- /dev/null +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json @@ -0,0 +1,169 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-03-01-preview", + "title": "SubscriptionClient", + "description": "Subscription client provides an interface to create and manage Azure subscriptions programmatically." + }, + "schemes": [ + "https" + ], + "host": "management.azure.com", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/cancel": { + "post": { + "operationId": "CancelSubscription", + "description": "Cancels the subscription", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/CanceledSubscriptionId" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { + "post": { + "operationId": "RenameSubscription", + "description": "Renames the subscription", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/subscriptionNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/RenamedSubscriptionId" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ErrorResponse": { + "description": "Describes the format of Error response.", + "type": "object", + "properties": { + "code": { + "description": "Error code", + "type": "string" + }, + "message": { + "description": "Error message indicating why the operation failed.", + "type": "string" + } + } + }, + "CanceledSubscriptionId": { + "description": "Canceled Subscription Id", + "properties": { + "value": { + "description": "Canceled Subscription Id", + "type": "string", + "readOnly": true + } + } + }, + "RenamedSubscriptionId": { + "description": "Renamed Subscription Id", + "properties": { + "value": { + "description": "Renamed Subscription Id", + "type": "string", + "readOnly": true + } + } + }, + "SubscriptionName": { + "type": "object", + "description": "New name of the subscription.", + "properties": { + "subscriptionName": { + "type": "string", + "description": "New subscription name" + } + } + } + }, + "parameters": { + "apiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Version of the API to be used with the client request. Current version is 2018-11-01-preview" + }, + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription Id." + }, + "subscriptionNameParameter": { + "name": "body", + "x-ms-parameter-location": "method", + "in": "body", + "required": true, + "description": "Subscription Name", + "schema": { + "$ref": "#/definitions/SubscriptionName" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + } +} \ No newline at end of file From 16967289841f4f09aff7101448d8d45ca7f31681 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Tue, 26 Feb 2019 14:14:55 -0800 Subject: [PATCH 08/17] Update subscriptions.json minor change --- .../preview/2019-03-01-preview/subscriptions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json index 3c574a3a8cf8..3ae3b0d46992 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json @@ -128,7 +128,7 @@ "in": "query", "required": true, "type": "string", - "description": "Version of the API to be used with the client request. Current version is 2018-11-01-preview" + "description": "Version of the API to be used with the client request. Current version is 2019-03-01-preview" }, "subscriptionIdParameter": { "name": "subscriptionId", From 7331afa9c59c99d5bb033969bddae7c48bea472e Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Thu, 28 Feb 2019 12:11:26 -0800 Subject: [PATCH 09/17] Added examples --- .../examples/cancelSubscription.json | 13 +++++++++++++ .../examples/renameSubscription.json | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/cancelSubscription.json create mode 100644 specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/renameSubscription.json diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/cancelSubscription.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/cancelSubscription.json new file mode 100644 index 000000000000..3f08af068ae7 --- /dev/null +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/cancelSubscription.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "subscriptionId": "83aa47df-e3e9-49ff-877b-94304bf3d3ad", + "api-version": "2019-03-01-preview" + }, + "responses": { + "200": { + "body": { + "SubscriptionId": "83aa47df-e3e9-49ff-877b-94304bf3d3ad" + } + } + } +} \ No newline at end of file diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/renameSubscription.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/renameSubscription.json new file mode 100644 index 000000000000..6e2dcff55e93 --- /dev/null +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/renameSubscription.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "subscriptionId": "83aa47df-e3e9-49ff-877b-94304bf3d3ad", + "api-version": "2019-03-01-preview", + "body": { + "SubscriptionName": "Test Sub" + } + }, + "responses": { + "200": { + "body": { + "SubscriptionId": "83aa47df-e3e9-49ff-877b-94304bf3d3ad" + } + } + } +} \ No newline at end of file From 5aa8181fa98169266dcca3f508be101d1a9eba4d Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Thu, 14 Mar 2019 19:07:55 -0700 Subject: [PATCH 10/17] Update subscriptions.json Url change --- .../preview/2019-03-01-preview/subscriptions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json index 3ae3b0d46992..4e07c5fdccc8 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json @@ -16,7 +16,7 @@ "application/json" ], "paths": { - "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/cancel": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Subscription/cancel": { "post": { "operationId": "CancelSubscription", "description": "Cancels the subscription", @@ -44,7 +44,7 @@ } } }, - "/providers/Microsoft.Subscription/subscriptions/{subscriptionId}/rename": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Subscription/rename": { "post": { "operationId": "RenameSubscription", "description": "Renames the subscription", From b810d18bd91a10ad4eb8cddee3907b461e63b087 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Wed, 27 Mar 2019 16:59:37 -0700 Subject: [PATCH 11/17] Update subscriptions.json Operation name change --- .../preview/2019-03-01-preview/subscriptions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json index 4e07c5fdccc8..bc70686dcfd2 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json @@ -18,7 +18,7 @@ "paths": { "/subscriptions/{subscriptionId}/providers/Microsoft.Subscription/cancel": { "post": { - "operationId": "CancelSubscription", + "operationId": "Subscriptions_Cancel", "description": "Cancels the subscription", "parameters": [ { @@ -46,7 +46,7 @@ }, "/subscriptions/{subscriptionId}/providers/Microsoft.Subscription/rename": { "post": { - "operationId": "RenameSubscription", + "operationId": "Subscriptions_Rename", "description": "Renames the subscription", "parameters": [ { From 3ea346203a975bd90cc76d3a94f454a3ba693936 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Thu, 18 Apr 2019 10:51:09 -0700 Subject: [PATCH 12/17] Update readme.md Changes in readme file --- specification/subscription/resource-manager/readme.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/subscription/resource-manager/readme.md b/specification/subscription/resource-manager/readme.md index 676edf37cb20..571f997b1e04 100644 --- a/specification/subscription/resource-manager/readme.md +++ b/specification/subscription/resource-manager/readme.md @@ -33,7 +33,17 @@ These are the global settings for the Subscription API. openapi-type: arm tag: package-2018-11-preview ``` +### Tag: package-2019-03-preview +These settings apply only when `--tag=package-2019-03-preview` is specified on the command line. + +``` yaml $(tag) == 'package-2019-03-preview' +input-file: +- Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json +- Microsoft.Subscription/stable/2016-06-01/subscriptions.json +title: SubscriptionClient +description: The subscription client +``` ### Tag: package-2018-11-preview From a8018695679044c15d4c26c32c24b6b77f3085b4 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Wed, 1 May 2019 10:29:21 -0700 Subject: [PATCH 13/17] Update readme.md updated default package --- specification/subscription/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/subscription/resource-manager/readme.md b/specification/subscription/resource-manager/readme.md index 571f997b1e04..7622358ed08a 100644 --- a/specification/subscription/resource-manager/readme.md +++ b/specification/subscription/resource-manager/readme.md @@ -31,7 +31,7 @@ These are the global settings for the Subscription API. ``` yaml openapi-type: arm -tag: package-2018-11-preview +tag: package-2019-03-preview ``` ### Tag: package-2019-03-preview From 5a632022c43557cdc9783baa36f1b59b2f01a02f Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Wed, 1 May 2019 12:25:05 -0700 Subject: [PATCH 14/17] Update subscriptions.json Fixed example links --- .../preview/2019-03-01-preview/subscriptions.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json index bc70686dcfd2..435412f57fa2 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json @@ -19,6 +19,11 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Subscription/cancel": { "post": { "operationId": "Subscriptions_Cancel", + "x-ms-examples": { + "cancelSubscription": { + "$ref": "./examples/cancelSubscription.json" + } + }, "description": "Cancels the subscription", "parameters": [ { @@ -47,6 +52,11 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Subscription/rename": { "post": { "operationId": "Subscriptions_Rename", + "x-ms-examples": { + "renameSubscription": { + "$ref": "./examples/renameSubscription.json" + } + }, "description": "Renames the subscription", "parameters": [ { From 31610c102fc69991bd1b0f70e198bc9e87da968e Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Wed, 1 May 2019 13:51:50 -0700 Subject: [PATCH 15/17] Feedback change --- .../preview/2019-03-01-preview/examples/cancelSubscription.json | 2 +- .../preview/2019-03-01-preview/examples/renameSubscription.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/cancelSubscription.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/cancelSubscription.json index 3f08af068ae7..5c26308c88ca 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/cancelSubscription.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/cancelSubscription.json @@ -6,7 +6,7 @@ "responses": { "200": { "body": { - "SubscriptionId": "83aa47df-e3e9-49ff-877b-94304bf3d3ad" + "value": "83aa47df-e3e9-49ff-877b-94304bf3d3ad" } } } diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/renameSubscription.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/renameSubscription.json index 6e2dcff55e93..c3e2e12590f3 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/renameSubscription.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/renameSubscription.json @@ -9,7 +9,7 @@ "responses": { "200": { "body": { - "SubscriptionId": "83aa47df-e3e9-49ff-877b-94304bf3d3ad" + "value": "83aa47df-e3e9-49ff-877b-94304bf3d3ad" } } } From d5f393c10fe854d7da26d6a7921a7b623f49ec81 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Wed, 1 May 2019 14:25:01 -0700 Subject: [PATCH 16/17] Suppress --- specification/subscription/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/subscription/resource-manager/readme.md b/specification/subscription/resource-manager/readme.md index 7622358ed08a..89cc80b7d1ce 100644 --- a/specification/subscription/resource-manager/readme.md +++ b/specification/subscription/resource-manager/readme.md @@ -23,6 +23,7 @@ To see additional help and options, run: ``` yaml directive: - suppress: R2059 + - suppress: R3023 ``` From bfdb50d64a52ff3f322a068a5145df3f0d1789b0 Mon Sep 17 00:00:00 2001 From: navysingla <47647464+navysingla@users.noreply.github.com> Date: Wed, 1 May 2019 17:08:23 -0700 Subject: [PATCH 17/17] Added operations swagger --- .../examples/getOperations.json | 29 ++++++++ .../2019-03-01-preview/subscriptions.json | 73 +++++++++++++++++++ .../subscription/resource-manager/readme.md | 1 - 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/getOperations.json diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/getOperations.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/getOperations.json new file mode 100644 index 000000000000..18a760d850cc --- /dev/null +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/examples/getOperations.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2019-03-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Subscription/cancel/action", + "display": { + "provider": "Microsoft Subscription", + "resource": "Resources", + "operation": "Cancels the subscription" + } + }, + { + "name": "Microsoft.Subscription/rename/action", + "display": { + "provider": "Microsoft Subscription", + "resource": "Resources", + "operation": "Renames the subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json index 435412f57fa2..f9b0a411d6d9 100644 --- a/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json +++ b/specification/subscription/resource-manager/Microsoft.Subscription/preview/2019-03-01-preview/subscriptions.json @@ -16,6 +16,36 @@ "application/json" ], "paths": { + "/providers/Microsoft.Subscription/operations": { + "get": { + "description": "Lists all of the available Microsoft.Subscription API operations.", + "operationId": "Operations_List", + "x-ms-examples": { + "getOperations": { + "$ref": "./examples/getOperations.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.Subscription/cancel": { "post": { "operationId": "Subscriptions_Cancel", @@ -130,6 +160,49 @@ "description": "New subscription name" } } + }, + "OperationListResult": { + "description": "Result of the request to list operations. It contains a list of operations and a URL link to get the next set of results.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "List of operations." + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of operation list results if there are any." + } + } + }, + "Operation": { + "description": "REST API operation", + "type": "object", + "properties": { + "name": { + "description": "Operation name: {provider}/{resource}/{operation}", + "type": "string" + }, + "display": { + "description": "The object that represents the operation.", + "properties": { + "provider": { + "description": "Service provider: Microsoft.Subscription", + "type": "string" + }, + "resource": { + "description": "Resource on which the operation is performed: Profile, endpoint, etc.", + "type": "string" + }, + "operation": { + "description": "Operation type: Read, write, delete, etc.", + "type": "string" + } + } + } + } } }, "parameters": { diff --git a/specification/subscription/resource-manager/readme.md b/specification/subscription/resource-manager/readme.md index 89cc80b7d1ce..7622358ed08a 100644 --- a/specification/subscription/resource-manager/readme.md +++ b/specification/subscription/resource-manager/readme.md @@ -23,7 +23,6 @@ To see additional help and options, run: ``` yaml directive: - suppress: R2059 - - suppress: R3023 ```