From bfbad6fcce3664310a460d30d0406ecb4305b7b9 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 21 May 2024 09:01:34 +0000 Subject: [PATCH 01/21] fix: Dockerfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-DEBIAN11-GLIBC-6673955 - https://snyk.io/vuln/SNYK-DEBIAN11-GLIBC-6673958 - https://snyk.io/vuln/SNYK-DEBIAN11-GLIBC-6673967 - https://snyk.io/vuln/SNYK-DEBIAN11-GLIBC-6673973 - https://snyk.io/vuln/SNYK-DEBIAN11-ZLIB-6008961 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b37f39c..03ccf43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG KUBECTL_VERSION=v1.28.9 ################################################################ ################################################################ -FROM debian:bullseye-20240211-slim AS base +FROM debian:bullseye-20240513-slim AS base LABEL vendor="Binbash Leverage (info@binbash.com.ar)" From 8edf18d12f058fc53383452c001bd411e9048704 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 8 Jun 2024 13:37:53 -0300 Subject: [PATCH 02/21] bump version --- versions_to_build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versions_to_build b/versions_to_build index a632204..8695520 100644 --- a/versions_to_build +++ b/versions_to_build @@ -1,3 +1,3 @@ -1.3.5-0.1.17 -1.5.0-0.1.17 -1.6.0-0.1.17 +1.3.5-0.1.18 +1.5.0-0.1.18 +1.6.0-0.1.18 From 1d678767d15d7f973835e75cbe8cc2cc65ee9a6d Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 15 Jun 2024 14:48:15 -0300 Subject: [PATCH 03/21] debugging docker --- .github/workflows/le-toolbox-integration-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 6293e82..9f53f1e 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -92,6 +92,7 @@ jobs: env: LEVERAGE_INTERACTIVE: 0 run: | + docker info printf "[INFO] Testing terraform\n" # These are later mounted in the container mkdir ~/.ssh && touch ~/.gitconfig From 0ef6a259a32aa1789f853b50de58c2d7fa029458 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 15 Jun 2024 15:09:52 -0300 Subject: [PATCH 04/21] using newer version? --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3ae671a..cc601c3 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ AWS_DOCKER_ENTRYPOINT := aws # from the circle ci workflow reading the versions_to_build file, # this values will be overwritten at build time: TERRAFORM_TAG := 1.3.5 -LEVERAGE_CLI_TAG := 0.0.5 +LEVERAGE_CLI_TAG := 1.14 DOCKER_TAG := ${TERRAFORM_TAG}-${LEVERAGE_CLI_TAG} DOCKER_REPO_NAME := binbash From 99b39b67c58981f078c275c511e01849cbfdbe3f Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 15 Jun 2024 15:21:08 -0300 Subject: [PATCH 05/21] more debugging --- .github/workflows/le-toolbox-integration-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 9f53f1e..f29466c 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -93,6 +93,9 @@ jobs: LEVERAGE_INTERACTIVE: 0 run: | docker info + echo $DOCKER_HOST + ls -l /var/run/docker/docker.sock + ls -l /var/run/docker.sock printf "[INFO] Testing terraform\n" # These are later mounted in the container mkdir ~/.ssh && touch ~/.gitconfig From ba5441649821f930967f6da0aa892f8971af61a3 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 15 Jun 2024 15:26:05 -0300 Subject: [PATCH 06/21] forcing new path? --- .github/workflows/le-toolbox-integration-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index f29466c..2bcaedf 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -92,6 +92,7 @@ jobs: env: LEVERAGE_INTERACTIVE: 0 run: | + export DOCKER_HOST=/var/run/docker/docker.sock docker info echo $DOCKER_HOST ls -l /var/run/docker/docker.sock From 1197948b72e70ba87b856669fd97469ead8a96bd Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 16 Jun 2024 12:09:12 -0300 Subject: [PATCH 07/21] another try --- .github/workflows/le-toolbox-integration-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 2bcaedf..d872fb3 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -91,10 +91,9 @@ jobs: - name: Test Terraform env: LEVERAGE_INTERACTIVE: 0 + DOCKER_HOST: unix:///run/docker/docker.sock run: | - export DOCKER_HOST=/var/run/docker/docker.sock docker info - echo $DOCKER_HOST ls -l /var/run/docker/docker.sock ls -l /var/run/docker.sock printf "[INFO] Testing terraform\n" From 68cdb4f371b9a40ca04450a9abe096b65fb2dcb5 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 16 Jun 2024 12:14:40 -0300 Subject: [PATCH 08/21] 20.04? --- .github/workflows/le-toolbox-integration-test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index d872fb3..e164336 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: test_leverage: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout base branch uses: actions/checkout@v3 @@ -91,11 +91,7 @@ jobs: - name: Test Terraform env: LEVERAGE_INTERACTIVE: 0 - DOCKER_HOST: unix:///run/docker/docker.sock run: | - docker info - ls -l /var/run/docker/docker.sock - ls -l /var/run/docker.sock printf "[INFO] Testing terraform\n" # These are later mounted in the container mkdir ~/.ssh && touch ~/.gitconfig From b330afb5242a72268d013582365a59dff2d21c9e Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 29 Jun 2024 06:22:11 -0300 Subject: [PATCH 09/21] debugging --- .github/workflows/le-toolbox-integration-test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index e164336..54e4702 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -14,7 +14,6 @@ jobs: printf "[INFO] Cloning RefArch" git clone https://github.com/binbashar/le-tf-infra-aws.git ./refarch - - name: Build and reference Toolbox Image run: | printf "[INFO] Build Toolbox\n" @@ -92,6 +91,7 @@ jobs: env: LEVERAGE_INTERACTIVE: 0 run: | + sudo ls -l /var/run/docker/docker.sock || sudo ls -l /var/run/docker.sock printf "[INFO] Testing terraform\n" # These are later mounted in the container mkdir ~/.ssh && touch ~/.gitconfig @@ -118,6 +118,4 @@ jobs: exit 1 fi - - working-directory: ./refarch/apps-devstg/global/cli-test-layer From c493c49e01258b43c7ece46711cd6d83470a1f33 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 29 Jun 2024 06:42:11 -0300 Subject: [PATCH 10/21] use version with improved debugging --- .github/workflows/le-toolbox-integration-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 54e4702..a7eaf34 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: test_leverage: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout base branch uses: actions/checkout@v3 @@ -40,7 +40,7 @@ jobs: run: | printf "[INFO] Installing CLI\n" python --version - pip install leverage + pip install leverage==1.12.2rc0 - name: Set up credentials run: | From f9ba4db3a73dbd0030e15d1c22ac14226b517d36 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 29 Jun 2024 07:10:09 -0300 Subject: [PATCH 11/21] now with requests pinned to 2.31 --- .github/workflows/le-toolbox-integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index a7eaf34..4ec7bef 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -40,7 +40,7 @@ jobs: run: | printf "[INFO] Installing CLI\n" python --version - pip install leverage==1.12.2rc0 + pip install leverage==1.12.2rc10 - name: Set up credentials run: | From 077daa4dea9ac6e94579744af5d0ca0a5b36e414 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sat, 29 Jun 2024 07:27:04 -0300 Subject: [PATCH 12/21] the issue was the docker-py lib --- .github/workflows/le-toolbox-integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 4ec7bef..daa59df 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -40,7 +40,7 @@ jobs: run: | printf "[INFO] Installing CLI\n" python --version - pip install leverage==1.12.2rc10 + pip install leverage==1.12.2rc11 - name: Set up credentials run: | From 45ed7f17d7313e8bc6149f73b8d46365d767898d Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 13/21] Revert "the issue was the docker-py lib" This reverts commit 077daa4dea9ac6e94579744af5d0ca0a5b36e414. --- .github/workflows/le-toolbox-integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index daa59df..4ec7bef 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -40,7 +40,7 @@ jobs: run: | printf "[INFO] Installing CLI\n" python --version - pip install leverage==1.12.2rc11 + pip install leverage==1.12.2rc10 - name: Set up credentials run: | From 18d694e8249189ae9e9adb2af65dd857f02c2f78 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 14/21] Revert "now with requests pinned to 2.31" This reverts commit f9ba4db3a73dbd0030e15d1c22ac14226b517d36. --- .github/workflows/le-toolbox-integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 4ec7bef..a7eaf34 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -40,7 +40,7 @@ jobs: run: | printf "[INFO] Installing CLI\n" python --version - pip install leverage==1.12.2rc10 + pip install leverage==1.12.2rc0 - name: Set up credentials run: | From f0bab09d24ddf7c51f1ca1f5ffaa9945d4e3310f Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 15/21] Revert "use version with improved debugging" This reverts commit c493c49e01258b43c7ece46711cd6d83470a1f33. --- .github/workflows/le-toolbox-integration-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index a7eaf34..54e4702 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: test_leverage: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout base branch uses: actions/checkout@v3 @@ -40,7 +40,7 @@ jobs: run: | printf "[INFO] Installing CLI\n" python --version - pip install leverage==1.12.2rc0 + pip install leverage - name: Set up credentials run: | From bd9647b68ef805a55373a7afea6a5ecc9d03a362 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 16/21] Revert "debugging" This reverts commit b330afb5242a72268d013582365a59dff2d21c9e. --- .github/workflows/le-toolbox-integration-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 54e4702..e164336 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -14,6 +14,7 @@ jobs: printf "[INFO] Cloning RefArch" git clone https://github.com/binbashar/le-tf-infra-aws.git ./refarch + - name: Build and reference Toolbox Image run: | printf "[INFO] Build Toolbox\n" @@ -91,7 +92,6 @@ jobs: env: LEVERAGE_INTERACTIVE: 0 run: | - sudo ls -l /var/run/docker/docker.sock || sudo ls -l /var/run/docker.sock printf "[INFO] Testing terraform\n" # These are later mounted in the container mkdir ~/.ssh && touch ~/.gitconfig @@ -118,4 +118,6 @@ jobs: exit 1 fi + + working-directory: ./refarch/apps-devstg/global/cli-test-layer From 09339eccac7b35f25d9d636eeed4c6140132a08c Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 17/21] Revert "20.04?" This reverts commit 68cdb4f371b9a40ca04450a9abe096b65fb2dcb5. --- .github/workflows/le-toolbox-integration-test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index e164336..d872fb3 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: test_leverage: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout base branch uses: actions/checkout@v3 @@ -91,7 +91,11 @@ jobs: - name: Test Terraform env: LEVERAGE_INTERACTIVE: 0 + DOCKER_HOST: unix:///run/docker/docker.sock run: | + docker info + ls -l /var/run/docker/docker.sock + ls -l /var/run/docker.sock printf "[INFO] Testing terraform\n" # These are later mounted in the container mkdir ~/.ssh && touch ~/.gitconfig From 5f1dfe2b3a03767a7b9bc55cc68ca97b94e0f35e Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 18/21] Revert "another try" This reverts commit 1197948b72e70ba87b856669fd97469ead8a96bd. --- .github/workflows/le-toolbox-integration-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index d872fb3..2bcaedf 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -91,9 +91,10 @@ jobs: - name: Test Terraform env: LEVERAGE_INTERACTIVE: 0 - DOCKER_HOST: unix:///run/docker/docker.sock run: | + export DOCKER_HOST=/var/run/docker/docker.sock docker info + echo $DOCKER_HOST ls -l /var/run/docker/docker.sock ls -l /var/run/docker.sock printf "[INFO] Testing terraform\n" From 90024ca60a61bf3afac7c7685532a128dbda96d8 Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 19/21] Revert "forcing new path?" This reverts commit ba5441649821f930967f6da0aa892f8971af61a3. --- .github/workflows/le-toolbox-integration-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 2bcaedf..f29466c 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -92,7 +92,6 @@ jobs: env: LEVERAGE_INTERACTIVE: 0 run: | - export DOCKER_HOST=/var/run/docker/docker.sock docker info echo $DOCKER_HOST ls -l /var/run/docker/docker.sock From 8b695c727ef1613176602145bec8d68f60f8d09e Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 20/21] Revert "more debugging" This reverts commit 99b39b67c58981f078c275c511e01849cbfdbe3f. --- .github/workflows/le-toolbox-integration-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index f29466c..9f53f1e 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -93,9 +93,6 @@ jobs: LEVERAGE_INTERACTIVE: 0 run: | docker info - echo $DOCKER_HOST - ls -l /var/run/docker/docker.sock - ls -l /var/run/docker.sock printf "[INFO] Testing terraform\n" # These are later mounted in the container mkdir ~/.ssh && touch ~/.gitconfig From 7d67ae4c3446ec1271fc9a807de81600c86fe81a Mon Sep 17 00:00:00 2001 From: Francisco Rivera Date: Sun, 30 Jun 2024 23:17:50 -0300 Subject: [PATCH 21/21] Revert "debugging docker" This reverts commit 1d678767d15d7f973835e75cbe8cc2cc65ee9a6d. --- .github/workflows/le-toolbox-integration-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/le-toolbox-integration-test.yml b/.github/workflows/le-toolbox-integration-test.yml index 9f53f1e..6293e82 100644 --- a/.github/workflows/le-toolbox-integration-test.yml +++ b/.github/workflows/le-toolbox-integration-test.yml @@ -92,7 +92,6 @@ jobs: env: LEVERAGE_INTERACTIVE: 0 run: | - docker info printf "[INFO] Testing terraform\n" # These are later mounted in the container mkdir ~/.ssh && touch ~/.gitconfig