wip - ledger pylint fixes

.vscode/cspell.json

@@ -1873,6 +1873,14 @@
         "Onvif"
       ]
     },
+    {
+      "filename": "sdk/confidentialledger/azure-confidentialledger/**",
+      "words": [
+        "mrenclave",
+        "MRENCLAVE",
+        "oeverify"
+      ]
+    },
     {
       "filename": "sdk/confidentialledger/azure-confidentialledger/azure/confidentialledger/_operations/*.py",
       "words": [

eng/tools/azure-sdk-tools/azpysdk/Check.py

@@ -11,7 +11,13 @@
 import subprocess
 
 from ci_tools.parsing import ParsedSetup
-from ci_tools.functions import discover_targeted_packages, get_venv_call, install_into_venv, get_venv_python
+from ci_tools.functions import (
+    discover_targeted_packages,
+    get_venv_call,
+    install_into_venv,
+    get_venv_python,
+    get_pip_command,
+)
 from ci_tools.variables import discover_repo_root
 from ci_tools.logging import logger
 
@@ -53,6 +59,7 @@ def run(self, args: argparse.Namespace) -> int:
 
     def create_venv(self, isolate: bool, venv_location: str) -> str:
         """Abstraction for creating a virtual environment."""
+
         if isolate:
             venv_cmd = get_venv_call(sys.executable)
             venv_python = get_venv_python(venv_location)
@@ -180,3 +187,24 @@ def install_dev_reqs(self, executable: str, args: argparse.Namespace, package_di
                     os.remove(temp_req_file.name)
                 except Exception as cleanup_error:
                     logger.warning(f"Failed to remove temporary requirements file: {cleanup_error}")
+
+    def pip_freeze(self, executable: str) -> None:
+        """Run pip freeze in the given virtual environment and log the output. This function handles both isolated and non-isolated
+        environments, as well as calling the proper `uv` executable with additional --python argument if needed."""
+        try:
+            # to uv pip install or freeze to a target environment, we have to add `--python <path to python exe>`
+            # to tell uv which environment to target
+            command = get_pip_command(executable)
+
+            if command[0] == "uv":
+                command += ["freeze", "--python", executable]
+            else:
+                command += ["freeze"]
+
+            result = subprocess.run(command, cwd=os.getcwd(), check=True, capture_output=True, text=True)
+            logger.info("Installed packages:")
+            logger.info(result.stdout)
+        except subprocess.CalledProcessError as e:
+            logger.error(f"Failed to run pip freeze: {e}")
+            logger.error(e.stdout)
+            logger.error(e.stderr)

eng/tools/azure-sdk-tools/azpysdk/pylint.py

@@ -51,7 +51,6 @@ def run(self, args: argparse.Namespace) -> int:
             package_name = parsed.name
             executable, staging_directory = self.get_executable(args.isolate, args.command, sys.executable, package_dir)
             logger.info(f"Processing {package_name} for pylint check")
-            pip_cmd = get_pip_command(executable)
 
             # install dependencies
             self.install_dev_reqs(executable, args, package_dir)
@@ -92,12 +91,7 @@ def run(self, args: argparse.Namespace) -> int:
                 return e.returncode
 
             # debug a pip freeze result
-            cmd = pip_cmd + ["freeze"]
-            freeze_result = subprocess.run(
-                cmd, cwd=package_dir, check=False, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
-            )
-            logger.debug(f"Running pip freeze with {cmd}")
-            logger.debug(freeze_result.stdout)
+            self.pip_freeze(executable)
 
             top_level_module = parsed.namespace.split(".")[0]
 
@@ -122,19 +116,29 @@ def run(self, args: argparse.Namespace) -> int:
                     ]
                 )
 
-                results.append(
-                    check_call(
-                        [
-                            executable,
-                            "-m",
-                            "pylint",
-                            "--rcfile={}".format(rcFileLocation),
-                            "--output-format=parseable",
-                            os.path.join(package_dir, top_level_module),
-                        ]
-                    )
+                pylint_result = self.run_venv_command(
+                    executable,
+                    [
+                        "-m",
+                        "pylint",
+                        "--rcfile={}".format(rcFileLocation),
+                        "--output-format=parseable",
+                        os.path.join(package_dir, top_level_module),
+                    ],
+                    cwd=package_dir,
+                    check=True,
                 )
+                # todo: why???
+                if pylint_result.stdout:
+                    print(pylint_result.stdout)
+                if pylint_result.stderr:
+                    print(pylint_result.stderr)
+                results.append(pylint_result.returncode)
             except CalledProcessError as e:
+                if hasattr(e, "stdout") and e.stdout:
+                    print(e.stdout)
+                if hasattr(e, "stderr") and e.stderr:
+                    print(e.stderr)
                 logger.error(
                     "{} exited with linting error {}. Please see this link for more information https://aka.ms/azsdk/python/pylint-guide".format(
                         package_name, e.returncode

sdk/confidentialledger/azure-confidentialledger/CHANGELOG.md

@@ -1,14 +1,18 @@
 # Release History
 
-## 1.2.0b2 (Unreleased)
+## 2.0.0b1 (Unreleased)
 
 ### Features Added
 
+- Added models.
+
 ### Breaking Changes
 
-### Bugs Fixed
+- Changed the input parameter on `create_user_defined_role` from accepting a list of roles to accepting a `Role` model.
+- Removed the `azure.confidentialledger.certificate` namespace from this package.
+- Removed the `ConfidentialLedgerCertificateClient`.
 
-### Other Changes
+**The `ConfidentialLedgerCertificateClient` can now be used through the `azure-confidentialledger-certificate` package.**
 
 ## 1.2.0b1 (2025-04-23)
 

sdk/confidentialledger/azure-confidentialledger/MANIFEST.in

@@ -1,7 +1,6 @@
 include *.md
 include LICENSE
-include azure/__init__.py
-include azure/confidentialledger/__init__.py
 include azure/confidentialledger/py.typed
 recursive-include tests *.py
-recursive-include samples *.py
+recursive-include samples *.py *.md
+include azure/__init__.py

sdk/confidentialledger/azure-confidentialledger/_metadata.json

@@ -0,0 +1,3 @@
+{
+  "apiVersion": "2024-12-09-preview"
+}

sdk/confidentialledger/azure-confidentialledger/apiview-properties.json

@@ -0,0 +1,113 @@
+{
+    "CrossLanguagePackageId": "ConfidentialLedger",
+    "CrossLanguageDefinitionId": {
+        "azure.confidentialledger.models.ApplicationClaim": "ConfidentialLedger.ApplicationClaim",
+        "azure.confidentialledger.models.Bundle": "ConfidentialLedger.Bundle",
+        "azure.confidentialledger.models.ClaimDigest": "ConfidentialLedger.ClaimDigest",
+        "azure.confidentialledger.models.Collection": "ConfidentialLedger.Collection",
+        "azure.confidentialledger.models.ConfidentialLedgerEnclaves": "ConfidentialLedger.ConfidentialLedgerEnclaves",
+        "azure.confidentialledger.models.ConfidentialLedgerError": "ConfidentialLedgerCommon.ConfidentialLedgerError",
+        "azure.confidentialledger.models.ConfidentialLedgerErrorBody": "ConfidentialLedgerCommon.ConfidentialLedgerErrorBody",
+        "azure.confidentialledger.models.ConsortiumMember": "ConfidentialLedger.ConsortiumMember",
+        "azure.confidentialledger.models.Constitution": "ConfidentialLedger.Constitution",
+        "azure.confidentialledger.models.EnclaveQuote": "ConfidentialLedger.EnclaveQuote",
+        "azure.confidentialledger.models.EndpointProperties": "ConfidentialLedger.EndpointProperties",
+        "azure.confidentialledger.models.InterpreterReusePolicy": "ConfidentialLedger.InterpreterReusePolicy",
+        "azure.confidentialledger.models.JsRuntimeOptions": "ConfidentialLedger.JsRuntimeOptions",
+        "azure.confidentialledger.models.LedgerEntry": "ConfidentialLedger.LedgerEntry",
+        "azure.confidentialledger.models.LedgerEntryClaim": "ConfidentialLedger.LedgerEntryClaim",
+        "azure.confidentialledger.models.LedgerQueryResult": "ConfidentialLedger.LedgerQueryResult",
+        "azure.confidentialledger.models.LedgerUser": "ConfidentialLedger.LedgerUser",
+        "azure.confidentialledger.models.LedgerUserMultipleRoles": "ConfidentialLedger.LedgerUserMultipleRoles",
+        "azure.confidentialledger.models.LedgerWriteResult": "ConfidentialLedger.LedgerWriteResult",
+        "azure.confidentialledger.models.Metadata": "ConfidentialLedger.Metadata",
+        "azure.confidentialledger.models.MethodToEndpointProperties": "ConfidentialLedger.MethodToEndpointProperties",
+        "azure.confidentialledger.models.ModuleDef": "ConfidentialLedger.ModuleDef",
+        "azure.confidentialledger.models.ReceiptContents": "ConfidentialLedger.ReceiptContents",
+        "azure.confidentialledger.models.ReceiptElement": "ConfidentialLedger.ReceiptElement",
+        "azure.confidentialledger.models.ReceiptLeafComponents": "ConfidentialLedger.ReceiptLeafComponents",
+        "azure.confidentialledger.models.Role": "ConfidentialLedger.Role",
+        "azure.confidentialledger.models.Roles": "ConfidentialLedger.Roles",
+        "azure.confidentialledger.models.TransactionReceipt": "ConfidentialLedger.TransactionReceipt",
+        "azure.confidentialledger.models.TransactionStatus": "ConfidentialLedger.TransactionStatus",
+        "azure.confidentialledger.models.UserDefinedFunction": "ConfidentialLedger.UserDefinedFunction",
+        "azure.confidentialledger.models.UserDefinedFunctionExecutionError": "ConfidentialLedger.UserDefinedFunctionExecutionError",
+        "azure.confidentialledger.models.UserDefinedFunctionExecutionProperties": "ConfidentialLedger.UserDefinedFunctionExecutionProperties",
+        "azure.confidentialledger.models.UserDefinedFunctionExecutionResponse": "ConfidentialLedger.UserDefinedFunctionExecutionResponse",
+        "azure.confidentialledger.models.UserDefinedFunctionExecutionResult": "ConfidentialLedger.UserDefinedFunctionExecutionResult",
+        "azure.confidentialledger.models.UserDefinedFunctionHook": "ConfidentialLedger.UserDefinedFunctionHook",
+        "azure.confidentialledger.models.ConfidentialLedgerQueryState": "ConfidentialLedger.ConfidentialLedgerQueryState",
+        "azure.confidentialledger.models.ApplicationClaimProtocol": "ConfidentialLedger.ApplicationClaimProtocol",
+        "azure.confidentialledger.models.ApplicationClaimKind": "ConfidentialLedger.ApplicationClaimKind",
+        "azure.confidentialledger.models.TransactionState": "ConfidentialLedger.TransactionState",
+        "azure.confidentialledger.models.ConfidentialLedgerUserRoleName": "ConfidentialLedger.ConfidentialLedgerUserRoleName",
+        "azure.confidentialledger.models.ForwardingRequired": "ConfidentialLedger.ForwardingRequired",
+        "azure.confidentialledger.models.Mode": "ConfidentialLedger.Mode",
+        "azure.confidentialledger.models.RedirectionStrategy": "ConfidentialLedger.RedirectionStrategy",
+        "azure.confidentialledger.models.UserDefinedFunctionExecutionStatus": "ConfidentialLedger.UserDefinedFunctionExecutionStatus",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_constitution": "ConfidentialLedger.getConstitution",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_constitution": "ConfidentialLedger.getConstitution",
+        "azure.confidentialledger.ConfidentialLedgerClient.list_consortium_members": "ConfidentialLedger.listConsortiumMembers",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.list_consortium_members": "ConfidentialLedger.listConsortiumMembers",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_enclave_quotes": "ConfidentialLedger.getEnclaveQuotes",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_enclave_quotes": "ConfidentialLedger.getEnclaveQuotes",
+        "azure.confidentialledger.ConfidentialLedgerClient.list_collections": "ConfidentialLedger.listCollections",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.list_collections": "ConfidentialLedger.listCollections",
+        "azure.confidentialledger.ConfidentialLedgerClient.list_ledger_entries": "ConfidentialLedger.listLedgerEntries",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.list_ledger_entries": "ConfidentialLedger.listLedgerEntries",
+        "azure.confidentialledger.ConfidentialLedgerClient.create_ledger_entry": "ConfidentialLedger.createLedgerEntry",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.create_ledger_entry": "ConfidentialLedger.createLedgerEntry",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_ledger_entry": "ConfidentialLedger.getLedgerEntry",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_ledger_entry": "ConfidentialLedger.getLedgerEntry",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_receipt": "ConfidentialLedger.getReceipt",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_receipt": "ConfidentialLedger.getReceipt",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_transaction_status": "ConfidentialLedger.getTransactionStatus",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_transaction_status": "ConfidentialLedger.getTransactionStatus",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_current_ledger_entry": "ConfidentialLedger.getCurrentLedgerEntry",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_current_ledger_entry": "ConfidentialLedger.getCurrentLedgerEntry",
+        "azure.confidentialledger.ConfidentialLedgerClient.list_users": "ConfidentialLedger.listUsers",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.list_users": "ConfidentialLedger.listUsers",
+        "azure.confidentialledger.ConfidentialLedgerClient.list_ledger_users": "ConfidentialLedger.listLedgerUsers",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.list_ledger_users": "ConfidentialLedger.listLedgerUsers",
+        "azure.confidentialledger.ConfidentialLedgerClient.delete_user": "ConfidentialLedger.deleteUser",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.delete_user": "ConfidentialLedger.deleteUser",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_user": "ConfidentialLedger.getUser",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_user": "ConfidentialLedger.getUser",
+        "azure.confidentialledger.ConfidentialLedgerClient.create_or_update_user": "ConfidentialLedger.createOrUpdateUser",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.create_or_update_user": "ConfidentialLedger.createOrUpdateUser",
+        "azure.confidentialledger.ConfidentialLedgerClient.delete_ledger_user": "ConfidentialLedger.deleteLedgerUser",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.delete_ledger_user": "ConfidentialLedger.deleteLedgerUser",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_ledger_user": "ConfidentialLedger.getLedgerUser",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_ledger_user": "ConfidentialLedger.getLedgerUser",
+        "azure.confidentialledger.ConfidentialLedgerClient.create_or_update_ledger_user": "ConfidentialLedger.createOrUpdateLedgerUser",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.create_or_update_ledger_user": "ConfidentialLedger.createOrUpdateLedgerUser",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_user_defined_endpoint": "ConfidentialLedger.getUserDefinedEndpoint",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_user_defined_endpoint": "ConfidentialLedger.getUserDefinedEndpoint",
+        "azure.confidentialledger.ConfidentialLedgerClient.create_user_defined_endpoint": "ConfidentialLedger.createUserDefinedEndpoint",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.create_user_defined_endpoint": "ConfidentialLedger.createUserDefinedEndpoint",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_runtime_options": "ConfidentialLedger.getRuntimeOptions",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_runtime_options": "ConfidentialLedger.getRuntimeOptions",
+        "azure.confidentialledger.ConfidentialLedgerClient.update_runtime_options": "ConfidentialLedger.updateRuntimeOptions",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.update_runtime_options": "ConfidentialLedger.updateRuntimeOptions",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_user_defined_endpoints_module": "ConfidentialLedger.getUserDefinedEndpointsModule",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_user_defined_endpoints_module": "ConfidentialLedger.getUserDefinedEndpointsModule",
+        "azure.confidentialledger.ConfidentialLedgerClient.list_user_defined_functions": "ConfidentialLedger.listUserDefinedFunctions",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.list_user_defined_functions": "ConfidentialLedger.listUserDefinedFunctions",
+        "azure.confidentialledger.ConfidentialLedgerClient.delete_user_defined_function": "ConfidentialLedger.deleteUserDefinedFunction",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.delete_user_defined_function": "ConfidentialLedger.deleteUserDefinedFunction",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_user_defined_function": "ConfidentialLedger.getUserDefinedFunction",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_user_defined_function": "ConfidentialLedger.getUserDefinedFunction",
+        "azure.confidentialledger.ConfidentialLedgerClient.create_user_defined_function": "ConfidentialLedger.createUserDefinedFunction",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.create_user_defined_function": "ConfidentialLedger.createUserDefinedFunction",
+        "azure.confidentialledger.ConfidentialLedgerClient.execute_user_defined_function": "ConfidentialLedger.executeUserDefinedFunction",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.execute_user_defined_function": "ConfidentialLedger.executeUserDefinedFunction",
+        "azure.confidentialledger.ConfidentialLedgerClient.get_user_defined_role": "ConfidentialLedger.getUserDefinedRole",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.get_user_defined_role": "ConfidentialLedger.getUserDefinedRole",
+        "azure.confidentialledger.ConfidentialLedgerClient.create_user_defined_role": "ConfidentialLedger.createUserDefinedRole",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.create_user_defined_role": "ConfidentialLedger.createUserDefinedRole",
+        "azure.confidentialledger.ConfidentialLedgerClient.update_user_defined_role": "ConfidentialLedger.updateUserDefinedRole",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.update_user_defined_role": "ConfidentialLedger.updateUserDefinedRole",
+        "azure.confidentialledger.ConfidentialLedgerClient.delete_user_defined_role": "ConfidentialLedger.deleteUserDefinedRole",
+        "azure.confidentialledger.aio.ConfidentialLedgerClient.delete_user_defined_role": "ConfidentialLedger.deleteUserDefinedRole"
+    }
+}

sdk/confidentialledger/azure-confidentialledger/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/confidentialledger/azure-confidentialledger",
-  "Tag": "python/confidentialledger/azure-confidentialledger_7025cb5b36"
+  "Tag": "python/confidentialledger/azure-confidentialledger_30ab71ea9a"
 }

sdk/confidentialledger/azure-confidentialledger/azure/confidentialledger/__init__.py

@@ -2,7 +2,7 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 # pylint: disable=wrong-import-position