From ab2f0968ebae1a305bb7e0f616cf1353b2a36828 Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Tue, 13 Apr 2021 12:18:25 -0700 Subject: [PATCH 01/27] ACR Admin swagger spec changes --- .../preview/2019-11-01/checkCapacity.json | 115 ++++++ .../examples/Configuration/CheckCapacity.json | 21 ++ .../Configuration/GetConfiguration.json | 19 + .../Configuration/SetConfiguration.json | 24 ++ .../2019-11-01/examples/Operations/List.json | 85 +++++ .../examples/Quotas/CreateOrUpdate.json | 27 ++ .../2019-11-01/examples/Quotas/Delete.json | 11 + .../2019-11-01/examples/Quotas/Get.json | 21 ++ .../2019-11-01/examples/Quotas/List.json | 24 ++ .../2019-11-01/examples/registries/List.json | 29 ++ .../preview/2019-11-01/getConfiguration.json | 106 ++++++ .../preview/2019-11-01/operations.json | 126 +++++++ .../preview/2019-11-01/quotas.json | 342 ++++++++++++++++++ .../preview/2019-11-01/registries.json | 152 ++++++++ .../preview/2019-11-01/setConfiguration.json | 115 ++++++ .../containerregistry/readme.azsautogen.md | 56 +++ .../containerregistry/readme.md | 89 +++++ 17 files changed, 1362 insertions(+) create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/CheckCapacity.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/SetConfiguration.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/CreateOrUpdate.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Get.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/List.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md create mode 100644 specification/azsadmin/resource-manager/containerregistry/readme.md diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json new file mode 100644 index 000000000000..2eebf233747b --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json @@ -0,0 +1,115 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/checkCapacity": { + "post": { + "x-ms-examples": { + "Returns container registry overall capacity properties.": { + "$ref": "./examples/Configuration/CheckCapacity.json" + } + }, + "tags": [ + "ContainerRegistryCapacity" + ], + "description": "Returns container registry overall capacity properties.", + "operationId": "ContainerRegistryCapacity_Post", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Container registry overall capacity properties is being returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacity" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ContainerRegistryCapacity": { + "description": "Container registry capacity property.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry capacity property.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ContainerRegistryCapacityProperty" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "ContainerRegistryCapacityProperty": { + "description": "Container registry capacity property.", + "type": "object", + "properties": { + "maximumCapacityInGb": { + "description": "Total storage capacity (GB) which can used by the registry.", + "type": "integer", + "format": "int32" + }, + "allowPush": { + "description": "Flag denotes if pushes are blocked for all registries.", + "type": "boolean" + }, + "registriesConsumptionInGb": { + "description": "Total storage capacity (GB) consumed by the registry.", + "type": "number", + "format": "float" + } + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/CheckCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/CheckCapacity.json new file mode 100644 index 000000000000..2d84ad6c40de --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/CheckCapacity.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "api-version": "2019-11-01-preview", + "location": "local", + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/checkCapacity/RegistryStampConfiguration", + "name": "local/RegistryStampConfiguration", + "type": "Microsoft.ContainerRegistry.Admin/locations/checkCapacity", + "properties": { + "maximumCapacityInGb": 100, + "registriesConsumptionInGb": 50.12, + "allowPush": true + } + } + } + } +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json new file mode 100644 index 000000000000..5e66d723c0d6 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "api-version": "2019-11-01-preview", + "location": "local", + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/getConfiguration/RegistryStampCapacity", + "name": "local/RegistryStampCapacity", + "type": "Microsoft.ContainerRegistry.Admin/locations/getConfiguration", + "properties": { + "maximumCapacityInGb": 100 + } + } + } + } +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/SetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/SetConfiguration.json new file mode 100644 index 000000000000..ac569b6af88c --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/SetConfiguration.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "api-version": "2019-11-01-preview", + "location": "local", + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "setConfigurationRequest": { + "properties": { + "maximumCapacityInGb": 10 + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/setConfiguration/RegistryStampCapacity", + "name": "local/RegistryStampCapacity", + "type": "Microsoft.ContainerRegistry.Admin/locations/setConfiguration", + "properties": { + "maximumCapacityInGb": 10 + } + } + } + } +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json new file mode 100644 index 000000000000..9d1806c331d8 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json @@ -0,0 +1,85 @@ +{ + "parameters": { + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.ContainerRegistry.Admin/locations/quotas/read", + "display": { + "provider": "Microsoft.ContainerRegistry.Admin", + "resource": "Quotas", + "operation": "List/Get Registry Quota(s)", + "description": "Gets a list of all Registry quota resources in the specified location." + } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/locations/quotas/write", + "display": { + "provider": "Microsoft.ContainerRegistry.Admin", + "resource": "Quotas", + "operation": "Create/Update Registry Quota", + "description": "Creates a Registry quota resource or modifies the quota values in the specified location." + } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/locations/quotas/delete", + "display": { + "provider": "Microsoft.ContainerRegistry.Admin", + "resource": "Quotas", + "operation": "Delete Registry Quota", + "description": "Deletes the given Registry quota resource from the specified location." + } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/operations/read", + "display": { + "provider": "Microsoft.ContainerRegistry.Admin", + "resource": "Operations", + "operation": "List Available Operations", + "description": "Lists operations available on registry resource provider" + } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/locations/checkCapacity/action", + "display": { + "provider": "Microsoft.ContainerRegistry.Admin", + "resource": "Registry Capacity Action", + "operation": "Get Registry Capacity Setting", + "description": "Returns registry capacity property." + } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/locations/getConfiguration/action", + "display": { + "provider": "Microsoft.ContainerRegistry.Admin", + "resource": "Registry configuration", + "operation": "Get Registry stamp configuration action", + "description": "Returns properties for registry stamp configuration." + } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/locations/setConfiguration/action", + "display": { + "provider": "Microsoft.ContainerRegistry.Admin", + "resource": "Registry configuration", + "operation": "Update registry stamp configuration action", + "description": "Update registry stamp configuration." + } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/locations/registries/read", + "display": { + "provider": "Microsoft.ContainerRegistry.Admin", + "resource": "Registries", + "operation": "List Registries", + "description": "Returns properties for the registries." + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/CreateOrUpdate.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/CreateOrUpdate.json new file mode 100644 index 000000000000..0a6826e12d3d --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/CreateOrUpdate.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "quotaName": "TestCreateQuota", + "api-version": "2019-11-01-preview", + "quotaObject": { + "properties": { + "numberOfRegistries": 10, + "capacityPerRegistryInGb": 50 + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/quotas/TestCreateQuota", + "name": "local/TestCreateQuota", + "type": "Microsoft.ContainerRegistry.Admin/locations/quotas", + "properties": { + "numberOfRegistries": 10, + "capacityPerRegistryInGb": 50 + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json new file mode 100644 index 000000000000..5a53873b3a3c --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "quotaName": "TestCreateQuota", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": {} + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Get.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Get.json new file mode 100644 index 000000000000..0bbaa54430b3 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Get.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "quotaName": "TestCreateQuota", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/quotas/TestCreateQuota", + "name": "local/TestCreateQuota", + "type": "Microsoft.ContainerRegistry.Admin/locations/quotas", + "properties": { + "numberOfRegistries": 10, + "capacityPerRegistryInGb": 50 + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/List.json new file mode 100644 index 000000000000..54f51ced0a80 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/List.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/quotas/TestCreateQuota", + "name": "local/TestCreateQuota", + "type": "Microsoft.ContainerRegistry.Admin/locations/quotas", + "properties": { + "numberOfRegistries": 10, + "capacityPerRegistryInGb": 50 + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json new file mode 100644 index 000000000000..ba3cc092d728 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/registries/testregistry", + "name": "local/testregistry", + "type": "Microsoft.ContainerRegistry.Admin/locations/registries", + "properties": { + "id": "/subscriptions/9a20956c-05fe-4c72-aa29-b2a1e5b802a7/resourceGroups/localResource/providers/Microsoft.ContainerRegistry/registries/testregistry", + "name": "testregistry", + "location": "local", + "creationDate": "2021-04-09T17:02:09.9839001Z", + "subscriptionId": "9a20956c-05fe-4c72-aa29-b2a1e5b802a7", + "resourceGroup": "localResource", + "registrySizeInBytes": 0 + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json new file mode 100644 index 000000000000..67f4536fc197 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json @@ -0,0 +1,106 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/getConfiguration": { + "post": { + "x-ms-examples": { + "Returns container registry overall capacity properties.": { + "$ref": "./examples/Configuration/GetConfiguration.json" + } + }, + "tags": [ + "ContainerRegistryGetConfiguration" + ], + "description": "Returns container registry overall capacity properties.", + "operationId": "ContainerRegistryGetConfiguration_Post", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Container registry overall capacity properties is being returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacity" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ContainerRegistryCapacity": { + "description": "Container registry capacity property.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry capacity property.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ContainerRegistryCapacityProperty" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "ContainerRegistryCapacityProperty": { + "description": "Container registry capacity property.", + "type": "object", + "properties": { + "maximumCapacityInGb": { + "description": "Total storage capacity (GB) which can used by the registry.", + "type": "integer", + "format": "int32" + } + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json new file mode 100644 index 000000000000..acc13f581c7c --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json @@ -0,0 +1,126 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/providers/Microsoft.ContainerRegistry.Admin/operations": { + "get": { + "x-ms-examples": { + "Get the list of support rest operations.": { + "$ref": "./examples/Operations/List.json" + } + }, + "description": "Get the list of supported admin container registry rest operations.", + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of operations has been returned.", + "schema": { + "$ref": "#/definitions/OperationList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "Operation": { + "description": "Describes the supported REST operation.", + "properties": { + "name": { + "description": "The name of the operation being performed on this particular object. It should match the action name that appears in RBAC / the event service.", + "type": "string", + "readOnly": true + }, + "display": { + "description": "Contains the localized display information for this particular operation / action.", + "$ref": "#/definitions/Display", + "readOnly": true + } + } + }, + "Display": { + "description": "Contains the localized display information for this particular operation / action.", + "properties": { + "provider": { + "description": "The localized friendly form of the resource provider name – it is expected to also include the publisher/company responsible. It should use Title Casing and begin with \"Microsoft\" for 1st party services. e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute.\"", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "The localized friendly form of the resource type related to this action/operation – it should match the public documentation for the resource provider.", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "The localized friendly name for the operation, as it should be shown to the user.", + "type": "string", + "readOnly": true + }, + "description": { + "description": "The localized friendly description for the operation, as it should be shown to the user. It should be thorough, yet concise – it will be used in tool tips and detailed views.", + "type": "string", + "readOnly": true + } + } + }, + "OperationList": { + "description": "Pageable list of supported operations.", + "properties": { + "value": { + "description": "List of operations", + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + } + } + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] + } + \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json new file mode 100644 index 000000000000..a8d1283e9653 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json @@ -0,0 +1,342 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/quotas/{quotaName}": { + "put": { + "x-ms-examples": { + "Create or update an existing container registry quota.": { + "$ref": "./examples/Quotas/CreateOrUpdate.json" + } + }, + "tags": [ + "ContainerRegistryQuotas" + ], + "description": "Create or update an existing container registry quota.", + "operationId": "ContainerRegistryQuotas_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/QuotaNameParameter" + }, + { + "$ref": "#/parameters/ContainerRegistryQuotaParameters" + } + ], + "responses": { + "200": { + "description": "OK -- The container registry quota has been created or updated.", + "schema": { + "$ref": "#/definitions/ContainerRegistryQuota" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "x-ms-examples": { + "Delete an existing container registry quota.": { + "$ref": "./examples/Quotas/Delete.json" + } + }, + "tags": [ + "ContainerRegistryQuotas" + ], + "description": "Delete an existing container registry quota", + "operationId": "ContainerRegistryQuotas_Delete", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/QuotaNameParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The container registry quota has been deleted." + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "x-ms-examples": { + "Returns the specified container registry quota.": { + "$ref": "./examples/Quotas/Get.json" + } + }, + "tags": [ + "ContainerRegistryQuotas" + ], + "description": "Returns the specified container registry quota.", + "operationId": "ContainerRegistryQuotas_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/QuotaNameParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The container registry quota has been returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryQuota" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/quotas": { + "get": { + "x-ms-examples": { + "Returns a list of container registry quotas at the given location.": { + "$ref": "./examples/Quotas/List.json" + } + }, + "tags": [ + "ContainerRegistryQuotas" + ], + "description": "Returns a list of container registry quotas at the given location.", + "operationId": "ContainerRegistryQuotas_List", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of container registry quotas has been returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryQuotaList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "Resource": { + "description": "Base resource object.", + "type": "object", + "properties": { + "id": { + "description": "Resource ID.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Resource Name.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "Resource Type.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, + "ContainerRegistryQuota": { + "description": "Container registry quota.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry quota properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ContainerRegistryQuotaProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ContainerRegistryQuotaProperties": { + "description": "Container registry quota properties.", + "type": "object", + "properties": { + "numberOfRegistries": { + "description": "Total number of container registry accounts.", + "type": "integer", + "format": "int32", + "default": 20 + }, + "capacityPerRegistryInGb": { + "description": "Storage capacity (GB) of each registry.", + "type": "integer", + "format": "int32", + "default": 50 + } + } + }, + "ContainerRegistryQuotaList": { + "description": "List of container registry quotas.", + "type": "object", + "properties": { + "value": { + "description": "List of container registry quotas.", + "type": "array", + "items": { + "$ref": "#/definitions/ContainerRegistryQuota" + } + } + } + }, + "ErrorResponse": { + "description": "The error response for request which failed.", + "type": "object", + "properties": { + "code": { + "description": "The error description code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "The error description message.", + "type": "string", + "readOnly": true + }, + "target": { + "description": "The error target description.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "The error details information.", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true + } + } + } + }, + "parameters": { + "ApiVersionParameter": { + "description": "REST Api Version.", + "name": "api-version", + "type": "string", + "in": "query", + "required": true + }, + "LocationParameter": { + "description": "Resource location.", + "name": "location", + "type": "string", + "in": "path", + "required": true, + "x-ms-parameter-location": "method" + }, + "SubscriptionIdParameter": { + "description": "Subscription Id.", + "name": "subscriptionId", + "type": "string", + "in": "path", + "required": true, + "x-ms-parameter-location": "method" + }, + "QuotaNameParameter": { + "description": "The name of the container registry quota.", + "name": "quotaName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "ContainerRegistryQuotaParameters": { + "description": "The properties of quota being created or updated.", + "name": "quotaObject", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ContainerRegistryQuota" + }, + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json new file mode 100644 index 000000000000..7258499f936c --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json @@ -0,0 +1,152 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/registries": { + "get": { + "x-ms-examples": { + "Returns a list of container registry quotas at the given location.": { + "$ref": "./examples/registries/List.json" + } + }, + "tags": [ + "ContainerRegistries" + ], + "description": "Returns a list of container registries present in all tenant location.", + "operationId": "ContainerRegistries_List", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of container registries has been returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistriesList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "ContainerRegistry": { + "description": "Container registry properties.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ContainerRegistryProperties" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "ContainerRegistryProperties": { + "description": "Container registry properties.", + "type": "object", + "properties": { + "id": { + "description": "Container registry id.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Container registry name.", + "type": "string", + "readOnly": true + }, + "location": { + "description": "Container registry location.", + "type": "string", + "readOnly": true + }, + "subscriptionId": { + "description": "SubscriptionId where container registry is present.", + "type": "string", + "readOnly": true + }, + "resourceGroup": { + "description": "ResourceGroup where container registry is present.", + "type": "string", + "readOnly": true + }, + "creationDate": { + "format": "date-time", + "description": "The time at which the registry created.", + "type": "string" + }, + "registrySizeInBytes": { + "description": "Total storage capacity (GB) used by the registry.", + "type": "integer", + "format": "int64" + } + } + }, + "ContainerRegistriesList": { + "description": "List of container registries.", + "type": "object", + "properties": { + "value": { + "description": "List of container registries.", + "type": "array", + "items": { + "$ref": "#/definitions/ContainerRegistry" + } + } + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json new file mode 100644 index 000000000000..f6fdb952bb88 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json @@ -0,0 +1,115 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/setConfiguration": { + "post": { + "x-ms-examples": { + "Returns container registry overall capacity properties.": { + "$ref": "./examples/Configuration/SetConfiguration.json" + } + }, + "tags": [ + "ContainerRegistrySetConfiguration" + ], + "description": "Configure container registry overall capacity properties.", + "operationId": "ContainerRegistrySetConfiguration_Post", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + }, + { + "name": "setConfigurationRequest", + "in": "body", + "description": "The object containing information for the configuration request.", + "required": true, + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacityProperty" + } + } + ], + "responses": { + "200": { + "description": "OK -- Container registry overall capacity properties is being returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacity" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ContainerRegistryCapacity": { + "description": "Container registry capacity property.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry capacity property.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ContainerRegistryCapacityProperty" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "ContainerRegistryCapacityProperty": { + "description": "Container registry capacity property.", + "type": "object", + "properties": { + "maximumCapacityInGb": { + "description": "Total storage capacity (GB) which can used by the registry.", + "type": "integer", + "format": "int32" + } + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md new file mode 100644 index 000000000000..c0ba01fd2dd6 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md @@ -0,0 +1,56 @@ +# ContainerRegistry Admin + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for ContainerRegistry Admin. + +--- +## Getting Started +To build the SDK for ContainerRegistry Admin, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run: + +> `autorest` + +To see additional help and options, run: + +> `autorest --help` +--- + +## Configuration + +### Basic Information +These are the global settings for the ContainerRegistry API. + +``` yaml +title: StorageAdminClient +description: ContainerRegistry Admin Client +openapi-type: arm +tag: package-2019-11-01 +``` + +``` yaml +input-file: + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json +``` + +--- +# Code Generation + +## C# + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + namespace: Microsoft.AzureStack.Management.ContainerRegistry.Admin + payload-flattening-threshold: 1 + output-folder: $(csharp-sdks-folder)/Generated + clear-output-folder: true +``` diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.md b/specification/azsadmin/resource-manager/containerregistry/readme.md new file mode 100644 index 000000000000..56236068e955 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/readme.md @@ -0,0 +1,89 @@ +# ContainerRegistry Admin + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for ContainerRegistry Admin. + +--- +## Getting Started +To build the SDK for ContainerRegistry Admin, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run: + +> `autorest` + +To see additional help and options, run: + +> `autorest --help` +--- + +## Configuration + +### Basic Information +These are the global settings for the ContainerRegistry API. + +``` yaml +title: ContainerRegistryAdminClient +description: ContainerRegistry Admin Client +openapi-type: arm +tag: package-2019-11-01 +``` + +### Tag: package-2019-11-01 + +These settings apply only when `--tag=package-2019-11-01` is specified on the command line. + +``` yaml $(tag) == 'package-2019-11-01' +input-file: + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json" +``` + +--- +# Code Generation + +## C# + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + namespace: Microsoft.AzureStack.Management.ContainerRegistry.Admin + payload-flattening-threshold: 1 + output-folder: $(csharp-sdks-folder)/Generated + clear-output-folder: true +``` + +## Multi-API/Profile support for AutoRest v3 generators + +AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. + +This block is updated by an automatic script. Edits may be lost! + +``` yaml $(tag) == 'all-api-versions' /* autogenerated */ +# include the azure profile definitions from the standard location +require: $(this-folder)/../../../../profiles/readme.md + +# all the input files across all versions +input-file: + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json +``` + +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 29dd865acf92a54146daa69db914045f91f55dd9 Mon Sep 17 00:00:00 2001 From: larysaborodina Date: Thu, 6 May 2021 03:25:32 +0000 Subject: [PATCH 02/27] Release/larisab (#1) * Add swagger spec for acr setup. * Add swagger spec for acr setup - fixed jsons. * Add swagger spec for acr setup - address feedback to convert get status to post. * Add swagger spec for acr setup - fixed typo. * Add swagger spec for acr setup - added setup specs to readme. * Add swagger spec for acr setup - fixed checkSetup definitions. * Add swagger spec for acr setup - addressed comments. * Add swagger spec for acr setup - addressed ARM feedback. * Add swagger spec for acr setup - added proper input-files n readme. * Add swagger spec for acr setup - fixed inavalid scheme. * Add swagger spec for acr setup - fixed inavalid method Post instaed of Get. Co-authored-by: Larysa Borodina --- .../examples/Setup/setupStatus.json | 18 +++ .../2019-11-01/examples/Setup/startSetup.json | 18 +++ .../preview/2019-11-01/registries.json | 2 +- .../preview/2019-11-01/setupStatus.json | 118 +++++++++++++++ .../preview/2019-11-01/startSetup.json | 141 ++++++++++++++++++ .../containerregistry/readme.azsautogen.md | 2 + .../containerregistry/readme.md | 4 + 7 files changed, 302 insertions(+), 1 deletion(-) create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json new file mode 100644 index 000000000000..ce385fe6af10 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setupStatus", + "name": "value", + "type": "Microsoft.ContainerRegistry.Setup/setupStatus", + "properties": { + "status": "SetupCompleted" + } + } + } + } +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json new file mode 100644 index 000000000000..5f8d7cd38a21 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "api-version": "2019-11-01-preview" + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setupStatus", + "name": "value", + "type": "Microsoft.ContainerRegistry.Setup/setupStatus", + "properties": { + "statusUri": "https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/setupStatus?api-version=2019-11-01-preview" + } + } + } + } +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json index 7258499f936c..ba88a04261d8 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json @@ -19,7 +19,7 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/registries": { "get": { "x-ms-examples": { - "Returns a list of container registry quotas at the given location.": { + "Returns a list of container registries at the given location.": { "$ref": "./examples/registries/List.json" } }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json new file mode 100644 index 000000000000..b1369ee9e7c3 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json @@ -0,0 +1,118 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/setupStatus": { + "get": { + "x-ms-examples": { + "Returns the status of the container registry setup.": { + "$ref": "./examples/Setup/setupStatus.json" + } + }, + "tags": [ + "ContainerRegistrySetup" + ], + "description": "Returns the status of the container registry setup.", + "operationId": "ContainerRegistrySetupStatus", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The status of the container registry setup has been returned.", + "schema": { + "$ref": "#/definitions/SetupResult" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "SetupResult": { + "description": "Container registry setup result.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry setup result properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SetupResultProperties" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "SetupResultProperties": { + "description": "Container registry setup result properties.", + "type": "object", + "properties": { + "status": { + "description": "The status of the container registry setup.", + "$ref": "#/definitions/SetupStatus", + "readOnly": true + } + } + }, + "SetupStatus": { + "description": "The status of the container registry setup.", + "type": "string", + "enum": [ + "ReadyToSetup", + "Running", + "Failed", + "Cancelled", + "Completed" + ], + "x-ms-enum": { + "name": "SetupStatus", + "modelAsString": true + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json new file mode 100644 index 000000000000..15eac8ebfd24 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json @@ -0,0 +1,141 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/startSetup": { + "post": { + "x-ms-examples": { + "Invokes container registry certificate uploading and ACR service deployment.": { + "$ref": "./examples/Setup/startSetup.json" + } + }, + "tags": [ + "ContainerRegistryStartSetup" + ], + "description": "Invokes container registry certificate uploading and service deployment.", + "operationId": "ContainerRegistryStartSetup", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + }, + { + "name": "startSetupRequest", + "in": "body", + "description": "The object containing information for the configuration request.", + "required": true, + "schema": { + "$ref": "#/definitions/ContainerRegistrySetupProperty" + } + } + ], + "responses": { + "201": { + "description": "Created -- Container registry certificate was uploaded successfully and deployment started.", + "schema": { + "$ref": "#/definitions/ContainerRegistrySetup" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ContainerRegistrySetupProperty": { + "description": "Container registry setup property.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry setup properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ContainerRegistrySetupProperties" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "ContainerRegistrySetupProperties": { + "description": "Container registry setup properties.", + "type": "object", + "properties": { + "password": { + "description": "Ssl certificate password.", + "type": "string" + }, + "sslCertBase64": { + "description": "Ssl certificate in base64 format.", + "type": "string" + } + } + }, + "ContainerRegistrySetup": { + "description": "Container registry start setup return.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry start setup return properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SetupProperty" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "SetupProperty": { + "description": "Container registry start setup return property.", + "type": "object", + "properties": { + "statusUri": { + "description": "The uri to poll status of the container registry setup.", + "type": "string" + } + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md index c0ba01fd2dd6..96a89b73739c 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md @@ -35,6 +35,8 @@ input-file: - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json ``` --- diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.md b/specification/azsadmin/resource-manager/containerregistry/readme.md index 56236068e955..51603bf3d1af 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.md @@ -39,6 +39,8 @@ input-file: - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json" ``` --- @@ -77,6 +79,8 @@ input-file: - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json ``` If there are files that should not be in the `all-api-versions` set, From 880c487e377357a8c5b2be2128984407dc4f0900 Mon Sep 17 00:00:00 2001 From: Rohit Date: Wed, 5 May 2021 20:31:40 -0700 Subject: [PATCH 03/27] Update API changes (#2) * Update API changes * Add delete call implementation * update examples --- .../{checkCapacity.json => capacity.json} | 79 +++++- .../preview/2019-11-01/configuration.json | 261 ++++++++++++++++++ .../Configuration/DeleteConfiguration.json | 11 + .../{CheckCapacity.json => GetCapacity.json} | 8 +- .../Configuration/GetConfiguration.json | 8 +- .../examples/Configuration/ListCapacity.json | 25 ++ .../Configuration/ListConfiguration.json | 23 ++ ...nfiguration.json => PutConfiguration.json} | 11 +- .../preview/2019-11-01/getConfiguration.json | 106 ------- .../preview/2019-11-01/setConfiguration.json | 115 -------- .../containerregistry/readme.md | 10 +- 11 files changed, 410 insertions(+), 247 deletions(-) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/{checkCapacity.json => capacity.json} (54%) create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/{CheckCapacity.json => GetCapacity.json} (74%) create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListConfiguration.json rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/{SetConfiguration.json => PutConfiguration.json} (61%) delete mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json delete mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json similarity index 54% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json index 2eebf233747b..12e66a6588c4 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json @@ -16,18 +16,18 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/checkCapacity": { - "post": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/capacity/{capacityName}": { + "get": { "x-ms-examples": { - "Returns container registry overall capacity properties.": { - "$ref": "./examples/Configuration/CheckCapacity.json" + "Returns container registry capacity properties.": { + "$ref": "./examples/Configuration/GetCapacity.json" } }, "tags": [ "ContainerRegistryCapacity" ], - "description": "Returns container registry overall capacity properties.", - "operationId": "ContainerRegistryCapacity_Post", + "description": "Returns container registry capacity property.", + "operationId": "ContainerRegistryCapacity_Get", "parameters": [ { "$ref": "quotas.json#/parameters/SubscriptionIdParameter" @@ -37,11 +37,14 @@ }, { "$ref": "quotas.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/CapacityNameParameter" } ], "responses": { "200": { - "description": "OK -- Container registry overall capacity properties is being returned.", + "description": "OK -- Container registry capacity property is being returned.", "schema": { "$ref": "#/definitions/ContainerRegistryCapacity" } @@ -54,6 +57,45 @@ } } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/capacity": { + "get": { + "x-ms-examples": { + "Returns container registry capacity properties.": { + "$ref": "./examples/Configuration/ListCapacity.json" + } + }, + "tags": [ + "ContainerRegistryCapacities" + ], + "description": "Returns a list of container registry capacity properties.", + "operationId": "ContainerRegistryCapacity_Get", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Container registry capacity properties are being returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacityList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } } }, "definitions": { @@ -92,6 +134,29 @@ "format": "float" } } + }, + "ContainerRegistryCapacityList": { + "description": "List of capacity property.", + "type": "object", + "properties": { + "value": { + "description": "List of capacity property.", + "type": "array", + "items": { + "$ref": "#/definitions/ContainerRegistryCapacity" + } + } + } + } + }, + "parameters": { + "CapacityNameParameter": { + "description": "The name of the capacity parameter.", + "name": "capacityName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" } }, "securityDefinitions": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json new file mode 100644 index 000000000000..7667ce979aa6 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json @@ -0,0 +1,261 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01-preview", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/configuration/{configurationName}": { + "put": { + "x-ms-examples": { + "Returns container registry overall capacity properties.": { + "$ref": "./examples/Configuration/PutConfiguration.json" + } + }, + "tags": [ + "ContainerRegistryConfiguration" + ], + "description": "Configure container registry overall capacity properties.", + "operationId": "ContainerRegistrySetConfiguration_Post", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" + }, + { + "$ref": "#/parameters/ConfigurationParameters" + } + ], + "responses": { + "200": { + "description": "OK -- Container registry overall capacity properties is being returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacity" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "x-ms-examples": { + "Delete an existing container registry quota.": { + "$ref": "./examples/Configuration/DeleteConfiguration.json" + } + }, + "tags": [ + "ContainerRegistryConfiguration" + ], + "description": "Delete an existing container registry configuration", + "operationId": "ContainerRegistryConfiguration_Delete", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The container registry configuration has been deleted." + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "x-ms-examples": { + "Returns the specified configuration.": { + "$ref": "./examples/Configuration/GetConfiguration.json" + } + }, + "tags": [ + "ContainerRegistryConfiguration" + ], + "description": "Returns the specified configuration details.", + "operationId": "ContainerRegistryConfiguration_Get", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The configuration has been returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacity" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/configuration": { + "get": { + "x-ms-examples": { + "Returns a list of configuration at the given location.": { + "$ref": "./examples/Configuration/ListConfiguration.json" + } + }, + "tags": [ + "ContainerRegistryConfiguration" + ], + "description": "Returns a list of configuration at the given location.", + "operationId": "ContainerRegistryConfiguration_List", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/LocationParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of configuration has been returned.", + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacityList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ContainerRegistryCapacity": { + "description": "Container registry capacity property.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry capacity property.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ContainerRegistryCapacityProperty" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "ContainerRegistryCapacityProperty": { + "description": "Container registry capacity property.", + "type": "object", + "properties": { + "maximumCapacityInGb": { + "description": "Total storage capacity (GB) which can used by the registry.", + "type": "integer", + "format": "int32" + } + } + }, + "ContainerRegistryCapacityList": { + "description": "List of configuration.", + "type": "object", + "properties": { + "value": { + "description": "List of configuration.", + "type": "array", + "items": { + "$ref": "#/definitions/ContainerRegistryCapacity" + } + } + } + } + }, + "parameters": { + "ConfigurationNameParameter": { + "description": "The name of the configuration.", + "name": "configurationName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "ConfigurationParameters": { + "description": "The properties of configuration being created or updated.", + "name": "configurationObject", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ContainerRegistryCapacity" + }, + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json new file mode 100644 index 000000000000..5390fc4580cd --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "configurationName": "Default", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": {} + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/CheckCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json similarity index 74% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/CheckCapacity.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json index 2d84ad6c40de..3bdf73cc95d9 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/CheckCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json @@ -7,9 +7,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/checkCapacity/RegistryStampConfiguration", - "name": "local/RegistryStampConfiguration", - "type": "Microsoft.ContainerRegistry.Admin/locations/checkCapacity", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/capacity/Default", + "name": "local/Default", + "type": "Microsoft.ContainerRegistry.Admin/locations/capacity", "properties": { "maximumCapacityInGb": 100, "registriesConsumptionInGb": 50.12, @@ -18,4 +18,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json index 5e66d723c0d6..87b9cf92d716 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json @@ -7,13 +7,13 @@ "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/getConfiguration/RegistryStampCapacity", - "name": "local/RegistryStampCapacity", - "type": "Microsoft.ContainerRegistry.Admin/locations/getConfiguration", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configuration/Default", + "name": "local/Default", + "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", "properties": { "maximumCapacityInGb": 100 } } } } -} \ No newline at end of file +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json new file mode 100644 index 000000000000..ba781faedf00 --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/capacity/Default", + "name": "local/Default", + "type": "Microsoft.ContainerRegistry.Admin/locations/capacity", + "properties": { + "maximumCapacityInGb": 100, + "registriesConsumptionInGb": 50.12, + "allowPush": true + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListConfiguration.json new file mode 100644 index 000000000000..642f39c5b24f --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListConfiguration.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configuration/Default", + "name": "local/Default", + "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", + "properties": { + "maximumCapacityInGb": 100 + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/SetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/PutConfiguration.json similarity index 61% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/SetConfiguration.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/PutConfiguration.json index ac569b6af88c..fc4427dd24ce 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/SetConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/PutConfiguration.json @@ -2,8 +2,9 @@ "parameters": { "api-version": "2019-11-01-preview", "location": "local", + "configurationName": "Default", "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", - "setConfigurationRequest": { + "configurationObject": { "properties": { "maximumCapacityInGb": 10 } @@ -12,13 +13,13 @@ "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/setConfiguration/RegistryStampCapacity", - "name": "local/RegistryStampCapacity", - "type": "Microsoft.ContainerRegistry.Admin/locations/setConfiguration", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configuration/Default", + "name": "local/Default", + "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", "properties": { "maximumCapacityInGb": 10 } } } } -} \ No newline at end of file +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json deleted file mode 100644 index 67f4536fc197..000000000000 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2019-11-01-preview", - "title": "ContainerRegistryManagementClient", - "description": "Admin Container Registry Management Client." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/getConfiguration": { - "post": { - "x-ms-examples": { - "Returns container registry overall capacity properties.": { - "$ref": "./examples/Configuration/GetConfiguration.json" - } - }, - "tags": [ - "ContainerRegistryGetConfiguration" - ], - "description": "Returns container registry overall capacity properties.", - "operationId": "ContainerRegistryGetConfiguration_Post", - "parameters": [ - { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "quotas.json#/parameters/LocationParameter" - }, - { - "$ref": "quotas.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK -- Container registry overall capacity properties is being returned.", - "schema": { - "$ref": "#/definitions/ContainerRegistryCapacity" - } - }, - "default": { - "description": "Error Response.", - "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "ContainerRegistryCapacity": { - "description": "Container registry capacity property.", - "type": "object", - "properties": { - "properties": { - "description": "Container registry capacity property.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/ContainerRegistryCapacityProperty" - } - }, - "allOf": [ - { - "$ref": "quotas.json#/definitions/Resource" - } - ] - }, - "ContainerRegistryCapacityProperty": { - "description": "Container registry capacity property.", - "type": "object", - "properties": { - "maximumCapacityInGb": { - "description": "Total storage capacity (GB) which can used by the registry.", - "type": "integer", - "format": "int32" - } - } - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ] -} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json deleted file mode 100644 index f6fdb952bb88..000000000000 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2019-11-01-preview", - "title": "ContainerRegistryManagementClient", - "description": "Admin Container Registry Management Client." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/setConfiguration": { - "post": { - "x-ms-examples": { - "Returns container registry overall capacity properties.": { - "$ref": "./examples/Configuration/SetConfiguration.json" - } - }, - "tags": [ - "ContainerRegistrySetConfiguration" - ], - "description": "Configure container registry overall capacity properties.", - "operationId": "ContainerRegistrySetConfiguration_Post", - "parameters": [ - { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "quotas.json#/parameters/LocationParameter" - }, - { - "$ref": "quotas.json#/parameters/ApiVersionParameter" - }, - { - "name": "setConfigurationRequest", - "in": "body", - "description": "The object containing information for the configuration request.", - "required": true, - "schema": { - "$ref": "#/definitions/ContainerRegistryCapacityProperty" - } - } - ], - "responses": { - "200": { - "description": "OK -- Container registry overall capacity properties is being returned.", - "schema": { - "$ref": "#/definitions/ContainerRegistryCapacity" - } - }, - "default": { - "description": "Error Response.", - "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "ContainerRegistryCapacity": { - "description": "Container registry capacity property.", - "type": "object", - "properties": { - "properties": { - "description": "Container registry capacity property.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/ContainerRegistryCapacityProperty" - } - }, - "allOf": [ - { - "$ref": "quotas.json#/definitions/Resource" - } - ] - }, - "ContainerRegistryCapacityProperty": { - "description": "Container registry capacity property.", - "type": "object", - "properties": { - "maximumCapacityInGb": { - "description": "Total storage capacity (GB) which can used by the registry.", - "type": "integer", - "format": "int32" - } - } - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ] -} diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.md b/specification/azsadmin/resource-manager/containerregistry/readme.md index 51603bf3d1af..4526114de001 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.md @@ -33,12 +33,11 @@ These settings apply only when `--tag=package-2019-11-01` is specified on the co ``` yaml $(tag) == 'package-2019-11-01' input-file: - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json" ``` @@ -73,12 +72,11 @@ require: $(this-folder)/../../../../profiles/readme.md # all the input files across all versions input-file: - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json ``` From ce2256f89e68e8c4c7716508c485011eadd6aa44 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Fri, 7 May 2021 10:59:37 -0700 Subject: [PATCH 04/27] Fix swagger validation errors. (#3) --- .../preview/2019-11-01/capacity.json | 2 +- .../preview/2019-11-01/configuration.json | 32 +-- .../examples/Configuration/GetCapacity.json | 4 +- .../Configuration/GetConfiguration.json | 4 +- .../examples/Configuration/ListCapacity.json | 2 +- .../examples/Setup/setupStatus.json | 30 +- .../2019-11-01/examples/Setup/startSetup.json | 37 ++- .../2019-11-01/examples/registries/List.json | 2 +- .../preview/2019-11-01/operations.json | 223 ++++++++------- .../preview/2019-11-01/quotas.json | 2 +- .../preview/2019-11-01/registries.json | 2 +- .../preview/2019-11-01/setupStatus.json | 2 +- .../preview/2019-11-01/startSetup.json | 262 +++++++++--------- 13 files changed, 306 insertions(+), 298 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json index 12e66a6588c4..236bce67ee55 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01-preview", + "version": "2019-11-01", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json index 7667ce979aa6..e227054bf957 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01-preview", + "version": "2019-11-01", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, @@ -19,14 +19,14 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/configuration/{configurationName}": { "put": { "x-ms-examples": { - "Returns container registry overall capacity properties.": { + "Returns container registry overall configuration properties.": { "$ref": "./examples/Configuration/PutConfiguration.json" } }, "tags": [ "ContainerRegistryConfiguration" ], - "description": "Configure container registry overall capacity properties.", + "description": "Configure container registry overall configuration properties.", "operationId": "ContainerRegistrySetConfiguration_Post", "parameters": [ { @@ -47,9 +47,9 @@ ], "responses": { "200": { - "description": "OK -- Container registry overall capacity properties is being returned.", + "description": "OK -- Container registry overall configuration properties is being returned.", "schema": { - "$ref": "#/definitions/ContainerRegistryCapacity" + "$ref": "#/definitions/ContainerRegistryConfiguration" } }, "default": { @@ -126,7 +126,7 @@ "200": { "description": "OK -- The configuration has been returned.", "schema": { - "$ref": "#/definitions/ContainerRegistryCapacity" + "$ref": "#/definitions/ContainerRegistryConfiguration" } }, "default": { @@ -165,7 +165,7 @@ "200": { "description": "OK -- The list of configuration has been returned.", "schema": { - "$ref": "#/definitions/ContainerRegistryCapacityList" + "$ref": "#/definitions/ContainerRegistryConfigurationList" } }, "default": { @@ -179,14 +179,14 @@ } }, "definitions": { - "ContainerRegistryCapacity": { - "description": "Container registry capacity property.", + "ContainerRegistryConfiguration": { + "description": "Container registry configuration property.", "type": "object", "properties": { "properties": { - "description": "Container registry capacity property.", + "description": "Container registry configuration property.", "x-ms-client-flatten": true, - "$ref": "#/definitions/ContainerRegistryCapacityProperty" + "$ref": "#/definitions/ContainerRegistryConfigurationProperty" } }, "allOf": [ @@ -195,8 +195,8 @@ } ] }, - "ContainerRegistryCapacityProperty": { - "description": "Container registry capacity property.", + "ContainerRegistryConfigurationProperty": { + "description": "Container registry configuration property.", "type": "object", "properties": { "maximumCapacityInGb": { @@ -206,7 +206,7 @@ } } }, - "ContainerRegistryCapacityList": { + "ContainerRegistryConfigurationList": { "description": "List of configuration.", "type": "object", "properties": { @@ -214,7 +214,7 @@ "description": "List of configuration.", "type": "array", "items": { - "$ref": "#/definitions/ContainerRegistryCapacity" + "$ref": "#/definitions/ContainerRegistryConfiguration" } } } @@ -235,7 +235,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ContainerRegistryCapacity" + "$ref": "#/definitions/ContainerRegistryConfiguration" }, "x-ms-parameter-location": "method" } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json index 3bdf73cc95d9..f6a2024fabfb 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2019-11-01-preview", "location": "local", - "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2" }, "responses": { "200": { @@ -13,7 +13,7 @@ "properties": { "maximumCapacityInGb": 100, "registriesConsumptionInGb": 50.12, - "allowPush": true + "allowPush": true } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json index 87b9cf92d716..a119e022890e 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json @@ -2,7 +2,9 @@ "parameters": { "api-version": "2019-11-01-preview", "location": "local", - "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2" + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "configurationName": "default" + } }, "responses": { "200": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json index ba781faedf00..2c2df42f5215 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json @@ -15,7 +15,7 @@ "properties": { "maximumCapacityInGb": 100, "registriesConsumptionInGb": 50.12, - "allowPush": true + "allowPush": true } } ] diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json index ce385fe6af10..c7a05f218bbb 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json @@ -1,18 +1,18 @@ { - "parameters": { - "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", - "api-version": "2019-11-01-preview" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setupStatus", - "name": "value", - "type": "Microsoft.ContainerRegistry.Setup/setupStatus", - "properties": { - "status": "SetupCompleted" - } - } + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "api-version": "2019-11-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setupStatus", + "name": "value", + "type": "Microsoft.ContainerRegistry.Setup/setupStatus", + "properties": { + "status": "SetupCompleted" } + } } -} \ No newline at end of file + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json index 5f8d7cd38a21..8f0b035fda6d 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json @@ -1,18 +1,25 @@ { - "parameters": { - "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", - "api-version": "2019-11-01-preview" - }, - "responses": { - "201": { - "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setupStatus", - "name": "value", - "type": "Microsoft.ContainerRegistry.Setup/setupStatus", - "properties": { - "statusUri": "https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/setupStatus?api-version=2019-11-01-preview" - } - } + "parameters": { + "api-version": "2019-11-01-preview", + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "configurationName": "Default", + "startSetupRequest": { + "properties": { + "password": "password", + "sslCertBase64": "sslCertBase64" + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setupStatus", + "name": "value", + "type": "Microsoft.ContainerRegistry.Setup/setupStatus", + "properties": { + "statusUri": "https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/setupStatus?api-version=2019-11-01-preview" } + } } -} \ No newline at end of file + } +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json index ba3cc092d728..5a9904080728 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json @@ -26,4 +26,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json index acc13f581c7c..defe91dad4a7 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json @@ -1,126 +1,125 @@ { - "swagger": "2.0", - "info": { - "version": "2019-11-01-preview", - "title": "ContainerRegistryManagementClient", - "description": "Admin Container Registry Management Client." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/providers/Microsoft.ContainerRegistry.Admin/operations": { - "get": { - "x-ms-examples": { - "Get the list of support rest operations.": { - "$ref": "./examples/Operations/List.json" + "swagger": "2.0", + "info": { + "version": "2019-11-01", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/providers/Microsoft.ContainerRegistry.Admin/operations": { + "get": { + "x-ms-examples": { + "Get the list of support rest operations.": { + "$ref": "./examples/Operations/List.json" + } + }, + "description": "Get the list of supported admin container registry rest operations.", + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of operations has been returned.", + "schema": { + "$ref": "#/definitions/OperationList" } }, - "description": "Get the list of supported admin container registry rest operations.", - "tags": [ - "Operations" - ], - "operationId": "Operations_List", - "parameters": [ - { - "$ref": "quotas.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK -- The list of operations has been returned.", - "schema": { - "$ref": "#/definitions/OperationList" - } - }, - "default": { - "description": "Error Response.", - "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" - } + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" } } } } - }, - "definitions": { - "Operation": { - "description": "Describes the supported REST operation.", - "properties": { - "name": { - "description": "The name of the operation being performed on this particular object. It should match the action name that appears in RBAC / the event service.", - "type": "string", - "readOnly": true - }, - "display": { - "description": "Contains the localized display information for this particular operation / action.", - "$ref": "#/definitions/Display", - "readOnly": true - } - } - }, - "Display": { - "description": "Contains the localized display information for this particular operation / action.", - "properties": { - "provider": { - "description": "The localized friendly form of the resource provider name – it is expected to also include the publisher/company responsible. It should use Title Casing and begin with \"Microsoft\" for 1st party services. e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute.\"", - "type": "string", - "readOnly": true - }, - "resource": { - "description": "The localized friendly form of the resource type related to this action/operation – it should match the public documentation for the resource provider.", - "type": "string", - "readOnly": true - }, - "operation": { - "description": "The localized friendly name for the operation, as it should be shown to the user.", - "type": "string", - "readOnly": true - }, - "description": { - "description": "The localized friendly description for the operation, as it should be shown to the user. It should be thorough, yet concise – it will be used in tool tips and detailed views.", - "type": "string", - "readOnly": true - } - } - }, - "OperationList": { - "description": "Pageable list of supported operations.", - "properties": { - "value": { - "description": "List of operations", - "type": "array", - "items": { - "$ref": "#/definitions/Operation" - } - } + } + }, + "definitions": { + "Operation": { + "description": "Describes the supported REST operation.", + "properties": { + "name": { + "description": "The name of the operation being performed on this particular object. It should match the action name that appears in RBAC / the event service.", + "type": "string", + "readOnly": true + }, + "display": { + "description": "Contains the localized display information for this particular operation / action.", + "$ref": "#/definitions/Display", + "readOnly": true } } }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" + "Display": { + "description": "Contains the localized display information for this particular operation / action.", + "properties": { + "provider": { + "description": "The localized friendly form of the resource provider name – it is expected to also include the publisher/company responsible. It should use Title Casing and begin with \"Microsoft\" for 1st party services. e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute.\"", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "The localized friendly form of the resource type related to this action/operation – it should match the public documentation for the resource provider.", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "The localized friendly name for the operation, as it should be shown to the user.", + "type": "string", + "readOnly": true + }, + "description": { + "description": "The localized friendly description for the operation, as it should be shown to the user. It should be thorough, yet concise – it will be used in tool tips and detailed views.", + "type": "string", + "readOnly": true } } }, - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] + "OperationList": { + "description": "Pageable list of supported operations.", + "properties": { + "value": { + "description": "List of operations", + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + } + } + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" } - ] - } - \ No newline at end of file + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json index a8d1283e9653..7c84058628c1 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01-preview", + "version": "2019-11-01", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json index ba88a04261d8..817144d9c570 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01-preview", + "version": "2019-11-01", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json index b1369ee9e7c3..a69074067b70 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01-preview", + "version": "2019-11-01, "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json index 15eac8ebfd24..cdae93573771 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json @@ -1,141 +1,141 @@ { - "swagger": "2.0", - "info": { - "version": "2019-11-01-preview", - "title": "ContainerRegistryManagementClient", - "description": "Admin Container Registry Management Client." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/startSetup": { - "post": { - "x-ms-examples": { - "Invokes container registry certificate uploading and ACR service deployment.": { - "$ref": "./examples/Setup/startSetup.json" - } - }, - "tags": [ - "ContainerRegistryStartSetup" - ], - "description": "Invokes container registry certificate uploading and service deployment.", - "operationId": "ContainerRegistryStartSetup", - "parameters": [ - { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "quotas.json#/parameters/ApiVersionParameter" - }, - { - "name": "startSetupRequest", - "in": "body", - "description": "The object containing information for the configuration request.", - "required": true, - "schema": { - "$ref": "#/definitions/ContainerRegistrySetupProperty" - } - } - ], - "responses": { - "201": { - "description": "Created -- Container registry certificate was uploaded successfully and deployment started.", - "schema": { - "$ref": "#/definitions/ContainerRegistrySetup" - } - }, - "default": { - "description": "Error Response.", - "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "ContainerRegistrySetupProperty": { - "description": "Container registry setup property.", - "type": "object", - "properties": { - "properties": { - "description": "Container registry setup properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/ContainerRegistrySetupProperties" - } - }, - "allOf": [ - { - "$ref": "quotas.json#/definitions/Resource" - } - ] + "swagger": "2.0", + "info": { + "version": "2019-11-01", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/startSetup": { + "post": { + "x-ms-examples": { + "Invokes container registry certificate uploading and ACR service deployment.": { + "$ref": "./examples/Setup/startSetup.json" + } }, - "ContainerRegistrySetupProperties": { - "description": "Container registry setup properties.", - "type": "object", - "properties": { - "password": { - "description": "Ssl certificate password.", - "type": "string" - }, - "sslCertBase64": { - "description": "Ssl certificate in base64 format.", - "type": "string" - } + "tags": [ + "ContainerRegistryStartSetup" + ], + "description": "Invokes container registry certificate uploading and service deployment.", + "operationId": "ContainerRegistryStartSetup", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + }, + { + "name": "startSetupRequest", + "in": "body", + "description": "The object containing information for the configuration request.", + "required": true, + "schema": { + "$ref": "#/definitions/ContainerRegistrySetupProperty" } - }, - "ContainerRegistrySetup": { - "description": "Container registry start setup return.", - "type": "object", - "properties": { - "properties": { - "description": "Container registry start setup return properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SetupProperty" - } - }, - "allOf": [ - { - "$ref": "quotas.json#/definitions/Resource" - } - ] - }, - "SetupProperty": { - "description": "Container registry start setup return property.", - "type": "object", - "properties": { - "statusUri": { - "description": "The uri to poll status of the container registry setup.", - "type": "string" - } + } + ], + "responses": { + "201": { + "description": "Created -- Container registry certificate was uploaded successfully and deployment started.", + "schema": { + "$ref": "#/definitions/ContainerRegistrySetup" } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ContainerRegistrySetupProperty": { + "description": "Container registry setup property.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry setup properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ContainerRegistrySetupProperties" } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } + "ContainerRegistrySetupProperties": { + "description": "Container registry setup properties.", + "type": "object", + "properties": { + "password": { + "description": "Ssl certificate password.", + "type": "string" + }, + "sslCertBase64": { + "description": "Ssl certificate in base64 format.", + "type": "string" } + } }, - "security": [ + "ContainerRegistrySetup": { + "description": "Container registry start setup return.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry start setup return properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SetupProperty" + } + }, + "allOf": [ { - "azure_auth": [ - "user_impersonation" - ] + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "SetupProperty": { + "description": "Container registry start setup return property.", + "type": "object", + "properties": { + "statusUri": { + "description": "The uri to poll status of the container registry setup.", + "type": "string" } - ] -} \ No newline at end of file + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} From a59846610743ba055e30433fd5ce197173d0e8f5 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Fri, 7 May 2021 12:29:42 -0700 Subject: [PATCH 05/27] Fix swagger validation errors - 2-nd. (#4) --- .../preview/2019-11-01/capacity.json | 2 +- .../Configuration/GetConfiguration.json | 1 - .../preview/2019-11-01/setupStatus.json | 220 +++++++++--------- 3 files changed, 111 insertions(+), 112 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json index 236bce67ee55..4a31c5048e68 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json @@ -69,7 +69,7 @@ "ContainerRegistryCapacities" ], "description": "Returns a list of container registry capacity properties.", - "operationId": "ContainerRegistryCapacity_Get", + "operationId": "ContainerRegistryCapacity_List", "parameters": [ { "$ref": "quotas.json#/parameters/SubscriptionIdParameter" diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json index a119e022890e..57743b2f1ce4 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json @@ -4,7 +4,6 @@ "location": "local", "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", "configurationName": "default" - } }, "responses": { "200": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json index a69074067b70..8b3319fc85d9 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json @@ -1,118 +1,118 @@ { - "swagger": "2.0", - "info": { - "version": "2019-11-01, - "title": "ContainerRegistryManagementClient", - "description": "Admin Container Registry Management Client." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/setupStatus": { - "get": { - "x-ms-examples": { - "Returns the status of the container registry setup.": { - "$ref": "./examples/Setup/setupStatus.json" - } - }, - "tags": [ - "ContainerRegistrySetup" - ], - "description": "Returns the status of the container registry setup.", - "operationId": "ContainerRegistrySetupStatus", - "parameters": [ - { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "quotas.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK -- The status of the container registry setup has been returned.", - "schema": { - "$ref": "#/definitions/SetupResult" - } - }, - "default": { - "description": "Error Response.", - "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "SetupResult": { - "description": "Container registry setup result.", - "type": "object", - "properties": { - "properties": { - "description": "Container registry setup result properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SetupResultProperties" - } - }, - "allOf": [ - { - "$ref": "quotas.json#/definitions/Resource" - } - ] + "swagger": "2.0", + "info": { + "version": "2019-11-01", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/setupStatus": { + "get": { + "x-ms-examples": { + "Returns the status of the container registry setup.": { + "$ref": "./examples/Setup/setupStatus.json" + } }, - "SetupResultProperties": { - "description": "Container registry setup result properties.", - "type": "object", - "properties": { - "status": { - "description": "The status of the container registry setup.", - "$ref": "#/definitions/SetupStatus", - "readOnly": true - } + "tags": [ + "ContainerRegistrySetup" + ], + "description": "Returns the status of the container registry setup.", + "operationId": "ContainerRegistrySetupStatus", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The status of the container registry setup has been returned.", + "schema": { + "$ref": "#/definitions/SetupResult" } - }, - "SetupStatus": { - "description": "The status of the container registry setup.", - "type": "string", - "enum": [ - "ReadyToSetup", - "Running", - "Failed", - "Cancelled", - "Completed" - ], - "x-ms-enum": { - "name": "SetupStatus", - "modelAsString": true + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" } + } } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } + } + } + }, + "definitions": { + "SetupResult": { + "description": "Container registry setup result.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry setup result properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SetupResultProperties" } - }, - "security": [ + }, + "allOf": [ { - "azure_auth": [ - "user_impersonation" - ] + "$ref": "quotas.json#/definitions/Resource" } - ] -} \ No newline at end of file + ] + }, + "SetupResultProperties": { + "description": "Container registry setup result properties.", + "type": "object", + "properties": { + "status": { + "description": "The status of the container registry setup.", + "$ref": "#/definitions/SetupStatus", + "readOnly": true + } + } + }, + "SetupStatus": { + "description": "The status of the container registry setup.", + "type": "string", + "enum": [ + "ReadyToSetup", + "Running", + "Failed", + "Cancelled", + "Completed" + ], + "x-ms-enum": { + "name": "SetupStatus", + "modelAsString": true + } + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} From 63a8d6a25895ca7dcde74122dcc8920668822acf Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Fri, 7 May 2021 14:10:59 -0700 Subject: [PATCH 06/27] Fix model validation fix --- .../preview/2019-11-01/examples/Configuration/GetCapacity.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json index f6a2024fabfb..81540304870a 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json @@ -2,7 +2,8 @@ "parameters": { "api-version": "2019-11-01-preview", "location": "local", - "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2" + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "capacityName": "default" }, "responses": { "200": { From 1762acd6a39d7e0ab02ce01ff210198d02a8f5cd Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Fri, 7 May 2021 14:44:34 -0700 Subject: [PATCH 07/27] Fix swagger validation errors - 3d. (#5) --- .../preview/2019-11-01/configuration.json | 5 +- .../preview/2019-11-01/quotas.json | 53 +++++++++++-------- .../preview/2019-11-01/registries.json | 4 ++ 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json index e227054bf957..4469536b007b 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json @@ -27,7 +27,7 @@ "ContainerRegistryConfiguration" ], "description": "Configure container registry overall configuration properties.", - "operationId": "ContainerRegistrySetConfiguration_Post", + "operationId": "ContainerRegistryConfiguration_Put", "parameters": [ { "$ref": "quotas.json#/parameters/SubscriptionIdParameter" @@ -89,6 +89,9 @@ "200": { "description": "OK -- The container registry configuration has been deleted." }, + "204": { + "description": "NotFound -- The container registry configuration not found." + }, "default": { "description": "Error Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json index 7c84058628c1..02a0b8656730 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json @@ -89,6 +89,9 @@ "200": { "description": "OK -- The container registry quota has been deleted." }, + "204": { + "description": "NotFound -- The container registry quota not found." + }, "default": { "description": "Error Response.", "schema": { @@ -252,28 +255,34 @@ "description": "The error response for request which failed.", "type": "object", "properties": { - "code": { - "description": "The error description code.", - "type": "string", - "readOnly": true - }, - "message": { - "description": "The error description message.", - "type": "string", - "readOnly": true - }, - "target": { - "description": "The error target description.", - "type": "string", - "readOnly": true - }, - "details": { - "description": "The error details information.", - "type": "array", - "items": { - "type": "string" - }, - "readOnly": true + "error": { + "type": "object", + "description": "The error object.", + "properties": { + "code": { + "description": "The error description code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "The error description message.", + "type": "string", + "readOnly": true + }, + "target": { + "description": "The error target description.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "The error details information.", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true + } + } } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json index 817144d9c570..33cfae712987 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json @@ -121,6 +121,10 @@ "description": "List of container registries.", "type": "object", "properties": { + "nextLink": { + "description": "URI to the next page.", + "type": "string" + }, "value": { "description": "List of container registries.", "type": "array", From dc94bb71b57a349b9c11be9f641da2307a2750f1 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Mon, 10 May 2021 10:52:29 -0700 Subject: [PATCH 08/27] Fix swagger validation errors - 4th. (#6) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. --- .../examples/Configuration/DeleteConfiguration.json | 3 ++- .../preview/2019-11-01/examples/Quotas/Delete.json | 3 ++- .../preview/2019-11-01/operations.json | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json index 5390fc4580cd..4546df16a13a 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json @@ -6,6 +6,7 @@ "api-version": "2019-11-01-preview" }, "responses": { - "200": {} + "200": {}, + "204": {} } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json index 5a53873b3a3c..ee8823b69a78 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json @@ -6,6 +6,7 @@ "api-version": "2019-11-01-preview" }, "responses": { - "200": {} + "200": {}, + "204": {} } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json index defe91dad4a7..16ef163cf283 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json @@ -59,6 +59,10 @@ "type": "string", "readOnly": true }, + "isDataAction": { + "description": "Indicates whether the operation is a data action", + "type": "boolean" + }, "display": { "description": "Contains the localized display information for this particular operation / action.", "$ref": "#/definitions/Display", From 26ed4b5f11e470fce00c0306682e63a46dd4b35c Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Mon, 10 May 2021 13:36:33 -0700 Subject: [PATCH 09/27] Release/acrchanges (#8) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. --- .../resource-manager/containerregistry/readme.azsautogen.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md index 96a89b73739c..f823dc80d877 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md @@ -29,12 +29,11 @@ tag: package-2019-11-01 ``` yaml input-file: - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/checkCapacity.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/getConfiguration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setConfiguration.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json ``` From dc8548d79f1b4ba80b70374ef97fc7ec3103d45e Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Mon, 10 May 2021 17:50:37 -0700 Subject: [PATCH 10/27] Release/acrchanges (#9) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. --- .../2019-11-01/examples/Operations/List.json | 26 ++++++++++++++++--- .../containerregistry/readme.azsautogen.md | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json index 9d1806c331d8..aec2551a9266 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json @@ -43,7 +43,7 @@ } }, { - "name": "Microsoft.ContainerRegistry.Admin/locations/checkCapacity/action", + "name": "Microsoft.ContainerRegistry.Admin/locations/capacity/read", "display": { "provider": "Microsoft.ContainerRegistry.Admin", "resource": "Registry Capacity Action", @@ -52,7 +52,7 @@ } }, { - "name": "Microsoft.ContainerRegistry.Admin/locations/getConfiguration/action", + "name": "Microsoft.ContainerRegistry.Admin/locations/configuration/read", "display": { "provider": "Microsoft.ContainerRegistry.Admin", "resource": "Registry configuration", @@ -61,7 +61,7 @@ } }, { - "name": "Microsoft.ContainerRegistry.Admin/locations/setConfiguration/action", + "name": "Microsoft.ContainerRegistry.Admin/locations/configuration/write", "display": { "provider": "Microsoft.ContainerRegistry.Admin", "resource": "Registry configuration", @@ -77,7 +77,25 @@ "operation": "List Registries", "description": "Returns properties for the registries." } - } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/startSetup/action", + "display": { + "provider": "Microsoft.ContainerRegistry.Setup", + "resource": "Start setup", + "operation": "Start container registry certificate upload and service deployment", + "description": "Update registry stamp configuration." + } + }, + { + "name": "Microsoft.ContainerRegistry.Admin/setupStatus/read", + "display": { + "provider": "Microsoft.ContainerRegistry.Setup", + "resource": "Setup status", + "operation": "Get status of container registry certificate upload and service deployment", + "description": "Get status of container registry certificate upload and service deployment." + } + } ] } } diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md index f823dc80d877..eb7f3cbb241b 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md @@ -21,7 +21,7 @@ To see additional help and options, run: These are the global settings for the ContainerRegistry API. ``` yaml -title: StorageAdminClient +title: ContainerRegistryAdminClient description: ContainerRegistry Admin Client openapi-type: arm tag: package-2019-11-01 From 59efe9b266e9ec86d4580ba6018d7c141e7bc53b Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Tue, 11 May 2021 12:44:00 -0700 Subject: [PATCH 11/27] Release/larisab (#11) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 12th. --- .../Setup/{setupStatus.json => Get.json} | 4 +- .../Setup/{startSetup.json => Start.json} | 0 .../{startSetup.json => setup.json} | 86 ++++++++++++- .../preview/2019-11-01/setupStatus.json | 118 ------------------ 4 files changed, 84 insertions(+), 124 deletions(-) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/{setupStatus.json => Get.json} (73%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/{startSetup.json => Start.json} (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/{startSetup.json => setup.json} (61%) delete mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json similarity index 73% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json index c7a05f218bbb..8f76bdeff4b6 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/setupStatus.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json @@ -6,9 +6,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setupStatus", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setup", "name": "value", - "type": "Microsoft.ContainerRegistry.Setup/setupStatus", + "type": "Microsoft.ContainerRegistry.Setup/setup", "properties": { "status": "SetupCompleted" } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/startSetup.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json similarity index 61% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json index cdae93573771..d38971bf28ff 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json @@ -16,18 +16,18 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/startSetup": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/setup/start": { "post": { "x-ms-examples": { "Invokes container registry certificate uploading and ACR service deployment.": { - "$ref": "./examples/Setup/startSetup.json" + "$ref": "./examples/Setup/Start.json" } }, "tags": [ - "ContainerRegistryStartSetup" + "ContainerRegistrySetupStart" ], "description": "Invokes container registry certificate uploading and service deployment.", - "operationId": "ContainerRegistryStartSetup", + "operationId": "ContainerRegistrySetup_Start", "parameters": [ { "$ref": "quotas.json#/parameters/SubscriptionIdParameter" @@ -60,6 +60,42 @@ } } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/setup": { + "get": { + "x-ms-examples": { + "Returns the status of the container registry setup.": { + "$ref": "./examples/Setup/Get.json" + } + }, + "tags": [ + "ContainerRegistrySetupStatus" + ], + "description": "Returns the status of the container registry setup.", + "operationId": "ContainerRegistrySetup_Get", + "parameters": [ + { + "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "quotas.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The status of the container registry setup has been returned.", + "schema": { + "$ref": "#/definitions/SetupResult" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "quotas.json#/definitions/ErrorResponse" + } + } + } + } } }, "definitions": { @@ -118,6 +154,48 @@ "type": "string" } } + }, + "SetupResult": { + "description": "Container registry setup result.", + "type": "object", + "properties": { + "properties": { + "description": "Container registry setup result properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SetupResultProperties" + } + }, + "allOf": [ + { + "$ref": "quotas.json#/definitions/Resource" + } + ] + }, + "SetupResultProperties": { + "description": "Container registry setup result properties.", + "type": "object", + "properties": { + "status": { + "description": "The status of the container registry setup.", + "$ref": "#/definitions/SetupStatus", + "readOnly": true + } + } + }, + "SetupStatus": { + "description": "The status of the container registry setup.", + "type": "string", + "enum": [ + "ReadyToSetup", + "Running", + "Failed", + "Cancelled", + "Completed" + ], + "x-ms-enum": { + "name": "SetupStatus", + "modelAsString": true + } } }, "securityDefinitions": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json deleted file mode 100644 index 8b3319fc85d9..000000000000 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2019-11-01", - "title": "ContainerRegistryManagementClient", - "description": "Admin Container Registry Management Client." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/setupStatus": { - "get": { - "x-ms-examples": { - "Returns the status of the container registry setup.": { - "$ref": "./examples/Setup/setupStatus.json" - } - }, - "tags": [ - "ContainerRegistrySetup" - ], - "description": "Returns the status of the container registry setup.", - "operationId": "ContainerRegistrySetupStatus", - "parameters": [ - { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "quotas.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK -- The status of the container registry setup has been returned.", - "schema": { - "$ref": "#/definitions/SetupResult" - } - }, - "default": { - "description": "Error Response.", - "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "SetupResult": { - "description": "Container registry setup result.", - "type": "object", - "properties": { - "properties": { - "description": "Container registry setup result properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SetupResultProperties" - } - }, - "allOf": [ - { - "$ref": "quotas.json#/definitions/Resource" - } - ] - }, - "SetupResultProperties": { - "description": "Container registry setup result properties.", - "type": "object", - "properties": { - "status": { - "description": "The status of the container registry setup.", - "$ref": "#/definitions/SetupStatus", - "readOnly": true - } - } - }, - "SetupStatus": { - "description": "The status of the container registry setup.", - "type": "string", - "enum": [ - "ReadyToSetup", - "Running", - "Failed", - "Cancelled", - "Completed" - ], - "x-ms-enum": { - "name": "SetupStatus", - "modelAsString": true - } - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ] -} From 54b707ad6d3d35437fa108959da173b64ab1b4c2 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Tue, 11 May 2021 19:30:46 -0700 Subject: [PATCH 12/27] Release/acrchanges (#12) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. --- .../preview/2019-11-01/capacity.json | 18 +-- .../preview/2019-11-01/configuration.json | 38 +++--- .../preview/2019-11-01/containerregistry.json | 121 ++++++++++++++++++ .../2019-11-01/examples/Operations/List.json | 2 +- .../2019-11-01/examples/Setup/Get.json | 4 +- .../2019-11-01/examples/Setup/Start.json | 6 +- .../preview/2019-11-01/operations.json | 4 +- .../preview/2019-11-01/quotas.json | 114 +++-------------- .../preview/2019-11-01/registries.json | 10 +- .../preview/2019-11-01/setup.json | 27 ++-- .../containerregistry/readme.azsautogen.md | 4 +- .../containerregistry/readme.md | 8 +- 12 files changed, 199 insertions(+), 157 deletions(-) create mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json index 4a31c5048e68..0aeccdc95228 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json @@ -30,13 +30,13 @@ "operationId": "ContainerRegistryCapacity_Get", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/CapacityNameParameter" @@ -52,7 +52,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -72,13 +72,13 @@ "operationId": "ContainerRegistryCapacity_List", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -91,7 +91,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -111,7 +111,7 @@ }, "allOf": [ { - "$ref": "quotas.json#/definitions/Resource" + "$ref": "containerregistry.json#/definitions/Resource" } ] }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json index 4469536b007b..d83ba8b60a84 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json @@ -30,19 +30,19 @@ "operationId": "ContainerRegistryConfiguration_Put", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" }, { - "$ref": "#/parameters/ConfigurationParameters" + "$ref": "#/parameters/ConfigurationParameter" } ], "responses": { @@ -55,7 +55,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -73,13 +73,13 @@ "operationId": "ContainerRegistryConfiguration_Delete", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { - "$ref": "quotas.json#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" @@ -95,7 +95,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -113,13 +113,13 @@ "operationId": "ContainerRegistryConfiguration_Get", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { - "$ref": "quotas.json#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" @@ -135,7 +135,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -155,13 +155,13 @@ "operationId": "ContainerRegistryConfiguration_List", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -174,7 +174,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -194,7 +194,7 @@ }, "allOf": [ { - "$ref": "quotas.json#/definitions/Resource" + "$ref": "containerregistry.json#/definitions/Resource" } ] }, @@ -232,7 +232,7 @@ "type": "string", "x-ms-parameter-location": "method" }, - "ConfigurationParameters": { + "ConfigurationParameter": { "description": "The properties of configuration being created or updated.", "name": "configurationObject", "in": "body", diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json new file mode 100644 index 000000000000..aa0597aa8b7f --- /dev/null +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json @@ -0,0 +1,121 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-01", + "title": "ContainerRegistryManagementClient", + "description": "Admin Container Registry Management Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { }, + "definitions": { + "Resource": { + "description": "Base resource object.", + "type": "object", + "properties": { + "id": { + "description": "Resource ID.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Resource Name.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "Resource Type.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, + "ErrorResponse": { + "description": "The error response for request which failed.", + "type": "object", + "properties": { + "error": { + "type": "object", + "description": "The error object.", + "properties": { + "code": { + "description": "The error description code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "The error description message.", + "type": "string", + "readOnly": true + }, + "target": { + "description": "The error target description.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "The error details information.", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true + } + } + } + } + } + }, + "parameters": { + "ApiVersionParameter": { + "description": "REST Api Version.", + "name": "api-version", + "type": "string", + "in": "query", + "required": true + }, + "LocationParameter": { + "description": "Resource location.", + "name": "location", + "type": "string", + "in": "path", + "required": true, + "x-ms-parameter-location": "method" + }, + "SubscriptionIdParameter": { + "description": "Subscription Id.", + "name": "subscriptionId", + "type": "string", + "in": "path", + "required": true, + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json index aec2551a9266..aca2b8331077 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json @@ -95,7 +95,7 @@ "operation": "Get status of container registry certificate upload and service deployment", "description": "Get status of container registry certificate upload and service deployment." } - } + } ] } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json index 8f76bdeff4b6..5e2701aa1910 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json @@ -6,9 +6,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setup", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/locations/global/setup", "name": "value", - "type": "Microsoft.ContainerRegistry.Setup/setup", + "type": "Microsoft.ContainerRegistry.Setup/locations/global/setup", "properties": { "status": "SetupCompleted" } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json index 8f0b035fda6d..bbdb5cf07e79 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json @@ -13,11 +13,11 @@ "responses": { "201": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/setupStatus", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/locations/global/setup", "name": "value", - "type": "Microsoft.ContainerRegistry.Setup/setupStatus", + "type": "Microsoft.ContainerRegistry.Setup/locations/global/setup", "properties": { - "statusUri": "https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/setupStatus?api-version=2019-11-01-preview" + "statusUri": "https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/locations/global/setup?api-version=2019-11-01-preview" } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json index 16ef163cf283..de39580c86ca 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json @@ -30,7 +30,7 @@ "operationId": "Operations_List", "parameters": [ { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -43,7 +43,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json index 02a0b8656730..ddb1a1751697 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json @@ -30,13 +30,13 @@ "operationId": "ContainerRegistryQuotas_CreateOrUpdate", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/QuotaNameParameter" @@ -55,7 +55,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -73,13 +73,13 @@ "operationId": "ContainerRegistryQuotas_Delete", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/QuotaNameParameter" @@ -95,7 +95,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -113,13 +113,13 @@ "operationId": "ContainerRegistryQuotas_Get", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/QuotaNameParameter" @@ -135,7 +135,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -155,13 +155,13 @@ "operationId": "ContainerRegistryQuotas_List", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -174,7 +174,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -182,28 +182,6 @@ } }, "definitions": { - "Resource": { - "description": "Base resource object.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource Name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource Type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, "ContainerRegistryQuota": { "description": "Container registry quota.", "type": "object", @@ -216,7 +194,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "containerregistry.json#/definitions/Resource" } ] }, @@ -250,67 +228,9 @@ } } } - }, - "ErrorResponse": { - "description": "The error response for request which failed.", - "type": "object", - "properties": { - "error": { - "type": "object", - "description": "The error object.", - "properties": { - "code": { - "description": "The error description code.", - "type": "string", - "readOnly": true - }, - "message": { - "description": "The error description message.", - "type": "string", - "readOnly": true - }, - "target": { - "description": "The error target description.", - "type": "string", - "readOnly": true - }, - "details": { - "description": "The error details information.", - "type": "array", - "items": { - "type": "string" - }, - "readOnly": true - } - } - } - } } }, "parameters": { - "ApiVersionParameter": { - "description": "REST Api Version.", - "name": "api-version", - "type": "string", - "in": "query", - "required": true - }, - "LocationParameter": { - "description": "Resource location.", - "name": "location", - "type": "string", - "in": "path", - "required": true, - "x-ms-parameter-location": "method" - }, - "SubscriptionIdParameter": { - "description": "Subscription Id.", - "name": "subscriptionId", - "type": "string", - "in": "path", - "required": true, - "x-ms-parameter-location": "method" - }, "QuotaNameParameter": { "description": "The name of the container registry quota.", "name": "quotaName", diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json index 33cfae712987..1e030a13e1ce 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json @@ -30,13 +30,13 @@ "operationId": "ContainerRegistries_List", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/LocationParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -49,7 +49,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } }, @@ -72,7 +72,7 @@ }, "allOf": [ { - "$ref": "quotas.json#/definitions/Resource" + "$ref": "containerregistry.json#/definitions/Resource" } ] }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json index d38971bf28ff..e10630f75a6c 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json @@ -16,7 +16,7 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/setup/start": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/setup": { "post": { "x-ms-examples": { "Invokes container registry certificate uploading and ACR service deployment.": { @@ -30,10 +30,13 @@ "operationId": "ContainerRegistrySetup_Start", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/LocationParameter" + }, + { + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { "name": "startSetupRequest", @@ -55,13 +58,11 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/setup": { + }, "get": { "x-ms-examples": { "Returns the status of the container registry setup.": { @@ -75,10 +76,10 @@ "operationId": "ContainerRegistrySetup_Get", "parameters": [ { - "$ref": "quotas.json#/parameters/SubscriptionIdParameter" + "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "quotas.json#/parameters/ApiVersionParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -91,7 +92,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "quotas.json#/definitions/ErrorResponse" + "$ref": "containerregistry.json#/definitions/ErrorResponse" } } } @@ -111,7 +112,7 @@ }, "allOf": [ { - "$ref": "quotas.json#/definitions/Resource" + "$ref": "containerregistry.json#/definitions/Resource" } ] }, @@ -141,7 +142,7 @@ }, "allOf": [ { - "$ref": "quotas.json#/definitions/Resource" + "$ref": "containerregistry.json#/definitions/Resource" } ] }, @@ -167,7 +168,7 @@ }, "allOf": [ { - "$ref": "quotas.json#/definitions/Resource" + "$ref": "containerregistry.json#/definitions/Resource" } ] }, diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md index eb7f3cbb241b..e9aed1111d97 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md @@ -31,11 +31,11 @@ tag: package-2019-11-01 input-file: - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json ``` --- diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.md b/specification/azsadmin/resource-manager/containerregistry/readme.md index 4526114de001..cfb27b00a7b1 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.md @@ -35,11 +35,11 @@ These settings apply only when `--tag=package-2019-11-01` is specified on the co input-file: - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json" ``` --- @@ -74,11 +74,11 @@ require: $(this-folder)/../../../../profiles/readme.md input-file: - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setupStatus.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/startSetup.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json ``` If there are files that should not be in the `all-api-versions` set, From 83f3d8198005a22dc07535ab097319153d15c01a Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Wed, 12 May 2021 20:38:57 -0700 Subject: [PATCH 13/27] Release/acrchanges (#13) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. --- .../preview/2019-11-01/containerregistry.json | 2 +- .../preview/2019-11-01/examples/Setup/Get.json | 5 +++-- .../preview/2019-11-01/examples/Setup/Start.json | 3 ++- .../preview/2019-11-01/setup.json | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json index aa0597aa8b7f..f8661b012201 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json @@ -15,7 +15,7 @@ "produces": [ "application/json" ], - "paths": { }, + "paths": {}, "definitions": { "Resource": { "description": "Base resource object.", diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json index 5e2701aa1910..2a02836a8746 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json @@ -1,12 +1,13 @@ { "parameters": { "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", - "api-version": "2019-11-01-preview" + "api-version": "2019-11-01-preview", + "location": "local" }, "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/locations/global/setup", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Setup/locations/local/setup", "name": "value", "type": "Microsoft.ContainerRegistry.Setup/locations/global/setup", "properties": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json index bbdb5cf07e79..0c91315be584 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-11-01-preview", "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", "configurationName": "Default", "startSetupRequest": { "properties": { @@ -17,7 +18,7 @@ "name": "value", "type": "Microsoft.ContainerRegistry.Setup/locations/global/setup", "properties": { - "statusUri": "https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/locations/global/setup?api-version=2019-11-01-preview" + "statusUri": "https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/locations/local/setup?api-version=2019-11-01-preview" } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json index e10630f75a6c..208c1336ec60 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json @@ -78,6 +78,9 @@ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "containerregistry.json#/parameters/LocationParameter" + }, { "$ref": "containerregistry.json#/parameters/ApiVersionParameter" } From 74b5d9120d1ca56c2e14d6d6517d8684295c19b2 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Thu, 13 May 2021 19:30:41 -0700 Subject: [PATCH 14/27] Release/acrchanges (#14) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. --- .../preview/2019-11-01/capacity.json | 2 +- .../preview/2019-11-01/configuration.json | 2 +- .../preview/2019-11-01/containerregistry.json | 2 +- .../preview/2019-11-01/operations.json | 2 +- .../preview/2019-11-01/quotas.json | 2 +- .../preview/2019-11-01/registries.json | 2 +- .../preview/2019-11-01/setup.json | 2 +- .../azsadmin/resource-manager/containerregistry/readme.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json index 0aeccdc95228..c099c57ac920 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01", + "version": "2019-11-01-preview", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json index d83ba8b60a84..72c3d26b54fa 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01", + "version": "2019-11-01-preview", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json index f8661b012201..4457d5f96cab 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01", + "version": "2019-11-01-preview", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json index de39580c86ca..2859c691e258 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01", + "version": "2019-11-01-preview", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json index ddb1a1751697..e745c058f753 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01", + "version": "2019-11-01-preview", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json index 1e030a13e1ce..d85890e2f9e3 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01", + "version": "2019-11-01-preview", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json index 208c1336ec60..e6513cd2f9b2 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-11-01", + "version": "2019-11-01-preview", "title": "ContainerRegistryManagementClient", "description": "Admin Container Registry Management Client." }, diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.md b/specification/azsadmin/resource-manager/containerregistry/readme.md index cfb27b00a7b1..2b4125ee056a 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.md @@ -31,7 +31,7 @@ tag: package-2019-11-01 These settings apply only when `--tag=package-2019-11-01` is specified on the command line. -``` yaml $(tag) == 'package-2019-11-01' +``` yaml $(tag) == 'package-2019-11-01-preview' input-file: - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json" From e7bfdb125714e620af27251f5dc108a946c95c09 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Fri, 21 May 2021 13:05:21 -0700 Subject: [PATCH 15/27] Release/acrchanges (#15) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. --- .../{2019-11-01 => 2019-11-01-preview}/capacity.json | 0 .../{2019-11-01 => 2019-11-01-preview}/configuration.json | 0 .../containerregistry.json | 0 .../examples/Configuration/DeleteConfiguration.json | 0 .../examples/Configuration/GetCapacity.json | 0 .../examples/Configuration/GetConfiguration.json | 0 .../examples/Configuration/ListCapacity.json | 0 .../examples/Configuration/ListConfiguration.json | 0 .../examples/Configuration/PutConfiguration.json | 0 .../examples/Operations/List.json | 0 .../examples/Quotas/CreateOrUpdate.json | 0 .../examples/Quotas/Delete.json | 0 .../examples/Quotas/Get.json | 0 .../examples/Quotas/List.json | 0 .../examples/Setup/Get.json | 0 .../examples/Setup/Start.json | 0 .../examples/registries/List.json | 2 +- .../{2019-11-01 => 2019-11-01-preview}/operations.json | 0 .../preview/{2019-11-01 => 2019-11-01-preview}/quotas.json | 0 .../{2019-11-01 => 2019-11-01-preview}/registries.json | 2 +- .../preview/{2019-11-01 => 2019-11-01-preview}/setup.json | 6 ++++-- 21 files changed, 6 insertions(+), 4 deletions(-) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/capacity.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/configuration.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/containerregistry.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Configuration/DeleteConfiguration.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Configuration/GetCapacity.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Configuration/GetConfiguration.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Configuration/ListCapacity.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Configuration/ListConfiguration.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Configuration/PutConfiguration.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Operations/List.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Quotas/CreateOrUpdate.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Quotas/Delete.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Quotas/Get.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Quotas/List.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Setup/Get.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/Setup/Start.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/examples/registries/List.json (83%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/operations.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/quotas.json (100%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/registries.json (99%) rename specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/{2019-11-01 => 2019-11-01-preview}/setup.json (98%) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/DeleteConfiguration.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/DeleteConfiguration.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/DeleteConfiguration.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetCapacity.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/GetConfiguration.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListCapacity.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/ListConfiguration.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/PutConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Configuration/PutConfiguration.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Operations/List.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Operations/List.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Operations/List.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/CreateOrUpdate.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/CreateOrUpdate.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/CreateOrUpdate.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/CreateOrUpdate.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/Delete.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Delete.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/Delete.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Get.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/Get.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/Get.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/Get.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/List.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Quotas/List.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/List.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Setup/Get.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Get.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Setup/Get.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Setup/Start.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/Setup/Start.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Setup/Start.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/registries/List.json similarity index 83% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/registries/List.json index 5a9904080728..8ec1fcb9c198 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/examples/registries/List.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/registries/List.json @@ -13,7 +13,7 @@ "name": "local/testregistry", "type": "Microsoft.ContainerRegistry.Admin/locations/registries", "properties": { - "id": "/subscriptions/9a20956c-05fe-4c72-aa29-b2a1e5b802a7/resourceGroups/localResource/providers/Microsoft.ContainerRegistry/registries/testregistry", + "registryId": "/subscriptions/9a20956c-05fe-4c72-aa29-b2a1e5b802a7/resourceGroups/localResource/providers/Microsoft.ContainerRegistry/registries/testregistry", "name": "testregistry", "location": "local", "creationDate": "2021-04-09T17:02:09.9839001Z", diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json similarity index 100% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json similarity index 99% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json index d85890e2f9e3..ce34aeab125c 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json @@ -80,7 +80,7 @@ "description": "Container registry properties.", "type": "object", "properties": { - "id": { + "registryId": { "description": "Container registry id.", "type": "string", "readOnly": true diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json similarity index 98% rename from specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json rename to specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index e6513cd2f9b2..f583ef9098d0 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -125,11 +125,13 @@ "properties": { "password": { "description": "Ssl certificate password.", - "type": "string" + "type": "string", + "format": "password" }, "sslCertBase64": { "description": "Ssl certificate in base64 format.", - "type": "string" + "type": "string", + "format": "bytes" } } }, From e924da37fe464ac7cca2ad00fb02456d5eb4689a Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Mon, 24 May 2021 11:14:38 -0700 Subject: [PATCH 16/27] Release/acrchanges (#16) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. --- .../preview/2019-11-01-preview/quotas.json | 2 +- .../containerregistry/readme.azsautogen.md | 14 +++++----- .../containerregistry/readme.md | 28 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json index e745c058f753..0e54b058c9e6 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json @@ -212,7 +212,7 @@ "description": "Storage capacity (GB) of each registry.", "type": "integer", "format": "int32", - "default": 50 + "default": 100 } } }, diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md index e9aed1111d97..6209329a89fa 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md @@ -29,13 +29,13 @@ tag: package-2019-11-01 ``` yaml input-file: - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json ``` --- diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.md b/specification/azsadmin/resource-manager/containerregistry/readme.md index 2b4125ee056a..9b112e16f4e4 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.md @@ -33,13 +33,13 @@ These settings apply only when `--tag=package-2019-11-01` is specified on the co ``` yaml $(tag) == 'package-2019-11-01-preview' input-file: - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json" + - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json" ``` --- @@ -72,13 +72,13 @@ require: $(this-folder)/../../../../profiles/readme.md # all the input files across all versions input-file: - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/capacity.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/configuration.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/containerregistry.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/operations.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/quotas.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/registries.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01/setup.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json + - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json ``` If there are files that should not be in the `all-api-versions` set, From def3f91846808ca0bfa6c4e642101ed935f63703 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Mon, 24 May 2021 11:59:19 -0700 Subject: [PATCH 17/27] Release/acrchanges (#17) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. --- .../preview/2019-11-01-preview/setup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index f583ef9098d0..191b2c1fc54d 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -131,7 +131,7 @@ "sslCertBase64": { "description": "Ssl certificate in base64 format.", "type": "string", - "format": "bytes" + "format": "byte" } } }, From 5dfa0e3e2293d074870640e2d47c1bf743c0b9b4 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Wed, 26 May 2021 21:00:59 -0700 Subject: [PATCH 18/27] Release/acrchanges (#18) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. --- .../preview/2019-11-01-preview/quotas.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json index 0e54b058c9e6..5c88af1d7a70 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json @@ -36,10 +36,10 @@ "$ref": "containerregistry.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "#/parameters/QuotaNameParameter" }, { - "$ref": "#/parameters/QuotaNameParameter" + "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/ContainerRegistryQuotaParameters" From 335f4e2064f668cb5c81513431efa3d07cb23c27 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Wed, 2 Jun 2021 17:51:28 -0700 Subject: [PATCH 19/27] Release/acrchanges (#19) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th --- .../preview/2019-11-01-preview/quotas.json | 2 +- .../preview/2019-11-01-preview/setup.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json index 5c88af1d7a70..7cb30afee1c9 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json @@ -27,7 +27,7 @@ "ContainerRegistryQuotas" ], "description": "Create or update an existing container registry quota.", - "operationId": "ContainerRegistryQuotas_CreateOrUpdate", + "operationId": "ContainerRegistry_QuotaCreateOrUpdate", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index 191b2c1fc54d..3608d567ba53 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -16,7 +16,7 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/setup": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Setup/locations/{location}/setup": { "post": { "x-ms-examples": { "Invokes container registry certificate uploading and ACR service deployment.": { @@ -27,7 +27,7 @@ "ContainerRegistrySetupStart" ], "description": "Invokes container registry certificate uploading and service deployment.", - "operationId": "ContainerRegistrySetup_Start", + "operationId": "ContainerRegistry_StartSetup", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" @@ -73,7 +73,7 @@ "ContainerRegistrySetupStatus" ], "description": "Returns the status of the container registry setup.", - "operationId": "ContainerRegistrySetup_Get", + "operationId": "ContainerRegistry_GetSetupStatus", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" From 5e9d1028209506db12f71814b16000f61d2c5eb8 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Thu, 3 Jun 2021 20:05:23 -0700 Subject: [PATCH 20/27] Release/acrchanges (#20) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th * Fix swagger validation errors - 27th * Fix swagger validation errors - 28th * Fix swagger validation errors - 29th * Fix swagger validation errors - 30th --- .../preview/2019-11-01-preview/quotas.json | 2 +- .../preview/2019-11-01-preview/setup.json | 37 +++++++------------ 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json index 7cb30afee1c9..5c88af1d7a70 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json @@ -27,7 +27,7 @@ "ContainerRegistryQuotas" ], "description": "Create or update an existing container registry quota.", - "operationId": "ContainerRegistry_QuotaCreateOrUpdate", + "operationId": "ContainerRegistryQuotas_CreateOrUpdate", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index 3608d567ba53..13756699beda 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -39,13 +39,7 @@ "$ref": "containerregistry.json#/parameters/ApiVersionParameter" }, { - "name": "startSetupRequest", - "in": "body", - "description": "The object containing information for the configuration request.", - "required": true, - "schema": { - "$ref": "#/definitions/ContainerRegistrySetupProperty" - } + "$ref": "#/parameters/StartSetupParameter" } ], "responses": { @@ -104,24 +98,7 @@ }, "definitions": { "ContainerRegistrySetupProperty": { - "description": "Container registry setup property.", - "type": "object", - "properties": { - "properties": { - "description": "Container registry setup properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/ContainerRegistrySetupProperties" - } - }, - "allOf": [ - { - "$ref": "containerregistry.json#/definitions/Resource" - } - ] - }, - "ContainerRegistrySetupProperties": { "description": "Container registry setup properties.", - "type": "object", "properties": { "password": { "description": "Ssl certificate password.", @@ -204,6 +181,18 @@ } } }, + "parameters": { + "StartSetupParameter": { + "name": "startSetupRequest", + "in": "body", + "description": "The object containing information for the configuration request.", + "required": true, + "schema": { + "$ref": "#/definitions/ContainerRegistrySetupProperty" + }, + "x-ms-parameter-location": "method" + } + }, "securityDefinitions": { "azure_auth": { "type": "oauth2", From b8105e504a1daecd9a82b56f66045d4015d33f59 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Fri, 4 Jun 2021 11:50:05 -0700 Subject: [PATCH 21/27] Release/acrchanges (#21) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th * Fix swagger validation errors - 27th * Fix swagger validation errors - 28th * Fix swagger validation errors - 29th * Fix swagger validation errors - 30th * Fix swagger validation errors - 31th --- .../preview/2019-11-01-preview/examples/Setup/Start.json | 6 ++---- .../preview/2019-11-01-preview/setup.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Setup/Start.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Setup/Start.json index 0c91315be584..b5cf9ed01d3a 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Setup/Start.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Setup/Start.json @@ -5,10 +5,8 @@ "location": "local", "configurationName": "Default", "startSetupRequest": { - "properties": { - "password": "password", - "sslCertBase64": "sslCertBase64" - } + "password": "password", + "sslCertBase64": "sslCertBase64" } }, "responses": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index 13756699beda..1dc40853e891 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -192,7 +192,7 @@ }, "x-ms-parameter-location": "method" } - }, + }, "securityDefinitions": { "azure_auth": { "type": "oauth2", From 4de853e9e6d0dae98b74a7bead095ba247d85042 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Fri, 18 Jun 2021 23:17:05 -0700 Subject: [PATCH 22/27] Release/acrchanges (#22) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th * Fix swagger validation errors - 27th * Fix swagger validation errors - 28th * Fix swagger validation errors - 29th * Fix swagger validation errors - 30th * Fix swagger validation errors - 31th * Fix swagger specs, address comments and naming bug - 32th * Fix swagger specs, address comments and naming bug - 33th --- .../preview/2019-11-01-preview/capacity.json | 10 ++++----- .../2019-11-01-preview/configuration.json | 6 ++--- .../2019-11-01-preview/containerregistry.json | 22 ------------------- .../examples/Configuration/GetCapacity.json | 4 ++-- .../Configuration/GetConfiguration.json | 2 +- .../examples/Configuration/ListCapacity.json | 4 ++-- .../Configuration/ListConfiguration.json | 2 +- .../examples/Quotas/CreateOrUpdate.json | 4 ++-- .../examples/Quotas/Get.json | 2 +- .../examples/Quotas/List.json | 2 +- .../preview/2019-11-01-preview/quotas.json | 6 ++--- .../2019-11-01-preview/registries.json | 4 ++-- .../preview/2019-11-01-preview/setup.json | 4 ++-- 13 files changed, 25 insertions(+), 47 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json index c099c57ac920..8ce848286b5f 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json @@ -111,7 +111,7 @@ }, "allOf": [ { - "$ref": "containerregistry.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" } ] }, @@ -119,8 +119,8 @@ "description": "Container registry capacity property.", "type": "object", "properties": { - "maximumCapacityInGb": { - "description": "Total storage capacity (GB) which can used by the registry.", + "maximumCapacityInGiB": { + "description": "Total storage capacity (GiB) which can used by the registry.", "type": "integer", "format": "int32" }, @@ -128,8 +128,8 @@ "description": "Flag denotes if pushes are blocked for all registries.", "type": "boolean" }, - "registriesConsumptionInGb": { - "description": "Total storage capacity (GB) consumed by the registry.", + "registriesConsumptionInGiB": { + "description": "Total storage capacity (GiB) consumed by the registry.", "type": "number", "format": "float" } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json index 72c3d26b54fa..c45ade90efa4 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json @@ -194,7 +194,7 @@ }, "allOf": [ { - "$ref": "containerregistry.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" } ] }, @@ -202,8 +202,8 @@ "description": "Container registry configuration property.", "type": "object", "properties": { - "maximumCapacityInGb": { - "description": "Total storage capacity (GB) which can used by the registry.", + "maximumCapacityInGiB": { + "description": "Total storage capacity (GiB) which can used by the registry.", "type": "integer", "format": "int32" } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json index 4457d5f96cab..a84b0fdb1e23 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json @@ -17,28 +17,6 @@ ], "paths": {}, "definitions": { - "Resource": { - "description": "Base resource object.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource Name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource Type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, "ErrorResponse": { "description": "The error response for request which failed.", "type": "object", diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json index 81540304870a..45972bfd165a 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json @@ -12,8 +12,8 @@ "name": "local/Default", "type": "Microsoft.ContainerRegistry.Admin/locations/capacity", "properties": { - "maximumCapacityInGb": 100, - "registriesConsumptionInGb": 50.12, + "maximumCapacityInGiB": 100, + "registriesConsumptionInGiB": 50.12, "allowPush": true } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json index 57743b2f1ce4..447424ba34a8 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json @@ -12,7 +12,7 @@ "name": "local/Default", "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", "properties": { - "maximumCapacityInGb": 100 + "maximumCapacityInGiB": 100 } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json index 2c2df42f5215..4f78d8f31326 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json @@ -13,8 +13,8 @@ "name": "local/Default", "type": "Microsoft.ContainerRegistry.Admin/locations/capacity", "properties": { - "maximumCapacityInGb": 100, - "registriesConsumptionInGb": 50.12, + "maximumCapacityInGiB": 100, + "registriesConsumptionInGiB": 50.12, "allowPush": true } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json index 642f39c5b24f..eb93302df68c 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json @@ -13,7 +13,7 @@ "name": "local/Default", "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", "properties": { - "maximumCapacityInGb": 100 + "maximumCapacityInGiB": 100 } } ] diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/CreateOrUpdate.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/CreateOrUpdate.json index 0a6826e12d3d..2937812393aa 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/CreateOrUpdate.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/CreateOrUpdate.json @@ -7,7 +7,7 @@ "quotaObject": { "properties": { "numberOfRegistries": 10, - "capacityPerRegistryInGb": 50 + "capacityPerRegistryInGiB": 50 } } }, @@ -19,7 +19,7 @@ "type": "Microsoft.ContainerRegistry.Admin/locations/quotas", "properties": { "numberOfRegistries": 10, - "capacityPerRegistryInGb": 50 + "capacityPerRegistryInGiB": 50 } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/Get.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/Get.json index 0bbaa54430b3..d0dd163b576a 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/Get.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/Get.json @@ -13,7 +13,7 @@ "type": "Microsoft.ContainerRegistry.Admin/locations/quotas", "properties": { "numberOfRegistries": 10, - "capacityPerRegistryInGb": 50 + "capacityPerRegistryInGiB": 50 } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/List.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/List.json index 54f51ced0a80..695010a07054 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/List.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Quotas/List.json @@ -14,7 +14,7 @@ "type": "Microsoft.ContainerRegistry.Admin/locations/quotas", "properties": { "numberOfRegistries": 10, - "capacityPerRegistryInGb": 50 + "capacityPerRegistryInGiB": 50 } } ] diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json index 5c88af1d7a70..af81e099b5b4 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json @@ -194,7 +194,7 @@ }, "allOf": [ { - "$ref": "containerregistry.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" } ] }, @@ -208,8 +208,8 @@ "format": "int32", "default": 20 }, - "capacityPerRegistryInGb": { - "description": "Storage capacity (GB) of each registry.", + "capacityPerRegistryInGiB": { + "description": "Storage capacity (GiB) of each registry.", "type": "integer", "format": "int32", "default": 100 diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json index ce34aeab125c..bd8a997d0d83 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json @@ -72,7 +72,7 @@ }, "allOf": [ { - "$ref": "containerregistry.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" } ] }, @@ -111,7 +111,7 @@ "type": "string" }, "registrySizeInBytes": { - "description": "Total storage capacity (GB) used by the registry.", + "description": "Total storage capacity (GiB) used by the registry.", "type": "integer", "format": "int64" } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index 1dc40853e891..b190ef55cd9d 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -124,7 +124,7 @@ }, "allOf": [ { - "$ref": "containerregistry.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" } ] }, @@ -150,7 +150,7 @@ }, "allOf": [ { - "$ref": "containerregistry.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" } ] }, From 80461ff3ad275873aecdc905632503e6d81729b2 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Mon, 21 Jun 2021 10:02:51 -0700 Subject: [PATCH 23/27] Release/acrchanges (#23) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th * Fix swagger validation errors - 27th * Fix swagger validation errors - 28th * Fix swagger validation errors - 29th * Fix swagger validation errors - 30th * Fix swagger validation errors - 31th * Fix swagger specs, address comments and naming bug - 32th * Fix swagger specs, address comments and naming bug - 33th * Fix swagger specs - 34th --- .../examples/Configuration/PutConfiguration.json | 4 ++-- .../preview/2019-11-01-preview/operations.json | 3 +++ .../preview/2019-11-01-preview/setup.json | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json index fc4427dd24ce..52a8e46b6d18 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json @@ -6,7 +6,7 @@ "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", "configurationObject": { "properties": { - "maximumCapacityInGb": 10 + "maximumCapacityInGiB": 10 } } }, @@ -17,7 +17,7 @@ "name": "local/Default", "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", "properties": { - "maximumCapacityInGb": 10 + "maximumCapacityInGiB": 10 } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json index 2859c691e258..2dea53ae24fc 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json @@ -53,6 +53,7 @@ "definitions": { "Operation": { "description": "Describes the supported REST operation.", + "type": "object", "properties": { "name": { "description": "The name of the operation being performed on this particular object. It should match the action name that appears in RBAC / the event service.", @@ -72,6 +73,7 @@ }, "Display": { "description": "Contains the localized display information for this particular operation / action.", + "type": "object", "properties": { "provider": { "description": "The localized friendly form of the resource provider name – it is expected to also include the publisher/company responsible. It should use Title Casing and begin with \"Microsoft\" for 1st party services. e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute.\"", @@ -97,6 +99,7 @@ }, "OperationList": { "description": "Pageable list of supported operations.", + "type": "object", "properties": { "value": { "description": "List of operations", diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index b190ef55cd9d..01c907ed26c6 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -99,6 +99,7 @@ "definitions": { "ContainerRegistrySetupProperty": { "description": "Container registry setup properties.", + "type": "object", "properties": { "password": { "description": "Ssl certificate password.", From ab9b855a2d16c604b1340dea159cbfadbd820946 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Tue, 22 Jun 2021 17:32:25 -0700 Subject: [PATCH 24/27] Release/acrchanges (#24) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th * Fix swagger validation errors - 27th * Fix swagger validation errors - 28th * Fix swagger validation errors - 29th * Fix swagger validation errors - 30th * Fix swagger validation errors - 31th * Fix swagger specs, address comments and naming bug - 32th * Fix swagger specs, address comments and naming bug - 33th * Fix swagger specs - 34th * Test cmdlet name creation with recommended operation id for quota * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id --- .../preview/2019-11-01-preview/capacity.json | 8 ++-- .../2019-11-01-preview/configuration.json | 12 +++--- .../2019-11-01-preview/containerregistry.json | 38 +------------------ .../examples/Configuration/GetCapacity.json | 4 +- .../Configuration/GetConfiguration.json | 4 +- .../examples/Configuration/ListCapacity.json | 4 +- .../Configuration/ListConfiguration.json | 4 +- .../Configuration/PutConfiguration.json | 4 +- .../2019-11-01-preview/operations.json | 2 +- .../preview/2019-11-01-preview/quotas.json | 16 ++++---- .../2019-11-01-preview/registries.json | 4 +- .../preview/2019-11-01-preview/setup.json | 4 +- 12 files changed, 34 insertions(+), 70 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json index 8ce848286b5f..2fba13869a0f 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json @@ -16,7 +16,7 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/capacity/{capacityName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/capacities/{capacityName}": { "get": { "x-ms-examples": { "Returns container registry capacity properties.": { @@ -52,13 +52,13 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/capacity": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/capacities": { "get": { "x-ms-examples": { "Returns container registry capacity properties.": { @@ -91,7 +91,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json index c45ade90efa4..860e767b5060 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json @@ -16,7 +16,7 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/configuration/{configurationName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/configurations/{configurationName}": { "put": { "x-ms-examples": { "Returns container registry overall configuration properties.": { @@ -55,7 +55,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -95,7 +95,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -135,13 +135,13 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/configuration": { + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerRegistry.Admin/locations/{location}/configurations": { "get": { "x-ms-examples": { "Returns a list of configuration at the given location.": { @@ -174,7 +174,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json index a84b0fdb1e23..b79f44ee57c1 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json @@ -16,43 +16,7 @@ "application/json" ], "paths": {}, - "definitions": { - "ErrorResponse": { - "description": "The error response for request which failed.", - "type": "object", - "properties": { - "error": { - "type": "object", - "description": "The error object.", - "properties": { - "code": { - "description": "The error description code.", - "type": "string", - "readOnly": true - }, - "message": { - "description": "The error description message.", - "type": "string", - "readOnly": true - }, - "target": { - "description": "The error target description.", - "type": "string", - "readOnly": true - }, - "details": { - "description": "The error details information.", - "type": "array", - "items": { - "type": "string" - }, - "readOnly": true - } - } - } - } - } - }, + "definitions": {}, "parameters": { "ApiVersionParameter": { "description": "REST Api Version.", diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json index 45972bfd165a..ab8e07e38fcb 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetCapacity.json @@ -8,9 +8,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/capacity/Default", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/capacities/Default", "name": "local/Default", - "type": "Microsoft.ContainerRegistry.Admin/locations/capacity", + "type": "Microsoft.ContainerRegistry.Admin/locations/capacities", "properties": { "maximumCapacityInGiB": 100, "registriesConsumptionInGiB": 50.12, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json index 447424ba34a8..4c4d4f60bc54 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/GetConfiguration.json @@ -8,9 +8,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configuration/Default", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configurations/Default", "name": "local/Default", - "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", + "type": "Microsoft.ContainerRegistry.Admin/locations/configurations", "properties": { "maximumCapacityInGiB": 100 } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json index 4f78d8f31326..a9002248457d 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListCapacity.json @@ -9,9 +9,9 @@ "body": { "value": [ { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/capacity/Default", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/capacities/Default", "name": "local/Default", - "type": "Microsoft.ContainerRegistry.Admin/locations/capacity", + "type": "Microsoft.ContainerRegistry.Admin/locations/capacities", "properties": { "maximumCapacityInGiB": 100, "registriesConsumptionInGiB": 50.12, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json index eb93302df68c..b39b129eac7d 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/ListConfiguration.json @@ -9,9 +9,9 @@ "body": { "value": [ { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configuration/Default", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configurations/Default", "name": "local/Default", - "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", + "type": "Microsoft.ContainerRegistry.Admin/locations/configurations", "properties": { "maximumCapacityInGiB": 100 } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json index 52a8e46b6d18..4edd55e0794b 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/examples/Configuration/PutConfiguration.json @@ -13,9 +13,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configuration/Default", + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.ContainerRegistry.Admin/locations/local/configurations/Default", "name": "local/Default", - "type": "Microsoft.ContainerRegistry.Admin/locations/configuration", + "type": "Microsoft.ContainerRegistry.Admin/locations/configurations", "properties": { "maximumCapacityInGiB": 10 } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json index 2dea53ae24fc..b80dbc9cea54 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json @@ -43,7 +43,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json index af81e099b5b4..e76f2412cbba 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json @@ -27,7 +27,7 @@ "ContainerRegistryQuotas" ], "description": "Create or update an existing container registry quota.", - "operationId": "ContainerRegistryQuotas_CreateOrUpdate", + "operationId": "Quota_CreateOrUpdate", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" @@ -55,7 +55,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -70,7 +70,7 @@ "ContainerRegistryQuotas" ], "description": "Delete an existing container registry quota", - "operationId": "ContainerRegistryQuotas_Delete", + "operationId": "Quotas_Delete", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" @@ -95,7 +95,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -110,7 +110,7 @@ "ContainerRegistryQuotas" ], "description": "Returns the specified container registry quota.", - "operationId": "ContainerRegistryQuotas_Get", + "operationId": "Quotas_Get", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" @@ -135,7 +135,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -152,7 +152,7 @@ "ContainerRegistryQuotas" ], "description": "Returns a list of container registry quotas at the given location.", - "operationId": "ContainerRegistryQuotas_List", + "operationId": "Quotas_List", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" @@ -174,7 +174,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json index bd8a997d0d83..754b7389fb6e 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json @@ -27,7 +27,7 @@ "ContainerRegistries" ], "description": "Returns a list of container registries present in all tenant location.", - "operationId": "ContainerRegistries_List", + "operationId": "ContainerRegistryRegistries_List", "parameters": [ { "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" @@ -49,7 +49,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index 01c907ed26c6..f3998ecf4711 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -52,7 +52,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } @@ -89,7 +89,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "containerregistry.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } } From 2c1ea026691f0b7ac5f9d0f34e0ecd2be72bfa53 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Wed, 23 Jun 2021 12:23:02 -0700 Subject: [PATCH 25/27] Release/acrchanges (#25) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th * Fix swagger validation errors - 27th * Fix swagger validation errors - 28th * Fix swagger validation errors - 29th * Fix swagger validation errors - 30th * Fix swagger validation errors - 31th * Fix swagger specs, address comments and naming bug - 32th * Fix swagger specs, address comments and naming bug - 33th * Fix swagger specs - 34th * Test cmdlet name creation with recommended operation id for quota * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Use v2 common resource types. --- .../preview/2019-11-01-preview/capacity.json | 6 +++--- .../preview/2019-11-01-preview/configuration.json | 10 +++++----- .../preview/2019-11-01-preview/operations.json | 2 +- .../preview/2019-11-01-preview/quotas.json | 10 +++++----- .../preview/2019-11-01-preview/registries.json | 4 ++-- .../preview/2019-11-01-preview/setup.json | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json index 2fba13869a0f..9b9cf8a48f4e 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json @@ -52,7 +52,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -91,7 +91,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -111,7 +111,7 @@ }, "allOf": [ { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource" } ] }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json index 860e767b5060..3d3c68dc2762 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json @@ -55,7 +55,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -95,7 +95,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -135,7 +135,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -174,7 +174,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -194,7 +194,7 @@ }, "allOf": [ { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource" } ] }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json index b80dbc9cea54..f1713aa1f427 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json @@ -43,7 +43,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json index e76f2412cbba..7f35e61e38a7 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json @@ -55,7 +55,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -95,7 +95,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -135,7 +135,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -174,7 +174,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -194,7 +194,7 @@ }, "allOf": [ { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource" } ] }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json index 754b7389fb6e..b33853072bc8 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json @@ -49,7 +49,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -72,7 +72,7 @@ }, "allOf": [ { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource" } ] }, diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index f3998ecf4711..863f94981b62 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -52,7 +52,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -89,7 +89,7 @@ "default": { "description": "Error Response.", "schema": { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -125,7 +125,7 @@ }, "allOf": [ { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource" } ] }, @@ -151,7 +151,7 @@ }, "allOf": [ { - "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource" } ] }, From 06a14879d9546de6ff30321afa61e5e74c587eb6 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Fri, 25 Jun 2021 10:02:14 -0700 Subject: [PATCH 26/27] Release/acrchanges (#26) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th * Fix swagger validation errors - 27th * Fix swagger validation errors - 28th * Fix swagger validation errors - 29th * Fix swagger validation errors - 30th * Fix swagger validation errors - 31th * Fix swagger specs, address comments and naming bug - 32th * Fix swagger specs, address comments and naming bug - 33th * Fix swagger specs - 34th * Test cmdlet name creation with recommended operation id for quota * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Use v2 common resource types. * Use v2 common resource types for parameters also. --- .../preview/2019-11-01-preview/capacity.json | 12 ++-- .../2019-11-01-preview/configuration.json | 24 +++---- .../2019-11-01-preview/containerregistry.json | 63 ------------------- .../2019-11-01-preview/operations.json | 2 +- .../preview/2019-11-01-preview/quotas.json | 24 +++---- .../2019-11-01-preview/registries.json | 6 +- .../preview/2019-11-01-preview/setup.json | 12 ++-- 7 files changed, 40 insertions(+), 103 deletions(-) delete mode 100644 specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json index 9b9cf8a48f4e..febe3c2514e2 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json @@ -30,13 +30,13 @@ "operationId": "ContainerRegistryCapacity_Get", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/CapacityNameParameter" @@ -72,13 +72,13 @@ "operationId": "ContainerRegistryCapacity_List", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json index 3d3c68dc2762..e652eb31a23d 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json @@ -30,13 +30,13 @@ "operationId": "ContainerRegistryConfiguration_Put", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" @@ -73,13 +73,13 @@ "operationId": "ContainerRegistryConfiguration_Delete", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" @@ -113,13 +113,13 @@ "operationId": "ContainerRegistryConfiguration_Get", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" @@ -155,13 +155,13 @@ "operationId": "ContainerRegistryConfiguration_List", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json deleted file mode 100644 index b79f44ee57c1..000000000000 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2019-11-01-preview", - "title": "ContainerRegistryManagementClient", - "description": "Admin Container Registry Management Client." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": {}, - "definitions": {}, - "parameters": { - "ApiVersionParameter": { - "description": "REST Api Version.", - "name": "api-version", - "type": "string", - "in": "query", - "required": true - }, - "LocationParameter": { - "description": "Resource location.", - "name": "location", - "type": "string", - "in": "path", - "required": true, - "x-ms-parameter-location": "method" - }, - "SubscriptionIdParameter": { - "description": "Subscription Id.", - "name": "subscriptionId", - "type": "string", - "in": "path", - "required": true, - "x-ms-parameter-location": "method" - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ] -} diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json index f1713aa1f427..ab1608cc86c7 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json @@ -30,7 +30,7 @@ "operationId": "Operations_List", "parameters": [ { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json index 7f35e61e38a7..e517e6930272 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json @@ -30,16 +30,16 @@ "operationId": "Quota_CreateOrUpdate", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/QuotaNameParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/ContainerRegistryQuotaParameters" @@ -73,13 +73,13 @@ "operationId": "Quotas_Delete", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/QuotaNameParameter" @@ -113,13 +113,13 @@ "operationId": "Quotas_Get", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { "$ref": "#/parameters/QuotaNameParameter" @@ -155,13 +155,13 @@ "operationId": "Quotas_List", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json index b33853072bc8..6699e2df73ef 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json @@ -30,13 +30,13 @@ "operationId": "ContainerRegistryRegistries_List", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json index 863f94981b62..d93cafeb7155 100644 --- a/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json +++ b/specification/azsadmin/resource-manager/containerregistry/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/setup.json @@ -30,13 +30,13 @@ "operationId": "ContainerRegistry_StartSetup", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/StartSetupParameter" @@ -70,13 +70,13 @@ "operationId": "ContainerRegistry_GetSetupStatus", "parameters": [ { - "$ref": "containerregistry.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "containerregistry.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { - "$ref": "containerregistry.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { From 05f6e24732b2ee99469c3a0e717c328fd715af80 Mon Sep 17 00:00:00 2001 From: larisaborodina <58491292+larisaborodina@users.noreply.github.com> Date: Fri, 25 Jun 2021 10:10:27 -0700 Subject: [PATCH 27/27] Release/acrchanges (#27) * Fix swagger validation errors - 4th. * Fix swagger validation errors - 5th. * Fix swagger validation errors - 6th. * Fix swagger validation errors - 7th. * Fix swagger validation errors - 13th. * Fix swagger validation errors - 14th. * Fix swagger validation errors - 15th. * Fix swagger validation errors - 16th. * Fix swagger validation errors - 17th. * Fix swagger validation errors - 18th. * Fix swagger validation errors - 19th. * Fix swagger validation errors - 20th. * Fix swagger validation errors - 21th. * Fix swagger validation errors - 21st. * Fix swagger validation errors - 22st. * Fix swagger validation errors - 23st. * Fix swagger validation errors - 24st. * Fix swagger validation errors - 25th. * Fix swagger validation errors - 26th * Fix swagger validation errors - 27th * Fix swagger validation errors - 28th * Fix swagger validation errors - 29th * Fix swagger validation errors - 30th * Fix swagger validation errors - 31th * Fix swagger specs, address comments and naming bug - 32th * Fix swagger specs, address comments and naming bug - 33th * Fix swagger specs - 34th * Test cmdlet name creation with recommended operation id for quota * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Test cmdlet name creation with recommended operation id * Use v2 common resource types. * Use v2 common resource types for parameters also. * Use v2 common resource types for parameters also. - fixed the readme to remove unneeded file --- .../resource-manager/containerregistry/readme.azsautogen.md | 1 - .../azsadmin/resource-manager/containerregistry/readme.md | 2 -- 2 files changed, 3 deletions(-) diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md index 6209329a89fa..a97a374fe88f 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.azsautogen.md @@ -31,7 +31,6 @@ tag: package-2019-11-01 input-file: - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json diff --git a/specification/azsadmin/resource-manager/containerregistry/readme.md b/specification/azsadmin/resource-manager/containerregistry/readme.md index 9b112e16f4e4..8b50a3246886 100644 --- a/specification/azsadmin/resource-manager/containerregistry/readme.md +++ b/specification/azsadmin/resource-manager/containerregistry/readme.md @@ -35,7 +35,6 @@ These settings apply only when `--tag=package-2019-11-01` is specified on the co input-file: - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json" - - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json" - "Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json" @@ -74,7 +73,6 @@ require: $(this-folder)/../../../../profiles/readme.md input-file: - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/capacity.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/configuration.json - - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/containerregistry.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/operations.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/quotas.json - $(this-folder)/Microsoft.ContainerRegistry.Admin/preview/2019-11-01-preview/registries.json