Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BV-267] Make sure .gitconfig is always present #295

Merged
merged 2 commits into from
Feb 1, 2025
Merged

[BV-267] Make sure .gitconfig is always present #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89c0162
make sure .gitconfig is always present
Franr Jan 12, 2025
b3c3c4d
update integration tests
Franr Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -

Expand Down
5 changes: 4 additions & 1 deletion leverage/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions leverage/path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/bats/leverage.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix the breaking changes introduced in #290


assert_line --index 0 "Tasks in build file \`build.py\`:"
assert_line --index 1 --regexp "^ hello\s+Say hello.$"
Expand All @@ -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.$"
Expand Down
Loading