From 89c0162aa7897ab80ba066ad976e27aed3ef336c Mon Sep 17 00:00:00 2001
From: Francisco Rivera <franmrivera@gmail.com>
Date: Sun, 12 Jan 2025 15:00:11 -0300
Subject: [PATCH 1/2] make sure .gitconfig is always present

---
 .github/workflows/tests-integration.yaml | 2 +-
 Dockerfile                               | 2 --
 leverage/container.py                    | 5 ++++-
 leverage/path.py                         | 4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests-integration.yaml b/.github/workflows/tests-integration.yaml
index da9b11d..6b92623 100644
--- a/.github/workflows/tests-integration.yaml
+++ b/.github/workflows/tests-integration.yaml
@@ -61,7 +61,7 @@ jobs:
         run: |
           mkdir -p ../theadamproject
           # These are later mounted in the container
-          mkdir ~/.ssh && touch ~/.gitconfig
+          mkdir ~/.ssh
 
       - name: Project Init
         run: |
diff --git a/Dockerfile b/Dockerfile
index 8d1b0b9..bef7e5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,6 @@ RUN git clone https://github.com/bats-core/bats-assert.git
 
 # Needed as is mounted later on
 RUN mkdir /root/.ssh
-# Needed for git to run propertly
-RUN touch /root/.gitconfig
 
 RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/usr/local POETRY_VERSION=1.8.2 python3 -
 
diff --git a/leverage/container.py b/leverage/container.py
index a8258ec..1dc4f52 100644
--- a/leverage/container.py
+++ b/leverage/container.py
@@ -455,6 +455,9 @@ def __init__(self, client, mounts=None, env_vars=None):
         # SSH AGENT
         SSH_AUTH_SOCK = os.getenv("SSH_AUTH_SOCK")
 
+        # make sure .gitconfig exists before mounting it
+        self.paths.host_git_config_file.touch(exist_ok=True)
+
         self.environment.update(
             {
                 "COMMON_CONFIG_FILE": self.paths.common_tfvars,
@@ -479,7 +482,7 @@ def __init__(self, client, mounts=None, env_vars=None):
                 target=self.paths.guest_aws_credentials_dir,
                 type="bind",
             ),
-            Mount(source=(self.paths.home / ".gitconfig").as_posix(), target="/etc/gitconfig", type="bind"),
+            Mount(source=self.paths.host_git_config_file.as_posix(), target="/etc/gitconfig", type="bind"),
         ]
         self.mounts.extend(extra_mounts)
         # if you have set the tf plugin cache locally
diff --git a/leverage/path.py b/leverage/path.py
index 1a09d24..9cbd5ef 100644
--- a/leverage/path.py
+++ b/leverage/path.py
@@ -197,6 +197,10 @@ def host_aws_profiles_file(self):
     def host_aws_credentials_file(self):
         return self.host_aws_credentials_dir / "credentials"
 
+    @property
+    def host_git_config_file(self):
+        return self.home / ".gitconfig"
+
     @property
     def local_backend_tfvars(self):
         return self.account_config_dir / self.BACKEND_TF_VARS

From b3c3c4d85d79a4d4abbb844462002cc725634cf1 Mon Sep 17 00:00:00 2001
From: Francisco Rivera <franmrivera@gmail.com>
Date: Sun, 12 Jan 2025 15:09:15 -0300
Subject: [PATCH 2/2] update integration tests

---
 tests/bats/leverage.bats | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bats/leverage.bats b/tests/bats/leverage.bats
index bbcbe48..f67cf94 100644
--- a/tests/bats/leverage.bats
+++ b/tests/bats/leverage.bats
@@ -35,7 +35,7 @@ teardown(){
     cp "$BUILD_SCRIPTS/simple_build.py" "$ACC_DIR/build.py"
     cd "$ACC_DIR"
 
-    run leverage -l
+    run leverage run -l
 
     assert_line --index 0 "Tasks in build file \`build.py\`:"
     assert_line --index 1 --regexp "^  hello\s+Say hello.$"
@@ -49,7 +49,7 @@ teardown(){
     cp "$BUILD_SCRIPTS/simple_build.py" "$ROOT_DIR/build.py"
     cd "$ROOT_DIR/account"
 
-    run leverage -l
+    run leverage run -l
 
     assert_line --index 0 "Tasks in build file \`build.py\`:"
     assert_line --index 1 --regexp "^  hello\s+Say hello.$"