systemlink-cli 2.1.0__tar.gz → 2.2.2__tar.gz

{systemlink_cli-2.1.0 → systemlink_cli-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 2.1.0
+Version: 2.2.2
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser

{systemlink_cli-2.1.0 → systemlink_cli-2.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "2.1.0"
+version = "2.2.2"
 description = "SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates."
 authors = ["Fred Visser <fred.visser@emerson.com>"]
 packages = [{ include = "slcli" }]

{systemlink_cli-2.1.0 → systemlink_cli-2.2.2}/slcli/_version.py

@@ -1,4 +1,4 @@
 """Version information for slcli."""
 
 # This file is auto-generated. Do not edit manually.
-__version__ = "2.1.0"
+__version__ = "2.2.2"

{systemlink_cli-2.1.0 → systemlink_cli-2.2.2}/slcli/managed_client/transport.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import socket
+import threading
 from collections import deque
 from dataclasses import dataclass
 from urllib.parse import urlsplit
@@ -12,6 +13,7 @@ from .protocol import MAX_FRAME_SIZE, MessagePackStream, SaltMessage
 
 DEFAULT_REQUEST_PORT = 4506
 DEFAULT_PUBLISH_PORT = 4505
+IDLE_RECEIVE_POLL_INTERVAL = 0.1
 
 
 @dataclass(frozen=True)
@@ -53,6 +55,7 @@ class SaltChannel:
         self._decoder = MessagePackStream(max_frame_size=max_frame_size)
         self._pending: deque[SaltMessage] = deque()
         self._closed = False
+        self._receive_lock = threading.RLock()
 
     @classmethod
     def connect(
@@ -80,7 +83,7 @@ class SaltChannel:
             raise TransportError("Unable to send a Salt message.") from error
 
     def receive(self, *, ignore_timeout: bool = False) -> SaltMessage:
-        """Read until one complete Salt MessagePack message is available."""
+        """Read a complete Salt message, polling for closure when ignoring timeouts."""
         if self._closed:
             raise TransportError("The Salt channel is closed.")
         if self._pending:
@@ -89,7 +92,23 @@ class SaltChannel:
             if self._closed:
                 raise TransportError("The Salt channel is closed.")
             try:
-                data = self._connection.recv(65536)
+                with self._receive_lock:
+                    if self._closed:
+                        raise TransportError("The Salt channel is closed.")
+                    if ignore_timeout:
+                        timeout = self._connection.gettimeout()
+                        self._connection.settimeout(
+                            IDLE_RECEIVE_POLL_INTERVAL
+                            if timeout is None
+                            else min(timeout, IDLE_RECEIVE_POLL_INTERVAL)
+                        )
+                        try:
+                            data = self._connection.recv(65536)
+                        finally:
+                            if not self._closed:
+                                self._connection.settimeout(timeout)
+                    else:
+                        data = self._connection.recv(65536)
             except socket.timeout as error:
                 if ignore_timeout:
                     continue
@@ -105,7 +124,7 @@ class SaltChannel:
                 return self._pending.popleft()
 
     def close(self) -> None:
-        """Close the socket and release its file descriptor."""
+        """Interrupt active reads before releasing the socket descriptor."""
         if self._closed:
             return
         self._closed = True
@@ -113,7 +132,8 @@ class SaltChannel:
             self._connection.shutdown(socket.SHUT_RDWR)
         except OSError:
             pass
-        try:
-            self._connection.close()
-        except OSError:
-            pass
+        with self._receive_lock:
+            try:
+                self._connection.close()
+            except OSError:
+                pass

{systemlink_cli-2.1.0 → systemlink_cli-2.2.2}/slcli/policy_click.py

@@ -18,6 +18,7 @@ from .policy_utils import (
     _format_template_list_row,
     _load_statements_from_file,
     _parse_properties_from_cli,
+    _validate_statements,
 )
 from .universal_handlers import FilteredResponse, UniversalResponseHandler
 from .utils import (
@@ -534,6 +535,86 @@ def register_policy_commands(cli: Any) -> None:
         except Exception as exc:
             handle_api_error(exc)
 
+    @template_group.command(name="update")
+    @click.argument("template_id")
+    @click.option("--name", type=str, default=None, help="New policy template name")
+    @click.option(
+        "--type",
+        "template_type",
+        type=click.Choice(["user", "service"], case_sensitive=False),
+        default=None,
+        help="New policy template type",
+    )
+    @click.option(
+        "--statements-file",
+        type=click.Path(exists=True, dir_okay=False),
+        default=None,
+        help='JSON file containing a statements list or an object with a "statements" list',
+    )
+    @click.option(
+        "--properties",
+        "-p",
+        multiple=True,
+        help="Updated custom properties as key=value (repeatable)",
+    )
+    @click.option(
+        "--format",
+        "-f",
+        type=click.Choice(["table", "json"]),
+        default="table",
+        show_default=True,
+        help="Output format",
+    )
+    def update_template(
+        template_id: str,
+        name: Optional[str],
+        template_type: Optional[str],
+        statements_file: Optional[str],
+        properties: Tuple[str, ...],
+        format: str,
+    ) -> None:
+        """Update selected fields on a reusable policy template."""
+        from .utils import check_readonly_mode
+
+        check_readonly_mode("update a policy template")
+
+        try:
+            payload: Dict[str, Any] = {}
+            if name is not None:
+                payload["name"] = name
+            if template_type is not None:
+                payload["type"] = template_type.lower()
+            if statements_file is not None:
+                statements = _load_statements_from_file(statements_file)
+                is_valid, error_message = _validate_statements(
+                    statements,
+                    require_workspace=False,
+                )
+                if not is_valid:
+                    raise ValueError(error_message or "Invalid statements")
+                payload["statements"] = statements
+            if properties:
+                payload["properties"] = _parse_properties_from_cli(properties)
+            if not payload:
+                raise ValueError("At least one update option is required")
+        except ValueError as exc:
+            click.echo(f"✗ Error: {exc}", err=True)
+            sys.exit(ExitCodes.INVALID_INPUT)
+
+        try:
+            url = f"{get_base_url()}/niauth/v1/policy-templates/{template_id}"
+            current_template = make_api_request("GET", url, payload=None).json()
+            merged_payload = {
+                field: current_template[field]
+                for field in ("name", "type", "statements", "properties")
+                if field in current_template
+            }
+            merged_payload.update(payload)
+            resp = make_api_request("PUT", url, payload=merged_payload)
+            _display_template_details(resp.json(), format)
+        except Exception as exc:
+            handle_api_error(exc)
+
     @template_group.command(name="list")
     @click.option(
         "--type",

{systemlink_cli-2.1.0 → systemlink_cli-2.2.2}/slcli/skills/slcli/references/commands.md

@@ -746,6 +746,7 @@ slcli auth policy diff <POLICY_ID_1> <POLICY_ID_2>  # Compare two policies
 # Policy templates
 slcli auth template list [-t INT] [-f json]
 slcli auth template create --name TEXT --statements-file PATH [--type user|service] [-p KEY=VALUE] [-f json]
+slcli auth template update TEMPLATE_ID [--name TEXT] [--type user|service] [--statements-file PATH] [-p KEY=VALUE] [-f json]
 slcli auth template get <TEMPLATE_ID> [-f json]
 slcli auth template delete <TEMPLATE_ID>
 ```
@@ -759,6 +760,10 @@ or an object with a `statements` array, for example:
 [{"actions": ["testresult:Read"], "resource": ["*"]}]
 ```
 
+`auth template update` fetches the current template and preserves unspecified
+fields before sending `PUT /niauth/v1/policy-templates/{template-id}`.
+Supplied statements and properties replace their existing values.
+
 Workspace fields are not required. Properties are repeatable string-valued
 `key=value` pairs. JSON output returns the full created template, including
 its ID. Apply that ID to a workspace using `auth policy create TEMPLATE_ID