[Confidential Ledger] Example fixes and Swagger changes to accommodat…

…e CLI / PowerShell generation (Azure#17695) * add swagger generation code for azcli * fiddle with ordering because the cli-extension codegen did not seem to run * remove comment * update readme files as in latest docs * fix example for cli test case generation * spec fixes for codegen * update documentation * fix example * Update readme.python.md * Update readme.md Co-authored-by: Yuchao Yan <[email protected]>
grucloud · Mar 7, 2022 · 24ae8db · 24ae8db
1 parent b65e9ba
commit 24ae8db
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 22 deletions.
diff --git a/...e-manager/Microsoft.ConfidentialLedger/preview/2020-12-01-preview/confidentialledger.json b/...e-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/...e-manager/Microsoft.ConfidentialLedger/preview/2021-05-13-preview/confidentialledger.json b/...e-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": {
@@ -581,7 +581,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": {
@@ -668,7 +668,7 @@
           "$ref": "#/definitions/Resource"
         },
         {
-          "$ref": "#/definitions/Location"
+          "$ref": "#/definitions/ResourceLocation"
         },
         {
           "$ref": "#/definitions/Tags"

diff --git a/...oft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Create.json b/...oft.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"
           }
         ]

diff --git a/...oft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json b/...oft.ConfidentialLedger/preview/2021-05-13-preview/examples/ConfidentialLedger_Update.json
@@ -5,7 +5,22 @@
     "resourceGroupName": "DummyResourceGroupName",
     "ledgerName": "DummyLedgerName",
     "confidentialLedger": {
-      "properties": {},
+      "properties": {
+        "ledgerType": "Public",
+        "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"
+          }
+        ]
+      },
       "location": "EastUS",
       "tags": {
         "additionalProps1": "additional properties",
@@ -18,8 +33,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 +44,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",

diff --git a/specification/confidentialledger/resource-manager/readme.az.md b/specification/confidentialledger/resource-manager/readme.az.md
@@ -0,0 +1,12 @@
+## AZ
+
+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"
+```
diff --git a/specification/confidentialledger/resource-manager/readme.cli.md 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
+```
diff --git a/specification/confidentialledger/resource-manager/readme.md b/specification/confidentialledger/resource-manager/readme.md
@@ -60,14 +60,15 @@ 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
   - 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

diff --git a/specification/confidentialledger/resource-manager/readme.python.md b/specification/confidentialledger/resource-manager/readme.python.md
@@ -3,19 +3,21 @@
 These settings apply only when `--python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
-```yaml $(python)
-python:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  payload-flattening-threshold: 2
-  namespace: microsoft.confidentialledger
-  package-name: azure-mgmt-confidentialledger
-  package-version: 0.0.1
-  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:
-  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-mode) == 'create' && $(track2)
+basic-setup-py: true
+output-folder: $(python-sdks-folder)/confidentialledger/azure-mgmt-confidentialledger
 ```