Skip to content

Commit 566baab

Browse files
JuliehzlAlancere
Juliehzl
and
Alancere
authored
Add more features to 2024-03-01 which are same with 2023-05-02-preview (#28369)
* fix * fix * fix * update readme * add sdk-suppressions.yaml --------- Co-authored-by: Alancere <[email protected]>
1 parent 4729117 commit 566baab

14 files changed

+465
-5
lines changed

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/AuthConfigs.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,10 @@
285285
"httpSettings": {
286286
"$ref": "#/definitions/HttpSettings",
287287
"description": "The configuration settings of the HTTP requests for authentication and authorization requests made against ContainerApp Service Authentication/Authorization."
288+
},
289+
"encryptionSettings": {
290+
"$ref": "#/definitions/EncryptionSettings",
291+
"description": "The configuration settings of the secrets references of encryption key and signing key for ContainerApp Service Authentication/Authorization."
288292
}
289293
},
290294
"x-ms-client-flatten": true
@@ -354,6 +358,20 @@
354358
}
355359
}
356360
},
361+
"EncryptionSettings": {
362+
"description": "The configuration settings of the secrets references of encryption key and signing key for ContainerApp Service Authentication/Authorization.",
363+
"type": "object",
364+
"properties": {
365+
"containerAppAuthEncryptionSecretName": {
366+
"description": "The secret name which is referenced for EncryptionKey.",
367+
"type": "string"
368+
},
369+
"containerAppAuthSigningSecretName": {
370+
"description": "The secret name which is referenced for SigningKey.",
371+
"type": "string"
372+
}
373+
}
374+
},
357375
"HttpSettingsRoutes": {
358376
"description": "The configuration settings of the paths HTTP requests.",
359377
"type": "object",
@@ -399,6 +417,10 @@
399417
"$ref": "#/definitions/LoginRoutes",
400418
"description": "The routes that specify the endpoints used for login and logout requests."
401419
},
420+
"tokenStore": {
421+
"$ref": "#/definitions/TokenStore",
422+
"description": "The configuration settings of the token store."
423+
},
402424
"preserveUrlFragmentsForLogins": {
403425
"description": "<code>true</code> if the fragments from the request are preserved after the login request is made; otherwise, <code>false</code>.",
404426
"type": "boolean"
@@ -430,6 +452,38 @@
430452
}
431453
}
432454
},
455+
"TokenStore": {
456+
"description": "The configuration settings of the token store.",
457+
"type": "object",
458+
"properties": {
459+
"enabled": {
460+
"description": "<code>true</code> to durably store platform-specific security tokens that are obtained during login flows; otherwise, <code>false</code>.\n The default is <code>false</code>.",
461+
"type": "boolean"
462+
},
463+
"tokenRefreshExtensionHours": {
464+
"format": "double",
465+
"description": "The number of hours after session token expiration that a session token can be used to\ncall the token refresh API. The default is 72 hours.",
466+
"type": "number"
467+
},
468+
"azureBlobStorage": {
469+
"$ref": "#/definitions/BlobStorageTokenStore",
470+
"description": "The configuration settings of the storage of the tokens if blob storage is used."
471+
}
472+
}
473+
},
474+
"BlobStorageTokenStore": {
475+
"description": "The configuration settings of the storage of the tokens if blob storage is used.",
476+
"type": "object",
477+
"required": [
478+
"sasUrlSettingName"
479+
],
480+
"properties": {
481+
"sasUrlSettingName": {
482+
"description": "The name of the app secrets containing the SAS URL of the blob storage containing the tokens.",
483+
"type": "string"
484+
}
485+
}
486+
},
433487
"CookieExpiration": {
434488
"description": "The configuration settings of the session cookie's expiration.",
435489
"type": "object",

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/ContainerApps.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,16 @@
961961
"corsPolicy": {
962962
"description": "CORS policy for container app",
963963
"$ref": "#/definitions/CorsPolicy"
964+
},
965+
"additionalPortMappings": {
966+
"description": "Settings to expose additional ports on container app",
967+
"type": "array",
968+
"items": {
969+
"$ref": "#/definitions/IngressPortMapping"
970+
},
971+
"x-ms-identifiers": [
972+
"targetPort"
973+
]
964974
}
965975
}
966976
},
@@ -1166,6 +1176,30 @@
11661176
}
11671177
}
11681178
},
1179+
"IngressPortMapping": {
1180+
"description": "Port mappings of container app ingress",
1181+
"type": "object",
1182+
"required": [
1183+
"external",
1184+
"targetPort"
1185+
],
1186+
"properties": {
1187+
"external": {
1188+
"description": "Specifies whether the app port is accessible outside of the environment",
1189+
"type": "boolean"
1190+
},
1191+
"targetPort": {
1192+
"format": "int32",
1193+
"description": "Specifies the port user's container listens on",
1194+
"type": "integer"
1195+
},
1196+
"exposedPort": {
1197+
"format": "int32",
1198+
"description": "Specifies the exposed port for the target port. If not specified, it defaults to target port",
1199+
"type": "integer"
1200+
}
1201+
}
1202+
},
11691203
"CustomHostnameAnalysisResult": {
11701204
"description": "Custom domain analysis.",
11711205
"type": "object",

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/Subscriptions.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"swagger": "2.0",
3+
"info": {
4+
"version": "2024-03-01",
5+
"title": "ContainerApps API Client"
6+
},
7+
"host": "management.azure.com",
8+
"schemes": [
9+
"https"
10+
],
11+
"consumes": [
12+
"application/json"
13+
],
14+
"produces": [
15+
"application/json"
16+
],
17+
"paths": {
18+
"/subscriptions/{subscriptionId}/providers/Microsoft.App/getCustomDomainVerificationId": {
19+
"post": {
20+
"tags": [
21+
"Subscriptions"
22+
],
23+
"description": "Get the verification id of a subscription used for verifying custom domains",
24+
"operationId": "GetCustomDomainVerificationId",
25+
"parameters": [
26+
{
27+
"$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
28+
},
29+
{
30+
"$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
31+
}
32+
],
33+
"responses": {
34+
"200": {
35+
"description": "OK. The custom domain verification id has been returned successfully.",
36+
"schema": {
37+
"$ref": "#/definitions/CustomDomainVerificationId"
38+
}
39+
},
40+
"default": {
41+
"description": "Common error response.",
42+
"schema": {
43+
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
44+
}
45+
}
46+
},
47+
"x-ms-examples": {
48+
"List all operations": {
49+
"$ref": "./examples/Subscriptions_GetCustomDomainVerificationId.json"
50+
}
51+
}
52+
}
53+
}
54+
},
55+
"definitions": {
56+
"CustomDomainVerificationId": {
57+
"description": "Custom domain verification Id of a subscription",
58+
"type": "string",
59+
"readOnly": true
60+
}
61+
},
62+
"securityDefinitions": {
63+
"azure_auth": {
64+
"type": "oauth2",
65+
"description": "Azure Active Directory OAuth2 Flow",
66+
"flow": "implicit",
67+
"authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
68+
"scopes": {
69+
"user_impersonation": "impersonate your user account"
70+
}
71+
}
72+
},
73+
"security": [
74+
{
75+
"azure_auth": [
76+
"user_impersonation"
77+
]
78+
}
79+
]
80+
}

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/Usages.json

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
{
2+
"swagger": "2.0",
3+
"info": {
4+
"version": "2024-03-01",
5+
"title": "ContainerApps API Client"
6+
},
7+
"host": "management.azure.com",
8+
"schemes": [
9+
"https"
10+
],
11+
"consumes": [
12+
"application/json"
13+
],
14+
"produces": [
15+
"application/json"
16+
],
17+
"paths": {
18+
"/subscriptions/{subscriptionId}/providers/Microsoft.App/locations/{location}/usages": {
19+
"get": {
20+
"tags": [
21+
"Usages"
22+
],
23+
"operationId": "Usages_List",
24+
"description": "Gets, for the specified location, the current resource usage information as well as the limits under the subscription.",
25+
"parameters": [
26+
{
27+
"name": "location",
28+
"in": "path",
29+
"required": true,
30+
"type": "string",
31+
"description": "The location for which resource usage is queried.",
32+
"pattern": "^[-\\w\\._]+$"
33+
},
34+
{
35+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
36+
},
37+
{
38+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
39+
}
40+
],
41+
"responses": {
42+
"200": {
43+
"description": "OK",
44+
"schema": {
45+
"$ref": "#/definitions/ListUsagesResult"
46+
}
47+
},
48+
"default": {
49+
"description": "Common error response.",
50+
"schema": {
51+
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
52+
}
53+
}
54+
},
55+
"x-ms-pageable": {
56+
"nextLinkName": "nextLink"
57+
},
58+
"x-ms-examples": {
59+
"List usages": {
60+
"$ref": "./examples/Usages_List.json"
61+
}
62+
}
63+
}
64+
},
65+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/usages": {
66+
"get": {
67+
"tags": [
68+
"Usages"
69+
],
70+
"operationId": "ManagedEnvironmentUsages_List",
71+
"description": "Gets the current usage information as well as the limits for environment.",
72+
"parameters": [
73+
{
74+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
75+
},
76+
{
77+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
78+
},
79+
{
80+
"name": "environmentName",
81+
"in": "path",
82+
"description": "Name of the Environment.",
83+
"required": true,
84+
"type": "string",
85+
"pattern": "^[-\\w\\._]+$"
86+
},
87+
{
88+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
89+
}
90+
],
91+
"responses": {
92+
"200": {
93+
"description": "OK",
94+
"schema": {
95+
"$ref": "#/definitions/ListUsagesResult"
96+
}
97+
},
98+
"default": {
99+
"description": "Common error response.",
100+
"schema": {
101+
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
102+
}
103+
}
104+
},
105+
"x-ms-pageable": {
106+
"nextLinkName": "nextLink"
107+
},
108+
"x-ms-examples": {
109+
"List managed environment usages": {
110+
"$ref": "./examples/ManagedEnvironmentUsages_List.json"
111+
}
112+
}
113+
}
114+
}
115+
},
116+
"definitions": {
117+
"UsageName": {
118+
"type": "object",
119+
"properties": {
120+
"value": {
121+
"type": "string",
122+
"description": "The name of the resource."
123+
},
124+
"localizedValue": {
125+
"type": "string",
126+
"description": "The localized name of the resource."
127+
}
128+
},
129+
"description": "The Usage Names."
130+
},
131+
"Usage": {
132+
"type": "object",
133+
"properties": {
134+
"unit": {
135+
"type": "string",
136+
"description": "An enum describing the unit of usage measurement.",
137+
"enum": [
138+
"Count"
139+
],
140+
"x-ms-enum": {
141+
"name": "UsageUnit",
142+
"modelAsString": false
143+
}
144+
},
145+
"currentValue": {
146+
"type": "number",
147+
"format": "float",
148+
"description": "The current usage of the resource."
149+
},
150+
"limit": {
151+
"type": "number",
152+
"format": "float",
153+
"description": "The maximum permitted usage of the resource."
154+
},
155+
"name": {
156+
"$ref": "#/definitions/UsageName",
157+
"description": "The name of the type of usage."
158+
}
159+
},
160+
"required": [
161+
"unit",
162+
"currentValue",
163+
"limit",
164+
"name"
165+
],
166+
"description": "Describes Compute Resource Usage."
167+
},
168+
"ListUsagesResult": {
169+
"type": "object",
170+
"properties": {
171+
"value": {
172+
"type": "array",
173+
"items": {
174+
"$ref": "#/definitions/Usage"
175+
},
176+
"x-ms-identifiers": [
177+
"name"
178+
],
179+
"description": "The list of compute resource usages."
180+
},
181+
"nextLink": {
182+
"type": "string",
183+
"description": "The URI to fetch the next page of compute resource usage information. Call ListNext() with this to fetch the next page of compute resource usage information."
184+
}
185+
}
186+
}
187+
}
188+
}

0 commit comments

Comments
 (0)