edge-containers-cli 4.0.0__tar.gz → 4.1.0__tar.gz

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 4.0.0
+Version: 4.1.0
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/__main__.py

@@ -23,15 +23,22 @@ def version_callback(value: bool):
 
 def backend_callback(ctx: typer.Context, backend: ECBackends):
     init_backend(backend)
+
     # Dynamically drop any method not implemented
     not_implemented = [
-        mthd.replace("_", "-") for mthd in ec_backend.get_notimplemented()
+        mthd.replace("_", "-") for mthd in ec_backend.get_notimplemented_cmds()
     ]
+    typer_commands = ctx.command.commands  # type: ignore
     for command in not_implemented:
-        typer_commands = ctx.command.commands  # type: ignore
         if command in typer_commands:
             typer_commands.pop(command)
 
+    # Dynamically drop any cli options as specified
+    for cmd_name, drop_params in ec_backend.get_notimplemented_params().items():
+        for index, param in enumerate(typer_commands[cmd_name].params):
+            if param.name in drop_params:
+                typer_commands[cmd_name].params.pop(index)
+
     return backend.value
 
 

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.0.0'
-__version_tuple__ = version_tuple = (4, 0, 0)
+__version__ = version = '4.1.0'
+__version_tuple__ = version_tuple = (4, 1, 0)

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/backend.py

@@ -20,6 +20,13 @@ class Backend:
         self._Commands: type | None = None
         self._commands: Commands | None = None
 
+    @property
+    def Commands(self):
+        if self._Commands is None:
+            raise BackendError("Backend commands not set")
+        else:
+            return self._Commands
+
     @property
     def commands(self):
         if self._commands is None:
@@ -44,7 +51,7 @@ class Backend:
             self._cxt = context
             self._commands = self._Commands(context)
 
-    def get_notimplemented(self) -> list[str]:
+    def get_notimplemented_cmds(self) -> list[str]:
         notimplemented = []
         if self._Commands is None:
             return []
@@ -54,6 +61,9 @@ class Backend:
                     notimplemented.append(command)
         return notimplemented
 
+    def get_notimplemented_params(self) -> dict[str, list[str]]:
+        return self.Commands.params_opt_out
+
 
 backend = Backend()
 

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/cli.py

@@ -234,9 +234,14 @@ def start(
     service_name: str = typer.Argument(
         ..., help="Name of the service container to start", autocompletion=all_svc
     ),
+    temp: bool = typer.Option(False, help="Directly overrides the controller values"),
 ):
     """Start a service"""
-    backend.commands.start(service_name)
+    try:
+        backend.commands.start(service_name, temp)
+    except GitError as e:
+        msg = f"{str(e)} - Try 'ec start <service> --temp' to bypass the git server"
+        raise GitError(msg) from e
 
 
 @cli.command()
@@ -246,9 +251,14 @@ def stop(
         help="Name of the service container to stop",
         autocompletion=running_svc,
     ),
+    temp: bool = typer.Option(False, help="Directly overrides the controller values"),
 ):
     """Stop a service"""
-    backend.commands.stop(service_name)
+    try:
+        backend.commands.stop(service_name, temp)
+    except GitError as e:
+        msg = f"{str(e)} - Try ec stop <service> --temp to bypass the git server"
+        raise GitError(msg) from e
 
 
 @cli.command()

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/cmds/argo_commands.py

@@ -6,12 +6,14 @@ Relies on the Helm class for deployment aspects.
 
 import webbrowser
 from datetime import datetime
+from pathlib import Path
 
 import polars
 from ruamel.yaml import YAML
 
 from edge_containers_cli.cmds.commands import CommandError, Commands, ServicesDataFrame
 from edge_containers_cli.definitions import ECContext
+from edge_containers_cli.git import set_values
 from edge_containers_cli.globals import TIME_FORMAT
 from edge_containers_cli.shell import ShellError, shell
 
@@ -21,6 +23,36 @@ def extract_ns_app(target: str) -> tuple[str, str]:
     return namespace, app
 
 
