From d7a4f68fc70c74bff0372da5a75f9fc91ab91972 Mon Sep 17 00:00:00 2001 From: nico_dreylaq Date: Mon, 2 Dec 2024 15:03:31 +0100 Subject: [PATCH 1/8] fix: update terraform version --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20587da82..3d7e00de3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1079,6 +1079,8 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 - name: Deploy Core run: | From cf6dc9323ceaf1310192f80957ec160752b83f66 Mon Sep 17 00:00:00 2001 From: nico_dreylaq Date: Tue, 3 Dec 2024 11:56:07 +0100 Subject: [PATCH 2/8] fix: specify terraform version in relevant jobs --- .github/workflows/code-formatting.yml | 5 +++++ terraform/main.tf | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/code-formatting.yml b/.github/workflows/code-formatting.yml index 54febaccc..362c356eb 100644 --- a/.github/workflows/code-formatting.yml +++ b/.github/workflows/code-formatting.yml @@ -63,6 +63,11 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: ref: ${{ github.ref }} + + - name: Setup Terraform + uses: hashicorp/setup-terraform@v1 + with: + terraform_version: 1.9.8 - name: Check Format run: terraform fmt -check -recursive -diff diff --git a/terraform/main.tf b/terraform/main.tf index 56f9b4b2b..dc80cec70 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -1,3 +1,7 @@ +terraform { + required_version = "= 1.9.8" +} + module "fluenbit" { source = "./modules/monitoring/fluentbit" image = var.log_driver_image From 6ef9e7bbeff49eff46c9f5fd789ce6c2a493c6c9 Mon Sep 17 00:00:00 2001 From: nico_dreylaq Date: Tue, 3 Dec 2024 14:36:15 +0100 Subject: [PATCH 3/8] fix: tf version missing for some jobs --- .github/workflows/build.yml | 15 ++++++++++++++- .github/workflows/code-formatting.yml | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d7e00de3..699e1e6c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -601,7 +601,8 @@ jobs: submodules: true - name: Setup Terraform - run: choco install terraform mongodb-shell 7zip just + run: choco install terraform --version=1.9.8 mongodb-shell 7zip just + - name: Setup AWS cli uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4 @@ -735,6 +736,9 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 + - name: Deploy Core run: | @@ -819,6 +823,9 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 + - name: Deploy Core run: | @@ -937,6 +944,9 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 + - name: Deploy Core run: | @@ -1009,6 +1019,9 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 + - name: Deploy Core run: | diff --git a/.github/workflows/code-formatting.yml b/.github/workflows/code-formatting.yml index 362c356eb..d25c9c66f 100644 --- a/.github/workflows/code-formatting.yml +++ b/.github/workflows/code-formatting.yml @@ -65,7 +65,7 @@ jobs: ref: ${{ github.ref }} - name: Setup Terraform - uses: hashicorp/setup-terraform@v1 + uses: hashicorp/setup-terraform@v2 with: terraform_version: 1.9.8 From 79837aa0344f22101924184e8143f27d5871955a Mon Sep 17 00:00:00 2001 From: nico_dreylaq Date: Tue, 3 Dec 2024 14:46:28 +0100 Subject: [PATCH 4/8] fix: removing useless tf version --- terraform/main.tf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/terraform/main.tf b/terraform/main.tf index dc80cec70..56f9b4b2b 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -1,7 +1,3 @@ -terraform { - required_version = "= 1.9.8" -} - module "fluenbit" { source = "./modules/monitoring/fluentbit" image = var.log_driver_image From 1f7ceea7855a1991c3d985371215b66252623ac5 Mon Sep 17 00:00:00 2001 From: nico_dreylaq Date: Tue, 3 Dec 2024 15:15:41 +0100 Subject: [PATCH 5/8] fix: removing mongodb-shell version specification during install --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 699e1e6c1..1c2a25a2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -600,8 +600,12 @@ jobs: ref: ${{ github.ref }} submodules: true - - name: Setup Terraform - run: choco install terraform --version=1.9.8 mongodb-shell 7zip just + - name: Install Terraform + run: choco install terraform --version=1.9.8 -y + + - name: Install Other Dependencies + run: choco install mongodb-shell 7zip just -y + - name: Setup AWS cli From 0d4b62f030053cb1dc6a1171ff169219b99163df Mon Sep 17 00:00:00 2001 From: nico_dreylaq Date: Wed, 4 Dec 2024 11:27:24 +0100 Subject: [PATCH 6/8] fix: add missing terraform version specification --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c2a25a2f..2b587920f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -351,6 +351,8 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 - name: Deploy Core run: | @@ -451,7 +453,9 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 - + with: + terraform_version: 1.9.8 + - name: Deploy Core run: | MONITOR_PREFIX="monitor/deploy/" tools/retry.sh -w 30 -- tools/monitor.sh \ From 4a4e1a1cd04d5a837782f19e150913dce530dd4b Mon Sep 17 00:00:00 2001 From: nico_dreylaq Date: Wed, 4 Dec 2024 12:00:49 +0100 Subject: [PATCH 7/8] fix: implem missing setup terraform --- .github/workflows/build.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b587920f..a2b7448b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,6 +59,11 @@ jobs: run: | sudo snap install --edge --classic just + - name: Setup Terraform + uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 + - name: Minio Server UP if: ${{ matrix.projects }} == "Adaptors/S3/tests" run: | @@ -125,7 +130,12 @@ jobs: - name: Setup just run: | sudo snap install --edge --classic just - + + - name: Setup Terraform + uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 + - name: Set up queue run: | MONITOR_PREFIX="monitor/deploy/" tools/retry.sh -w 30 -- tools/monitor.sh \ @@ -269,7 +279,12 @@ jobs: - name: Setup just run: | sudo snap install --edge --classic just - + + - name: Setup Terraform + uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 + with: + terraform_version: 1.9.8 + - name: Login to Docker Hub uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3 with: From 19862e21c35b62371dd4308aa191d063e9cd0d28 Mon Sep 17 00:00:00 2001 From: nico_dreylaq Date: Wed, 4 Dec 2024 14:44:36 +0100 Subject: [PATCH 8/8] refactor: remove useless terraform setup --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2b7448b6..724397776 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -280,11 +280,6 @@ jobs: run: | sudo snap install --edge --classic just - - name: Setup Terraform - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 - with: - terraform_version: 1.9.8 - - name: Login to Docker Hub uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3 with: