From 2971425c41363c48d8f323b8b327e234ed137d9e Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Tue, 25 Jan 2022 14:44:04 +0800 Subject: [PATCH 01/10] add ephemeral storage --- .../preview/2022-01-01-preview/CommonDefinitions.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json index 920e6fb3bc9d..eca8d0af589f 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json @@ -88,6 +88,11 @@ "memory": { "description": "Required memory, e.g. \"250Mb\"", "type": "string" + }, + "ephemeralStorage": { + "description": "Ephemeral Storage, e.g. \"1Gi\"", + "type": "string", + "readonly": true } } }, From 2e375ce1706726f8a985efa79b102792ac483bb1 Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Tue, 25 Jan 2022 19:06:29 +0800 Subject: [PATCH 02/10] add outbound ip --- .../preview/2022-01-01-preview/ContainerApps.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 3546171f470c..e5894d80b8d3 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -407,6 +407,14 @@ "template": { "$ref": "./CommonDefinitions.json#/definitions/Template", "description": "Container App versioned application definition." + }, + "outboundIPAddresses": { + "description": "Outbound IP Addresses for container app.", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true } }, "x-ms-client-flatten": true From 2de3220b82257f267cc36e2289c67d2dda9ec71d Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Wed, 26 Jan 2022 14:54:21 +0800 Subject: [PATCH 03/10] add listsecrets --- .../2022-01-01-preview/ContainerApps.json | 78 +++++++++++++++++++ .../examples/ContainerApps_ListSecrets.json | 25 ++++++ 2 files changed, 103 insertions(+) create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index e5894d80b8d3..039ef5c06166 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -309,6 +309,52 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}/listSecrets": { + "post": { + "tags": [ + "ContainerApps" + ], + "summary": "List secrets for a container app", + "operationId": "ContainerApps_ListSecrets", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Container App.", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecretsCollection" + } + }, + "default": { + "description": "Common error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "List Container Apps Secrets": { + "$ref": "./examples/ListContainerAppSecrets.json" + } + } + } } }, "definitions": { @@ -559,6 +605,38 @@ "type": "boolean" } } + }, + "SecretsCollection": { + "description": "Container App Secrets Collection ARM resource.", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of resources.", + "type": "array", + "items": { + "$ref": "#/definitions/ContainerAppSecret" + } + } + } + }, + "ContainerAppSecret": { + "description": "Container App Secret.", + "type": "object", + "properties": { + "name": { + "description": "Secret Name.", + "type": "string", + "readOnly": true + }, + "value": { + "description": "Secret Value.", + "type": "string", + "readOnly": true + } + } } }, "securityDefinitions": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json new file mode 100644 index 000000000000..7240ad453cf3 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "rg", + "name": "testcontainerApp0", + "api-version": "2021-03-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "name": "secret1", + "value": "value1" + }, + { + "name": "secret2", + "value": "value2" + } + ] + } + } + } + } \ No newline at end of file From 546fdd64d23c1767caf9e73ef5d5ce3e586539d7 Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Thu, 27 Jan 2022 19:09:55 +0800 Subject: [PATCH 04/10] fix CI --- .../2022-01-01-preview/ContainerApps.json | 5 ++- .../examples/ContainerApps_ListSecrets.json | 44 +++++++++---------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 039ef5c06166..002c19fbb988 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -351,7 +351,7 @@ }, "x-ms-examples": { "List Container Apps Secrets": { - "$ref": "./examples/ListContainerAppSecrets.json" + "$ref": "./examples/ContainerApps_ListSecrets.json" } } } @@ -634,7 +634,8 @@ "value": { "description": "Secret Value.", "type": "string", - "readOnly": true + "readOnly": true, + "x-ms-secret": true } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json index 7240ad453cf3..1755ad944566 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json @@ -1,25 +1,25 @@ { - "parameters": { - "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "resourceGroupName": "rg", - "name": "testcontainerApp0", - "api-version": "2021-03-01" - }, - "responses": { - "200": { - "headers": {}, - "body": { - "value": [ - { - "name": "secret1", - "value": "value1" - }, - { - "name": "secret2", - "value": "value2" - } - ] - } + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "rg", + "name": "testcontainerApp0", + "api-version": "2021-03-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "name": "secret1", + "value": "value1" + }, + { + "name": "secret2", + "value": "value2" + } + ] } } - } \ No newline at end of file + } +} From 6b9e720dc634284cb4da4ef2ef373ec9640fc1e4 Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Thu, 27 Jan 2022 19:51:02 +0800 Subject: [PATCH 05/10] fix example --- .../examples/ContainerApps_ListSecrets.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json index 1755ad944566..7a7b2c131fda 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json @@ -11,12 +11,10 @@ "body": { "value": [ { - "name": "secret1", - "value": "value1" + "name": "secret1" }, { - "name": "secret2", - "value": "value2" + "name": "secret2" } ] } From af0cdcad760342666352e9bbd96d9ea9ab937dcc Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Thu, 27 Jan 2022 20:25:45 +0800 Subject: [PATCH 06/10] fix --- .../preview/2022-01-01-preview/CommonDefinitions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json index eca8d0af589f..0060ec895984 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json @@ -92,7 +92,7 @@ "ephemeralStorage": { "description": "Ephemeral Storage, e.g. \"1Gi\"", "type": "string", - "readonly": true + "readOnly": true } } }, From d43119ff4674758508d19258cf633e2a3f0bee3e Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Thu, 27 Jan 2022 21:31:18 +0800 Subject: [PATCH 07/10] add identifier --- .../preview/2022-01-01-preview/ContainerApps.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 002c19fbb988..1a8038390df3 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -619,7 +619,10 @@ "items": { "$ref": "#/definitions/ContainerAppSecret" } - } + }, + "x-ms-identifiers": [ + "name" + ] } }, "ContainerAppSecret": { From a61c83f56ae5805b55e7eb6f9e734e357f99598d Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Thu, 27 Jan 2022 21:47:41 +0800 Subject: [PATCH 08/10] fix --- .../preview/2022-01-01-preview/ContainerApps.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 1a8038390df3..85cdbb0a62e4 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -618,11 +618,11 @@ "type": "array", "items": { "$ref": "#/definitions/ContainerAppSecret" - } - }, - "x-ms-identifiers": [ - "name" - ] + }, + "x-ms-identifiers": [ + "name" + ] + } } }, "ContainerAppSecret": { From eb417d0c3c8df2fdb8b4a33750d18394c5fe6c56 Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Fri, 28 Jan 2022 08:58:47 +0800 Subject: [PATCH 09/10] add example --- .../preview/2022-01-01-preview/ContainerApps.json | 3 +-- .../examples/ContainerApps_ListSecrets.json | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 85cdbb0a62e4..485016efec89 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -637,8 +637,7 @@ "value": { "description": "Secret Value.", "type": "string", - "readOnly": true, - "x-ms-secret": true + "readOnly": true } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json index 7a7b2c131fda..4d17e4116733 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListSecrets.json @@ -3,7 +3,7 @@ "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroupName": "rg", "name": "testcontainerApp0", - "api-version": "2021-03-01" + "api-version": "2022-01-01-preview" }, "responses": { "200": { @@ -11,10 +11,12 @@ "body": { "value": [ { - "name": "secret1" + "name": "secret1", + "value": "myvalue1" }, { - "name": "secret2" + "name": "secret2", + "value": "myvalue2" } ] } From ac6d66d8841188b6de216cfde3039b5e0cf63d21 Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Sat, 29 Jan 2022 14:40:36 +0800 Subject: [PATCH 10/10] mars as secret --- .../Microsoft.App/preview/2022-01-01-preview/ContainerApps.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 485016efec89..a87b87916d1b 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -637,6 +637,7 @@ "value": { "description": "Secret Value.", "type": "string", + "x-ms-secret": true, "readOnly": true } }