Merge pull request #203 from epics-containers/no-commit

improve service version management for ArgoCD. fixes #200

Author: gilesknap

src/edge_containers_cli/cli.py

@@ -99,7 +99,7 @@ def deploy(
     def confirm_callback(svc_version):
         confirmation(
             f"Deploy {service_name.lower()} "
-            f"of version `{svc_version}` to target `{backend.commands.target}`",
+            f" version `{svc_version}` to target `{backend.commands.target}`",
             yes,
         )
 

src/edge_containers_cli/cmds/argo_commands.py

@@ -21,7 +21,7 @@
     ServicesSchema,
 )
 from edge_containers_cli.definitions import ECContext
-from edge_containers_cli.git import del_key, set_value
+from edge_containers_cli.git import check_exists, del_key, set_value
 from edge_containers_cli.logging import log
 from edge_containers_cli.shell import ShellError, shell
 from edge_containers_cli.utils import YamlTypes
@@ -142,9 +142,17 @@ def delete(self, service_name: str) -> None:
         push_remove_key(self.target, f"ec_services.{service_name}")
 
     def deploy(self, service_name, version, args, confirm_callback=None) -> None:
-        latest_version = self._get_latest_version(service_name)
         if not version:
+            latest_version = self._get_latest_version(service_name)
             version = latest_version
+
+        service_path = Path(globals.SERVICES_DIR) / service_name
+        if not check_exists(service_path, self.repo, version):
+            raise CommandError(
+                f"Service '{service_name}' not found in repo "
+                f"'{self.repo}' with branch/tag '{version}'"
+            )
+
         if confirm_callback:
             confirm_callback(version)
         deploy_dict: YamlTypes = {"enabled": True, "targetRevision": version}

src/edge_containers_cli/cmds/k8s_commands.py

@@ -52,8 +52,8 @@ def delete(self, service_name, commit=False):
         )
 
     def deploy(self, service_name, version, args, confirm_callback=None):
-        latest_version = self._get_latest_version(service_name)
         if not version:
+            latest_version = self._get_latest_version(service_name)
             version = latest_version
 
         chart = Helm(

src/edge_containers_cli/git.py

@@ -234,3 +234,20 @@ def list_instances(
         sorted_list = natsorted(svc_list)[::-1]
         services_df = polars.from_dict({"version": sorted_list})
         return services_df
+
+
+def check_exists(path: Path, repo: str, tag: str) -> bool:
+    """
+    Check if a path exists within the given repository and tag/branch.
+    """
+    with new_workdir() as working_dir:
+        try:
+            shell.run_command(f"git clone {repo} -b {tag} {working_dir}")
+        except ShellError:
+            log.debug(f"Branch or tag '{tag}' does not exist in repo '{repo}'.")
+            return False
+        full_path = Path(working_dir) / path
+        if not full_path.exists():
+            log.debug(f"'{path}' does not exist in repo '{repo}', tag {tag}.")
+            return False
+    return True

tests/data/argocd.yaml

@@ -64,6 +64,8 @@ deploy:
   - cmd: git ls-tree -r 2.0
     rsp: |
       100644 blob b7b39845b55fb4d45d58ba86ef4527917877d556    services/bl01t-ea-test-01/Chart.yaml
+  - cmd: git clone https://github.com/epics-containers/bl01t-services -b 1.0 /tmp/ec_tests
+    rsp: ""
   - cmd: argocd app get namespace/bl01t
     rsp: |
       spec: