Remove generic command assert and wait plugins

Author: marcofortina

docs/guides/ssh-smoke.md

@@ -48,8 +48,8 @@ remote user. It covers:
 - `fs.find`, `fs.chmod`, `fs.remove`
 - `archive.tar`, `archive.untar`, `archive.zip`, `archive.unzip`
 - `transfer.upload`, `transfer.download`, `transfer.sync`
-- `wait.command`, `wait.file`, `wait.path`, `wait.process`
-- `assert.command`, `assert.file`, `assert.path`, `assert.disk`, `assert.tcp`
+- `wait.file`, `wait.path`, `wait.process`
+- `assert.file`, `assert.path`, `assert.disk`, `assert.tcp`
 - artifact capture for stdout/stderr/data
 - resume helpers through the normal run state store
 

docs/plugins/generated.md

@@ -581,41 +581,6 @@ with:
 
 ## assert
 
-### `assert.command`
-
-Assert that a remote command matches the requested condition.
-
-- Remote session: `true`
-- Dry-run support: `true`
-- Check mode support: `false`
-
-| Parameter | Required | Type | Default | Description |
-|---|---:|---|---|---|
-| `command` | yes | `string` |  | Command line to execute. |
-| `rc` | no | `integer` | `0` | Expected process return code. |
-| `equals` | no | `string` |  | Expected stdout value after trimming whitespace. |
-| `contains` | no | `string` |  | Required substring in stdout or HTTP response body. |
-| `not_contains` | no | `string` |  | Substring that must not appear in stdout. |
-| `sudo` | no | `boolean` | `False` | Run the remote operation through sudo -n when supported. |
-| `get_pty` | no | `boolean` | `False` | Request a pseudo-terminal for the remote command. |
-
-Result fields:
-
-- `changed`: Whether the plugin changed the target or controller state.
-- `message`: Human-readable result message.
-- `rc`: Process or command return code when applicable.
-- `stdout`: Captured standard output when applicable.
-- `stderr`: Captured standard error when applicable.
-- `data`: Plugin-specific structured result data.
-
-Example:
-
-```yaml
-use: assert.command
-with:
-  command: echo automax
-```
-
 ### `assert.disk`
 
 Assert remote disk capacity thresholds.
@@ -11320,43 +11285,6 @@ with:
 
 ## wait
 
-### `wait.command`
-
-Wait until a remote command matches the requested condition.
-
-- Remote session: `true`
-- Dry-run support: `true`
-- Check mode support: `false`
-
-| Parameter | Required | Type | Default | Description |
-|---|---:|---|---|---|
-| `command` | yes | `string` |  | Command line to execute. |
-| `timeout` | no | `number` |  | Operation timeout in seconds. |
-| `interval` | no | `number` | `2` | Polling interval in seconds. |
-| `rc` | no | `integer` | `0` | Expected process return code. |
-| `equals` | no | `string` |  | Expected stdout value after trimming whitespace. |
-| `contains` | no | `string` |  | Required substring in stdout or HTTP response body. |
-| `not_contains` | no | `string` |  | Substring that must not appear in stdout. |
-| `sudo` | no | `boolean` | `False` | Run the remote operation through sudo -n when supported. |
-| `get_pty` | no | `boolean` | `False` | Request a pseudo-terminal for the remote command. |
-
-Result fields:
-
-- `changed`: Whether the plugin changed the target or controller state.
-- `message`: Human-readable result message.
-- `rc`: Process or command return code when applicable.
-- `stdout`: Captured standard output when applicable.
-- `stderr`: Captured standard error when applicable.
-- `data`: Plugin-specific structured result data.
-
-Example:
-
-```yaml
-use: wait.command
-with:
-  command: echo automax
-```
-
 ### `wait.file`
 
 Wait until a remote file condition is true.

docs/plugins/index.md

@@ -34,7 +34,6 @@ archive.tar
 archive.untar
 archive.unzip
 archive.zip
-assert.command
 assert.disk
 assert.file
 assert.path
@@ -205,6 +204,7 @@ network.bond
 network.bridge
 network.dns
 network.dns_assert
+network.dns_facts
 network.interface
 network.link_assert
 network.port_check
@@ -261,8 +261,6 @@ process.kill
 process.signal
 process.wait
 remote.command
-network.dns
-network.dns_facts
 secret.redact_assert
 secret.scan_output
 secret.scan_preview
@@ -348,12 +346,10 @@ user.remove
 user.set_password
 user.shell_assert
 user.unlock
-wait.command
 wait.file
 wait.path
 wait.process
 wait.tcp
-
 ```
 
 ## Manuals by category

docs/plugins/wait-assert.md

@@ -31,29 +31,6 @@ TCP checks run from the controller.
     port: 443
 ```
 
-## `wait.command` and `assert.command`
-
-Command checks run on the remote target.
-
-```yaml
-- id: wait_service_active
-  use: wait.command
-  with:
-    command: "systemctl is-active nginx"
-    equals: active
-    timeout: 120
-    interval: 5
-    sudo: true
-
-- id: assert_version
-  use: assert.command
-  with:
-    command: "/opt/myapp/bin/myapp --version"
-    contains: "{{ vars.version }}"
-```
-
-Supported expectations are `rc`, `equals`, `contains` and `not_contains`.
-
 ## `wait.file`, `wait.path`, `assert.file`, `assert.path`
 
 Remote file/path checks.

examples/runbooks/RUNBOOK_INDEX.md

@@ -7,7 +7,7 @@ Per-plugin runbooks only. No combined runbook, no reused runtime smoke flow, and
 | `runbooks/01-alternatives.check.yaml` | `alternatives` | 3 |
 | `runbooks/02-apparmor.check.yaml` | `apparmor` | 8 |
 | `runbooks/03-archive.check.yaml` | `archive` | 6 |
-| `runbooks/04-assert.check.yaml` | `assert` | 5 |
+| `runbooks/04-assert.check.yaml` | `assert` | 4 |
 | `runbooks/05-auditd.check.yaml` | `auditd` | 8 |
 | `runbooks/06-authselect.check.yaml` | `authselect` | 1 |
 | `runbooks/07-backup.check.yaml` | `backup` | 9 |
@@ -68,4 +68,4 @@ Per-plugin runbooks only. No combined runbook, no reused runtime smoke flow, and
 | `runbooks/63-udev.check.yaml` | `udev` | 7 |
 | `runbooks/64-ufw.check.yaml` | `ufw` | 6 |
 | `runbooks/65-user.check.yaml` | `user` | 11 |
-| `runbooks/66-wait.check.yaml` | `wait` | 5 |
+| `runbooks/66-wait.check.yaml` | `wait` | 4 |

examples/runbooks/runbooks/04-assert.check.yaml

@@ -14,10 +14,6 @@ tasks:
   steps:
   - id: catalog
     substeps:
-    - id: assert_command
-      use: assert.command
-      with:
-        command: echo automax
     - id: assert_disk
       use: assert.disk
       with:

examples/runbooks/runbooks/66-wait.check.yaml

@@ -14,10 +14,6 @@ tasks:
   steps:
   - id: catalog
     substeps:
-    - id: wait_command
-      use: wait.command
-      with:
-        command: echo automax
     - id: wait_file
       use: wait.file
       with:

scripts/ssh-smoke.sh

@@ -111,11 +111,6 @@ tasks:
               ssh_smoke_output: stdout.trim
             artifacts:
               stdout: core/read-marker.txt
-          - id: assert_marker
-            use: assert.command
-            with:
-              command: "cat result.txt"
-              equals: automax-ssh-ok
           - id: exists_marker
             use: fs.exists
             with:
@@ -255,13 +250,6 @@ tasks:
               type: directory
               timeout: 10
               interval: 1
-          - id: wait_command
-            use: wait.command
-            with:
-              command: "cat ${WORK_DIR}/result.txt"
-              contains: line=new
-              timeout: 10
-              interval: 1
           - id: start_background_process
             use: remote.command
             with:

src/automax/plugins/manual_preview.py

@@ -133,8 +133,6 @@ def fallback_manual_commands(plugin_name: str, params: Dict[str, Any], context:
         return [f"{sudo}aa-status"]
 
     if plugin_name.startswith("assert."):
-        if plugin_name == "assert.command":
-            return [str(params.get("command", "true"))]
         if plugin_name in {"assert.file", "assert.path"}:
             return [f"test -e {_q(path)}"]
         if plugin_name == "assert.disk":
@@ -312,8 +310,6 @@ def fallback_manual_commands(plugin_name: str, params: Dict[str, Any], context:
     if plugin_name.startswith("wait."):
         timeout = params.get("timeout", 60)
         interval = params.get("interval", 2)
-        if plugin_name == "wait.command":
-            return [f"timeout {_q(timeout)} sh -c 'until {params.get('command', 'true')}; do sleep {_q(interval)}; done'"]
         if plugin_name in {"wait.file", "wait.path"}:
             return [f"timeout {_q(timeout)} sh -c 'until test -e {_q(path)}; do sleep {_q(interval)}; done'"]
         if plugin_name == "wait.process":

src/automax/plugins/registry.py

@@ -198,12 +198,10 @@ def build_builtin_registry(extra_plugin_paths: Iterable[str] = ()) -> PluginRegi
     )
     from automax.plugins.http import HttpAssertPlugin, HttpRequestPlugin, HttpWaitPlugin
     from automax.plugins.wait_assert import (
-        AssertCommandPlugin,
         AssertDiskPlugin,
         AssertFilePlugin,
         AssertPathPlugin,
         AssertTcpPlugin,
-        WaitCommandPlugin,
         WaitFilePlugin,
         WaitPathPlugin,
         WaitProcessPlugin,
@@ -512,12 +510,10 @@ def build_builtin_registry(extra_plugin_paths: Iterable[str] = ()) -> PluginRegi
         FactsServicesPlugin(),
         PlatformFactsPlugin(),
         WaitTcpPlugin(),
-        WaitCommandPlugin(),
         WaitFilePlugin(),
         WaitPathPlugin(),
         WaitProcessPlugin(),
         AssertTcpPlugin(),
-        AssertCommandPlugin(),
         AssertFilePlugin(),
         AssertPathPlugin(),
         AssertDiskPlugin(),