From 80afa52b390ebc93e528ab47d32fe4f95bae49cf Mon Sep 17 00:00:00 2001 From: Haridarshan Hosakere Sudhakar Date: Thu, 15 Feb 2018 11:06:52 -0800 Subject: [PATCH 1/2] fix the hardcoding of api version for classicadmin in sdk --- .../authorization-ClassicAdminCalls.json | 2 +- .../examples/GetClassicAdministrators.json | 2 +- specification/authorization/resource-manager/readme.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename specification/authorization/resource-manager/Microsoft.Authorization/preview/{2015-07-01 => 2015-06-01}/authorization-ClassicAdminCalls.json (99%) rename specification/authorization/resource-manager/Microsoft.Authorization/preview/{2015-07-01 => 2015-06-01}/examples/GetClassicAdministrators.json (96%) diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/authorization-ClassicAdminCalls.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json similarity index 99% rename from specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/authorization-ClassicAdminCalls.json rename to specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json index 67521e2e3a3c..517db0205de5 100644 --- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/authorization-ClassicAdminCalls.json +++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "AuthorizationManagementClient", - "version": "2015-07-01", + "version": "2015-06-01", "description": "Role based access control provides you a way to apply granular level policy administration down to individual resources or resource groups. These operations enable you to manage role definitions and role assignments. A role definition describes the set of actions that can be performed on resources. A role assignment grants access to Azure Active Directory users." }, "host": "management.azure.com", diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/examples/GetClassicAdministrators.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-06-01/examples/GetClassicAdministrators.json similarity index 96% rename from specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/examples/GetClassicAdministrators.json rename to specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-06-01/examples/GetClassicAdministrators.json index c920724db459..7b2714814e73 100644 --- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/examples/GetClassicAdministrators.json +++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-06-01/examples/GetClassicAdministrators.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subId", - "api-version": "2015-07-01" + "api-version": "2015-06-01" }, "responses": { "200": { diff --git a/specification/authorization/resource-manager/readme.md b/specification/authorization/resource-manager/readme.md index d8084aa565ee..e16e83b11d98 100644 --- a/specification/authorization/resource-manager/readme.md +++ b/specification/authorization/resource-manager/readme.md @@ -64,7 +64,7 @@ These settings apply only when `--tag=package-2018-01-01-preview` is specified o ``` yaml $(tag) == 'package-2018-01-01-preview' input-file: -- Microsoft.Authorization/preview/2015-07-01/authorization-ClassicAdminCalls.json +- Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json - Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleBasedCalls.json ``` From 228c368e8b1956804f353314932a9a506630e8dd Mon Sep 17 00:00:00 2001 From: Haridarshan Hosakere Sudhakar Date: Thu, 15 Feb 2018 11:13:35 -0800 Subject: [PATCH 2/2] fix 2017 version preview file --- .../preview/2015-07-01/authorization.json | 88 ------------------- .../authorization/resource-manager/readme.md | 1 + 2 files changed, 1 insertion(+), 88 deletions(-) diff --git a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/authorization.json b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/authorization.json index fd2eefdd398a..c56c5350859c 100644 --- a/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/authorization.json +++ b/specification/authorization/resource-manager/Microsoft.Authorization/preview/2015-07-01/authorization.json @@ -34,43 +34,6 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/classicAdministrators": { - "get": { - "tags": [ - "ClassicAdministrators" - ], - "operationId": "ClassicAdministrators_List", - "description": "Gets service administrator, account administrator, and co-administrators for the subscription.", - "parameters": [ - { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "The API version to use for this operation." - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "Returns an array of administrators.", - "schema": { - "$ref": "#/definitions/ClassicAdministratorListResult" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "GetConfigurations": { - "$ref": "./examples/GetClassicAdministrators.json" - } - } - } - }, "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Authorization/permissions": { "get": { "tags": [ @@ -492,57 +455,6 @@ }, "description": "Role Definitions filter" }, - "ClassicAdministratorProperties": { - "properties": { - "emailAddress": { - "type": "string", - "description": "The email address of the administrator." - }, - "role": { - "type": "string", - "description": "The role of the administrator." - } - }, - "description": "Classic Administrator properties." - }, - "ClassicAdministrator": { - "properties": { - "id": { - "type": "string", - "description": "The ID of the administrator." - }, - "name": { - "type": "string", - "description": "The name of the administrator." - }, - "type": { - "type": "string", - "description": "The type of the administrator." - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ClassicAdministratorProperties", - "description": "Properties for the classic administrator." - } - }, - "description": "Classic Administrators" - }, - "ClassicAdministratorListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ClassicAdministrator" - }, - "description": "An array of administrators." - }, - "nextLink": { - "type": "string", - "description": "The URL to use for getting the next set of results." - } - }, - "description": "ClassicAdministrator list result information." - }, "Permission": { "properties": { "actions": { diff --git a/specification/authorization/resource-manager/readme.md b/specification/authorization/resource-manager/readme.md index e16e83b11d98..13da6a2479b0 100644 --- a/specification/authorization/resource-manager/readme.md +++ b/specification/authorization/resource-manager/readme.md @@ -54,6 +54,7 @@ These settings apply only when `--tag=package-2017-10-01-preview` is specified o ``` yaml $(tag) == 'package-2017-10-01-preview' input-file: +- Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json - Microsoft.Authorization/preview/2015-07-01/authorization.json - Microsoft.Authorization/preview/2017-10-01-preview/authorization-RACalls.json ```