+def patch_value(target: str, key: str, value: str | bool | int):
+    cmd_temp_ = f"argocd app set {target} -p {key}={value}"
+    shell.run_command(cmd_temp_, skip_on_dryrun=True)
+    cmd_sync = f"argocd app sync {target} --apply-out-of-sync-only"
+    shell.run_command(cmd_sync, skip_on_dryrun=True)
+
+
+def push_value(target: str, key: str, value: str | bool | int):
+    # Get source details
+    app_resp = shell.run_command(
+        f"argocd app get {target} -o yaml",
+    )
+    app_dicts = YAML(typ="safe").load(app_resp)
+    repo_url = app_dicts["spec"]["source"]["repoURL"]
+    path = Path(app_dicts["spec"]["source"]["path"])
+
+    set_values(
+        repo_url,
+        path / "values.yaml",
+        key,
+        value,
+    )
+
+    # Sync & release a possible patched value
+    cmd_sync = f"argocd app sync {target} --apply-out-of-sync-only"
+    shell.run_command(cmd_sync, skip_on_dryrun=True)
+    cmd_unset = f"argocd app unset {target} -p {key}"
+    shell.run_command(cmd_unset, skip_on_dryrun=True)
+
+
 class ArgoCommands(Commands):
     """
     A class for implementing the Kubernetes based commands
@@ -52,17 +84,19 @@ class ArgoCommands(Commands):
         )
         shell.run_command(cmd, skip_on_dryrun=True)
 
-    def start(self, service_name):
+    def start(self, service_name, temp):
         self._check_service(service_name)
-        namespace, app = extract_ns_app(self.target)
-        cmd = f"argocd app set {namespace}/{service_name} -p global.enabled=true"
-        shell.run_command(cmd, skip_on_dryrun=True)
+        if temp:
+            patch_value(self.target, f"ec_services.{service_name}.enabled", True)
+        else:
+            push_value(self.target, f"ec_services.{service_name}.enabled", True)
 
-    def stop(self, service_name):
+    def stop(self, service_name, temp):
         self._check_service(service_name)
-        namespace, app = extract_ns_app(self.target)
-        cmd = f"argocd app set {namespace}/{service_name} -p global.enabled=false"
-        shell.run_command(cmd, skip_on_dryrun=True)
+        if temp:
+            patch_value(self.target, f"ec_services.{service_name}.enabled", False)
+        else:
+            push_value(self.target, f"ec_services.{service_name}.enabled", False)
 
     def _get_logs(self, service_name, prev) -> str:
         namespace, app = extract_ns_app(self.target)

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/cmds/commands.py

@@ -39,6 +39,8 @@ class Commands(ABC):
     Methods not exposed to the CLI should be private
     """
 
+    params_opt_out: dict[str, list[str]] = {}
+
     def __init__(self, ctx: ECContext):
         self._target = ctx.target
         self._target_valid = False
@@ -72,50 +74,50 @@ class Commands(ABC):
             log.debug("log_url = %s", self._log_url)
             return self._log_url
 
-    def attach(self, service_name: str):
+    def attach(self, service_name: str) -> None:
         raise NotImplementedError
 
-    def delete(self, service_name: str):
+    def delete(self, service_name: str) -> None:
         raise NotImplementedError
 
-    def deploy(self, service_name: str, version: str, args: str):
+    def deploy(self, service_name: str, version: str, args: str) -> None:
         raise NotImplementedError
 
-    def deploy_local(self, svc_instance: Path, args: str):
+    def deploy_local(self, svc_instance: Path, args: str) -> None:
         raise NotImplementedError
 
-    def exec(self, service_name: str):
+    def exec(self, service_name: str) -> None:
         raise NotImplementedError
 
-    def logs(self, service_name: str, prev: bool):
+    def logs(self, service_name: str, prev: bool) -> None:
         raise NotImplementedError
 
-    def log_history(self, service_name: str):
+    def log_history(self, service_name: str) -> None:
         raise NotImplementedError
 
-    def ps(self, running_only: bool):
+    def ps(self, running_only: bool) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def restart(self, service_name: str):
+    def restart(self, service_name: str) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def start(self, service_name: str):
+    def start(self, service_name: str, temp: bool) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def stop(self, service_name: str):
+    def stop(self, service_name: str, temp: bool) -> None:
         raise NotImplementedError
 
-    def template(self, svc_instance: Path, args: str):
+    def template(self, svc_instance: Path, args: str) -> None:
         raise NotImplementedError
 
     @abstractmethod
     def _get_services(self, running_only: bool) -> ServicesDataFrame:
         raise NotImplementedError
 
-    def _ps(self, running_only: bool):
+    def _ps(self, running_only: bool) -> None:
         services_df = self._get_services(running_only)
         print(services_df)
 
