From fb6c65aff9714e339028fb5205d9020b89f700d1 Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 11:49:29 -0700 Subject: [PATCH 01/10] Move runningState property to LedgerProperties --- .../preview/2023-01-26-preview/confidentialledger.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index 2a4f85477e50..aef21e134ed5 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -608,6 +608,10 @@ "readOnly": true, "description": "Internal namespace for the Ledger" }, + "runningState": { + "description": "Object representing RunningState for Ledger.", + "$ref": "#/definitions/RunningState" + }, "ledgerType": { "description": "Type of Confidential Ledger", "$ref": "#/definitions/ConfidentialLedgerType" @@ -649,10 +653,6 @@ } ], "properties": { - "runningState": { - "description": "Object representing RunningState for Ledger.", - "$ref": "#/definitions/RunningState" - }, "properties": { "description": "Properties of Confidential Ledger Resource.", "$ref": "#/definitions/LedgerProperties" From e1bd1d844cd0afa00308670de91095d605181ee9 Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 12:03:09 -0700 Subject: [PATCH 02/10] Update examples --- .../examples/ConfidentialLedger_Create.json | 4 ++-- .../2023-01-26-preview/examples/ConfidentialLedger_Get.json | 2 +- .../2023-01-26-preview/examples/ConfidentialLedger_List.json | 2 +- .../examples/ConfidentialLedger_ListBySub.json | 2 +- .../examples/ConfidentialLedger_Update.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Create.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Create.json index d8b9886adeeb..3376c48b45ec 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Create.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Create.json @@ -30,8 +30,8 @@ "responses": { "200": { "body": { - "runningState": "Active", "properties": { + "runningState": "Active", "ledgerName": "DummyLedgerName", "ledgerUri": "https://dummy.accledger.domain.com/DummyLedgerName", "identityServiceUri": "https://dummy.accledger.identity.com/DummyLedgerName", @@ -71,8 +71,8 @@ }, "201": { "body": { - "runningState": "Unknown", "properties": { + "runningState": "Unknown", "ledgerName": "DummyLedgerName", "ledgerType": "Public", "ledgerInternalNamespace": "dummyNamespace", diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Get.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Get.json index 6110db44121c..773544c66011 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Get.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Get.json @@ -8,12 +8,12 @@ "responses": { "200": { "body": { - "runningState": "Active", "properties": { "ledgerName": "DummyLedgerName", "ledgerUri": "https://dummy.accledger.domain.com/DummyLedgerName", "identityServiceUri": "https://dummy.accledger.identity.com/DummyLedgerName", "ledgerType": "Public", + "runningState": "Active", "ledgerInternalNamespace": "dummyNamespace", "provisioningState": "Succeeded", "aadBasedSecurityPrincipals": [ diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_List.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_List.json index 637a9ba5c744..0e84438a6394 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_List.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_List.json @@ -9,8 +9,8 @@ "body": { "value": [ { - "runningState": "Active", "properties": { + "runningState": "Active", "ledgerName": "DummyLedgerName", "ledgerUri": "https://dummy.accledger.domain.com/DummyLedgerName", "identityServiceUri": "https://dummy.accledger.identity.com/DummyLedgerName", diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_ListBySub.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_ListBySub.json index d2c5f87b10e4..3d17a60d786a 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_ListBySub.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_ListBySub.json @@ -8,8 +8,8 @@ "body": { "value": [ { - "runningState": "Active", "properties": { + "runningState": "Active", "ledgerName": "DummyLedgerName", "ledgerUri": "https://dummy.accledger.domain.com/DummyLedgerName", "identityServiceUri": "https://dummy.accledger.identity.com/DummyLedgerName", diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Update.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Update.json index 43d6edd45272..4ea9c9f036b7 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Update.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/examples/ConfidentialLedger_Update.json @@ -31,8 +31,8 @@ "responses": { "200": { "body": { - "runningState": "Active", "properties": { + "runningState": "Active", "ledgerName": "DummyLedgerName", "ledgerUri": "https://dummyledgername.confidential-ledger.azure.com", "identityServiceUri": "https://identity.confidential-ledger.core.azure.com/ledgerIdentity/dummyledgername", From 0d0a31de96f1d8e470fb1ebb6ad9a096696cb218 Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 12:06:20 -0700 Subject: [PATCH 03/10] remove TAGS --- .../preview/2023-01-26-preview/confidentialledger.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index aef21e134ed5..46a675b2b3d7 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -647,9 +647,6 @@ "allOf": [ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" - }, - { - "$ref": "#/definitions/Tags" } ], "properties": { From dff3fb47695d404d627498ca639a5fd9a3320d66 Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 12:21:27 -0700 Subject: [PATCH 04/10] Remove Tag def --- .../2023-01-26-preview/confidentialledger.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index 46a675b2b3d7..cb82545ed8e5 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -415,24 +415,6 @@ } }, "definitions": { - "Tags": { - "description": "Tags for Confidential Ledger Resource", - "type": "object", - "properties": { - "tags": { - "type": "object", - "description": "Additional tags for Confidential Ledger", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ] - } - } - }, "ResourceProviderOperationList": { "description": "List containing this Resource Provider's available operations.", "type": "object", From 68dc36a04d8f98d4600fa12764d6aeeec548f018 Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 12:37:10 -0700 Subject: [PATCH 05/10] remove all tags --- .../confidentialledger.json | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index cb82545ed8e5..1fad374d9127 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -36,9 +36,6 @@ "paths": { "/providers/Microsoft.ConfidentialLedger/operations": { "get": { - "tags": [ - "Operations" - ], "operationId": "Operations_List", "description": "Retrieves a list of available API operations", "summary": "Retrieves a list of available API operations under this Resource Provider.", @@ -73,9 +70,6 @@ }, "/subscriptions/{subscriptionId}/providers/Microsoft.ConfidentialLedger/checkNameAvailability": { "post": { - "tags": [ - "NameAvailability" - ], "description": "To check whether a resource name is available.", "operationId": "CheckNameAvailability", "parameters": [ @@ -118,9 +112,6 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ConfidentialLedger/ledgers/{ledgerName}": { "get": { - "tags": [ - "Confidential Ledger" - ], "summary": "Retrieves information about a Confidential Ledger resource.", "description": "Retrieves the properties of a Confidential Ledger.", "operationId": "Ledger_Get", @@ -159,9 +150,6 @@ } }, "delete": { - "tags": [ - "Confidential Ledger" - ], "summary": "Deletes a Confidential Ledger resource.", "description": "Deletes an existing Confidential Ledger.", "operationId": "Ledger_Delete", @@ -204,9 +192,6 @@ } }, "put": { - "tags": [ - "Confidential Ledger" - ], "summary": "Creates a Confidential Ledger.", "description": "Creates a Confidential Ledger with the specified ledger parameters.", "operationId": "Ledger_Create", @@ -264,9 +249,6 @@ } }, "patch": { - "tags": [ - "Confidential Ledger" - ], "summary": "Update Confidential Ledger properties", "description": "Updates properties of Confidential Ledger", "operationId": "Ledger_Update", @@ -320,9 +302,6 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ConfidentialLedger/ledgers": { "get": { - "tags": [ - "Confidential Ledger" - ], "summary": "Retrieves information about all Confidential Ledger resources under the given subscription and resource group", "description": "Retrieves the properties of all Confidential Ledgers.", "operationId": "Ledger_ListByResourceGroup", @@ -369,9 +348,6 @@ }, "/subscriptions/{subscriptionId}/providers/Microsoft.ConfidentialLedger/ledgers/": { "get": { - "tags": [ - "Confidential Ledger" - ], "summary": "Retrieves information about all Confidential Ledger resources under the given subscription", "description": "Retrieves the properties of all Confidential Ledgers.", "operationId": "Ledger_ListBySubscription", From 1a15d855c985c06c5093dc2e1e3267b34e0094de Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 12:44:31 -0700 Subject: [PATCH 06/10] Revert "remove all tags" This reverts commit 68dc36a04d8f98d4600fa12764d6aeeec548f018. --- .../confidentialledger.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index 1fad374d9127..cb82545ed8e5 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -36,6 +36,9 @@ "paths": { "/providers/Microsoft.ConfidentialLedger/operations": { "get": { + "tags": [ + "Operations" + ], "operationId": "Operations_List", "description": "Retrieves a list of available API operations", "summary": "Retrieves a list of available API operations under this Resource Provider.", @@ -70,6 +73,9 @@ }, "/subscriptions/{subscriptionId}/providers/Microsoft.ConfidentialLedger/checkNameAvailability": { "post": { + "tags": [ + "NameAvailability" + ], "description": "To check whether a resource name is available.", "operationId": "CheckNameAvailability", "parameters": [ @@ -112,6 +118,9 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ConfidentialLedger/ledgers/{ledgerName}": { "get": { + "tags": [ + "Confidential Ledger" + ], "summary": "Retrieves information about a Confidential Ledger resource.", "description": "Retrieves the properties of a Confidential Ledger.", "operationId": "Ledger_Get", @@ -150,6 +159,9 @@ } }, "delete": { + "tags": [ + "Confidential Ledger" + ], "summary": "Deletes a Confidential Ledger resource.", "description": "Deletes an existing Confidential Ledger.", "operationId": "Ledger_Delete", @@ -192,6 +204,9 @@ } }, "put": { + "tags": [ + "Confidential Ledger" + ], "summary": "Creates a Confidential Ledger.", "description": "Creates a Confidential Ledger with the specified ledger parameters.", "operationId": "Ledger_Create", @@ -249,6 +264,9 @@ } }, "patch": { + "tags": [ + "Confidential Ledger" + ], "summary": "Update Confidential Ledger properties", "description": "Updates properties of Confidential Ledger", "operationId": "Ledger_Update", @@ -302,6 +320,9 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ConfidentialLedger/ledgers": { "get": { + "tags": [ + "Confidential Ledger" + ], "summary": "Retrieves information about all Confidential Ledger resources under the given subscription and resource group", "description": "Retrieves the properties of all Confidential Ledgers.", "operationId": "Ledger_ListByResourceGroup", @@ -348,6 +369,9 @@ }, "/subscriptions/{subscriptionId}/providers/Microsoft.ConfidentialLedger/ledgers/": { "get": { + "tags": [ + "Confidential Ledger" + ], "summary": "Retrieves information about all Confidential Ledger resources under the given subscription", "description": "Retrieves the properties of all Confidential Ledgers.", "operationId": "Ledger_ListBySubscription", From 39f747455c1b090e6b92bd2c6a1321f29e180540 Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 12:44:43 -0700 Subject: [PATCH 07/10] Revert "Remove Tag def" This reverts commit dff3fb47695d404d627498ca639a5fd9a3320d66. --- .../2023-01-26-preview/confidentialledger.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index cb82545ed8e5..46a675b2b3d7 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -415,6 +415,24 @@ } }, "definitions": { + "Tags": { + "description": "Tags for Confidential Ledger Resource", + "type": "object", + "properties": { + "tags": { + "type": "object", + "description": "Additional tags for Confidential Ledger", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ] + } + } + }, "ResourceProviderOperationList": { "description": "List containing this Resource Provider's available operations.", "type": "object", From 186fea8a0935c015b0baa3b28c05d656bf629a69 Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 12:46:01 -0700 Subject: [PATCH 08/10] Revert "Revert "Remove Tag def"" This reverts commit 39f747455c1b090e6b92bd2c6a1321f29e180540. --- .../2023-01-26-preview/confidentialledger.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index 46a675b2b3d7..cb82545ed8e5 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -415,24 +415,6 @@ } }, "definitions": { - "Tags": { - "description": "Tags for Confidential Ledger Resource", - "type": "object", - "properties": { - "tags": { - "type": "object", - "description": "Additional tags for Confidential Ledger", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ] - } - } - }, "ResourceProviderOperationList": { "description": "List containing this Resource Provider's available operations.", "type": "object", From f0f3945b8f11af9c5b8aba51703c35ed477e6af1 Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 14:03:15 -0700 Subject: [PATCH 09/10] Bring tags back --- .../confidentialledger.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index cb82545ed8e5..aef21e134ed5 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -415,6 +415,24 @@ } }, "definitions": { + "Tags": { + "description": "Tags for Confidential Ledger Resource", + "type": "object", + "properties": { + "tags": { + "type": "object", + "description": "Additional tags for Confidential Ledger", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ] + } + } + }, "ResourceProviderOperationList": { "description": "List containing this Resource Provider's available operations.", "type": "object", @@ -629,6 +647,9 @@ "allOf": [ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" + }, + { + "$ref": "#/definitions/Tags" } ], "properties": { From 138ef48f56b802307929f69431a0b632af6c099e Mon Sep 17 00:00:00 2001 From: Musabbir Khan Date: Thu, 13 Apr 2023 14:42:09 -0700 Subject: [PATCH 10/10] Remove Tags again --- .../confidentialledger.json | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json index aef21e134ed5..cb82545ed8e5 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2023-01-26-preview/confidentialledger.json @@ -415,24 +415,6 @@ } }, "definitions": { - "Tags": { - "description": "Tags for Confidential Ledger Resource", - "type": "object", - "properties": { - "tags": { - "type": "object", - "description": "Additional tags for Confidential Ledger", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ] - } - } - }, "ResourceProviderOperationList": { "description": "List containing this Resource Provider's available operations.", "type": "object", @@ -647,9 +629,6 @@ "allOf": [ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" - }, - { - "$ref": "#/definitions/Tags" } ], "properties": {