edge-containers-cli 4.4.3__tar.gz → 4.4.5__tar.gz

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edge-containers-cli
-Version: 4.4.3
+Version: 4.4.5
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -221,6 +221,7 @@ Requires-Dist: ruamel.yaml
 Requires-Dist: jinja2
 Requires-Dist: polars-lts-cpu
 Requires-Dist: textual
+Requires-Dist: urllib3<2.4.0
 Provides-Extra: dev
 Requires-Dist: copier; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/pyproject.toml

@@ -21,6 +21,9 @@ dependencies = [
     "jinja2",
     "polars-lts-cpu",
     "textual",
+    # urllib>=2.4.0 fails to validate DLS Kubernetes certificates
+    # https://github.com/kubernetes-client/python/issues/2394
+    "urllib3<2.4.0",
 ]
 
 dynamic = ["version"]
@@ -58,7 +61,7 @@ version_file = "src/edge_containers_cli/_version.py"
 
 [tool.pyright]
 typeCheckingMode = "standard"
-reportMissingImports = false # Ignore missing stubs in imported modules
+reportMissingImports = false  # Ignore missing stubs in imported modules
 
 [tool.pytest.ini_options]
 # Run pytest with all our checkers, and don't spam us with massive tracebacks on error

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/src/edge_containers_cli/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '4.4.3'
-__version_tuple__ = version_tuple = (4, 4, 3)
+__version__ = version = '4.4.5'
+__version_tuple__ = version_tuple = (4, 4, 5)
+
+__commit_id__ = commit_id = 'g6ed12beec'

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/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,
         )
 

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/src/edge_containers_cli/cmds/argo_commands.py

@@ -21,7 +21,7 @@ from edge_containers_cli.cmds.commands import (
     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 @@ class ArgoCommands(Commands):
         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}

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/src/edge_containers_cli/cmds/k8s_commands.py

@@ -52,8 +52,8 @@ class K8sCommands(Commands):
         )
 
     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(

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/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

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/src/edge_containers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edge-containers-cli
-Version: 4.4.3
+Version: 4.4.5
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -221,6 +221,7 @@ Requires-Dist: ruamel.yaml
 Requires-Dist: jinja2
 Requires-Dist: polars-lts-cpu
 Requires-Dist: textual
+Requires-Dist: urllib3<2.4.0
 Provides-Extra: dev
 Requires-Dist: copier; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/src/edge_containers_cli.egg-info/requires.txt

@@ -5,6 +5,7 @@ ruamel.yaml
 jinja2
 polars-lts-cpu
 textual
+urllib3<2.4.0
 
 [dev]
 copier

{edge_containers_cli-4.4.3 → edge_containers_cli-4.4.5}/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: