From eacf7f3cce5baf2027b94ef30c04b73504a1c70b Mon Sep 17 00:00:00 2001 From: Nan Jiang Date: Fri, 7 Mar 2025 17:45:09 +0800 Subject: [PATCH 1/5] Fix LintDiff failed --- .../2025-01-01/ConnectedEnvironmentsCertificates.json | 6 ++++++ .../2025-01-01/ConnectedEnvironmentsDaprComponents.json | 6 ++++++ .../stable/2025-01-01/ConnectedEnvironmentsStorages.json | 6 ++++++ .../ConnectedEnvironmentsCertificate_CreateOrUpdate.json | 2 +- .../examples/ConnectedEnvironmentsCertificate_Get.json | 2 +- ...EnvironmentsCertificates_ListByConnectedEnvironment.json | 4 ++-- .../examples/ConnectedEnvironmentsCertificates_Patch.json | 2 +- 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsCertificates.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsCertificates.json index 3a24e2473141..0dcbed1e1189 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsCertificates.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsCertificates.json @@ -165,6 +165,12 @@ "$ref": "./CommonDefinitions.json#/definitions/Certificate" } }, + "201": { + "description": "Created", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/Certificate" + } + }, "default": { "description": "Error response.", "schema": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json index f7e007839d21..b36142298edb 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json @@ -47,6 +47,12 @@ "$ref": "./CommonDefinitions.json#/definitions/DaprComponentsCollection" } }, + "201": { + "description": "Created", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprComponentsCollection" + } + }, "default": { "description": "Common error response.", "schema": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json index 1d6e3d9d38b1..d0ee673ffd04 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json @@ -48,6 +48,12 @@ "$ref": "#/definitions/ConnectedEnvironmentStoragesCollection" } }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/ConnectedEnvironmentStoragesCollection" + } + }, "default": { "description": "Common error response.", "schema": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json index 07a517cdaca0..e33769d23652 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json @@ -17,7 +17,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "type": "Microsoft.App/ConnectedEnvironments/Certificates", "location": "East US", "properties": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_Get.json index b60854576f11..9a833334a8cd 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_Get.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_Get.json @@ -10,7 +10,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificates/certificates/certificate-firendly-name", "name": "certificate-firendly-name", "type": "Microsoft.App/ConnectedEnvironments/Certificates", "location": "East US", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificates_ListByConnectedEnvironment.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificates_ListByConnectedEnvironment.json index c9eada13e243..606684db3840 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificates_ListByConnectedEnvironment.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificates_ListByConnectedEnvironment.json @@ -11,7 +11,7 @@ "body": { "value": [ { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "name": "certificate-firendly-name", "type": "Microsoft.App/ConnectedEnvironments/Certificates", "location": "East US", @@ -29,7 +29,7 @@ } }, { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "name": "certificate-firendly-name", "type": "Microsoft.App/ConnectedEnvironments/Certificates", "location": "East US", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificates_Patch.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificates_Patch.json index 979857299567..acf05d91afc4 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificates_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificates_Patch.json @@ -16,7 +16,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "type": "Microsoft.App/ConnectedEnvironments/Certificates", "location": "East US", "tags": { From 44f09d1eeacee8bb284eec6077edb0038ed725a5 Mon Sep 17 00:00:00 2001 From: Nan Jiang Date: Fri, 7 Mar 2025 17:47:35 +0800 Subject: [PATCH 2/5] Update ConnectedEnvironmentsCertificate_Get.json --- .../examples/ConnectedEnvironmentsCertificate_Get.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_Get.json index 9a833334a8cd..dd5891764a67 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_Get.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_Get.json @@ -10,7 +10,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificates/certificates/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "name": "certificate-firendly-name", "type": "Microsoft.App/ConnectedEnvironments/Certificates", "location": "East US", From be8da609347d4919cba79ebabecc5272ab5208ef Mon Sep 17 00:00:00 2001 From: Nan Jiang Date: Fri, 7 Mar 2025 17:56:12 +0800 Subject: [PATCH 3/5] fix --- .../ConnectedEnvironmentsDaprComponents.json | 12 +++++------ .../ConnectedEnvironmentsStorages.json | 12 +++++------ ...nvironmentsCertificate_CreateOrUpdate.json | 20 +++++++++++++++++++ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json index b36142298edb..a26012fabae0 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json @@ -47,12 +47,6 @@ "$ref": "./CommonDefinitions.json#/definitions/DaprComponentsCollection" } }, - "201": { - "description": "Created", - "schema": { - "$ref": "./CommonDefinitions.json#/definitions/DaprComponentsCollection" - } - }, "default": { "description": "Common error response.", "schema": { @@ -277,6 +271,12 @@ "$ref": "./CommonDefinitions.json#/definitions/DaprSecretsCollection" } }, + "201": { + "description": "OK", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprSecretsCollection" + } + }, "default": { "description": "Common error response.", "schema": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json index d0ee673ffd04..e00c975cf159 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json @@ -48,12 +48,6 @@ "$ref": "#/definitions/ConnectedEnvironmentStoragesCollection" } }, - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/ConnectedEnvironmentStoragesCollection" - } - }, "default": { "description": "Common error response.", "schema": { @@ -169,6 +163,12 @@ "$ref": "#/definitions/ConnectedEnvironmentStorage" } }, + "201": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedEnvironmentStorage" + } + }, "default": { "description": "Common error response.", "schema": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json index e33769d23652..5eb651ae1f16 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json @@ -33,6 +33,26 @@ "valid": true } } + }, + "201": { + "headers": {}, + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/testcontainerenv/certificates/certificate-firendly-name", + "type": "Microsoft.App/ConnectedEnvironments/Certificates", + "location": "East US", + "properties": { + "provisioningState": "Succeeded", + "subjectName": "my-subject-name.company.country.net", + "subjectAlternativeNames": [ + "CN=my-subject-name.com" + ], + "issuer": "Issuer Name", + "issueDate": "2021-11-06T04:00:00Z", + "expirationDate": "2022-11-06T04:00:00Z", + "thumbprint": "CERTIFICATE_THUMBPRINT", + "valid": true + } + } } } } From 36a6bbd00841b167d1d89cc63d4f7dbe9e56c665 Mon Sep 17 00:00:00 2001 From: Nan Jiang Date: Fri, 7 Mar 2025 21:42:54 +0800 Subject: [PATCH 4/5] fix --- .../ConnectedEnvironmentsDaprComponents.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json index a26012fabae0..3b0c8b3aec5d 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsDaprComponents.json @@ -164,6 +164,12 @@ "$ref": "./CommonDefinitions.json#/definitions/DaprComponent" } }, + "201": { + "description": "OK", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprComponent" + } + }, "default": { "description": "Common error response.", "schema": { @@ -271,12 +277,6 @@ "$ref": "./CommonDefinitions.json#/definitions/DaprSecretsCollection" } }, - "201": { - "description": "OK", - "schema": { - "$ref": "./CommonDefinitions.json#/definitions/DaprSecretsCollection" - } - }, "default": { "description": "Common error response.", "schema": { From 7e8d38fb9b4b97419a2ba40760ef3e285ce99166 Mon Sep 17 00:00:00 2001 From: Nan Jiang Date: Fri, 7 Mar 2025 22:11:34 +0800 Subject: [PATCH 5/5] fix --- ...ronmentsDaprComponents_CreateOrUpdate.json | 40 +++++++++++++++++++ ...edEnvironmentsStorages_CreateOrUpdate.json | 14 +++++++ 2 files changed, 54 insertions(+) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsDaprComponents_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsDaprComponents_CreateOrUpdate.json index 93f278f7ba32..6fc077d75ed4 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsDaprComponents_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsDaprComponents_CreateOrUpdate.json @@ -82,6 +82,46 @@ ] } } + }, + "201": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/jlaw-demo1/daprcomponents/reddog", + "name": "reddog", + "type": "Microsoft.App/connectedEnvironments/daprcomponents", + "properties": { + "componentType": "state.azure.cosmosdb", + "version": "v1", + "ignoreErrors": false, + "initTimeout": "50s", + "secrets": [ + { + "name": "masterkey" + } + ], + "metadata": [ + { + "name": "url", + "value": "" + }, + { + "name": "database", + "value": "itemsDB" + }, + { + "name": "collection", + "value": "items" + }, + { + "name": "masterkey", + "secretRef": "masterkey" + } + ], + "scopes": [ + "container-app-1", + "container-app-2" + ] + } + } } } } diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsStorages_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsStorages_CreateOrUpdate.json index aa6579f73b16..7a6da6357ad1 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsStorages_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ConnectedEnvironmentsStorages_CreateOrUpdate.json @@ -30,6 +30,20 @@ } } } + }, + "201": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/connectedEnvironments/env/storages/jlaw-demo1", + "name": "jlaw-demo1", + "type": "Microsoft.App/connectedEnvironments/storages", + "properties": { + "azureFile": { + "accountName": "account1", + "shareName": "share1", + "accessMode": "ReadOnly" + } + } + } } } }