diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json index 0b141066b3cd..bacda92370b3 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json @@ -1296,7 +1296,7 @@ } }, "202": { - "description": "Accepted. The response indicates the exiting Config Server is now updating and contains a Location\r\nheader to query the operation result.", + "description": "Accepted. The response indicates the create or update request for Config Server is now accepted and contains a Location\r\nheader to query the operation result.", "schema": { "$ref": "#/definitions/ConfigServerResource" } @@ -1376,6 +1376,97 @@ "$ref": "./examples/ConfigServers_UpdatePatch_Consumption.json" } } + }, + "delete": { + "tags": [ + "AppPlatform" + ], + "description": "Disable the default Config Server, only available in Enterprise Plan.", + "operationId": "ConfigServers_Delete", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServiceNameParameter" + } + ], + "responses": { + "202": { + "description": "Accepted. The response indicates the default Config Server is now deleting.", + "headers": { + "Location": { + "type": "string" + } + } + }, + "204": { + "description": "Success. The response indicates the default Config Server doesn't exist or has deleted." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "ConfigServers_Delete": { + "$ref": "./examples/ConfigServers_Delete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AppPlatform/Spring/{serviceName}/configServers": { + "get": { + "tags": [ + "AppPlatform" + ], + "description": "Handles requests to list all config server resources in a Service.", + "operationId": "ConfigServers_List", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServiceNameParameter" + } + ], + "responses": { + "200": { + "description": "Success. The response describes the list of config servers in the Service.", + "schema": { + "$ref": "#/definitions/ConfigServerResourceCollection" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "ConfigServers_List": { + "$ref": "./examples/ConfigServers_List.json" + } + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AppPlatform/Spring/{serviceName}/configServers/validate": { @@ -10383,7 +10474,7 @@ "readOnly": true, "properties": { "cpu": { - "description": "Cpu allocated to each Application Configuration Service instance", + "description": "CPU allocated to each Application Configuration Service instance", "type": "string", "readOnly": true }, @@ -10997,7 +11088,7 @@ "readOnly": true, "properties": { "cpu": { - "description": "Cpu allocated to each Service Registry instance", + "description": "CPU allocated to each Service Registry instance", "type": "string", "readOnly": true }, @@ -11212,10 +11303,12 @@ "description": "State of the config server.", "enum": [ "NotAvailable", + "Creating", "Deleted", "Failed", "Succeeded", - "Updating" + "Updating", + "Deleting" ], "type": "string", "readOnly": true, @@ -11224,6 +11317,21 @@ "modelAsString": true } }, + "resourceRequests": { + "description": "The requested resource quantity for required CPU and Memory, only available in Enterprise Plan.", + "$ref": "#/definitions/ConfigServerResourceRequests", + "readOnly": true + }, + "instances": { + "description": "Collection of instances belong to Config Server, only available in Enterprise Plan.", + "uniqueItems": false, + "type": "array", + "x-ms-identifiers": [], + "items": { + "$ref": "#/definitions/ConfigServerInstance" + }, + "readOnly": true + }, "error": { "$ref": "#/definitions/Error", "description": "Error when apply config server settings." @@ -11256,6 +11364,24 @@ } } }, + "ConfigServerResourceCollection": { + "description": "Object that includes an array of config server resources and a possible link for next set", + "type": "object", + "properties": { + "value": { + "description": "Collection of config server resources", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/ConfigServerResource" + } + }, + "nextLink": { + "description": "URL client should use to fetch the next page (per server side paging).\r\nIt's null for now, added for future use.", + "type": "string" + } + } + }, "MonitoringSettingResource": { "description": "Monitoring Setting resource", "type": "object", @@ -11586,6 +11712,45 @@ }, "x-ms-discriminator-value": "Weekly" }, + "ConfigServerResourceRequests": { + "description": "Resource request payload of Config Server, only available in Enterprise Plan.", + "type": "object", + "readOnly": true, + "properties": { + "cpu": { + "description": "CPU allocated to each Config Server instance", + "type": "string", + "readOnly": true + }, + "memory": { + "description": "Memory allocated to each Config Server instance", + "type": "string", + "readOnly": true + }, + "instanceCount": { + "format": "int32", + "description": "Instance count of the Config Server", + "type": "integer", + "readOnly": true + } + } + }, + "ConfigServerInstance": { + "description": "Collection of instances belong to the Config Server, only available in Enterprise Plan.", + "type": "object", + "properties": { + "name": { + "description": "Name of the Config Server instance", + "type": "string", + "readOnly": true + }, + "status": { + "description": "Status of the Config Server instance", + "type": "string", + "readOnly": true + } + } + }, "ConfigServerSettings": { "description": "The settings of config server.", "type": "object", @@ -14640,7 +14805,7 @@ "type": "object", "properties": { "cpu": { - "description": "Cpu allocated to each Spring Cloud Gateway instance.", + "description": "CPU allocated to each Spring Cloud Gateway instance.", "type": "string", "default": "1" }, @@ -14677,7 +14842,7 @@ "readOnly": true, "properties": { "cpu": { - "description": "Cpu allocated to each Spring Cloud Gateway Operator instance.", + "description": "CPU allocated to each Spring Cloud Gateway Operator instance.", "type": "string", "readOnly": true }, @@ -15114,7 +15279,7 @@ "type": "object", "properties": { "cpu": { - "description": "Cpu allocated to each API portal instance", + "description": "CPU allocated to each API portal instance", "type": "string", "readOnly": true }, @@ -15280,7 +15445,7 @@ "type": "object", "properties": { "cpu": { - "description": "Cpu allocated to each application accelerator component. 1 core can be represented by 1 or 1000m", + "description": "CPU allocated to each application accelerator component. 1 core can be represented by 1 or 1000m", "type": "string", "readOnly": true }, diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_Delete.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_Delete.json new file mode 100644 index 000000000000..15324939df97 --- /dev/null +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_Delete.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "api-version": "2024-05-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "serviceName": "myservice" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/locations/eastus/operationStatus/default/operationId/00000000-0000-0000-0000-000000000000?api-version=2024-05-01-preview", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000/Spring/default?api-version=2024-05-01-preview" + } + }, + "204": {} + } +} diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_Get.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_Get.json index bbc1f854b6f0..858ad7fc1909 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_Get.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_Get.json @@ -18,7 +18,22 @@ "/" ] } - } + }, + "resourceRequests": { + "cpu": "1", + "memory": "1G", + "instanceCount": 2 + }, + "instances": [ + { + "name": "instance1", + "status": "Running" + }, + { + "name": "instance2", + "status": "Running" + } + ] }, "systemData": { "createdBy": "sample-user", diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_List.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_List.json new file mode 100644 index 000000000000..4a6240796967 --- /dev/null +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_List.json @@ -0,0 +1,56 @@ +{ + "parameters": { + "api-version": "2024-05-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "serviceName": "myservice" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "provisioningState": "Succeeded", + "configServer": { + "gitProperty": { + "uri": "https://github.com/fake-user/fake-repository.git", + "label": "master", + "searchPaths": [ + "/" + ] + } + }, + "resourceRequests": { + "cpu": "1", + "memory": "1G", + "instanceCount": 2 + }, + "instances": [ + { + "name": "instance1", + "status": "Running" + }, + { + "name": "instance2", + "status": "Running" + } + ] + }, + "systemData": { + "createdBy": "sample-user", + "createdByType": "User", + "createdAt": "2021-08-11T03:16:03.944Z", + "lastModifiedBy": "sample-user", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-11T03:17:03.944Z" + }, + "type": "Microsoft.AppPlatform/Spring/configServers", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/configServers/default", + "name": "default" + } + ] + } + } + } +} diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_UpdatePatch.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_UpdatePatch.json index 107449b040e0..943001181e21 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_UpdatePatch.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_UpdatePatch.json @@ -35,7 +35,22 @@ "/" ] } - } + }, + "resourceRequests": { + "cpu": "1", + "memory": "1G", + "instanceCount": 2 + }, + "instances": [ + { + "name": "instance1", + "status": "Running" + }, + { + "name": "instance2", + "status": "Running" + } + ] }, "systemData": { "createdBy": "sample-user", @@ -62,7 +77,22 @@ "/" ] } - } + }, + "resourceRequests": { + "cpu": "1", + "memory": "1G", + "instanceCount": 2 + }, + "instances": [ + { + "name": "instance1", + "status": "Running" + }, + { + "name": "instance2", + "status": "Running" + } + ] }, "systemData": { "createdBy": "sample-user", diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_UpdatePut.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_UpdatePut.json index 816d460bf6f1..f163f7dbd0db 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_UpdatePut.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/ConfigServers_UpdatePut.json @@ -31,7 +31,22 @@ "/" ] } - } + }, + "resourceRequests": { + "cpu": "1", + "memory": "1G", + "instanceCount": 2 + }, + "instances": [ + { + "name": "instance1", + "status": "Running" + }, + { + "name": "instance2", + "status": "Running" + } + ] }, "systemData": { "createdBy": "sample-user", @@ -58,7 +73,22 @@ "/" ] } - } + }, + "resourceRequests": { + "cpu": "1", + "memory": "1G", + "instanceCount": 2 + }, + "instances": [ + { + "name": "instance1", + "status": "Running" + }, + { + "name": "instance2", + "status": "Running" + } + ] }, "systemData": { "createdBy": "sample-user",