Skip to content

Commit 910f631

Browse files
trajkobalruslanymichimuneMichimune KohnoJuliehzl
authored
Availableworkloadprofiles - GET endpoint (#20650)
* 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]>
1 parent 96f4ed5 commit 910f631

File tree

3 files changed

+286
-0
lines changed

3 files changed

+286
-0
lines changed
Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
{
2+
"swagger": "2.0",
3+
"info": {
4+
"version": "2022-06-01-preview",
5+
"title": "ContainerApps API Client"
6+
},
7+
"host": "management.azure.com",
8+
"schemes": [
9+
"https"
10+
],
11+
"produces": [
12+
"application/json"
13+
],
14+
"paths": {
15+
"/subscriptions/{subscriptionId}/providers/Microsoft.App/locations/{location}/availableManagedEnvironmentsWorkloadProfileTypes": {
16+
"get": {
17+
"tags": [
18+
"AvailableWorkloadProfiles"
19+
],
20+
"summary": "Get available workload profiles by location.",
21+
"description": "Get all available workload profiles for a location.",
22+
"operationId": "AvailableWorkloadProfiles_Get",
23+
"parameters": [
24+
{
25+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
26+
},
27+
{
28+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/LocationParameter"
29+
},
30+
{
31+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
32+
}
33+
],
34+
"responses": {
35+
"200": {
36+
"description": "OK",
37+
"schema": {
38+
"$ref": "#/definitions/AvailableWorkloadProfilesCollection"
39+
}
40+
},
41+
"default": {
42+
"description": "Error response.",
43+
"schema": {
44+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse"
45+
}
46+
}
47+
},
48+
"x-ms-pageable": {
49+
"nextLinkName": "nextLink"
50+
},
51+
"x-ms-examples": {
52+
"BillingMeters_Get": {
53+
"$ref": "./examples/AvailableWorkloadProfiles_Get.json"
54+
}
55+
}
56+
}
57+
}
58+
},
59+
"definitions": {
60+
"AvailableWorkloadProfile": {
61+
"description": "A premium workload profile.",
62+
"type": "object",
63+
"allOf": [
64+
{
65+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
66+
}
67+
],
68+
"properties": {
69+
"location": {
70+
"type": "string",
71+
"description": "Region of the workload profile."
72+
},
73+
"properties": {
74+
"description": "Revision resource specific properties",
75+
"type": "object",
76+
"properties": {
77+
"billingMeterCategory": {
78+
"description": "Used to map workload profile types to billing meter.",
79+
"type": "string",
80+
"enum": [
81+
"PremiumSkuGeneralPurpose",
82+
"PremiumSkuMemoryOptimized",
83+
"PremiumSkuComputeOptimized"
84+
],
85+
"x-ms-enum": {
86+
"name": "Category",
87+
"modelAsString": true
88+
}
89+
},
90+
"applicability": {
91+
"type": "string",
92+
"description": "indicates whether the profile is default for the location.",
93+
"enum": [
94+
"LocationDefault",
95+
"Custom"
96+
],
97+
"x-ms-enum": {
98+
"name": "Applicability",
99+
"modelAsString": true
100+
}
101+
},
102+
"cores": {
103+
"type": "integer",
104+
"format": "int32",
105+
"description": "Number of cores in CPU."
106+
},
107+
"memoryGiB": {
108+
"type": "integer",
109+
"format": "int32",
110+
"description": "Memory in GiB."
111+
},
112+
"displayName": {
113+
"type": "string",
114+
"description": "The everyday name of the workload profile."
115+
}
116+
}
117+
}
118+
}
119+
},
120+
"AvailableWorkloadProfilesCollection": {
121+
"description": "Collection of available workload profiles in the location.",
122+
"required": [
123+
"value"
124+
],
125+
"type": "object",
126+
"properties": {
127+
"value": {
128+
"description": "Collection of workload profiles.",
129+
"type": "array",
130+
"items": {
131+
"$ref": "#/definitions/AvailableWorkloadProfile"
132+
}
133+
},
134+
"nextLink": {
135+
"description": "Link to next page of resources.",
136+
"type": "string",
137+
"readOnly": true
138+
}
139+
}
140+
}
141+
},
142+
"securityDefinitions": {
143+
"azure_auth": {
144+
"type": "oauth2",
145+
"authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
146+
"flow": "implicit",
147+
"description": "Azure Active Directory OAuth2 Flow",
148+
"scopes": {
149+
"user_impersonation": "impersonate your user account"
150+
}
151+
}
152+
}
153+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"location": "East US",
5+
"api-version": "2022-06-01-preview"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"location": "East US",
13+
"properties": {
14+
"displayName": "General Compute 1",
15+
"billingMeterCategory": "PremiumSkuGeneralCompute",
16+
"applicability": "LocationDefault",
17+
"cores": 4,
18+
"memoryGiB": 16
19+
},
20+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/GeneralCompute-1",
21+
"name": "GeneralCompute-1",
22+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
23+
},
24+
{
25+
"location": "East US",
26+
"properties": {
27+
"displayName": "General Compute 2",
28+
"billingMeterCategory": "PremiumSkuGeneralCompute",
29+
"applicability": "Custom",
30+
"cores": 8,
31+
"memoryGiB": 32
32+
},
33+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/GeneralCompute-2",
34+
"name": "GeneralCompute-2",
35+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
36+
},
37+
{
38+
"location": "East US",
39+
"properties": {
40+
"displayName": "General Compute 3",
41+
"billingMeterCategory": "PremiumSkuGeneralCompute",
42+
"applicability": "Custom",
43+
"cores": 16,
44+
"memoryGiB": 64
45+
},
46+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/GeneralCompute-3",
47+
"name": "GeneralCompute-3",
48+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
49+
},
50+
{
51+
"location": "East US",
52+
"properties": {
53+
"displayName": "Memory Optimized 1",
54+
"billingMeterCategory": "PremiumSkuMemoryOptimized",
55+
"applicability": "Custom",
56+
"cores": 4,
57+
"memoryGiB": 32
58+
},
59+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/MemoryOptimized-1",
60+
"name": "MemoryOptimized-1",
61+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
62+
},
63+
{
64+
"location": "East US",
65+
"properties": {
66+
"displayName": "Memory Optimized 2",
67+
"billingMeterCategory": "PremiumSkuMemoryOptimized",
68+
"applicability": "Custom",
69+
"cores": 8,
70+
"memoryGiB": 64
71+
},
72+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/MemoryOptimized-1",
73+
"name": "MemoryOptimized-1",
74+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
75+
},
76+
{
77+
"location": "East US",
78+
"properties": {
79+
"displayName": "Memory Optimized 3",
80+
"billingMeterCategory": "PremiumSkuMemoryOptimized",
81+
"applicability": "Custom",
82+
"cores": 16,
83+
"memoryGiB": 128
84+
},
85+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/MemoryOptimized-1",
86+
"name": "MemoryOptimized-1",
87+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
88+
},
89+
{
90+
"location": "East US",
91+
"properties": {
92+
"displayName": "CPU Optimized 1",
93+
"billingMeterCategory": "PremiumSkuComputeOptimized",
94+
"applicability": "Custom",
95+
"cores": 4,
96+
"memoryGiB": 8
97+
},
98+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/CPUOptimized-1",
99+
"name": "CPUOptimized-1",
100+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
101+
},
102+
{
103+
"location": "East US",
104+
"properties": {
105+
"displayName": "CPU Optimized 2",
106+
"billingMeterCategory": "PremiumSkuComputeOptimized",
107+
"applicability": "Custom",
108+
"cores": 8,
109+
"memoryGiB": 16
110+
},
111+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/CPUOptimized-2",
112+
"name": "CPUOptimized-2",
113+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
114+
},
115+
{
116+
"location": "East US",
117+
"properties": {
118+
"displayName": "CPU Optimized 3",
119+
"billingMeterCategory": "PremiumSkuComputeOptimized",
120+
"applicability": "Custom",
121+
"cores": 16,
122+
"memoryGiB": 32
123+
},
124+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/CPUOptimized-3",
125+
"name": "CPUOptimized-3",
126+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
127+
}
128+
]
129+
}
130+
}
131+
}
132+
}

specification/app/resource-manager/readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ input-file:
5050
- Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsCertificates.json
5151
- Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsDaprComponents.json
5252
- Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsStorages.json
53+
- Microsoft.App/preview/2022-06-01-preview/AvailableWorkloadProfiles.json
5354
- Microsoft.App/preview/2022-06-01-preview/BillingMeters.json
5455
directive:
5556
- suppress: R3018

0 commit comments

Comments
 (0)