@@ -123,19 +125,19 @@ class Commands(ABC):
     def _get_logs(self, service_name: str, prev: bool) -> str:
         raise NotImplementedError
 
-    def _logs(self, service_name: str, prev: bool):
+    def _logs(self, service_name: str, prev: bool) -> None:
         print(self._get_logs(service_name, prev))
 
-    def _validate_target(self):
+    def _validate_target(self) -> None:
         raise NotImplementedError
 
-    def _running_services(self):
+    def _running_services(self) -> list[str]:
         return self._get_services(running_only=True)["name"].to_list()
 
-    def _all_services(self):
+    def _all_services(self) -> list[str]:
         return self._get_services(running_only=False)["name"].to_list()
 
-    def _check_service(self, service_name: str):
+    def _check_service(self, service_name: str) -> None:
         services_list = self._get_services(running_only=False)["name"]
         if service_name in services_list:
             pass

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/cmds/k8s_commands.py

@@ -23,6 +23,11 @@ class K8sCommands(Commands):
     A class for implementing the Kubernetes based commands
     """
 
+    params_opt_out = {
+        "stop": ["temp"],
+        "start": ["temp"],
+    }
+
     def __init__(
         self,
         ctx: ECContext,
@@ -84,14 +89,14 @@ class K8sCommands(Commands):
             f"kubectl delete -n {self.target} {pod_name}", skip_on_dryrun=True
         )
 
-    def start(self, service_name):
+    def start(self, service_name, temp):
         self._check_service(service_name)
         shell.run_command(
             f"kubectl scale -n {self.target} statefulset {service_name} --replicas=1",
             skip_on_dryrun=True,
         )
 
-    def stop(self, service_name):
+    def stop(self, service_name, temp):
         self._check_service(service_name)
         shell.run_command(
             f"kubectl scale -n {self.target} statefulset {service_name} --replicas=0 ",

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/cmds/monitor.py

@@ -446,7 +446,7 @@ class MonitorApp(App):
         def check_start(start: bool | None) -> None:
             """Called when StartScreen is dismissed."""
             if start:
-                self.commands.start(service_name)
+                self.commands.start(service_name, False)
 
         self.push_screen(StartScreen(service_name), check_start)
 
@@ -457,7 +457,7 @@ class MonitorApp(App):
         def check_stop(stop: bool | None) -> None:
             """Called when StopScreen is dismissed."""
             if stop:
-                self.commands.stop(service_name)
+                self.commands.stop(service_name, False)
 
         self.push_screen(StopScreen(service_name), check_stop)
 

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/git.py

@@ -9,14 +9,40 @@ import polars
 from natsort import natsorted
 
 from edge_containers_cli.logging import log
-from edge_containers_cli.shell import shell
-from edge_containers_cli.utils import chdir, new_workdir
+from edge_containers_cli.shell import ShellError, shell
+from edge_containers_cli.utils import YamlFile, chdir, new_workdir
 
 
 class GitError(Exception):
     pass
 
 
+def set_values(repo_url: str, file: Path, key: str, value: str | bool | int) -> None:
+    """
+    sets an existing key value pair in a yaml file and push the changes
+    """
+    with new_workdir() as path:
+        try:
+            shell.run_command(f"git clone --depth=1 {repo_url} {path}")
+            with chdir(path):  # From python 3.11 can use contextlib.chdir(working_dir)
+                file_data = YamlFile(file)
+
+                value_repo = file_data.get_key(key)
+                if value_repo == value:
+                    log.debug(f"{key} already set as {value}")
+                else:
+                    file_data.set_key(key, value)
+                    file_data.dump_file()
+
+                    commit_msg = f"Set {key}={value} in {file}"
+                    shell.run_command("git add .")
+                    shell.run_command(f'git commit -m "{commit_msg}"')
+                    shell.run_command("git push", skip_on_dryrun=True)
+
+        except (FileNotFoundError, ShellError) as e:
+            raise GitError(str(e)) from e
+
+
 def create_version_map(
     repo: str, root_dir: Path, working_dir: Path, shared: list[str] | None = None
 ) -> dict[str, list[str]]:

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli/utils.py

@@ -12,6 +12,8 @@ from datetime import datetime
 from pathlib import Path
 from typing import TypeVar
 
+from ruamel.yaml import YAML
+
 import edge_containers_cli.globals as globals
 from edge_containers_cli.logging import log
 
@@ -112,3 +114,46 @@ def read_cached_dict(cache_folder: Path, cache_file: str) -> dict:
                 read_dict = json.load(f)
 
     return read_dict
+
+
+class YamlFile:
+    def __init__(self, file: Path) -> None:
+        self.file = file
+        self._processor = YAML(typ="rt")  # 'rt' slower but preserves comments
+        with open(file) as fp:
+            self._yaml_data = self._processor.load(fp)
+
+    def dump_file(self, output_path: Path | None = None):
+        with open(output_path if output_path else self.file, "wb") as file_w:
+            self._processor.dump(self._yaml_data, file_w)
+
+    def get_key(self, key_path: str) -> str | bool | int | None:
+        curser = self._yaml_data
+        for key in key_path.split("."):
+            try:
+                curser = curser[key]
+            except KeyError:
+                log.debug(f"Entry '{key}' in '{key_path}' not found")
+                return None
+        return curser
+
+    def set_key(self, key_path: str, value: str | bool | int):
+        curser = self._yaml_data
+        keys = key_path.split(".")
+        element = keys[-1]
+
+        # Iterate through mappings to element - Entries must exist
+        for key in keys:
+            if key is element:
+                break  # Keep dict as pointer
+            curser = curser[key]
+
+        # Set element if exists or create it
+        try:
+            curser[element] = type(curser[element])(value)  # Preserve type
+        except KeyError:
+            # Create element if does not exist
+            log.debug(f"Entry '{element}' in '{key_path}' not found - Creating")
+            curser[element] = value
+
+        log.debug(f"Set '{element}' in '{key_path}' to {value}")

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 4.0.0
+Version: 4.1.0
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/src/edge_containers_cli.egg-info/SOURCES.txt

@@ -78,19 +78,22 @@ tests/conftest.py
 tests/test_argocd.py
 tests/test_cli.py
 tests/test_k8s.py
+tests/test_unit.py
 tests/data/argocd.yaml
 tests/data/cli.yaml
 tests/data/k8s.yaml
-tests/data/bl01t/services/values.yaml
-tests/data/bl01t/services/bl01t-ea-test-01/Chart.yaml
-tests/data/bl01t/services/bl01t-ea-test-01/values.yaml
-tests/data/bl01t/services/bl01t-ea-test-01/config/ioc.db
-tests/data/bl01t/services/bl01t-ea-test-01/config/ioc.yaml
-tests/data/bl01t/services/bl01t-ea-test-01/templates/configmap.yaml
-tests/data/bl01t/services/bl01t-ea-test-02/Chart.yaml
-tests/data/bl01t/services/bl01t-ea-test-02/values.yaml
-tests/data/bl01t/services/bl01t-ea-test-02/charts/dls-aravis
-tests/data/bl01t/services/dls-aravis/Chart.yaml
-tests/data/bl01t/services/dls-aravis/values.yaml
-tests/data/bl01t/services/dls-aravis/config/ioc.yaml
-tests/data/bl01t/services/dls-aravis/templates/configmap.yaml
+tests/data/yaml.yaml
+tests/data/bl01t-deployment/apps/values.yaml
+tests/data/bl01t-services/services/values.yaml
+tests/data/bl01t-services/services/bl01t-ea-test-01/Chart.yaml
+tests/data/bl01t-services/services/bl01t-ea-test-01/values.yaml
+tests/data/bl01t-services/services/bl01t-ea-test-01/config/ioc.db
+tests/data/bl01t-services/services/bl01t-ea-test-01/config/ioc.yaml
+tests/data/bl01t-services/services/bl01t-ea-test-01/templates/configmap.yaml
+tests/data/bl01t-services/services/bl01t-ea-test-02/Chart.yaml
+tests/data/bl01t-services/services/bl01t-ea-test-02/values.yaml
+tests/data/bl01t-services/services/bl01t-ea-test-02/charts/dls-aravis
+tests/data/bl01t-services/services/dls-aravis/Chart.yaml
+tests/data/bl01t-services/services/dls-aravis/values.yaml
+tests/data/bl01t-services/services/dls-aravis/config/ioc.yaml
+tests/data/bl01t-services/services/dls-aravis/templates/configmap.yaml

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/tests/conftest.py

@@ -179,7 +179,7 @@ def K8S(mocker, data):
             "EC_LOG_URL": "https://graylog2.diamond.ac.uk/{service_name}*",
             "EC_TARGET": "bl01t",
             "EC_CLI_BACKEND": "K8S",
-            "EC_SERVICES_REPO": "https://github.com/epics-containers/bl01t",
+            "EC_SERVICES_REPO": "https://github.com/epics-containers/bl01t-services",
         },
     )
     file = Path(__file__).parent / "data" / "k8s.yaml"

edge_containers_cli-4.1.0/tests/data/argocd.yaml

@@ -0,0 +1,83 @@
+checks:
+  - cmd: argocd app get namespace/bl01t
+    rsp: ""
+  - cmd: argocd app list -l "ec_service=true" --app-namespace namespace -o yaml
+    rsp: |
+      - metadata:
+          creationTimestamp: "2024-07-12T13:42:50Z"
+          name: bl01t-ea-test-01
+        spec:
+          source:
+            targetRevision: main
+        status:
+          resources:
+            - kind: StatefulSet
+              name: bl01t-ea-test-01
+  - cmd: argocd app manifests namespace/bl01t-ea-test-01 --source live
+    rsp: |
+      ---
+      apiVersion: apps/v1
+      kind: StatefulSet
+      metadata:
+        name: bl01t-ea-test-01
+        creationTimestamp: "2024-07-12T13:52:35Z"
+      status:
+        readyReplicas: 1
+
+logs:
+  - cmd: argocd app logs namespace/bl01t-ea-test-01
+    rsp: ""
+
+log_history:
+  - cmd: https://graylog2.diamond.ac.uk/bl01t-ea-test-01*
+    rsp: True
+
+restart:
+  - cmd: argocd app delete-resource namespace/bl01t-ea-test-01 --kind StatefulSet
+    rsp: ""
+
+start:
+  - cmd: argocd app get namespace/bl01t -o yaml
+    rsp: |
+      spec:
+        source:
+          repoURL: https://github.com/test/example-deployment.git
+          path: apps
+  - cmd: git clone --depth=1 https://github.com/test/example-deployment.git /tmp/ec_tests
+    rsp: ""
+  - cmd: git add .
+    rsp: ""
+  - cmd: git commit -m "Set ec_services.bl01t-ea-test-01.enabled=True in apps/values.yaml"
+    rsp: ""
+  - cmd: git push
+    rsp: ""
+  - cmd: argocd app sync namespace/bl01t --apply-out-of-sync-only
+    rsp: ""
+  - cmd: argocd app unset namespace/bl01t -p ec_services.bl01t-ea-test-01.enabled
+    rsp: ""
+
+start_temp:
+  - cmd: argocd app set namespace/bl01t -p ec_services.bl01t-ea-test-01.enabled=True
+    rsp: ""
+  - cmd: argocd app sync namespace/bl01t --apply-out-of-sync-only
+    rsp: ""
+
+stop:
+  - cmd: argocd app get namespace/bl01t -o yaml
+    rsp: |
+      spec:
+        source:
+          repoURL: https://github.com/test/example-deployment.git
+          path: apps
+  - cmd: git clone --depth=1 https://github.com/test/example-deployment.git /tmp/ec_tests
+    rsp: ""
+  - cmd: argocd app sync namespace/bl01t --apply-out-of-sync-only
+    rsp: ""
+  - cmd: argocd app unset namespace/bl01t -p ec_services.bl01t-ea-test-01.enabled
+    rsp: ""
+
+stop_temp:
+  - cmd: argocd app set namespace/bl01t -p ec_services.bl01t-ea-test-01.enabled=False
+    rsp: ""
+  - cmd: argocd app sync namespace/bl01t --apply-out-of-sync-only
+    rsp: ""

edge_containers_cli-4.1.0/tests/data/bl01t-deployment/apps/values.yaml

@@ -0,0 +1,3 @@
+ec_services:
+  bl01t-ea-test-01:
+    enabled: false

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/tests/data/k8s.yaml

@@ -28,7 +28,7 @@ delete:
     rsp: ""
 
 template:
-  - cmd: 'helm package .*\/tests\/data\/bl01t\/services\/bl01t-ea-test-01 -u --app-version .*'
+  - cmd: 'helm package .*\/tests\/data\/bl01t-services\/services\/bl01t-ea-test-01 -u --app-version .*'
     rsp: ""
   - cmd: 'helm template bl01t-ea-test-01 .*\.tgz --values .*values.yaml  --values .*values.yaml   --debug *'
     rsp: |
@@ -37,7 +37,7 @@ template:
       ...
 
 deploy_local:
-  - cmd: 'helm package .*\/tests\/data\/bl01t\/services\/bl01t-ea-test-01 -u --app-version .*'
+  - cmd: 'helm package .*\/tests\/data\/bl01t-services\/services\/bl01t-ea-test-01 -u --app-version .*'
     rsp: ""
   - cmd: 'helm upgrade --install bl01t-ea-test-01 .*\.tgz --values .*values.yaml  --values .*values.yaml --namespace bl01t *'
     rsp: ""
@@ -45,7 +45,7 @@ deploy_local:
 deploy:
   - cmd: kubectl get namespace bl01t
     rsp: ""
-  - cmd: git clone https://github.com/epics-containers/bl01t /tmp/ec_tests --depth=1 --single-branch --branch=2.0
+  - cmd: git clone https://github.com/epics-containers/bl01t-services /tmp/ec_tests --depth=1 --single-branch --branch=2.0
     rsp: ""
   - cmd: helm package /tmp/ec_tests/services/bl01t-ea-test-01 -u --app-version 2.0
     rsp: ""

edge_containers_cli-4.1.0/tests/data/yaml.yaml

@@ -0,0 +1,12 @@
+# Trunk comment
+trunk_A:
+  # branch comment
+  branch_A:
+    leaf_A: 0 # Leaf comment
+    leaf_B: zero
+
+trunk_B:
+  leaf_B: true # Out of order
+  leaf_A: false # Comment before space
+
+leaf_A: "False"

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/tests/test_argocd.py

@@ -1,3 +1,9 @@
+import shutil
+from pathlib import Path
+
+from tests.conftest import TMPDIR
+
+
 def test_logs(mock_run, ARGOCD):
     mock_run.set_seq(ARGOCD.checks + ARGOCD.logs)
     mock_run.run_cli("logs bl01t-ea-test-01")
@@ -13,16 +19,30 @@ def test_restart(mock_run, ARGOCD):
     mock_run.run_cli("restart bl01t-ea-test-01")
 
 
-def test_start(mock_run, ARGOCD):
+def test_start(mock_run, ARGOCD, data: Path):
     mock_run.set_seq(ARGOCD.checks + ARGOCD.start)
+    TMPDIR.mkdir()
+    shutil.copytree(data / "bl01t-deployment/apps", TMPDIR / "apps")
     mock_run.run_cli("start bl01t-ea-test-01")
 
 
-def test_stop(mock_run, ARGOCD):
+def test_start_temp(mock_run, ARGOCD):
+    mock_run.set_seq(ARGOCD.checks + ARGOCD.start_temp)
+    mock_run.run_cli("start bl01t-ea-test-01 --temp")
+
+
+def test_stop(mock_run, ARGOCD, data: Path):
     mock_run.set_seq(ARGOCD.checks + ARGOCD.stop)
+    TMPDIR.mkdir()
+    shutil.copytree(data / "bl01t-deployment/apps", TMPDIR / "apps")
     mock_run.run_cli("stop bl01t-ea-test-01")
 
 
+def test_stop_temp(mock_run, ARGOCD):
+    mock_run.set_seq(ARGOCD.checks + ARGOCD.stop_temp)
+    mock_run.run_cli("stop bl01t-ea-test-01 --temp")
+
+
 def test_ps(mock_run, ARGOCD):
     expect = (
         "| name             | version | ready | deployed             |\n"

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/tests/test_cli.py

@@ -23,7 +23,7 @@ def test_list(mock_run, CLI, data: Path):
     mock_run.set_seq(CLI.instances)
     # prep what instances expects to find after it cloned bl01t repo
     TMPDIR.mkdir()
-    shutil.copytree(data / "bl01t/services", TMPDIR / "services")
+    shutil.copytree(data / "bl01t-services/services", TMPDIR / "services")
     res = mock_run.run_cli("list")
 
     assert res == expect
@@ -39,6 +39,6 @@ def test_instances(mock_run, CLI, data: Path):
     mock_run.set_seq(CLI.instances)
     # prep what instances expects to find after it cloned bl01t repo
     TMPDIR.mkdir()
-    shutil.copytree(data / "bl01t/services", TMPDIR / "services")
+    shutil.copytree(data / "bl01t-services/services", TMPDIR / "services")
     res = mock_run.run_cli("instances bl01t-ea-test-01")
     assert res == expect

{edge_containers_cli-4.0.0 → edge_containers_cli-4.1.0}/tests/test_k8s.py

@@ -16,18 +16,20 @@ def test_delete(mock_run, K8S):
 
 def test_template(mock_run, data, K8S):
     mock_run.set_seq(K8S.template)
-    mock_run.run_cli(f"template {data / 'bl01t/services/bl01t-ea-test-01'}")
+    mock_run.run_cli(f"template {data / 'bl01t-services/services/bl01t-ea-test-01'}")
 
 
 def test_deploy_local(mock_run, data, K8S):
     mock_run.set_seq(K8S.checks[:1] + K8S.deploy_local)
-    mock_run.run_cli(f"deploy-local {data / 'bl01t/services/bl01t-ea-test-01'}")
+    mock_run.run_cli(
+        f"deploy-local {data / 'bl01t-services/services/bl01t-ea-test-01'}"
+    )
 
 
 def test_deploy(mock_run, K8S, data: Path):
     mock_run.set_seq(K8S.deploy)
     # prep what deploy expects to find after it cloned bl01t repo
-    shutil.copytree(data / "bl01t/services", TMPDIR / "services")
+    shutil.copytree(data / "bl01t-services/services", TMPDIR / "services")
     mock_run.run_cli("deploy bl01t-ea-test-01 2.0")
 
 

edge_containers_cli-4.1.0/tests/test_unit.py

@@ -0,0 +1,30 @@
+from edge_containers_cli.utils import YamlFile
+
+
+def test_yaml_processor_get(data):
+    processor = YamlFile(data / "yaml.yaml")
+    expect_0 = {
+        "trunk_A.branch_A.leaf_A": 0,
+        "trunk_A.branch_A.leaf_B": "zero",
+        "trunk_B.leaf_A": False,
+        "leaf_A": "False",
+    }
+    for key_0 in expect_0:
+        assert processor.get_key(key_0) == expect_0[key_0]
+
+
+def test_yaml_processor_set(data):
+    processor = YamlFile(data / "yaml.yaml")
+    expect_1 = {
+        "trunk_A.branch_A.leaf_A": 1,
+        "trunk_A.branch_A.leaf_B": "one",
+        "trunk_B.leaf_A": True,
+        "trunk_B.leaf_C": True,  # insertion
+        "leaf_A": "True",
+    }
+    for key_1 in expect_1:
+        processor.set_key(key_1, expect_1[key_1])
+        get = processor.get_key(key_1)
+        expect = expect_1[key_1]
+        assert get == expect
+        assert type(get) is type(expect)

edge_containers_cli-4.0.0/tests/data/argocd.yaml

@@ -1,45 +0,0 @@
-checks:
-  - cmd: argocd app get namespace/bl01t
-    rsp: ""
-  - cmd: argocd app list -l "ec_service=true" --app-namespace namespace -o yaml
-    rsp: |
-      - metadata:
-          creationTimestamp: "2024-07-12T13:42:50Z"
-          name: bl01t-ea-test-01
-        spec:
-          source:
-            targetRevision: main
-        status:
-          resources:
-            - kind: StatefulSet
-              name: bl01t-ea-test-01
-  - cmd: argocd app manifests namespace/bl01t-ea-test-01 --source live
-    rsp: |
-      ---
-      apiVersion: apps/v1
-      kind: StatefulSet
-      metadata:
-        name: bl01t-ea-test-01
-        creationTimestamp: "2024-07-12T13:52:35Z"
-      status:
-        readyReplicas: 1
-
-logs:
-  - cmd: argocd app logs namespace/bl01t-ea-test-01
-    rsp: ""
-
-log_history:
-  - cmd: https://graylog2.diamond.ac.uk/bl01t-ea-test-01*
-    rsp: True
-
-restart:
-  - cmd: argocd app delete-resource namespace/bl01t-ea-test-01 --kind StatefulSet
-    rsp: ""
-
-start:
-  - cmd: argocd app set namespace/bl01t-ea-test-01 -p global.enabled=true
-    rsp: ""
-
-stop:
-  - cmd: argocd app set namespace/bl01t-ea-test-01 -p global.enabled=false
-    rsp: ""