fix: Set current working directory in deploy command (#185)

aladdin/commands/deploy.py

@@ -70,9 +70,8 @@ def deploy(
         )
         sys.exit(1)
 
-    with clone_and_checkout(git_ref, repo) as tmpdirname:
-        with working_directory(tmpdirname):
-            helm_chart_path = ProjectConf().get_helm_chart_path(chart)
+    with clone_and_checkout(git_ref, repo, cwd=True):
+        helm_chart_path = ProjectConf().get_helm_chart_path(chart)
 
         helm_args = [
             f"--values=aladdin://{cluster_code}",

aladdin/lib/git.py

@@ -3,7 +3,7 @@
 import subprocess
 import tempfile
 import sys
-from contextlib import contextmanager, suppress
+from contextlib import contextmanager, suppress, nullcontext
 
 from aladdin.lib.utils import working_directory
 from aladdin.config import load_git_configs, ALADDIN_DEV
@@ -96,7 +96,7 @@ def _get_hash_ls_remote(cls, ref, url):
 
 
 @contextmanager
-def clone_and_checkout(githash, repo_name=None, debug=ALADDIN_DEV):
+def clone_and_checkout(githash, repo_name=None, debug=ALADDIN_DEV, cwd=False):
     current_hash = None
     current_repo = None
     with suppress(subprocess.CalledProcessError):
@@ -110,11 +110,14 @@ def clone_and_checkout(githash, repo_name=None, debug=ALADDIN_DEV):
         current_hash == githash and
         (Git.clean_working_tree() or debug)
     ):
-        yield Git.get_base_directory()
+        dir = Git.get_base_directory()
+        context = working_directory(dir) if cwd else nullcontext()
+        with context:
+            yield dir
         return
 
     if not repo_name:
-        logging.error(f"No repo found or specified")
+        logging.error("No repo found or specified")
         return sys.exit(1)
 
     git_account = load_git_configs()["account"]
@@ -133,4 +136,6 @@ def clone_and_checkout(githash, repo_name=None, debug=ALADDIN_DEV):
                 f"Could not checkout to ref '{githash}' in repo {git_url}. Have you pushed it to remote?"
             )
             return sys.exit(1)
-        yield tmpdirname
+        context = working_directory(tmpdirname) if cwd else nullcontext()
+        with context:
+            yield tmpdirname

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aladdin"
-version = "1.29.8.9"
+version = "1.29.8.10"
 description = ""
 authors = ["Fivestars <[email protected]>"]
 include = [