Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Availableworkloadprofiles - GET endpoint #20650

Merged
merged 52 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
24d1f09
Adds base for updating Microsoft.App from version stable/2022-03-01 t…
ruslany Apr 13, 2022
5e1015c
Updates readme
ruslany Apr 13, 2022
bbd4441
Updates API version in new specs and examples
ruslany Apr 13, 2022
fabf9a5
Add app diag to 2022-05-01 (#18678)
michimune Apr 26, 2022
7077134
Fix definition for customhostnameesult (#19014)
Juliehzl May 12, 2022
a33bd39
Cherry pick for the parameter name fixes for the 2022-03-01 and makin…
ruslany May 13, 2022
0fd5e26
Fix description in all API versions (#19313)
ruslany Jun 3, 2022
056cc51
Add traffic info to revisions api (#19054)
ruslany Jun 7, 2022
5421cc7
Add httpReadBufferSize to dapr config in Microsoft.App-2022-05-01 (#1…
ahmelsayed Jun 9, 2022
8e5d315
Adds base for updating Microsoft.App from version stable/2022-05-01 t…
Juliehzl Jun 10, 2022
45cd59b
Updates readme
Juliehzl Jun 10, 2022
481bb59
Updates API version in new specs and examples
Juliehzl Jun 10, 2022
ec34aa3
Add new resources for 2022-06-01-preview (#19494)
Juliehzl Jul 12, 2022
83d8432
Enable Dapr AI Connection string for Microsoft.App connected environm…
LaylaLiu-gmail Jul 29, 2022
8f6ff49
update (#20013)
Juliehzl Jul 29, 2022
6d7a4b0
Fixdescriptions on microsoft.app 2022 06 01 preview (#20133)
ruslany Aug 8, 2022
baa9b05
Added `secretsStoreComponent` in 2022-06-01 spec (#20044)
ItalyPaleAle Aug 9, 2022
bb43ed1
Add custom domain configuration for managed environment (#20149)
mjqin Aug 9, 2022
94d84ee
Add additional Dapr options (2022-06-01-preview) (#19886)
ahmelsayed Aug 10, 2022
3450a5c
adding ip-restriction feat (#19841)
tdaroly Aug 12, 2022
903da55
Remove Traffic Labels from revisions because they haven't been impele…
ruslany Aug 17, 2022
2b61c76
Add property for tcp apps (#20193)
zhenqxuMSFT Aug 18, 2022
fba4c8b
Add Init Containers to common definitions (#19855)
p-bouchon Aug 19, 2022
68a1c9e
Update container app provisioningstate (#20411)
Juliehzl Aug 26, 2022
e4568a1
add property: maxInactiveRevisions (#20334)
njuCZ Aug 30, 2022
62f0c62
Add premium sku related properties for managed environment (#19770)
jijohn14 Aug 30, 2022
483d3a4
Fix source control status code in 2022-06-01-preview. (#20429)
yalixiang Aug 30, 2022
9845076
Swagger documentation for /locations/{location}/billingMeters - GET e…
trajkobal Aug 31, 2022
404bde2
Add example, fix validation errors
trajkobal Aug 31, 2022
51042c8
Fix ARM validation errors, code review comments
trajkobal Aug 31, 2022
54d80fd
Fix response validation
trajkobal Aug 31, 2022
c6e7c42
Remove 20220501 because we will not support it in server side (#20427)
Juliehzl Sep 1, 2022
10ea6b0
add proxy resource properties
trajkobal Sep 7, 2022
df7c4b8
Response formatting
trajkobal Sep 7, 2022
b1aab39
Added support for user defined routing (#20464)
desokey Sep 8, 2022
cebac94
add default error response
trajkobal Sep 8, 2022
5faf48b
Add available workprofiles -GET endpoint
trajkobal Sep 8, 2022
04a072c
Remove duplicate schema name WorkloadProfile
trajkobal Sep 8, 2022
1fe7a2a
Change memoryGiB to memoryGB as suggested in code review
trajkobal Sep 12, 2022
cd99a4b
Add x-ms-pageable - nextLink support to not introduce breaking change…
trajkobal Sep 12, 2022
e4b6e9d
rename to memory in GiB because our case is Gibibytes base 1024
trajkobal Sep 12, 2022
6712d92
change friendlyName to displayName
trajkobal Sep 12, 2022
0cce38c
Some more APIs (#20448)
xwang971 Sep 13, 2022
2fcf2eb
Add new property to the response object
trajkobal Sep 13, 2022
e3d090a
add last active time for revision (#20658)
njuCZ Sep 15, 2022
0624af2
Add custom domain for connected env (#20731)
Juliehzl Sep 15, 2022
c371e7c
billingMeters - GET endpoint (#20485)
trajkobal Sep 16, 2022
d0f6acb
Change the boolean value for default to enum
trajkobal Sep 16, 2022
41a50c3
change error response to v3/ErrorResponse
trajkobal Sep 16, 2022
20dc2c8
Fix 2022-06-01-preview branch merge conflicts (#20773)
ruslany Sep 20, 2022
c49d3c4
Merge branch 'Microsoft.App-2022-06-01-preview' into availableworkloa…
trajkobal Sep 20, 2022
37504c5
Merge branch 'main' into availableworkloadprofiles
trajkobal Sep 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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": {
trajkobal marked this conversation as resolved.
Show resolved Hide resolved
"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": {
trajkobal marked this conversation as resolved.
Show resolved Hide resolved
"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