From b97d55888cced73c61e8fe26bd35bd6e0245138d Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Sun, 2 Feb 2020 11:46:13 -0800 Subject: [PATCH 01/20] Adds base for updating Microsoft.Maps from version stable/2018-05-01 to version 2020-04-01-preview --- .../examples/CreateAccount.json | 55 ++ .../examples/DeleteAccount.json | 12 + .../examples/GetAccount.json | 29 + .../examples/GetOperations.json | 67 ++ .../examples/ListAccountsByResourceGroup.json | 41 + .../examples/ListAccountsBySubscription.json | 40 + .../2020-04-01-preview/examples/ListKeys.json | 18 + .../examples/MoveAccounts.json | 17 + .../examples/RegenerateKey.json | 21 + .../examples/UpdateAccount.json | 34 + .../2020-04-01-preview/maps-management.json | 803 ++++++++++++++++++ 11 files changed, 1137 insertions(+) create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json new file mode 100644 index 000000000000..ead879a2afe4 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json @@ -0,0 +1,55 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount", + "MapsAccountCreateParameters": { + "location": "global", + "sku": { + "name": "S0" + }, + "tags": { + "test": "true" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "name": "myMapsAccount", + "type": "Microsoft.Maps/accounts", + "location": "global", + "tags": { + "test": "true" + }, + "sku": { + "name": "S0", + "tier": "Standard" + }, + "properties": { + "x-ms-client-id": "string" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "name": "myMapsAccount", + "type": "Microsoft.Maps/accounts", + "location": "global", + "tags": { + "test": "true" + }, + "sku": { + "name": "S0", + "tier": "Standard" + }, + "properties": { + "x-ms-client-id": "string" + } + } + } + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json new file mode 100644 index 000000000000..3d6c171b6268 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json new file mode 100644 index 000000000000..b7898f9969e1 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "name": "myMapsAccount", + "type": "Microsoft.Maps/accounts", + "location": "global", + "tags": { + "test": "true" + }, + "sku": { + "name": "S0", + "tier": "Standard" + }, + "properties": { + "x-ms-client-id": "string" + } + } + }, + "404": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json new file mode 100644 index 000000000000..c2c0326eaa84 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json @@ -0,0 +1,67 @@ +{ + "parameters": { + "api-version": "2018-05-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Maps/register/action", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "Register the provider", + "description": "Register the provider" + } + }, + { + "name": "Microsoft.Maps/accounts/write", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "Create or update a Maps Account.", + "description": "Create or update a Maps Account." + } + }, + { + "name": "Microsoft.Maps/accounts/read", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "Get a Maps Account.", + "description": "Get a Maps Account." + } + }, + { + "name": "Microsoft.Maps/accounts/delete", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "Delete a Maps Account.", + "description": "Delete a Maps Account." + } + }, + { + "name": "Microsoft.Maps/accounts/listKeys/action", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "List keys", + "description": "List Maps Account keys" + } + }, + { + "name": "Microsoft.Maps/accounts/regenerateKey/action", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "Generate new primary or secondary key", + "description": "Generate new Maps Account primary or secondary key" + } + } + ] + } + } + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json new file mode 100644 index 000000000000..6b2fbb5401d1 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json @@ -0,0 +1,41 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount2", + "name": "myMapsAccount2", + "type": "Microsoft.Maps/accounts", + "location": "global", + "tags": { + "test": "true" + }, + "sku": { + "name": "S0", + "tier": "Standard" + } + }, + { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "name": "myMapsAccount", + "type": "Microsoft.Maps/accounts", + "location": "global", + "tags": { + "test": "true" + }, + "sku": { + "name": "S0", + "tier": "Standard" + } + } + ] + } + } + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json new file mode 100644 index 000000000000..832171fa4c53 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount2", + "name": "myMapsAccount2", + "type": "Microsoft.Maps/accounts", + "location": "global", + "tags": { + "test": "true" + }, + "sku": { + "name": "S0", + "tier": "Standard" + } + }, + { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "name": "myMapsAccount", + "type": "Microsoft.Maps/accounts", + "location": "global", + "tags": { + "test": "true" + }, + "sku": { + "name": "S0", + "tier": "Standard" + } + } + ] + } + } + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json new file mode 100644 index 000000000000..bfd3a40fc666 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "primaryKey": "ZiBllKWCwXXLTO13S2TaoHoK8kPFYaoyYlAcnCcE4PQ", + "secondaryKey": "cJHpmUGNaGGO8H59p6NKGhfff9VjD278-2bi5wo0_mU" + } + }, + "404": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json new file mode 100644 index 000000000000..f2a54233bcaf --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "moveRequest": { + "targetResourceGroup": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup2", + "resourceIds": [ + "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount2" + ] + } + }, + "responses": { + "200": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json new file mode 100644 index 000000000000..698a8020ae34 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount", + "keySpecification": { + "keyType": "primary" + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "primaryKey": "uj0yqjjz8zG3IOSWvb_smi1q1QenGtupAqrOA1zCO6s", + "secondaryKey": "cJHpmUGNaGGO8H59p6NKGhfff9VjD278-2bi5wo0_mU" + } + }, + "404": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json new file mode 100644 index 000000000000..56de4f4edcf9 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "api-version": "2018-05-01", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount", + "MapsAccountUpdateParameters": { + "tags": { + "specialTag": "true" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", + "name": "myMapsAccount", + "type": "Microsoft.Maps/accounts", + "location": "global", + "tags": { + "specialTag": "true" + }, + "sku": { + "name": "S0", + "tier": "Standard" + }, + "properties": { + "x-ms-client-id": "string" + } + } + }, + "404": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json new file mode 100644 index 000000000000..83a54f031f8e --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json @@ -0,0 +1,803 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Maps Resource Provider", + "description": "Resource Provider", + "version": "2018-05-01", + "x-ms-code-generation-settings": { + "name": "MapsManagementClient" + } + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "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" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}": { + "put": { + "description": "Create or update a Maps Account. A Maps Account holds the keys which allow access to the Maps REST APIs.", + "operationId": "Accounts_CreateOrUpdate", + "x-ms-examples": { + "CreateAccount": { + "$ref": "./examples/CreateAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "name": "MapsAccountCreateParameters", + "in": "body", + "description": "The new or updated parameters for the Maps Account.", + "required": true, + "schema": { + "$ref": "#/definitions/MapsAccountCreateParameters" + } + } + ], + "responses": { + "200": { + "description": "The Account was successfully updated.", + "schema": { + "$ref": "#/definitions/MapsAccount" + } + }, + "201": { + "description": "The Account was successfully created.", + "schema": { + "$ref": "#/definitions/MapsAccount" + } + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + }, + "patch": { + "description": "Updates a Maps Account. Only a subset of the parameters may be updated after creation, such as Sku and Tags.", + "operationId": "Accounts_Update", + "x-ms-examples": { + "UpdateAccount": { + "$ref": "./examples/UpdateAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "name": "MapsAccountUpdateParameters", + "in": "body", + "description": "The updated parameters for the Maps Account.", + "required": true, + "schema": { + "$ref": "#/definitions/MapsAccountUpdateParameters" + } + } + ], + "responses": { + "200": { + "description": "The Account was successfully updated.", + "schema": { + "$ref": "#/definitions/MapsAccount" + } + }, + "404": { + "description": "The specified Account was not found. Nothing was updated." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + }, + "delete": { + "description": "Delete a Maps Account.", + "operationId": "Accounts_Delete", + "x-ms-examples": { + "DeleteAccount": { + "$ref": "./examples/DeleteAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + } + ], + "responses": { + "200": { + "description": "The Account was deleted successfully." + }, + "204": { + "description": "The specified Account was not found. Nothing was deleted." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + }, + "get": { + "description": "Get a Maps Account.", + "operationId": "Accounts_Get", + "x-ms-examples": { + "GetAccount": { + "$ref": "./examples/GetAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/MapsAccount" + } + }, + "404": { + "description": "The specified Account does not exist." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts": { + "get": { + "description": "Get all Maps Accounts in a Resource Group", + "operationId": "Accounts_ListByResourceGroup", + "x-ms-examples": { + "ListAccountsByResourceGroup": { + "$ref": "./examples/ListAccountsByResourceGroup.json" + } + }, + "x-ms-pageable": { + "nextLinkName": null, + "itemName": "value" + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/MapsAccounts" + } + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Maps/accounts": { + "get": { + "description": "Get all Maps Accounts in a Subscription", + "operationId": "Accounts_ListBySubscription", + "x-ms-examples": { + "ListAccountsBySubscription": { + "$ref": "./examples/ListAccountsBySubscription.json" + } + }, + "x-ms-pageable": { + "nextLinkName": null, + "itemName": "value" + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/MapsAccounts" + } + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/moveResources": { + "post": { + "description": "Moves Maps Accounts from one ResourceGroup (or Subscription) to another", + "operationId": "Accounts_Move", + "x-ms-examples": { + "MoveAccounts": { + "$ref": "./examples/MoveAccounts.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "description": "The name of the resource group that contains Maps Account to move.", + "required": true, + "type": "string" + }, + { + "name": "moveRequest", + "in": "body", + "description": "The details of the Maps Account move.", + "required": true, + "schema": { + "$ref": "#/definitions/MapsAccountsMoveRequest" + } + } + ], + "responses": { + "200": { + "description": "The Accounts were successfully moved." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/listKeys": { + "post": { + "description": "Get the keys to use with the Maps APIs. A key is used to authenticate and authorize access to the Maps REST APIs. Only one key is needed at a time; two are given to provide seamless key regeneration.", + "operationId": "Accounts_ListKeys", + "x-ms-examples": { + "ListKeys": { + "$ref": "./examples/ListKeys.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/MapsAccountKeys" + } + }, + "404": { + "description": "The specified Account does not exist." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/regenerateKey": { + "post": { + "description": "Regenerate either the primary or secondary key for use with the Maps APIs. The old key will stop working immediately.", + "operationId": "Accounts_RegenerateKeys", + "x-ms-examples": { + "RegenerateKey": { + "$ref": "./examples/RegenerateKey.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "name": "keySpecification", + "in": "body", + "required": true, + "description": "Which key to regenerate: primary or secondary.", + "schema": { + "$ref": "#/definitions/MapsKeySpecification" + } + } + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/MapsAccountKeys" + } + }, + "404": { + "description": "The specified Account does not exist." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, + "/providers/Microsoft.Maps/operations": { + "get": { + "description": "List operations available for the Maps Resource Provider", + "operationId": "Accounts_ListOperations", + "x-ms-examples": { + "GetOperations": { + "$ref": "./examples/GetOperations.json" + } + }, + "x-ms-pageable": { + "nextLinkName": null, + "itemName": "value" + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/MapsOperations" + } + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "description": "The name of the Azure Resource Group.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "AccountNameParameter": { + "name": "accountName", + "in": "path", + "description": "The name of the Maps Account.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "definitions": { + "Error": { + "type": "object", + "description": "This object is returned when an error occurs in the Maps API", + "properties": { + "code": { + "type": "string", + "readOnly": true, + "description": "Error code." + }, + "message": { + "type": "string", + "readOnly": true, + "description": "If available, a human readable description of the error." + }, + "target": { + "type": "string", + "readOnly": true, + "description": "If available, the component generating the error." + }, + "details": { + "type": "array", + "readOnly": true, + "description": "If available, a list of additional details about the error.", + "items": { + "type": "object", + "properties": { + "code": { + "type": "string", + "readOnly": true, + "description": "Error code." + }, + "message": { + "type": "string", + "readOnly": true, + "description": "If available, a human readable description of the error." + }, + "target": { + "type": "string", + "readOnly": true, + "description": "If available, the component generating the error." + } + } + } + } + } + }, + "Resource": { + "description": "An Azure resource", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The fully qualified Maps Account resource identifier." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the Maps Account, which is unique within a Resource Group." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Azure resource type." + } + }, + "x-ms-azure-resource": true + }, + "MapsAccount": { + "description": "An Azure resource which represents access to a suite of Maps REST APIs.", + "type": "object", + "properties": { + "location": { + "readOnly": true, + "type": "string", + "description": "The location of the resource." + }, + "tags": { + "readOnly": true, + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Gets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." + }, + "sku": { + "readOnly": true, + "description": "The SKU of this account.", + "$ref": "#/definitions/Sku" + }, + "properties": { + "readOnly": true, + "description": "The map account properties.", + "$ref": "#/definitions/MapsAccountProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "MapsAccountCreateParameters": { + "description": "Parameters used to create a new Maps Account.", + "type": "object", + "properties": { + "location": { + "type": "string", + "description": "The location of the resource." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." + }, + "sku": { + "description": "The SKU of this account.", + "$ref": "#/definitions/Sku" + } + }, + "required": [ + "location", + "sku" + ] + }, + "MapsAccountUpdateParameters": { + "description": "Parameters used to update an existing Maps Account.", + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." + }, + "sku": { + "description": "The SKU of this account.", + "$ref": "#/definitions/Sku" + } + } + }, + "MapsAccounts": { + "description": "A list of Maps Accounts.", + "type": "object", + "properties": { + "value": { + "description": "a Maps Account.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/MapsAccount" + } + } + } + }, + "Sku": { + "description": "The SKU of the Maps Account.", + "properties": { + "name": { + "description": "The name of the SKU, in standard format (such as S0).", + "type": "string" + }, + "tier": { + "readOnly": true, + "type": "string", + "description": "Gets the sku tier. This is based on the SKU name." + } + }, + "required": [ + "name" + ] + }, + "MapsAccountsMoveRequest": { + "description": "The description of what resources to move between resource groups.", + "type": "object", + "required": [ + "targetResourceGroup", + "resourceIds" + ], + "properties": { + "targetResourceGroup": { + "type": "string", + "description": "The name of the destination resource group." + }, + "resourceIds": { + "type": "array", + "items": { + "type": "string" + }, + "description": "A list of resource names to move from the source resource group." + } + } + }, + "MapsKeySpecification": { + "description": "Whether the operation refers to the primary or secondary key.", + "type": "object", + "required": [ + "keyType" + ], + "properties": { + "keyType": { + "type": "string", + "enum": [ + "primary", + "secondary" + ], + "x-ms-enum": { + "name": "KeyType", + "modelAsString": true + }, + "description": "Whether the operation refers to the primary or secondary key." + } + } + }, + "MapsAccountKeys": { + "description": "The set of keys which can be used to access the Maps REST APIs. Two keys are provided for key rotation without interruption.", + "type": "object", + "properties": { + "id": { + "type": "string", + "readOnly": true, + "description": "The full Azure resource identifier of the Maps Account." + }, + "primaryKey": { + "type": "string", + "readOnly": true, + "description": "The primary key for accessing the Maps REST APIs." + }, + "secondaryKey": { + "type": "string", + "readOnly": true, + "description": "The secondary key for accessing the Maps REST APIs." + } + } + }, + "MapsOperations": { + "description": "The set of operations available for Maps.", + "type": "object", + "properties": { + "value": { + "description": "An operation available for Maps.", + "type": "array", + "readOnly": true, + "items": { + "type": "object", + "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "Operation name: {provider}/{resource}/{operation}." + }, + "display": { + "description": "The human-readable description of the operation.", + "type": "object", + "properties": { + "provider": { + "type": "string", + "readOnly": true, + "description": "Service provider: Microsoft Maps." + }, + "resource": { + "type": "string", + "readOnly": true, + "description": "Resource on which the operation is performed." + }, + "operation": { + "type": "string", + "readOnly": true, + "description": "The action that users can perform, based on their permission level." + }, + "description": { + "type": "string", + "readOnly": true, + "description": "The description of the operation." + } + } + }, + "origin": { + "type": "string", + "readOnly": true, + "description": "The origin of the operation." + } + } + } + } + } + }, + "MapsAccountProperties": { + "description": "Additional Map account properties", + "properties": { + "x-ms-client-id": { + "description": "A unique identifier for the maps account", + "type": "string" + } + } + } + } +} From 8ece92bc76af3efcdf6ec51fe2f1cf4316acec89 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Sun, 2 Feb 2020 11:46:34 -0800 Subject: [PATCH 02/20] Updates readme --- specification/maps/resource-manager/readme.md | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/specification/maps/resource-manager/readme.md b/specification/maps/resource-manager/readme.md index 6afc578c4420..e3bae513e794 100644 --- a/specification/maps/resource-manager/readme.md +++ b/specification/maps/resource-manager/readme.md @@ -5,7 +5,9 @@ This is the AutoRest configuration file for Maps. --- + ## Getting Started + To build the SDK for Maps, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run: > `autorest` @@ -13,21 +15,29 @@ To build the SDK for Maps, simply [Install AutoRest](https://aka.ms/autorest/ins To see additional help and options, run: > `autorest --help` + --- ## Configuration - - ### Basic Information + These are the global settings for the Maps API. ``` yaml openapi-type: arm -tag: package-2018-05 +tag: package-preview-2020-04 ``` +### Tag: package-preview-2020-04 + +These settings apply only when `--tag=package-preview-2020-04` is specified on the command line. + +```yaml $(tag) == 'package-preview-2020-04' +input-file: + - Microsoft.Maps/preview/2020-04-01-preview/maps-management.json +``` ### Tag: package-2017-01 These settings apply only when `--tag=package-2017-01` is specified on the command line. @@ -47,8 +57,8 @@ input-file: ``` --- -# Code Generation +# Code Generation ## Swagger to SDK @@ -64,7 +74,6 @@ swagger-to-sdk: - repo: azure-sdk-for-node ``` - ## C# These settings apply only when `--csharp` is specified on the command line. @@ -135,9 +144,7 @@ regenerate-manager: true generate-interface: true ``` - - -## Multi-API/Profile support for AutoRest v3 generators +## Multi-API/Profile support for AutoRest v3 generators AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. @@ -154,11 +161,10 @@ input-file: ``` -If there are files that should not be in the `all-api-versions` set, +If there are files that should not be in the `all-api-versions` set, uncomment the `exclude-file` section below and add the file paths. ``` yaml $(tag) == 'all-api-versions' #exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json ``` - From adb6f1ba466d39bd04a6de26a965acbfeaea7f12 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Sun, 2 Feb 2020 11:46:37 -0800 Subject: [PATCH 03/20] Updates API version in new specs and examples --- .../preview/2020-04-01-preview/examples/CreateAccount.json | 2 +- .../preview/2020-04-01-preview/examples/DeleteAccount.json | 2 +- .../preview/2020-04-01-preview/examples/GetAccount.json | 2 +- .../preview/2020-04-01-preview/examples/GetOperations.json | 2 +- .../examples/ListAccountsByResourceGroup.json | 2 +- .../2020-04-01-preview/examples/ListAccountsBySubscription.json | 2 +- .../preview/2020-04-01-preview/examples/ListKeys.json | 2 +- .../preview/2020-04-01-preview/examples/MoveAccounts.json | 2 +- .../preview/2020-04-01-preview/examples/RegenerateKey.json | 2 +- .../preview/2020-04-01-preview/examples/UpdateAccount.json | 2 +- .../preview/2020-04-01-preview/maps-management.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json index ead879a2afe4..913a02e9e5d9 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json index 3d6c171b6268..4c5cbc930566 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json index b7898f9969e1..e1d7c5f80ad8 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json index c2c0326eaa84..886173b25659 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01" + "api-version": "2020-04-01-preview" }, "responses": { "200": { diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json index 6b2fbb5401d1..5121d76d82ed 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup" }, diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json index 832171fa4c53..31c0a02c9c03 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0" }, "responses": { diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json index bfd3a40fc666..8fd7d10afb76 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json index f2a54233bcaf..b3634454de07 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "moveRequest": { diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json index 698a8020ae34..4a73bb70e1ee 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json index 56de4f4edcf9..3cc014cd338b 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-05-01", + "api-version": "2020-04-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json index 83a54f031f8e..4416f368ff15 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json @@ -3,7 +3,7 @@ "info": { "title": "Azure Maps Resource Provider", "description": "Resource Provider", - "version": "2018-05-01", + "version": "2020-04-01-preview", "x-ms-code-generation-settings": { "name": "MapsManagementClient" } From 67fbce18a51fdcc474203dc191adcee812bf964d Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Sun, 2 Feb 2020 14:49:11 -0800 Subject: [PATCH 04/20] add private atlas resource and examples --- .../examples/CreatePrivateAtlas.json | 45 +++ .../examples/DeletePrivateAtlas.json | 13 + .../examples/GetPrivateAtlas.json | 26 ++ .../examples/ListPrivateAtlasByAccount.json | 28 ++ .../examples/UpdatePrivateAtlas.json | 31 ++ .../2020-04-01-preview/maps-management.json | 343 +++++++++++++++++- 6 files changed, 484 insertions(+), 2 deletions(-) create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeletePrivateAtlas.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetPrivateAtlas.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json create mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json new file mode 100644 index 000000000000..d10ad047868b --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "api-version": "2020-04-01-preview", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount", + "privateAtlasName": "myPrivateAtlas", + "PrivateAtlasCreateParameters": { + "location": "unitedstates", + "tags": { + "test": "true" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "name": "myPrivateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlas", + "location": "unitedstates", + "tags": { + "test": "true" + }, + "properties": { + "provisioningState": "Succeeded" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "name": "myPrivateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlas", + "location": "unitedstates", + "tags": { + "test": "true" + }, + "properties": { + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeletePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeletePrivateAtlas.json new file mode 100644 index 000000000000..ed3a2342cbcf --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeletePrivateAtlas.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2020-04-01-preview", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount", + "privateAtlasName": "myPrivateAtlas" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetPrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetPrivateAtlas.json new file mode 100644 index 000000000000..5c8282eb00e0 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetPrivateAtlas.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2020-04-01-preview", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount", + "privateAtlasName": "myPrivateAtlas" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "name": "myPrivateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlas", + "location": "unitedstates", + "tags": { + "test": "true" + }, + "properties": { + "provisioningState": "Succeeded" + } + } + }, + "404": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json new file mode 100644 index 000000000000..815ae1dd32ac --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "api-version": "2020-04-01-preview", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "name": "myPrivateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlas", + "location": "unitedstates", + "tags": { + "test": "true" + }, + "properties":{ + "provisioningState": "Succeeded" + } + } + ] + } + } + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json new file mode 100644 index 000000000000..f8e53a9f84d9 --- /dev/null +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "api-version": "2020-04-01-preview", + "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", + "resourceGroupName": "myResourceGroup", + "accountName": "myMapsAccount", + "privateAtlasName": "myPrivateAtlas", + "PrivateAtlasUpdateParameters": { + "tags": { + "specialTag": "true" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "name": "myPrivateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlas", + "location": "unitedstates", + "tags": { + "specialTag": "true" + }, + "properties": { + "provisioningState": "Succeeded" + } + } + }, + "404": {} + } +} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json index 4416f368ff15..f4d72136ad2b 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json @@ -466,6 +466,253 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlas/{privateAtlasName}": { + "put": { + "description": "Create or update a Private Atlas resource. Private Atlas resource will enable the usage of Azure resources to build a custom set of mapping data. It requires an account to exist before it can be created.", + "operationId": "PrivateAtlas_CreateOrUpdate", + "x-ms-examples": { + "CreateAccount": { + "$ref": "./examples/CreatePrivateAtlas.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "$ref": "#/parameters/PrivateAtlasNameParameter" + }, + { + "name": "PrivateAtlasCreateParameters", + "in": "body", + "description": "The new or updated parameters for the Private Atlas resource.", + "required": true, + "schema": { + "$ref": "#/definitions/PrivateAtlasCreateParameters" + } + } + ], + "responses": { + "200": { + "description": "The Private Atlas was successfully updated.", + "schema": { + "$ref": "#/definitions/PrivateAtlas" + } + }, + "201": { + "description": "The Private Atlas was successfully created.", + "schema": { + "$ref": "#/definitions/PrivateAtlas" + } + }, + "202": { + "description": "The Private Atlas was accepted for creation", + "schema": { + "$ref": "#/definitions/PrivateAtlas" + } + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + }, + "patch": { + "description": "Updates the Private Atlas resource. Only a subset of the parameters may be updated after creation, such as Tags.", + "operationId": "PrivateAtlas_Update", + "x-ms-examples": { + "UpdateAccount": { + "$ref": "./examples/UpdatePrivateAtlas.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "$ref": "#/parameters/PrivateAtlasNameParameter" + }, + { + "name": "PrivateAtlasUpdateParameters", + "in": "body", + "description": "The updated parameters for the Private Atlas.", + "required": true, + "schema": { + "$ref": "#/definitions/PrivateAtlasUpdateParameters" + } + } + ], + "responses": { + "200": { + "description": "The Private Atlas was successfully updated.", + "schema": { + "$ref": "#/definitions/PrivateAtlas" + } + }, + "202": { + "description": "The Private Atlas was accepted for update", + "schema": { + "$ref": "#/definitions/PrivateAtlas" + } + }, + "404": { + "description": "The specified Private Atlas was not found. Nothing was updated." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + }, + "delete": { + "description": "Delete a Maps Account.", + "operationId": "PrivateAtlas_Delete", + "x-ms-examples": { + "DeleteAccount": { + "$ref": "./examples/DeleteAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "$ref": "#/parameters/PrivateAtlasNameParameter" + } + ], + "responses": { + "200": { + "description": "The Private Atlas was deleted successfully." + }, + "204": { + "description": "The specified Private Atlas was not found. Nothing was deleted." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + }, + "get": { + "description": "Get a Private Atlas resource.", + "operationId": "PrivateAtlas_Get", + "x-ms-examples": { + "GetAccount": { + "$ref": "./examples/GetPrivateAtlas.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "$ref": "#/parameters/PrivateAtlasNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/MapsAccount" + } + }, + "404": { + "description": "The specified Account does not exist." + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlas": { + "get": { + "description": "Get all Private Atlas instances for an Azure Map Account", + "operationId": "PrivateAtlas_ListByAccount", + "x-ms-examples": { + "ListPrivateAtlasByAccount": { + "$ref": "./examples/ListPrivateAtlasByAccount.json" + } + }, + "x-ms-pageable": { + "nextLinkName": null, + "itemName": "value" + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/PrivateAtlasList" + } + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } } }, "parameters": { @@ -498,6 +745,14 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "PrivateAtlasNameParameter": { + "name": "privateAtlasName", + "in": "path", + "description": "The name of the Private Atlas instance.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" } }, "definitions": { @@ -553,12 +808,12 @@ "id": { "readOnly": true, "type": "string", - "description": "The fully qualified Maps Account resource identifier." + "description": "The fully qualified resource identifier." }, "name": { "readOnly": true, "type": "string", - "description": "The name of the Maps Account, which is unique within a Resource Group." + "description": "The name of the Maps resource, which is unique within a Resource Group." }, "type": { "readOnly": true, @@ -568,6 +823,34 @@ }, "x-ms-azure-resource": true }, + "PrivateAtlas": { + "description": "An Azure resource which represents which will provision the ability to create private location data.", + "type": "object", + "properties": { + "location": { + "readOnly": true, + "type": "string", + "description": "The location of the resource." + }, + "tags": { + "readOnly": true, + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Gets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." + }, + "properties": { + "description": "The Private Atlas resource properties.", + "$ref": "#/definitions/PrivateAtlasProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, "MapsAccount": { "description": "An Azure resource which represents access to a suite of Maps REST APIs.", "type": "object", @@ -627,6 +910,26 @@ "sku" ] }, + "PrivateAtlasCreateParameters": { + "description": "Parameters used to create a new Private Atlas resource.", + "type": "object", + "properties": { + "location": { + "type": "string", + "description": "The location of the resource." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." + } + }, + "required": [ + "location" + ] + }, "MapsAccountUpdateParameters": { "description": "Parameters used to update an existing Maps Account.", "type": "object", @@ -644,6 +947,19 @@ } } }, + "PrivateAtlasUpdateParameters": { + "description": "Parameters used to update an existing Private Atlas resource.", + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." + } + } + }, "MapsAccounts": { "description": "A list of Maps Accounts.", "type": "object", @@ -658,6 +974,20 @@ } } }, + "PrivateAtlasList": { + "description": "A list of Private Atlas resources.", + "type": "object", + "properties": { + "value": { + "description": "a Private Atlas.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/PrivateAtlas" + } + } + } + }, "Sku": { "description": "The SKU of the Maps Account.", "properties": { @@ -799,5 +1129,14 @@ } } } + }, + "PrivateAtlasProperties": { + "description": "Private Atlas resource properties", + "properties": { + "provisioningState": { + "description": "The state of the resource provisioning, terminal states: Succeeded, Failed, Canceled", + "type": "string" + } + } } } From deb01f20bd3e99788c7390e6b193c55e762e34a8 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 10:12:42 -0800 Subject: [PATCH 05/20] fixing invalid format --- .../2020-04-01-preview/maps-management.json | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json index f4d72136ad2b..4def324d1297 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json @@ -670,46 +670,46 @@ } } } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlas": { - "get": { - "description": "Get all Private Atlas instances for an Azure Map Account", - "operationId": "PrivateAtlas_ListByAccount", - "x-ms-examples": { - "ListPrivateAtlasByAccount": { - "$ref": "./examples/ListPrivateAtlasByAccount.json" - } - }, - "x-ms-pageable": { - "nextLinkName": null, - "itemName": "value" - }, - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlas": { + "get": { + "description": "Get all Private Atlas instances for an Azure Map Account", + "operationId": "PrivateAtlas_ListByAccount", + "x-ms-examples": { + "ListPrivateAtlasByAccount": { + "$ref": "./examples/ListPrivateAtlasByAccount.json" + } }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" + "x-ms-pageable": { + "nextLinkName": null, + "itemName": "value" }, - { - "$ref": "#/parameters/AccountNameParameter" - } - ], - "responses": { - "200": { - "description": "The request was successful.", - "schema": { - "$ref": "#/definitions/PrivateAtlasList" + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" } - }, - "default": { - "description": "An unexpected error occurred.", - "schema": { - "$ref": "#/definitions/Error" + ], + "responses": { + "200": { + "description": "The request was successful.", + "schema": { + "$ref": "#/definitions/PrivateAtlasList" + } + }, + "default": { + "description": "An unexpected error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } } } } @@ -1128,14 +1128,14 @@ "type": "string" } } - } - }, - "PrivateAtlasProperties": { - "description": "Private Atlas resource properties", - "properties": { - "provisioningState": { - "description": "The state of the resource provisioning, terminal states: Succeeded, Failed, Canceled", - "type": "string" + }, + "PrivateAtlasProperties": { + "description": "Private Atlas resource properties", + "properties": { + "provisioningState": { + "description": "The state of the resource provisioning, terminal states: Succeeded, Failed, Canceled", + "type": "string" + } } } } From 8d23949a10660864e6f135444929b67ea504607a Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 11:18:33 -0800 Subject: [PATCH 06/20] fixing build validation errors --- .../examples/CreatePrivateAtlas.json | 14 +++++++++++ .../examples/UpdatePrivateAtlas.json | 14 +++++++++++ .../2020-04-01-preview/maps-management.json | 25 ++++++++++--------- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json index d10ad047868b..618f8edf62da 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json @@ -40,6 +40,20 @@ "provisioningState": "Succeeded" } } + }, + "202": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "name": "myPrivateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlas", + "location": "unitedstates", + "tags": { + "specialTag": "true" + }, + "properties": { + "provisioningState": "Succeeded" + } + } } } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json index f8e53a9f84d9..68dbcad8af7c 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json @@ -26,6 +26,20 @@ } } }, + "202": { + "body": { + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "name": "myPrivateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlas", + "location": "unitedstates", + "tags": { + "specialTag": "true" + }, + "properties": { + "provisioningState": "Succeeded" + } + } + }, "404": {} } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json index 4def324d1297..407342fe4003 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json @@ -297,7 +297,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/moveResources": { "post": { "description": "Moves Maps Accounts from one ResourceGroup (or Subscription) to another", - "operationId": "Accounts_Move", + "operationId": "Accounts_MoveResources", "x-ms-examples": { "MoveAccounts": { "$ref": "./examples/MoveAccounts.json" @@ -470,7 +470,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlas/{privateAtlasName}": { "put": { "description": "Create or update a Private Atlas resource. Private Atlas resource will enable the usage of Azure resources to build a custom set of mapping data. It requires an account to exist before it can be created.", - "operationId": "PrivateAtlas_CreateOrUpdate", + "operationId": "PrivateAtlasCollection_CreateOrUpdate", "x-ms-examples": { "CreateAccount": { "$ref": "./examples/CreatePrivateAtlas.json" @@ -527,11 +527,12 @@ "$ref": "#/definitions/Error" } } - } + }, + "x-ms-long-running-operation": true }, "patch": { "description": "Updates the Private Atlas resource. Only a subset of the parameters may be updated after creation, such as Tags.", - "operationId": "PrivateAtlas_Update", + "operationId": "PrivateAtlasCollection_Update", "x-ms-examples": { "UpdateAccount": { "$ref": "./examples/UpdatePrivateAtlas.json" @@ -588,11 +589,11 @@ } }, "delete": { - "description": "Delete a Maps Account.", - "operationId": "PrivateAtlas_Delete", + "description": "Delete a Private Atlas resource.", + "operationId": "PrivateAtlasCollection_Delete", "x-ms-examples": { - "DeleteAccount": { - "$ref": "./examples/DeleteAccount.json" + "DeletePrivateAtlas": { + "$ref": "./examples/DeletePrivateAtlas.json" } }, "parameters": [ @@ -629,9 +630,9 @@ }, "get": { "description": "Get a Private Atlas resource.", - "operationId": "PrivateAtlas_Get", + "operationId": "PrivateAtlasCollection_Get", "x-ms-examples": { - "GetAccount": { + "GetPrivateAtlas": { "$ref": "./examples/GetPrivateAtlas.json" } }, @@ -656,7 +657,7 @@ "200": { "description": "The request was successful.", "schema": { - "$ref": "#/definitions/MapsAccount" + "$ref": "#/definitions/PrivateAtlas" } }, "404": { @@ -674,7 +675,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlas": { "get": { "description": "Get all Private Atlas instances for an Azure Map Account", - "operationId": "PrivateAtlas_ListByAccount", + "operationId": "PrivateAtlasCollection_ListByAccount", "x-ms-examples": { "ListPrivateAtlasByAccount": { "$ref": "./examples/ListPrivateAtlasByAccount.json" From b02b21ef04164089fc18c1092ffb276d3cb8a9e6 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 11:33:47 -0800 Subject: [PATCH 07/20] fixing style --- .../2020-04-01-preview/examples/ListPrivateAtlasByAccount.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json index 815ae1dd32ac..ad99e7163832 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json @@ -17,7 +17,7 @@ "tags": { "test": "true" }, - "properties":{ + "properties": { "provisioningState": "Succeeded" } } From e83c5cc903461360741ee65bc6572ac6c4054cc0 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 15:14:01 -0800 Subject: [PATCH 08/20] removing 202 from review feedback --- .../examples/CreatePrivateAtlas.json | 14 -------------- .../examples/UpdatePrivateAtlas.json | 14 -------------- .../2020-04-01-preview/maps-management.json | 12 ------------ 3 files changed, 40 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json index 618f8edf62da..d10ad047868b 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json @@ -40,20 +40,6 @@ "provisioningState": "Succeeded" } } - }, - "202": { - "body": { - "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", - "name": "myPrivateAtlas", - "type": "Microsoft.Maps/accounts/privateAtlas", - "location": "unitedstates", - "tags": { - "specialTag": "true" - }, - "properties": { - "provisioningState": "Succeeded" - } - } } } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json index 68dbcad8af7c..f8e53a9f84d9 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json @@ -26,20 +26,6 @@ } } }, - "202": { - "body": { - "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", - "name": "myPrivateAtlas", - "type": "Microsoft.Maps/accounts/privateAtlas", - "location": "unitedstates", - "tags": { - "specialTag": "true" - }, - "properties": { - "provisioningState": "Succeeded" - } - } - }, "404": {} } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json index 407342fe4003..fd7fc37d5481 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json @@ -515,12 +515,6 @@ "$ref": "#/definitions/PrivateAtlas" } }, - "202": { - "description": "The Private Atlas was accepted for creation", - "schema": { - "$ref": "#/definitions/PrivateAtlas" - } - }, "default": { "description": "An unexpected error occurred.", "schema": { @@ -571,12 +565,6 @@ "$ref": "#/definitions/PrivateAtlas" } }, - "202": { - "description": "The Private Atlas was accepted for update", - "schema": { - "$ref": "#/definitions/PrivateAtlas" - } - }, "404": { "description": "The specified Private Atlas was not found. Nothing was updated." }, From 21928176ec018ffc4a32afbbb40e1fdd6f5d10d0 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 16:48:44 -0800 Subject: [PATCH 09/20] api version, inheritance, and feedback --- .../examples/CreateAccount.json | 2 +- .../examples/CreatePrivateAtlas.json | 8 +- .../examples/DeleteAccount.json | 2 +- .../examples/DeletePrivateAtlas.json | 2 +- .../examples/GetAccount.json | 2 +- .../examples/GetOperations.json | 29 +- .../examples/GetPrivateAtlas.json | 6 +- .../examples/ListAccountsByResourceGroup.json | 2 +- .../examples/ListAccountsBySubscription.json | 2 +- .../examples/ListKeys.json | 2 +- .../examples/ListPrivateAtlasByAccount.json | 6 +- .../examples/MoveAccounts.json | 2 +- .../examples/RegenerateKey.json | 2 +- .../examples/UpdateAccount.json | 2 +- .../examples/UpdatePrivateAtlas.json | 2 +- .../maps-management.json | 262 +++++------------- 16 files changed, 116 insertions(+), 217 deletions(-) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/CreateAccount.json (97%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/CreatePrivateAtlas.json (84%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/DeleteAccount.json (84%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/DeletePrivateAtlas.json (86%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/GetAccount.json (94%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/GetOperations.json (66%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/GetPrivateAtlas.json (80%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/ListAccountsByResourceGroup.json (96%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/ListAccountsBySubscription.json (96%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/ListKeys.json (92%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/ListPrivateAtlasByAccount.json (80%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/MoveAccounts.json (93%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/RegenerateKey.json (93%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/UpdateAccount.json (95%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/examples/UpdatePrivateAtlas.json (95%) rename specification/maps/resource-manager/Microsoft.Maps/preview/{2020-04-01-preview => 2020-02-01-preview}/maps-management.json (77%) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreateAccount.json similarity index 97% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreateAccount.json index 913a02e9e5d9..479aa06c15d8 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreateAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreateAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreatePrivateAtlas.json similarity index 84% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreatePrivateAtlas.json index d10ad047868b..70a7474351d9 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/CreatePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreatePrivateAtlas.json @@ -15,9 +15,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlases/myPrivateAtlas", "name": "myPrivateAtlas", - "type": "Microsoft.Maps/accounts/privateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlases", "location": "unitedstates", "tags": { "test": "true" @@ -29,9 +29,9 @@ }, "201": { "body": { - "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlases/myPrivateAtlas", "name": "myPrivateAtlas", - "type": "Microsoft.Maps/accounts/privateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlases", "location": "unitedstates", "tags": { "test": "true" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/DeleteAccount.json similarity index 84% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/DeleteAccount.json index 4c5cbc930566..f1c3cf4b7431 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeleteAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/DeleteAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeletePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/DeletePrivateAtlas.json similarity index 86% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeletePrivateAtlas.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/DeletePrivateAtlas.json index ed3a2342cbcf..0fa27735df9f 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/DeletePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/DeletePrivateAtlas.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetAccount.json similarity index 94% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetAccount.json index e1d7c5f80ad8..aaa97ccbb65e 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json similarity index 66% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json index 886173b25659..aca1b47955a8 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetOperations.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview" + "api-version": "2020-02-01-preview" }, "responses": { "200": { @@ -59,6 +59,33 @@ "operation": "Generate new primary or secondary key", "description": "Generate new Maps Account primary or secondary key" } + }, + { + "name": "Microsoft.Maps/accounts/privateAtlases/write", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "Create or update a Private Atlas.", + "description": "Create or update a Private Atlas." + } + }, + { + "name": "Microsoft.Maps/accounts/privateAtlases/read", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "Get a Private Atlas.", + "description": "Get a Private Atlas." + } + }, + { + "name": "Microsoft.Maps/accounts/privateAtlases/delete", + "display": { + "provider": "Microsoft Maps", + "resource": "Maps Account", + "operation": "Delete a Private Atlas.", + "description": "Delete a Private Atlas." + } } ] } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetPrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetPrivateAtlas.json similarity index 80% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetPrivateAtlas.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetPrivateAtlas.json index 5c8282eb00e0..bacdcb2cae8e 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/GetPrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetPrivateAtlas.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", @@ -9,9 +9,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlases/myPrivateAtlas", "name": "myPrivateAtlas", - "type": "Microsoft.Maps/accounts/privateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlases", "location": "unitedstates", "tags": { "test": "true" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListAccountsByResourceGroup.json similarity index 96% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListAccountsByResourceGroup.json index 5121d76d82ed..d34e9c36e9a4 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsByResourceGroup.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListAccountsByResourceGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup" }, diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListAccountsBySubscription.json similarity index 96% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListAccountsBySubscription.json index 31c0a02c9c03..c95c95984281 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListAccountsBySubscription.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListAccountsBySubscription.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0" }, "responses": { diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListKeys.json similarity index 92% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListKeys.json index 8fd7d10afb76..2277ea6a5379 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListKeys.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListKeys.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListPrivateAtlasByAccount.json similarity index 80% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListPrivateAtlasByAccount.json index ad99e7163832..1b678fa217a4 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/ListPrivateAtlasByAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListPrivateAtlasByAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount" @@ -10,9 +10,9 @@ "body": { "value": [ { - "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlas/myPrivateAtlas", + "id": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount/privateAtlases/myPrivateAtlas", "name": "myPrivateAtlas", - "type": "Microsoft.Maps/accounts/privateAtlas", + "type": "Microsoft.Maps/accounts/privateAtlases", "location": "unitedstates", "tags": { "test": "true" diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/MoveAccounts.json similarity index 93% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/MoveAccounts.json index b3634454de07..395d6ef51aee 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/MoveAccounts.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/MoveAccounts.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "moveRequest": { diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/RegenerateKey.json similarity index 93% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/RegenerateKey.json index 4a73bb70e1ee..85dc9363ea18 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/RegenerateKey.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/RegenerateKey.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdateAccount.json similarity index 95% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdateAccount.json index 3cc014cd338b..19d20921a185 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdateAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdateAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdatePrivateAtlas.json similarity index 95% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdatePrivateAtlas.json index f8e53a9f84d9..c52f3d9ef0bf 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/examples/UpdatePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdatePrivateAtlas.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json similarity index 77% rename from specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json rename to specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json index fd7fc37d5481..f88c85a21853 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-04-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json @@ -3,7 +3,7 @@ "info": { "title": "Azure Maps Resource Provider", "description": "Resource Provider", - "version": "2020-04-01-preview", + "version": "2020-02-01-preview", "x-ms-code-generation-settings": { "name": "MapsManagementClient" } @@ -48,13 +48,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -85,7 +85,7 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -100,13 +100,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -134,7 +134,7 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -149,13 +149,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -171,7 +171,7 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -186,13 +186,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -211,7 +211,7 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -232,13 +232,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" } ], "responses": { @@ -251,7 +251,7 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -272,10 +272,10 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" } ], "responses": { @@ -288,7 +288,7 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -305,10 +305,10 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { "name": "resourceGroupName", @@ -334,7 +334,7 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -351,13 +351,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -370,13 +370,10 @@ "$ref": "#/definitions/MapsAccountKeys" } }, - "404": { - "description": "The specified Account does not exist." - }, "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -393,13 +390,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -421,13 +418,10 @@ "$ref": "#/definitions/MapsAccountKeys" } }, - "404": { - "description": "The specified Account does not exist." - }, "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -448,7 +442,7 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -461,16 +455,16 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlas/{privateAtlasName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlases/{privateAtlasName}": { "put": { "description": "Create or update a Private Atlas resource. Private Atlas resource will enable the usage of Azure resources to build a custom set of mapping data. It requires an account to exist before it can be created.", - "operationId": "PrivateAtlasCollection_CreateOrUpdate", + "operationId": "PrivateAtlases_CreateOrUpdate", "x-ms-examples": { "CreateAccount": { "$ref": "./examples/CreatePrivateAtlas.json" @@ -478,13 +472,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -518,15 +512,14 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } - }, - "x-ms-long-running-operation": true + } }, "patch": { "description": "Updates the Private Atlas resource. Only a subset of the parameters may be updated after creation, such as Tags.", - "operationId": "PrivateAtlasCollection_Update", + "operationId": "PrivateAtlases_Update", "x-ms-examples": { "UpdateAccount": { "$ref": "./examples/UpdatePrivateAtlas.json" @@ -534,13 +527,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -565,20 +558,17 @@ "$ref": "#/definitions/PrivateAtlas" } }, - "404": { - "description": "The specified Private Atlas was not found. Nothing was updated." - }, "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } }, "delete": { "description": "Delete a Private Atlas resource.", - "operationId": "PrivateAtlasCollection_Delete", + "operationId": "PrivateAtlases_Delete", "x-ms-examples": { "DeletePrivateAtlas": { "$ref": "./examples/DeletePrivateAtlas.json" @@ -586,13 +576,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -611,14 +601,14 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } }, "get": { "description": "Get a Private Atlas resource.", - "operationId": "PrivateAtlasCollection_Get", + "operationId": "PrivateAtlases_Get", "x-ms-examples": { "GetPrivateAtlas": { "$ref": "./examples/GetPrivateAtlas.json" @@ -626,13 +616,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -648,22 +638,19 @@ "$ref": "#/definitions/PrivateAtlas" } }, - "404": { - "description": "The specified Account does not exist." - }, "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlas": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlases": { "get": { "description": "Get all Private Atlas instances for an Azure Map Account", - "operationId": "PrivateAtlasCollection_ListByAccount", + "operationId": "PrivateAtlases_ListByAccount", "x-ms-examples": { "ListPrivateAtlasByAccount": { "$ref": "./examples/ListPrivateAtlasByAccount.json" @@ -675,13 +662,13 @@ }, "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/AccountNameParameter" @@ -697,7 +684,7 @@ "default": { "description": "An unexpected error occurred.", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -705,28 +692,6 @@ } }, "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Client Api Version." - }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "description": "The name of the Azure Resource Group.", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" - }, "AccountNameParameter": { "name": "accountName", "in": "path", @@ -745,90 +710,10 @@ } }, "definitions": { - "Error": { - "type": "object", - "description": "This object is returned when an error occurs in the Maps API", - "properties": { - "code": { - "type": "string", - "readOnly": true, - "description": "Error code." - }, - "message": { - "type": "string", - "readOnly": true, - "description": "If available, a human readable description of the error." - }, - "target": { - "type": "string", - "readOnly": true, - "description": "If available, the component generating the error." - }, - "details": { - "type": "array", - "readOnly": true, - "description": "If available, a list of additional details about the error.", - "items": { - "type": "object", - "properties": { - "code": { - "type": "string", - "readOnly": true, - "description": "Error code." - }, - "message": { - "type": "string", - "readOnly": true, - "description": "If available, a human readable description of the error." - }, - "target": { - "type": "string", - "readOnly": true, - "description": "If available, the component generating the error." - } - } - } - } - } - }, - "Resource": { - "description": "An Azure resource", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "The fully qualified resource identifier." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the Maps resource, which is unique within a Resource Group." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Azure resource type." - } - }, - "x-ms-azure-resource": true - }, "PrivateAtlas": { "description": "An Azure resource which represents which will provision the ability to create private location data.", "type": "object", "properties": { - "location": { - "readOnly": true, - "type": "string", - "description": "The location of the resource." - }, - "tags": { - "readOnly": true, - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Gets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." - }, "properties": { "description": "The Private Atlas resource properties.", "$ref": "#/definitions/PrivateAtlasProperties" @@ -836,7 +721,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ] }, @@ -844,19 +729,6 @@ "description": "An Azure resource which represents access to a suite of Maps REST APIs.", "type": "object", "properties": { - "location": { - "readOnly": true, - "type": "string", - "description": "The location of the resource." - }, - "tags": { - "readOnly": true, - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Gets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." - }, "sku": { "readOnly": true, "description": "The SKU of this account.", @@ -870,7 +742,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ] }, From acc1eb4400fb36d51e7e78fdc3c8cfcacd2fda90 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 16:54:03 -0800 Subject: [PATCH 10/20] removing 404 from examples and fixing version --- .../2020-02-01-preview/examples/CreatePrivateAtlas.json | 2 +- .../preview/2020-02-01-preview/examples/GetAccount.json | 3 +-- .../preview/2020-02-01-preview/examples/GetPrivateAtlas.json | 3 +-- .../preview/2020-02-01-preview/examples/ListKeys.json | 3 +-- .../preview/2020-02-01-preview/examples/RegenerateKey.json | 3 +-- .../preview/2020-02-01-preview/examples/UpdateAccount.json | 3 +-- .../2020-02-01-preview/examples/UpdatePrivateAtlas.json | 3 +-- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreatePrivateAtlas.json index 70a7474351d9..2cdac095220f 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreatePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/CreatePrivateAtlas.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-04-01-preview", + "api-version": "2020-02-01-preview", "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", "resourceGroupName": "myResourceGroup", "accountName": "myMapsAccount", diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetAccount.json index aaa97ccbb65e..bdd29f380fde 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetAccount.json @@ -23,7 +23,6 @@ "x-ms-client-id": "string" } } - }, - "404": {} + } } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetPrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetPrivateAtlas.json index bacdcb2cae8e..be395a1bdb57 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetPrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetPrivateAtlas.json @@ -20,7 +20,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListKeys.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListKeys.json index 2277ea6a5379..06154cd25e3b 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListKeys.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/ListKeys.json @@ -12,7 +12,6 @@ "primaryKey": "ZiBllKWCwXXLTO13S2TaoHoK8kPFYaoyYlAcnCcE4PQ", "secondaryKey": "cJHpmUGNaGGO8H59p6NKGhfff9VjD278-2bi5wo0_mU" } - }, - "404": {} + } } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/RegenerateKey.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/RegenerateKey.json index 85dc9363ea18..d49a57b6e44c 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/RegenerateKey.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/RegenerateKey.json @@ -15,7 +15,6 @@ "primaryKey": "uj0yqjjz8zG3IOSWvb_smi1q1QenGtupAqrOA1zCO6s", "secondaryKey": "cJHpmUGNaGGO8H59p6NKGhfff9VjD278-2bi5wo0_mU" } - }, - "404": {} + } } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdateAccount.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdateAccount.json index 19d20921a185..cb2efc8fd0c1 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdateAccount.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdateAccount.json @@ -28,7 +28,6 @@ "x-ms-client-id": "string" } } - }, - "404": {} + } } } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdatePrivateAtlas.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdatePrivateAtlas.json index c52f3d9ef0bf..7801c16868d7 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdatePrivateAtlas.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/UpdatePrivateAtlas.json @@ -25,7 +25,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } From caea80619146cbd18622e192f7fafc12496f9001 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 17:10:25 -0800 Subject: [PATCH 11/20] fixing readme and remaining 404s --- .../2020-02-01-preview/maps-management.json | 6 ----- .../maps/resource-manager/readme.go.md | 10 +++++++ specification/maps/resource-manager/readme.md | 27 ++++++++++++++----- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json index f88c85a21853..d9ac461acca8 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json @@ -128,9 +128,6 @@ "$ref": "#/definitions/MapsAccount" } }, - "404": { - "description": "The specified Account was not found. Nothing was updated." - }, "default": { "description": "An unexpected error occurred.", "schema": { @@ -205,9 +202,6 @@ "$ref": "#/definitions/MapsAccount" } }, - "404": { - "description": "The specified Account does not exist." - }, "default": { "description": "An unexpected error occurred.", "schema": { diff --git a/specification/maps/resource-manager/readme.go.md b/specification/maps/resource-manager/readme.go.md index 4920d9c3b794..6efef1e5f16f 100644 --- a/specification/maps/resource-manager/readme.go.md +++ b/specification/maps/resource-manager/readme.go.md @@ -15,6 +15,16 @@ go: batch: - tag: package-2018-05 - tag: package-2017-01 + - tag: package-2020-02 +``` + +### Tag: package-2020-02 and go + +These settings apply only when `--tag=package-2020-02 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag)=='package-2020-02' && $(go) +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-02-01-preview/$(namespace) ``` ### Tag: package-2018-05 and go diff --git a/specification/maps/resource-manager/readme.md b/specification/maps/resource-manager/readme.md index e3bae513e794..79bbbeb90092 100644 --- a/specification/maps/resource-manager/readme.md +++ b/specification/maps/resource-manager/readme.md @@ -26,18 +26,18 @@ These are the global settings for the Maps API. ``` yaml openapi-type: arm -tag: package-preview-2020-04 +tag: package-preview-2020-02 ``` +### Tag: package-preview-2020-02 -### Tag: package-preview-2020-04 +These settings apply only when `--tag=package-preview-2020-02` is specified on the command line. -These settings apply only when `--tag=package-preview-2020-04` is specified on the command line. - -```yaml $(tag) == 'package-preview-2020-04' +```yaml $(tag) == 'package-preview-2020-02' input-file: - - Microsoft.Maps/preview/2020-04-01-preview/maps-management.json + - Microsoft.Maps/preview/2020-02-01-preview/maps-management.json ``` + ### Tag: package-2017-01 These settings apply only when `--tag=package-2017-01` is specified on the command line. @@ -116,6 +116,20 @@ output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-maps batch: - tag: package-2017-01 - tag: package-2018-05 + - tag: package-2020-02 +``` + +### Tag: package-2020-02 and java + +These settings apply only when `--tag=package-2020-02 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java=`. + +``` yaml $(tag) == 'package-2020-02' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.maps.v2020_02_01_preview + output-folder: $(azure-libraries-for-java-folder)/sdk/maps/mgmt-v2020_02_01_preview +regenerate-manager: true +generate-interface: true ``` ### Tag: package-2017-01 and java @@ -158,6 +172,7 @@ require: $(this-folder)/../../../profiles/readme.md input-file: - $(this-folder)/Microsoft.Maps/stable/2017-01-01-preview/maps-management.json - $(this-folder)/Microsoft.Maps/stable/2018-05-01/maps-management.json + - $(this-folder)/Microsoft.Maps/private/2020-02-01-preview/maps-management.json ``` From ddc4bbd3cc2080d02a9e077e5ba9ee53adaba87b Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 17:36:58 -0800 Subject: [PATCH 12/20] fixing typo --- specification/maps/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/maps/resource-manager/readme.md b/specification/maps/resource-manager/readme.md index 79bbbeb90092..c16e2133eae3 100644 --- a/specification/maps/resource-manager/readme.md +++ b/specification/maps/resource-manager/readme.md @@ -172,7 +172,7 @@ require: $(this-folder)/../../../profiles/readme.md input-file: - $(this-folder)/Microsoft.Maps/stable/2017-01-01-preview/maps-management.json - $(this-folder)/Microsoft.Maps/stable/2018-05-01/maps-management.json - - $(this-folder)/Microsoft.Maps/private/2020-02-01-preview/maps-management.json + - $(this-folder)/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json ``` From 8a64f8b88a7881e188901e3febd851fc056d5264 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 17:56:09 -0800 Subject: [PATCH 13/20] trying to fix missing input file --- specification/maps/resource-manager/readme.go.md | 8 ++++---- specification/maps/resource-manager/readme.md | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/specification/maps/resource-manager/readme.go.md b/specification/maps/resource-manager/readme.go.md index 6efef1e5f16f..4796b49edc9d 100644 --- a/specification/maps/resource-manager/readme.go.md +++ b/specification/maps/resource-manager/readme.go.md @@ -15,15 +15,15 @@ go: batch: - tag: package-2018-05 - tag: package-2017-01 - - tag: package-2020-02 + - tag: package-preview-2020-02 ``` -### Tag: package-2020-02 and go +### Tag: package-preview-2020-02 and go -These settings apply only when `--tag=package-2020-02 --go` is specified on the command line. +These settings apply only when `--tag=package-preview-2020-02 --go` is specified on the command line. Please also specify `--go-sdk-folder=`. -``` yaml $(tag)=='package-2020-02' && $(go) +``` yaml $(tag)=='package-preview-2020-02' && $(go) output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-02-01-preview/$(namespace) ``` diff --git a/specification/maps/resource-manager/readme.md b/specification/maps/resource-manager/readme.md index c16e2133eae3..90d06ff50174 100644 --- a/specification/maps/resource-manager/readme.md +++ b/specification/maps/resource-manager/readme.md @@ -173,7 +173,6 @@ input-file: - $(this-folder)/Microsoft.Maps/stable/2017-01-01-preview/maps-management.json - $(this-folder)/Microsoft.Maps/stable/2018-05-01/maps-management.json - $(this-folder)/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json - ``` If there are files that should not be in the `all-api-versions` set, From 0fc42acbce1bddfc4b96530b5978dd7fd8f40c28 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Mon, 3 Feb 2020 18:24:52 -0800 Subject: [PATCH 14/20] fixing output directory --- specification/maps/resource-manager/readme.go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/maps/resource-manager/readme.go.md b/specification/maps/resource-manager/readme.go.md index 4796b49edc9d..620bc68e8b4c 100644 --- a/specification/maps/resource-manager/readme.go.md +++ b/specification/maps/resource-manager/readme.go.md @@ -24,7 +24,7 @@ These settings apply only when `--tag=package-preview-2020-02 --go` is specified Please also specify `--go-sdk-folder=`. ``` yaml $(tag)=='package-preview-2020-02' && $(go) -output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-02-01-preview/$(namespace) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-02-01-preview/$(namespace) ``` ### Tag: package-2018-05 and go From 1611a3511a677c85f6ba58a5e7883cd385881f52 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Tue, 4 Feb 2020 09:54:19 -0800 Subject: [PATCH 15/20] adding tags to support docs preview --- .../2020-02-01-preview/maps-management.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json index d9ac461acca8..ae1dc46aba2f 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json @@ -39,6 +39,9 @@ "paths": { "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}": { "put": { + "tags": [ + "Accounts" + ], "description": "Create or update a Maps Account. A Maps Account holds the keys which allow access to the Maps REST APIs.", "operationId": "Accounts_CreateOrUpdate", "x-ms-examples": { @@ -91,6 +94,9 @@ } }, "patch": { + "tags": [ + "Accounts" + ], "description": "Updates a Maps Account. Only a subset of the parameters may be updated after creation, such as Sku and Tags.", "operationId": "Accounts_Update", "x-ms-examples": { @@ -137,6 +143,9 @@ } }, "delete": { + "tags": [ + "Accounts" + ], "description": "Delete a Maps Account.", "operationId": "Accounts_Delete", "x-ms-examples": { @@ -174,6 +183,9 @@ } }, "get": { + "tags": [ + "Accounts" + ], "description": "Get a Maps Account.", "operationId": "Accounts_Get", "x-ms-examples": { @@ -213,6 +225,9 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts": { "get": { + "tags": [ + "Accounts" + ], "description": "Get all Maps Accounts in a Resource Group", "operationId": "Accounts_ListByResourceGroup", "x-ms-examples": { @@ -253,6 +268,9 @@ }, "/subscriptions/{subscriptionId}/providers/Microsoft.Maps/accounts": { "get": { + "tags": [ + "Accounts" + ], "description": "Get all Maps Accounts in a Subscription", "operationId": "Accounts_ListBySubscription", "x-ms-examples": { @@ -290,6 +308,9 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/moveResources": { "post": { + "tags": [ + "Accounts" + ], "description": "Moves Maps Accounts from one ResourceGroup (or Subscription) to another", "operationId": "Accounts_MoveResources", "x-ms-examples": { @@ -336,6 +357,9 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/listKeys": { "post": { + "tags": [ + "Accounts" + ], "description": "Get the keys to use with the Maps APIs. A key is used to authenticate and authorize access to the Maps REST APIs. Only one key is needed at a time; two are given to provide seamless key regeneration.", "operationId": "Accounts_ListKeys", "x-ms-examples": { @@ -375,6 +399,9 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/regenerateKey": { "post": { + "tags": [ + "Accounts" + ], "description": "Regenerate either the primary or secondary key for use with the Maps APIs. The old key will stop working immediately.", "operationId": "Accounts_RegenerateKeys", "x-ms-examples": { @@ -423,6 +450,9 @@ }, "/providers/Microsoft.Maps/operations": { "get": { + "tags": [ + "Operations" + ], "description": "List operations available for the Maps Resource Provider", "operationId": "Accounts_ListOperations", "x-ms-examples": { @@ -457,6 +487,9 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlases/{privateAtlasName}": { "put": { + "tags": [ + "Private Atlases" + ], "description": "Create or update a Private Atlas resource. Private Atlas resource will enable the usage of Azure resources to build a custom set of mapping data. It requires an account to exist before it can be created.", "operationId": "PrivateAtlases_CreateOrUpdate", "x-ms-examples": { @@ -512,6 +545,9 @@ } }, "patch": { + "tags": [ + "Private Atlases" + ], "description": "Updates the Private Atlas resource. Only a subset of the parameters may be updated after creation, such as Tags.", "operationId": "PrivateAtlases_Update", "x-ms-examples": { @@ -561,6 +597,9 @@ } }, "delete": { + "tags": [ + "Private Atlases" + ], "description": "Delete a Private Atlas resource.", "operationId": "PrivateAtlases_Delete", "x-ms-examples": { @@ -601,6 +640,9 @@ } }, "get": { + "tags": [ + "Private Atlases" + ], "description": "Get a Private Atlas resource.", "operationId": "PrivateAtlases_Get", "x-ms-examples": { @@ -643,6 +685,9 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlases": { "get": { + "tags": [ + "Private Atlases" + ], "description": "Get all Private Atlas instances for an Azure Map Account", "operationId": "PrivateAtlases_ListByAccount", "x-ms-examples": { From 230a359b82af6e8165687e8b49b36770adcf3906 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Tue, 4 Feb 2020 12:59:39 -0800 Subject: [PATCH 16/20] fixing List Operations name and sample --- .../examples/GetOperations.json | 16 +++++++++++++--- .../2020-02-01-preview/maps-management.json | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json index aca1b47955a8..07ee8797dd6f 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json @@ -60,11 +60,21 @@ "description": "Generate new Maps Account primary or secondary key" } }, + { + "name": "Microsoft.Maps/accounts/data/read", + "isDataAction": true, + "display": { + "provider": "Microsoft Maps", + "resource": "Data", + "operation": "Maps Account Reader Data Access", + "description": "Grants data read access to a maps account." + } + }, { "name": "Microsoft.Maps/accounts/privateAtlases/write", "display": { "provider": "Microsoft Maps", - "resource": "Maps Account", + "resource": "Private Atlas", "operation": "Create or update a Private Atlas.", "description": "Create or update a Private Atlas." } @@ -73,7 +83,7 @@ "name": "Microsoft.Maps/accounts/privateAtlases/read", "display": { "provider": "Microsoft Maps", - "resource": "Maps Account", + "resource": "Private Atlas", "operation": "Get a Private Atlas.", "description": "Get a Private Atlas." } @@ -82,7 +92,7 @@ "name": "Microsoft.Maps/accounts/privateAtlases/delete", "display": { "provider": "Microsoft Maps", - "resource": "Maps Account", + "resource": "Private Atlas", "operation": "Delete a Private Atlas.", "description": "Delete a Private Atlas." } diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json index ae1dc46aba2f..dafb64150580 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json @@ -454,7 +454,7 @@ "Operations" ], "description": "List operations available for the Maps Resource Provider", - "operationId": "Accounts_ListOperations", + "operationId": "Maps_ListOperations", "x-ms-examples": { "GetOperations": { "$ref": "./examples/GetOperations.json" From 4c19150a06f3657c01c285bdcdf087a359637e90 Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Tue, 4 Feb 2020 13:59:21 -0800 Subject: [PATCH 17/20] adding supressions and fix for operations --- .../2020-02-01-preview/maps-management.json | 6 ++++ specification/maps/resource-manager/readme.md | 32 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json index dafb64150580..2a00e1d9ca06 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json @@ -988,6 +988,12 @@ "description": "The human-readable description of the operation.", "type": "object", "properties": { + "isDataAction": { + "type": "boolean", + "readOnly": true, + "default": false, + "description": "Is the operation a data related action." + }, "provider": { "type": "string", "readOnly": true, diff --git a/specification/maps/resource-manager/readme.md b/specification/maps/resource-manager/readme.md index 90d06ff50174..7e4451cc4655 100644 --- a/specification/maps/resource-manager/readme.md +++ b/specification/maps/resource-manager/readme.md @@ -158,6 +158,38 @@ regenerate-manager: true generate-interface: true ``` +## Suppression + +``` yaml +directive: + - suppress: R2017 # PutRequestResponseScheme + where: + - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlases/{privateAtlasName}"].put + from: maps-management.json + reason: + - Common type models are inherited. + - suppress: R2001 # AvoidNestedProperties + where: + - $.definitions.PrivateAtlas.properties.properties + - $.definitions.MapsAccount.properties.properties + from: maps-management.json + reason: + - Flattening does not work well with polymorphic models. + - PrivateAtlas.properties is an arbitrary dictionary and cannot be flattened. + - MapsAccount.properties is an arbitrary dictionary and cannot be flattened. + - suppress: R3010 # TrackedResourceListByImmediateParent + where: + - $.definitions + reason: + - Pipeline runs are not listable. The operation PrivateAtlases_ListByAccount serves this purpose. + - suppress: R4000 # DescriptionAndTitleMissing + where: + - $.definitions.Resource + from: types.json + reason: + - Common type models are inherited. +``` + ## Multi-API/Profile support for AutoRest v3 generators AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. From 867f537313646916f980003b9109e077dc55a38e Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Tue, 4 Feb 2020 14:02:40 -0800 Subject: [PATCH 18/20] fixing the schema --- .../preview/2020-02-01-preview/maps-management.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json index 2a00e1d9ca06..e60f8123de65 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json @@ -984,16 +984,16 @@ "readOnly": true, "description": "Operation name: {provider}/{resource}/{operation}." }, + "isDataAction": { + "type": "boolean", + "readOnly": true, + "default": false, + "description": "Is the operation a data related action." + }, "display": { "description": "The human-readable description of the operation.", "type": "object", "properties": { - "isDataAction": { - "type": "boolean", - "readOnly": true, - "default": false, - "description": "Is the operation a data related action." - }, "provider": { "type": "string", "readOnly": true, From 72171a3b41484a68a4510a57e0c3ad68a4ff870b Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Tue, 4 Feb 2020 14:19:35 -0800 Subject: [PATCH 19/20] removing isDataAction to fix --- .../2020-02-01-preview/examples/GetOperations.json | 10 ---------- .../preview/2020-02-01-preview/maps-management.json | 6 ------ 2 files changed, 16 deletions(-) diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json index 07ee8797dd6f..5b1c4177aa9f 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/GetOperations.json @@ -60,16 +60,6 @@ "description": "Generate new Maps Account primary or secondary key" } }, - { - "name": "Microsoft.Maps/accounts/data/read", - "isDataAction": true, - "display": { - "provider": "Microsoft Maps", - "resource": "Data", - "operation": "Maps Account Reader Data Access", - "description": "Grants data read access to a maps account." - } - }, { "name": "Microsoft.Maps/accounts/privateAtlases/write", "display": { diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json index e60f8123de65..dafb64150580 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json @@ -984,12 +984,6 @@ "readOnly": true, "description": "Operation name: {provider}/{resource}/{operation}." }, - "isDataAction": { - "type": "boolean", - "readOnly": true, - "default": false, - "description": "Is the operation a data related action." - }, "display": { "description": "The human-readable description of the operation.", "type": "object", From 1a4bd6dc60b381c304873223d957407a386c7c1d Mon Sep 17 00:00:00 2001 From: Daniel Stack Date: Tue, 4 Feb 2020 15:10:11 -0800 Subject: [PATCH 20/20] supress nested tracked, and remove move --- .../examples/MoveAccounts.json | 17 ----- .../2020-02-01-preview/maps-management.json | 72 +------------------ specification/maps/resource-manager/readme.md | 12 ++++ 3 files changed, 13 insertions(+), 88 deletions(-) delete mode 100644 specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/MoveAccounts.json diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/MoveAccounts.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/MoveAccounts.json deleted file mode 100644 index 395d6ef51aee..000000000000 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/examples/MoveAccounts.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parameters": { - "api-version": "2020-02-01-preview", - "subscriptionId": "21a9967a-e8a9-4656-a70b-96ff1c4d05a0", - "resourceGroupName": "myResourceGroup", - "moveRequest": { - "targetResourceGroup": "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup2", - "resourceIds": [ - "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount", - "/subscriptions/21a9967a-e8a9-4656-a70b-96ff1c4d05a0/resourceGroups/myResourceGroup/providers/Microsoft.Maps/accounts/myMapsAccount2" - ] - } - }, - "responses": { - "200": {} - } -} diff --git a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json index dafb64150580..65917ee7ddd9 100644 --- a/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json +++ b/specification/maps/resource-manager/Microsoft.Maps/preview/2020-02-01-preview/maps-management.json @@ -306,55 +306,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/moveResources": { - "post": { - "tags": [ - "Accounts" - ], - "description": "Moves Maps Accounts from one ResourceGroup (or Subscription) to another", - "operationId": "Accounts_MoveResources", - "x-ms-examples": { - "MoveAccounts": { - "$ref": "./examples/MoveAccounts.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "description": "The name of the resource group that contains Maps Account to move.", - "required": true, - "type": "string" - }, - { - "name": "moveRequest", - "in": "body", - "description": "The details of the Maps Account move.", - "required": true, - "schema": { - "$ref": "#/definitions/MapsAccountsMoveRequest" - } - } - ], - "responses": { - "200": { - "description": "The Accounts were successfully moved." - }, - "default": { - "description": "An unexpected error occurred.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" - } - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/listKeys": { "post": { "tags": [ @@ -798,7 +749,7 @@ "additionalProperties": { "type": "string" }, - "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters." + "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). Each tag must have a key no greater than 128 characters and value no greater than 256 characters." }, "sku": { "description": "The SKU of this account.", @@ -905,27 +856,6 @@ "name" ] }, - "MapsAccountsMoveRequest": { - "description": "The description of what resources to move between resource groups.", - "type": "object", - "required": [ - "targetResourceGroup", - "resourceIds" - ], - "properties": { - "targetResourceGroup": { - "type": "string", - "description": "The name of the destination resource group." - }, - "resourceIds": { - "type": "array", - "items": { - "type": "string" - }, - "description": "A list of resource names to move from the source resource group." - } - } - }, "MapsKeySpecification": { "description": "Whether the operation refers to the primary or secondary key.", "type": "object", diff --git a/specification/maps/resource-manager/readme.md b/specification/maps/resource-manager/readme.md index 7e4451cc4655..2be4e6a22c65 100644 --- a/specification/maps/resource-manager/readme.md +++ b/specification/maps/resource-manager/readme.md @@ -165,9 +165,11 @@ directive: - suppress: R2017 # PutRequestResponseScheme where: - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}/privateAtlases/{privateAtlasName}"].put + - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Maps/accounts/{accountName}"].put from: maps-management.json reason: - Common type models are inherited. + - ClientId property will be ignored by requests - suppress: R2001 # AvoidNestedProperties where: - $.definitions.PrivateAtlas.properties.properties @@ -182,6 +184,16 @@ directive: - $.definitions reason: - Pipeline runs are not listable. The operation PrivateAtlases_ListByAccount serves this purpose. + - suppress: R3027 # TrackedResourceListByResourceGroup + where: + - $.definitions.PrivateAtlas + reason: + - This is a nested tracked resource. + - suppress: R3028 # TrackedResourceListBySubscription + where: + - $.definitions.PrivateAtlas + reason: + - This is a nested tracked resource. - suppress: R4000 # DescriptionAndTitleMissing where: - $.definitions.Resource