From d225d22459a03a7475b90d60a64f2ee6bf6ab821 Mon Sep 17 00:00:00 2001 From: Lyndon Shi Date: Tue, 14 Dec 2021 16:13:32 -0800 Subject: [PATCH 01/10] add swagger generation code for azcli --- .../resource-manager/readme.az.md | 23 +++++++++++++++++++ .../resource-manager/readme.cli.md | 4 ++++ .../resource-manager/readme.md | 1 + .../resource-manager/readme.python.md | 15 +++++++----- 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 specification/confidentialledger/resource-manager/readme.az.md create mode 100644 specification/confidentialledger/resource-manager/readme.cli.md diff --git a/specification/confidentialledger/resource-manager/readme.az.md b/specification/confidentialledger/resource-manager/readme.az.md new file mode 100644 index 000000000000..d446420a862d --- /dev/null +++ b/specification/confidentialledger/resource-manager/readme.az.md @@ -0,0 +1,23 @@ +## AZ + +[//]: # "See https://github.com/Azure/autorest.az/blob/b000db70f608c64918d04a0e0f5b50bb5468baa0/doc/how-to-author-readme-file.md" + +These settings apply only when `--az` is specified on the command line. + +``` yaml $(az) && $(target-mode) != 'core' +az: + extensions: confidentialledger + namespace: azure.mgmt.confidentialledger + package-name: azure-mgmt-confidentialledger +az-output-folder: $(azure-cli-extension-folder)/src/confidentialledger +python-sdk-output-folder: "$(az-output-folder)/azext_confidentialledger/vendored_sdks/confidentialledger" +``` + +``` yaml $(az) && $(target-mode) == 'core' +az: + extensions: confidentialledger + namespace: azure.mgmt.confidentialledger + package-name: azure-mgmt-confidentialledger +az-output-folder: $(azure-cli-folder)/src/azure-cli/azure/cli/command_modules/{serviceFolderName} +python-sdk-output-folder: "$(az-output-folder)/vendored_sdks/confidentialledger" +``` \ No newline at end of file diff --git a/specification/confidentialledger/resource-manager/readme.cli.md b/specification/confidentialledger/resource-manager/readme.cli.md new file mode 100644 index 000000000000..179636a56760 --- /dev/null +++ b/specification/confidentialledger/resource-manager/readme.cli.md @@ -0,0 +1,4 @@ +``` yaml +# add any configuration here for all CLI languages +# refer to the faq.md for more details +``` \ No newline at end of file diff --git a/specification/confidentialledger/resource-manager/readme.md b/specification/confidentialledger/resource-manager/readme.md index 640a3b03ad91..db6449edc7f7 100644 --- a/specification/confidentialledger/resource-manager/readme.md +++ b/specification/confidentialledger/resource-manager/readme.md @@ -68,6 +68,7 @@ swagger-to-sdk: - repo: azure-sdk-for-ruby after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_confidentialledger'] + - repo: azure-cli-extensions ``` ## Go diff --git a/specification/confidentialledger/resource-manager/readme.python.md b/specification/confidentialledger/resource-manager/readme.python.md index d51e32acadda..42e9697b7ba8 100644 --- a/specification/confidentialledger/resource-manager/readme.python.md +++ b/specification/confidentialledger/resource-manager/readme.python.md @@ -7,15 +7,18 @@ Please also specify `--python-sdks-folder= Date: Tue, 14 Dec 2021 16:23:32 -0800 Subject: [PATCH 02/10] fiddle with ordering because the cli-extension codegen did not seem to run --- specification/confidentialledger/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/confidentialledger/resource-manager/readme.md b/specification/confidentialledger/resource-manager/readme.md index db6449edc7f7..cf586997c51b 100644 --- a/specification/confidentialledger/resource-manager/readme.md +++ b/specification/confidentialledger/resource-manager/readme.md @@ -64,11 +64,11 @@ swagger-to-sdk: - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-go-track2 + - repo: azure-cli-extensions - repo: azure-sdk-for-js - repo: azure-sdk-for-ruby after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_confidentialledger'] - - repo: azure-cli-extensions ``` ## Go From a4845ce4c9ecc84dda76a0df815e8777aa04818d Mon Sep 17 00:00:00 2001 From: Lyndon Shi Date: Tue, 14 Dec 2021 16:25:15 -0800 Subject: [PATCH 03/10] remove comment --- specification/confidentialledger/resource-manager/readme.az.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/confidentialledger/resource-manager/readme.az.md b/specification/confidentialledger/resource-manager/readme.az.md index d446420a862d..33bdacfc5c79 100644 --- a/specification/confidentialledger/resource-manager/readme.az.md +++ b/specification/confidentialledger/resource-manager/readme.az.md @@ -1,7 +1,5 @@ ## AZ -[//]: # "See https://github.com/Azure/autorest.az/blob/b000db70f608c64918d04a0e0f5b50bb5468baa0/doc/how-to-author-readme-file.md" - These settings apply only when `--az` is specified on the command line. ``` yaml $(az) && $(target-mode) != 'core' From c080bc2d990ff52e7c26567f3f2a84f5a4f2b22b Mon Sep 17 00:00:00 2001 From: Lyndon Shi Date: Wed, 15 Dec 2021 15:05:06 -0800 Subject: [PATCH 04/10] update readme files as in latest docs --- .../confidentialledger/resource-manager/readme.az.md | 9 --------- .../confidentialledger/resource-manager/readme.md | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/specification/confidentialledger/resource-manager/readme.az.md b/specification/confidentialledger/resource-manager/readme.az.md index 33bdacfc5c79..f709177a215f 100644 --- a/specification/confidentialledger/resource-manager/readme.az.md +++ b/specification/confidentialledger/resource-manager/readme.az.md @@ -9,13 +9,4 @@ az: package-name: azure-mgmt-confidentialledger az-output-folder: $(azure-cli-extension-folder)/src/confidentialledger python-sdk-output-folder: "$(az-output-folder)/azext_confidentialledger/vendored_sdks/confidentialledger" -``` - -``` yaml $(az) && $(target-mode) == 'core' -az: - extensions: confidentialledger - namespace: azure.mgmt.confidentialledger - package-name: azure-mgmt-confidentialledger -az-output-folder: $(azure-cli-folder)/src/azure-cli/azure/cli/command_modules/{serviceFolderName} -python-sdk-output-folder: "$(az-output-folder)/vendored_sdks/confidentialledger" ``` \ No newline at end of file diff --git a/specification/confidentialledger/resource-manager/readme.md b/specification/confidentialledger/resource-manager/readme.md index cf586997c51b..db6449edc7f7 100644 --- a/specification/confidentialledger/resource-manager/readme.md +++ b/specification/confidentialledger/resource-manager/readme.md @@ -64,11 +64,11 @@ swagger-to-sdk: - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-go-track2 - - repo: azure-cli-extensions - repo: azure-sdk-for-js - repo: azure-sdk-for-ruby after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_confidentialledger'] + - repo: azure-cli-extensions ``` ## Go From db64f20192a28068dbed0920cd47d09e22902bb2 Mon Sep 17 00:00:00 2001 From: Lyndon Shi Date: Mon, 27 Dec 2021 11:34:47 -0800 Subject: [PATCH 05/10] fix example for cli test case generation --- .../2021-05-13-preview/examples/ConfidentialLedger_Create.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Create.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Create.json index 75df24f7242e..0989499b1a4d 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Create.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Create.json @@ -16,7 +16,7 @@ ], "certBasedSecurityPrincipals": [ { - "cert": "MIIDBTCCAe2gAwIBAgIQXVogj9BAf49IpuOSIvztNDANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MB4XDTIwMDMxNzAwMDAwMFoXDTI1MDMxNzAwMDAwMFowLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANfLmdz9yIDskpZzrMXiDeVlCs75ZunrzwzBW5lz7UxdBjHu7Q9iT32otlBp++LOwBcKsVjuQ0GUbulX0FLsfLjEeCe58ZtSn//+6VRFSScg7i+WvDwEUWELR+vMPtCGcXBTpILEnYbSMz0No4+Jpkc1lyMIfDP/KSeqojo74xfW4RKtAgv39uwZ5Yz2hZ/IcWOvaQqMXp1lqhXLFIRWbwjLYYUbmwGwYpQ6++Cml0ucQoMkgYT88HpA/fzXQlLgrHamr3eE/lVp26ZWwfGLAvkdNBabQRSrk8k/c6BmY1mYpUFZo+795PI16mAdp1ioEwH8I5osis+/BR5GhPpwiA8CAwEAAaMhMB8wHQYDVR0OBBYEFF8MDGklOGhGNVJvsHHRCaqtzexcMA0GCSqGSIb3DQEBCwUAA4IBAQCKkegw/mdpCVl1lOpgU4G9RT+1gtcPqZK9kpimuDggSJju6KUQlOCi5/lIH5DCzpjFdmG17TjWVBNve5kowmrhLzovY0Ykk7+6hYTBK8dNNSmd4SK7zY++0aDIuOzHP2Cur+kgFC0gez50tPzotLDtMmp40gknXuzltwJfezNSw3gLgljDsGGcDIXK3qLSYh44qSuRGwulcN2EJUZBI9tIxoODpaWHIN8+z2uZvf8JBYFjA3+n9FRQn51X16CTcjq4QRTbNVpgVuQuyaYnEtx0ZnDvguB3RjGSPIXTRBkLl2x7e8/6uAZ6tchw8rhcOtPsFgJuoJokGjvcUSR/6Eqd", + "cert": "-----BEGIN CERTIFICATE-----MIIBsjCCATigAwIBAgIUZWIbyG79TniQLd2UxJuU74tqrKcwCgYIKoZIzj0EAwMwEDEOMAwGA1UEAwwFdXNlcjAwHhcNMjEwMzE2MTgwNjExWhcNMjIwMzE2MTgwNjExWjAQMQ4wDAYDVQQDDAV1c2VyMDB2MBAGByqGSM49AgEGBSuBBAAiA2IABBiWSo/j8EFit7aUMm5lF+lUmCu+IgfnpFD+7QMgLKtxRJ3aGSqgS/GpqcYVGddnODtSarNE/HyGKUFUolLPQ5ybHcouUk0kyfA7XMeSoUA4lBz63Wha8wmXo+NdBRo39qNTMFEwHQYDVR0OBBYEFPtuhrwgGjDFHeUUT4nGsXaZn69KMB8GA1UdIwQYMBaAFPtuhrwgGjDFHeUUT4nGsXaZn69KMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwMDaAAwZQIxAOnozm2CyqRwSSQLls5r+mUHRGRyXHXwYtM4Dcst/VEZdmS9fqvHRCHbjUlO/+HNfgIwMWZ4FmsjD3wnPxONOm9YdVn/PRD7SsPRPbOjwBiE4EBGaHDsLjYAGDSGi7NJnSkA-----END CERTIFICATE-----", "ledgerRoleName": "Reader" } ] From 87ac29578ab6875c1cdef1327abc686e091959a8 Mon Sep 17 00:00:00 2001 From: Lyndon Shi Date: Tue, 4 Jan 2022 10:13:07 -0800 Subject: [PATCH 06/10] spec fixes for codegen --- .../confidentialledger.json | 4 +- .../examples/ConfidentialLedger_Update.json | 43 +++++++++++++++++-- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json index 96e423cee57f..157b6054fdda 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json @@ -412,7 +412,7 @@ } }, "definitions": { - "Location": { + "ResourceLocation": { "description": "Location of the ARM Resource", "type": "object", "properties": { @@ -661,7 +661,7 @@ "$ref": "#/definitions/Resource" }, { - "$ref": "#/definitions/Location" + "$ref": "#/definitions/ResourceLocation" }, { "$ref": "#/definitions/Tags" diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json index d822f7d26004..d8b15d2bddb5 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json @@ -5,11 +5,42 @@ "resourceGroupName": "DummyResourceGroupName", "ledgerName": "DummyLedgerName", "confidentialLedger": { - "properties": {}, + "properties": { + "ledgerName": "DummyLedgerName", + "ledgerUri": "https://dummyledgername.confidential-ledger.azure.com", + "identityServiceUri": "https://identity.confidential-ledger.core.azure.com/ledgerIdentity/dummyledgername", + "ledgerType": "Public", + "ledgerInternalNamespace": "dummyNamespace", + "provisioningState": "Succeeded", + "aadBasedSecurityPrincipals": [ + { + "principalId": "34621747-6fc8-4771-a2eb-72f31c461f2e", + "tenantId": "bce123b9-2b7b-4975-8360-5ca0b9b1cd08", + "ledgerRoleName": "Administrator" + } + ], + "certBasedSecurityPrincipals": [ + { + "cert": "-----BEGIN CERTIFICATE-----\nMIIDUjCCAjqgAwIBAgIQJ2IrDBawSkiAbkBYmiAopDANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDExtTeW50aGV0aWNzIExlZGdlciBVc2VyIENlcnQwHhcNMjAwOTIzMjIxODQ2WhcNMjEwOTIzMjIyODQ2WjAmMSQwIgYDVQQDExtTeW50aGV0aWNzIExlZGdlciBVc2VyIENlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCX2s/Eu4q/eQ63N+Ugeg5oAciZua/YCJr41c/696szvSY7Zg1SNJlW88/nbz70+QpO55OmqlEE3QCU+T0Vl/h0Gf//n1PYcoBbTGUnYEmV+fTTHict6rFiEwrGJ62tvcpYgwapInSLyEeUzjki0zhOLJ1OfRnYd1eGnFVMpE5aVjiS8Q5dmTEUyd51EIprGE8RYAW9aeWSwTH7gjHUsRlJnHKcdhaK/v5QKJnNu5bzPFUcpC0ZBcizoMPAtroLAD4B68Jl0z3op18MgZe6lRrVoWuxfqnk5GojuB/Vu8ohAZKoFhQ6NB6r+LL2AUs+Zr7Bt26IkEdR178n9JMEA4gHAgMBAAGjfDB6MA4GA1UdDwEB/wQEAwIFoDAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBS/a7PU9iOfOKEyZCp11Oen5VSuuDAdBgNVHQ4EFgQUv2uz1PYjnzihMmQqddTnp+VUrrgwDQYJKoZIhvcNAQELBQADggEBAF5q2fDwnse8egXhfaJCqqM969E9gSacqFmASpoDJPRPEX7gqoO7v1ww7nqRtRDoRiBvo/yNk7jlSAkRN3nRRnZLZZ3MYQdmCr4FGyIqRg4Y94+nja+Du9pDD761rxRktMVPSOaAVM/E5DQvscDlPvlPYe9mkcrLCE4DXYpiMmLT8Tm55LJJq5m07dVDgzAIR1L/hmEcbK0pnLgzciMtMLxGO2udnyyW/UW9WxnjvrrD2JluTHH9mVbb+XQP1oFtlRBfH7aui1ZgWfKvxrdP4zdK9QoWSUvRux3TLsGmHRBjBMtqYDY3y5mB+aNjLelvWpeVb0m2aOSVXynrLwNCAVA=\n-----END CERTIFICATE-----", + "ledgerRoleName": "Reader" + } + ] + }, + "name": "DummyLedgerName", + "id": "/subscriptions/00000000-0000-0000-0000-000000000001/providers/Microsoft.ConfidentialLedger/ledgers/DummyLedgerName", + "type": "Microsoft.ConfidentialLedger/ledgers", "location": "EastUS", "tags": { "additionalProps1": "additional properties", "additionProps2": "additional property value" + }, + "systemData": { + "createdBy": "ledgerAdmin@contoso.com", + "createdByType": "Admin1", + "createdAt": "2020-12-01T00:00:00.1234567Z", + "lastModifiedBy": "ledgerAdmin2@outlook.com", + "lastModifiedByType": "Admin2", + "lastModifiedAt": "2020-12-02T00:00:00.1234567Z" } } }, @@ -18,8 +49,8 @@ "body": { "properties": { "ledgerName": "DummyLedgerName", - "ledgerUri": "https://dummy.accledger.domain.com/DummyLedgerName", - "identityServiceUri": "https://dummy.accledger.identity.com/DummyLedgerName", + "ledgerUri": "https://dummyledgername.confidential-ledger.azure.com", + "identityServiceUri": "https://identity.confidential-ledger.core.azure.com/ledgerIdentity/dummyledgername", "ledgerType": "Public", "ledgerInternalNamespace": "dummyNamespace", "provisioningState": "Succeeded", @@ -29,6 +60,12 @@ "tenantId": "bce123b9-2b7b-4975-8360-5ca0b9b1cd08", "ledgerRoleName": "Administrator" } + ], + "certBasedSecurityPrincipals": [ + { + "cert": "-----BEGIN CERTIFICATE-----\nMIIDUjCCAjqgAwIBAgIQJ2IrDBawSkiAbkBYmiAopDANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDExtTeW50aGV0aWNzIExlZGdlciBVc2VyIENlcnQwHhcNMjAwOTIzMjIxODQ2WhcNMjEwOTIzMjIyODQ2WjAmMSQwIgYDVQQDExtTeW50aGV0aWNzIExlZGdlciBVc2VyIENlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCX2s/Eu4q/eQ63N+Ugeg5oAciZua/YCJr41c/696szvSY7Zg1SNJlW88/nbz70+QpO55OmqlEE3QCU+T0Vl/h0Gf//n1PYcoBbTGUnYEmV+fTTHict6rFiEwrGJ62tvcpYgwapInSLyEeUzjki0zhOLJ1OfRnYd1eGnFVMpE5aVjiS8Q5dmTEUyd51EIprGE8RYAW9aeWSwTH7gjHUsRlJnHKcdhaK/v5QKJnNu5bzPFUcpC0ZBcizoMPAtroLAD4B68Jl0z3op18MgZe6lRrVoWuxfqnk5GojuB/Vu8ohAZKoFhQ6NB6r+LL2AUs+Zr7Bt26IkEdR178n9JMEA4gHAgMBAAGjfDB6MA4GA1UdDwEB/wQEAwIFoDAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBS/a7PU9iOfOKEyZCp11Oen5VSuuDAdBgNVHQ4EFgQUv2uz1PYjnzihMmQqddTnp+VUrrgwDQYJKoZIhvcNAQELBQADggEBAF5q2fDwnse8egXhfaJCqqM969E9gSacqFmASpoDJPRPEX7gqoO7v1ww7nqRtRDoRiBvo/yNk7jlSAkRN3nRRnZLZZ3MYQdmCr4FGyIqRg4Y94+nja+Du9pDD761rxRktMVPSOaAVM/E5DQvscDlPvlPYe9mkcrLCE4DXYpiMmLT8Tm55LJJq5m07dVDgzAIR1L/hmEcbK0pnLgzciMtMLxGO2udnyyW/UW9WxnjvrrD2JluTHH9mVbb+XQP1oFtlRBfH7aui1ZgWfKvxrdP4zdK9QoWSUvRux3TLsGmHRBjBMtqYDY3y5mB+aNjLelvWpeVb0m2aOSVXynrLwNCAVA=\n-----END CERTIFICATE-----", + "ledgerRoleName": "Reader" + } ] }, "name": "DummyLedgerName", From d4ac1e86f2c1079c01f500803eb46bb27918c8f3 Mon Sep 17 00:00:00 2001 From: Lyndon Shi Date: Mon, 7 Feb 2022 15:29:46 -0800 Subject: [PATCH 07/10] update documentation --- .../preview/2020-12-01-preview/confidentialledger.json | 2 +- .../preview/2021-05-13-preview/confidentialledger.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2020-12-01-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2020-12-01-preview/confidentialledger.json index da5066749b97..bf60b61c0f24 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2020-12-01-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2020-12-01-preview/confidentialledger.json @@ -530,7 +530,7 @@ "description": "Cert based security principal with Ledger RoleName", "properties": { "cert": { - "description": "Base64 encoded public key of the user cert (.pem or .cer)", + "description": "Public key of the user cert (.pem or .cer)", "type": "string" }, "ledgerRoleName": { diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json index 157b6054fdda..866190ab56e9 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json @@ -578,7 +578,7 @@ "description": "Cert based security principal with Ledger RoleName", "properties": { "cert": { - "description": "Base64 encoded public key of the user cert (.pem or .cer)", + "description": "Public key of the user cert (.pem or .cer)", "type": "string" }, "ledgerRoleName": { From c1f548ab3c1dd1df73841d663a6d3a0f66df37d1 Mon Sep 17 00:00:00 2001 From: Lyndon Shi Date: Mon, 7 Feb 2022 15:40:55 -0800 Subject: [PATCH 08/10] fix example --- .../examples/ConfidentialLedger_Update.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json index d8b15d2bddb5..f2bcfa57d958 100644 --- a/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json +++ b/specification/confidentialledger/resource-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json @@ -6,12 +6,7 @@ "ledgerName": "DummyLedgerName", "confidentialLedger": { "properties": { - "ledgerName": "DummyLedgerName", - "ledgerUri": "https://dummyledgername.confidential-ledger.azure.com", - "identityServiceUri": "https://identity.confidential-ledger.core.azure.com/ledgerIdentity/dummyledgername", "ledgerType": "Public", - "ledgerInternalNamespace": "dummyNamespace", - "provisioningState": "Succeeded", "aadBasedSecurityPrincipals": [ { "principalId": "34621747-6fc8-4771-a2eb-72f31c461f2e", @@ -26,21 +21,10 @@ } ] }, - "name": "DummyLedgerName", - "id": "/subscriptions/00000000-0000-0000-0000-000000000001/providers/Microsoft.ConfidentialLedger/ledgers/DummyLedgerName", - "type": "Microsoft.ConfidentialLedger/ledgers", "location": "EastUS", "tags": { "additionalProps1": "additional properties", "additionProps2": "additional property value" - }, - "systemData": { - "createdBy": "ledgerAdmin@contoso.com", - "createdByType": "Admin1", - "createdAt": "2020-12-01T00:00:00.1234567Z", - "lastModifiedBy": "ledgerAdmin2@outlook.com", - "lastModifiedByType": "Admin2", - "lastModifiedAt": "2020-12-02T00:00:00.1234567Z" } } }, From c125e3b8ac6c0a263b3622d7615fd41963ba9b04 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Tue, 15 Feb 2022 10:14:57 +0800 Subject: [PATCH 09/10] Update readme.python.md --- .../resource-manager/readme.python.md | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/specification/confidentialledger/resource-manager/readme.python.md b/specification/confidentialledger/resource-manager/readme.python.md index 42e9697b7ba8..aef6ed5ec919 100644 --- a/specification/confidentialledger/resource-manager/readme.python.md +++ b/specification/confidentialledger/resource-manager/readme.python.md @@ -3,22 +3,21 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. -```yaml $(python) -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - namespace: azure.mgmt.confidentialledger - package-name: azure-mgmt-confidentialledger - clear-output-folder: true +``` yaml $(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-mgmt-confidentialledger +no-namespace-folders: true +package-version: 1.0.0b1 +clear-output-folder: true ``` -``` yaml $(python) && $(python-mode) == 'update' -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/confidentialledger/azure-mgmt-confidentialledger/azure/mgmt/confidentialledger +``` yaml $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/confidentialledger/azure-mgmt-confidentialledger/azure/mgmt/confidentialledger ``` -``` yaml $(python) && $(python-mode) == 'create' -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/confidentialledger/azure-mgmt-confidentialledger + +``` yaml $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/confidentialledger/azure-mgmt-confidentialledger ``` From 5aadf3dca53505bcf41d5f6dd5e405f17ea708fb Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Tue, 15 Feb 2022 10:15:17 +0800 Subject: [PATCH 10/10] Update readme.md --- specification/confidentialledger/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/confidentialledger/resource-manager/readme.md b/specification/confidentialledger/resource-manager/readme.md index db6449edc7f7..a978b33a9719 100644 --- a/specification/confidentialledger/resource-manager/readme.md +++ b/specification/confidentialledger/resource-manager/readme.md @@ -60,7 +60,7 @@ This is not used by Autorest itself. ```yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-net - - repo: azure-sdk-for-python + - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-go-track2