Skip to content

Commit

Permalink
Availableworkloadprofiles - GET endpoint (#20650)
Browse files Browse the repository at this point in the history
* Adds base for updating Microsoft.App from version stable/2022-03-01 to version 2022-05-01

* Updates readme

* Updates API version in new specs and examples

* Add app diag to 2022-05-01 (#18678)

* Add container apps diagnostics

* Fix validation errors

* Move Microsoft.App diag APIs to 2022-05-01

* Fix validation errors

* Fix validation errors

* Fix validation errors 3

* Change operationIds

Co-authored-by: Michimune Kohno <[email protected]>

* Fix definition for customhostnameesult (#19014)

* fix

* update

* more fix

* Cherry pick for the parameter name fixes for the 2022-03-01 and making the same fixes in 2022-05-01 (#19048)

* Correct Probe enums (#18839)

* fix probe enums

* Fix revision mode enum

* Fix patch example

* Fix the casing of enums in the latest api version

* Change the parameter names to unblock Terraform release (#19005)

* contianerapps: fixing swagger inconsistencies in 2022-01-01-preview

* containerapps: fixing inconsistencies in the 2022-03-01 swagger

* containerapps: updating the examples for 2022-01-01-preview

* containerapps: updating the examples to account for the updated parameter names

* containerapps: fixing linting

* fix probe enums

* Fix revision mode enum

* Fix the policheck error

* Revert "containerapps: fixing linting"

This reverts commit 3c4872f.

* Revert "containerapps: updating the examples for 2022-01-01-preview"

This reverts commit 9b81fbd.

* Revert "contianerapps: fixing swagger inconsistencies in 2022-01-01-preview"

This reverts commit 553fc55.

* Undo changes to 2022-01-01-preview

* Fix one issue

* fix remaining inconsistency

* fix authConfig and sourceControl names

Co-authored-by: tombuildsstuff <[email protected]>
Co-authored-by: Mike Vu <[email protected]>

* Change param names

* Fix examples

* Fix CI errors

Co-authored-by: Mike Vu <[email protected]>
Co-authored-by: tombuildsstuff <[email protected]>

* Fix description in all API versions (#19313)

* Fix description for ManagedEnvironment.Internal property (#19307)

* Fix descriptions in all api versions

* Add traffic info to revisions api (#19054)

* Add traffic info to a revision api

* Add deprecated prop

* Prettier fixes

* 1pdate based on new proposal

* Rename

* Change names

* minor fix

* Add httpReadBufferSize to dapr config in Microsoft.App-2022-05-01 (#19360)

* Add httpReadBufferSize to dapr config

* remove nullable

* Adds base for updating Microsoft.App from version stable/2022-05-01 to version 2022-06-01-preview

* Updates readme

* Updates API version in new specs and examples

* Add new resources for 2022-06-01-preview (#19494)

* update

* update

* update

* fix

* update

* update

* update

* update

* fix

* update

* update

* Enable Dapr AI Connection string for Microsoft.App connected environment (#19974)

* Enable Dapr AI Connection string for Microsoft.App connected environment

* Fix dapr ai connection string

* remove read

* remove read permission of dapr ai connection string and instrument key for managed environment

* fixes for comments

* update (#20013)

* Fixdescriptions on microsoft.app 2022 06 01 preview (#20133)

* Fix casing for detector properties

* Fix descriptions

* Fix descriptions and detectorProperties in 2022-06-01-preview

* Added `secretsStoreComponent` in 2022-06-01 spec (#20044)

* Added `secretsStoreComponent` in 2022-06-01 spec

Signed-off-by: ItalyPaleAle <[email protected]>

* Fixed typos and added example of name/key

Signed-off-by: ItalyPaleAle <[email protected]>

* Add custom domain configuration for managed environment (#20149)

Co-authored-by: Mengjun Qin <[email protected]>

* Add additional Dapr options (2022-06-01-preview) (#19886)

* Add additional Dapr options

* Update examples for 2022-06-01-preview

* force ci

* force ci

* force ci

* adding ip-restriction feat (#19841)

* adding ip-restriction feat

* remove from stable, add to preview

* fix lintDiff error

* fix modelvalidation error

* fix formatting changes

* rename names, add note to all allow or all deny

* fix spell check error

* update name and examples

* rename `ipAddress` to `ipAddressRange`

* making small change to re-run build pipeline

* trigger GitHub actions

* resolve comments

Co-authored-by: Taher Darolywala <[email protected]>

* Remove Traffic Labels from revisions because they haven't been impelemented (#20261)

* Revert "Add traffic info to revisions api (#19054)"

This reverts commit 056cc51.

* Remove traffic labels from revisions

* Add property for tcp apps (#20193)

* Add property for tcp apps

* Add scale

* Fix

* Fix

* Add Init Containers to common definitions (#19855)

* add init containers to common definitions

* move changes to 06-01 preview

* remove repeated container definition

* fix allof syntax

* fix anonymous container definition

* fix lintdiff errors

* fix container allof syntax

* add more init examples

* split baseContainer definition

* remove description

Co-authored-by: p-bouchon <[email protected]>

* Update container app provisioningstate (#20411)

* update

* update

* add property: maxInactiveRevisions (#20334)

* add property: maxInactiveRevisions

* update

* update

* Add premium sku related properties for managed environment (#19770)

* Add premium sku related properties for managed environment

* Move sku to base property

* Add workloadProfileType

* Examples for managed environment

* Add container app example

* Fix workloadProfiles

* Add custom word

* Fix WorkloadProfileType references

* prettier fixes

* Fix workload profile

* Fix typo

* remove readonly property for workload profile

* Add object type

* nit: Fix description location

* Fix XmsIdentifierValidation

* Remove spaces from enum values

* Remove unwanted change

* Add aka ms url

* Update examples for workload profile type

* Fix rebase issue

* Fix json

* Update description and move location

* Remove provisioning state for node pool

* sku capacity explanation

* Remove capacity attribute

* Remove capacity attribute from required

* Mark sku property as required

* Add x-ms-identifiers

* Rename mimum and maximum

* Rename skutype to skuName

* Make sku property as optional

* Make workload profile type as string

* fix go SDK automation config

Co-authored-by: Chenjie Shi <[email protected]>

* Fix source control status code in 2022-06-01-preview. (#20429)

* Swagger documentation for /locations/{location}/billingMeters - GET endpoint

* Add example, fix validation errors

* Fix ARM validation errors, code review comments

* Fix response validation

* Remove 20220501 because we will not support it in server side (#20427)

* remove

* update

* add proxy resource properties

* Response formatting

* Added support for user defined routing (#20464)

* Added support for user defined routing

* Added examples

* fixed JSON syntax

* syntax fix

* fixed vnetenvironment syntax

* fixed camel case

* case fix

* enum syntax

* fixed comma cases ManagedEnvironmentOutBoundType

* fixing casing

* add default error response

* Add available workprofiles -GET endpoint

* Remove duplicate schema name WorkloadProfile

* Change memoryGiB to memoryGB as suggested in code review

* Add x-ms-pageable - nextLink support to not introduce breaking changes in the future

* rename to memory in GiB because our case is Gibibytes base 1024

* change friendlyName to displayName

* Some more APIs (#20448)

* new APIs to 06-01

* test fix

* more fixes

* Add new property to the response object

* add last active time for revision (#20658)

* Add custom domain for connected env (#20731)

* add custom domain

* fhcekout

* billingMeters - GET endpoint (#20485)

* Swagger documentation for /locations/{location}/billingMeters - GET endpoint

* Add example, fix validation errors

* Fix ARM validation errors, code review comments

* Fix response validation

* add proxy resource properties

* Response formatting

* add default error response

* ARM Review feedback + small naming change for a property

* Change GB to GiB

* Change the boolean value for default to enum

* change error response to v3/ErrorResponse

* Fix 2022-06-01-preview branch merge conflicts (#20773)

* Reset

* more fixes

* More fixes

* another conflict fix

* Fix old preview version

* fix 2022-03-01

Signed-off-by: ItalyPaleAle <[email protected]>
Co-authored-by: Ruslan Yakushev <[email protected]>
Co-authored-by: michimune <[email protected]>
Co-authored-by: Michimune Kohno <[email protected]>
Co-authored-by: Zunli Hu <[email protected]>
Co-authored-by: Mike Vu <[email protected]>
Co-authored-by: tombuildsstuff <[email protected]>
Co-authored-by: Ahmed ElSayed <[email protected]>
Co-authored-by: LaylaLiu-gmail <[email protected]>
Co-authored-by: Alessandro (Ale) Segala <[email protected]>
Co-authored-by: Mengjun Qin <[email protected]>
Co-authored-by: Mengjun Qin <[email protected]>
Co-authored-by: Taher Daroly <[email protected]>
Co-authored-by: Taher Darolywala <[email protected]>
Co-authored-by: zhenqxuMSFT <[email protected]>
Co-authored-by: p-bouchon <[email protected]>
Co-authored-by: p-bouchon <[email protected]>
Co-authored-by: njucz <[email protected]>
Co-authored-by: JJ <[email protected]>
Co-authored-by: Chenjie Shi <[email protected]>
Co-authored-by: yalixiang <[email protected]>
Co-authored-by: Mahmoud Desokey <[email protected]>
Co-authored-by: Xingjian Wang <[email protected]>
  • Loading branch information
23 people authored Sep 28, 2022
1 parent 96f4ed5 commit 910f631
Show file tree
Hide file tree
Showing 3 changed files with 286 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
{
"swagger": "2.0",
"info": {
"version": "2022-06-01-preview",
"title": "ContainerApps API Client"
},
"host": "management.azure.com",
"schemes": [
"https"
],
"produces": [
"application/json"
],
"paths": {
"/subscriptions/{subscriptionId}/providers/Microsoft.App/locations/{location}/availableManagedEnvironmentsWorkloadProfileTypes": {
"get": {
"tags": [
"AvailableWorkloadProfiles"
],
"summary": "Get available workload profiles by location.",
"description": "Get all available workload profiles for a location.",
"operationId": "AvailableWorkloadProfiles_Get",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/LocationParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/AvailableWorkloadProfilesCollection"
}
},
"default": {
"description": "Error response.",
"schema": {
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
},
"x-ms-examples": {
"BillingMeters_Get": {
"$ref": "./examples/AvailableWorkloadProfiles_Get.json"
}
}
}
}
},
"definitions": {
"AvailableWorkloadProfile": {
"description": "A premium workload profile.",
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
}
],
"properties": {
"location": {
"type": "string",
"description": "Region of the workload profile."
},
"properties": {
"description": "Revision resource specific properties",
"type": "object",
"properties": {
"billingMeterCategory": {
"description": "Used to map workload profile types to billing meter.",
"type": "string",
"enum": [
"PremiumSkuGeneralPurpose",
"PremiumSkuMemoryOptimized",
"PremiumSkuComputeOptimized"
],
"x-ms-enum": {
"name": "Category",
"modelAsString": true
}
},
"applicability": {
"type": "string",
"description": "indicates whether the profile is default for the location.",
"enum": [
"LocationDefault",
"Custom"
],
"x-ms-enum": {
"name": "Applicability",
"modelAsString": true
}
},
"cores": {
"type": "integer",
"format": "int32",
"description": "Number of cores in CPU."
},
"memoryGiB": {
"type": "integer",
"format": "int32",
"description": "Memory in GiB."
},
"displayName": {
"type": "string",
"description": "The everyday name of the workload profile."
}
}
}
}
},
"AvailableWorkloadProfilesCollection": {
"description": "Collection of available workload profiles in the location.",
"required": [
"value"
],
"type": "object",
"properties": {
"value": {
"description": "Collection of workload profiles.",
"type": "array",
"items": {
"$ref": "#/definitions/AvailableWorkloadProfile"
}
},
"nextLink": {
"description": "Link to next page of resources.",
"type": "string",
"readOnly": true
}
}
}
},
"securityDefinitions": {
"azure_auth": {
"type": "oauth2",
"authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
"flow": "implicit",
"description": "Azure Active Directory OAuth2 Flow",
"scopes": {
"user_impersonation": "impersonate your user account"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"location": "East US",
"api-version": "2022-06-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"location": "East US",
"properties": {
"displayName": "General Compute 1",
"billingMeterCategory": "PremiumSkuGeneralCompute",
"applicability": "LocationDefault",
"cores": 4,
"memoryGiB": 16
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/GeneralCompute-1",
"name": "GeneralCompute-1",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
},
{
"location": "East US",
"properties": {
"displayName": "General Compute 2",
"billingMeterCategory": "PremiumSkuGeneralCompute",
"applicability": "Custom",
"cores": 8,
"memoryGiB": 32
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/GeneralCompute-2",
"name": "GeneralCompute-2",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
},
{
"location": "East US",
"properties": {
"displayName": "General Compute 3",
"billingMeterCategory": "PremiumSkuGeneralCompute",
"applicability": "Custom",
"cores": 16,
"memoryGiB": 64
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/GeneralCompute-3",
"name": "GeneralCompute-3",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
},
{
"location": "East US",
"properties": {
"displayName": "Memory Optimized 1",
"billingMeterCategory": "PremiumSkuMemoryOptimized",
"applicability": "Custom",
"cores": 4,
"memoryGiB": 32
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/MemoryOptimized-1",
"name": "MemoryOptimized-1",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
},
{
"location": "East US",
"properties": {
"displayName": "Memory Optimized 2",
"billingMeterCategory": "PremiumSkuMemoryOptimized",
"applicability": "Custom",
"cores": 8,
"memoryGiB": 64
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/MemoryOptimized-1",
"name": "MemoryOptimized-1",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
},
{
"location": "East US",
"properties": {
"displayName": "Memory Optimized 3",
"billingMeterCategory": "PremiumSkuMemoryOptimized",
"applicability": "Custom",
"cores": 16,
"memoryGiB": 128
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/MemoryOptimized-1",
"name": "MemoryOptimized-1",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
},
{
"location": "East US",
"properties": {
"displayName": "CPU Optimized 1",
"billingMeterCategory": "PremiumSkuComputeOptimized",
"applicability": "Custom",
"cores": 4,
"memoryGiB": 8
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/CPUOptimized-1",
"name": "CPUOptimized-1",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
},
{
"location": "East US",
"properties": {
"displayName": "CPU Optimized 2",
"billingMeterCategory": "PremiumSkuComputeOptimized",
"applicability": "Custom",
"cores": 8,
"memoryGiB": 16
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/CPUOptimized-2",
"name": "CPUOptimized-2",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
},
{
"location": "East US",
"properties": {
"displayName": "CPU Optimized 3",
"billingMeterCategory": "PremiumSkuComputeOptimized",
"applicability": "Custom",
"cores": 16,
"memoryGiB": 32
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/CPUOptimized-3",
"name": "CPUOptimized-3",
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
}
]
}
}
}
}
1 change: 1 addition & 0 deletions specification/app/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ input-file:
- Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsCertificates.json
- Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsDaprComponents.json
- Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsStorages.json
- Microsoft.App/preview/2022-06-01-preview/AvailableWorkloadProfiles.json
- Microsoft.App/preview/2022-06-01-preview/BillingMeters.json
directive:
- suppress: R3018
Expand Down

0 comments on commit 910f631

Please sign in to comment.