From d41eb7dc3b74cbbed0e75e382f1cb6fb94ba1488 Mon Sep 17 00:00:00 2001 From: Rafael Date: Sat, 4 Jul 2026 00:54:19 -0500 Subject: [PATCH] chore: bump actions/checkout to v7, Terraform required_version to 1.15, rename docker-compose.yml to compose.yml --- .github/workflows/api-tests.yml | 2 +- .github/workflows/deploy-prod.yml | 4 ++-- .github/workflows/docker-image.yml | 8 ++++---- .github/workflows/e2e.yml | 6 +++--- .github/workflows/k6-load.yml | 2 +- .github/workflows/lambdas.yml | 10 +++++----- .github/workflows/terraform-validate.yml | 2 +- docker-compose.yml => compose.yml | 0 lambdas/README.md | 2 +- terraform/envs/local/terraform.tf | 2 +- terraform/envs/prod/terraform.tf | 2 +- terraform/modules/bootstrap/terraform.tf | 2 +- terraform/scripts/local-bootstrap.sh | 2 +- terraform/scripts/local-destroy.sh | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) rename docker-compose.yml => compose.yml (100%) diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml index f4b8562..3e29138 100644 --- a/.github/workflows/api-tests.yml +++ b/.github/workflows/api-tests.yml @@ -31,7 +31,7 @@ jobs: timeout-minutes: 20 steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - name: Set up JDK 21 uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4 diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 3b0c2c0..195d4b9 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -69,7 +69,7 @@ jobs: TF_VAR_git_commit: ${{ github.sha }} steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 # Exchanges the GitHub OIDC token for short-lived AWS STS credentials and # exports them as env vars for every step below (Terraform + AWS CLI). @@ -174,7 +174,7 @@ jobs: environment: prod steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - name: Configure AWS credentials (OIDC) uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1 diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c26c3bb..17a5817 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -8,14 +8,14 @@ on: - 'api/**' - 'terraform/**' - '.github/workflows/docker-image.yml' - - 'docker-compose.yml' + - 'compose.yml' pull_request: branches: [master] paths: - 'api/**' - 'terraform/**' - '.github/workflows/docker-image.yml' - - 'docker-compose.yml' + - 'compose.yml' permissions: contents: read @@ -39,7 +39,7 @@ jobs: AWS_ENDPOINT_URL: http://localhost:4566 steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 @@ -137,7 +137,7 @@ jobs: AWS_ENDPOINT_URL: http://localhost:4566 steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 03a3015..0bf01ae 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -19,7 +19,7 @@ on: - 'lambdas/**' - 'terraform/**' - 'e2e/**' - - 'docker-compose.yml' + - 'compose.yml' - '.github/workflows/e2e.yml' push: branches: [master] @@ -28,7 +28,7 @@ on: - 'lambdas/**' - 'terraform/**' - 'e2e/**' - - 'docker-compose.yml' + - 'compose.yml' - '.github/workflows/e2e.yml' workflow_dispatch: @@ -45,7 +45,7 @@ jobs: timeout-minutes: 45 steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 diff --git a/.github/workflows/k6-load.yml b/.github/workflows/k6-load.yml index 2470b0a..4b8e145 100644 --- a/.github/workflows/k6-load.yml +++ b/.github/workflows/k6-load.yml @@ -104,7 +104,7 @@ jobs: ABORT: ${{ inputs.abort }} steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - name: Guardrail — require a configured target run: | diff --git a/.github/workflows/lambdas.yml b/.github/workflows/lambdas.yml index f8f929e..f641a63 100644 --- a/.github/workflows/lambdas.yml +++ b/.github/workflows/lambdas.yml @@ -9,7 +9,7 @@ on: - 'lambdas/**' - 'terraform/**' - '.github/workflows/lambdas.yml' - - 'docker-compose.yml' + - 'compose.yml' pull_request: branches: [master] paths: @@ -17,7 +17,7 @@ on: - 'lambdas/**' - 'terraform/**' - '.github/workflows/lambdas.yml' - - 'docker-compose.yml' + - 'compose.yml' permissions: contents: read @@ -37,7 +37,7 @@ jobs: timeout-minutes: 15 steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - name: Install uv uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 # v5 @@ -66,7 +66,7 @@ jobs: timeout-minutes: 15 steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - name: Build outbox-poller image run: | @@ -108,7 +108,7 @@ jobs: AWS_ENDPOINT_URL: http://localhost:4566 steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 diff --git a/.github/workflows/terraform-validate.yml b/.github/workflows/terraform-validate.yml index a1ecb66..914f4ae 100644 --- a/.github/workflows/terraform-validate.yml +++ b/.github/workflows/terraform-validate.yml @@ -31,7 +31,7 @@ jobs: working-directory: terraform/envs/local steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 diff --git a/docker-compose.yml b/compose.yml similarity index 100% rename from docker-compose.yml rename to compose.yml diff --git a/lambdas/README.md b/lambdas/README.md index 8253ef3..b1d0052 100644 --- a/lambdas/README.md +++ b/lambdas/README.md @@ -61,5 +61,5 @@ docker push localhost:5100/000000000000/us-east-1/cloudledger/projector:latest ## Local Environment Notes - Lambda containers reach Floci services via container name: `DB_HOST=floci-rds-cloudledger-postgres`, `SQS_ENDPOINT_URL=http://floci:4566` — not `localhost`. -- Floci ECR registry: `localhost:5100/000000000000/us-east-1/` (path-style URIs, set by `FLOCI_SERVICES_ECR_URI_STYLE=path` in `docker-compose.yml`). +- Floci ECR registry: `localhost:5100/000000000000/us-east-1/` (path-style URIs, set by `FLOCI_SERVICES_ECR_URI_STYLE=path` in `compose.yml`). - Use `psycopg[binary]` in Dockerfiles — the Lambda base image needs the native C extension. diff --git a/terraform/envs/local/terraform.tf b/terraform/envs/local/terraform.tf index 2db0149..4b3b861 100644 --- a/terraform/envs/local/terraform.tf +++ b/terraform/envs/local/terraform.tf @@ -6,5 +6,5 @@ terraform { } } - required_version = ">= 1.2" + required_version = ">= 1.15" } \ No newline at end of file diff --git a/terraform/envs/prod/terraform.tf b/terraform/envs/prod/terraform.tf index 05082f0..5e81f7e 100644 --- a/terraform/envs/prod/terraform.tf +++ b/terraform/envs/prod/terraform.tf @@ -6,7 +6,7 @@ terraform { } } - required_version = ">= 1.2" + required_version = ">= 1.15" backend "s3" { bucket = "cloudledger-terraform-state" diff --git a/terraform/modules/bootstrap/terraform.tf b/terraform/modules/bootstrap/terraform.tf index 8600b98..87cf32a 100644 --- a/terraform/modules/bootstrap/terraform.tf +++ b/terraform/modules/bootstrap/terraform.tf @@ -6,7 +6,7 @@ terraform { } } - required_version = ">= 1.2" + required_version = ">= 1.15" # Intentionally no backend block — this module bootstraps the backend. # State is stored locally until it is migrated or discarded after creation. diff --git a/terraform/scripts/local-bootstrap.sh b/terraform/scripts/local-bootstrap.sh index 7e84682..3baca3c 100755 --- a/terraform/scripts/local-bootstrap.sh +++ b/terraform/scripts/local-bootstrap.sh @@ -16,7 +16,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" echo "==> Starting Floci..." -docker compose -f "$REPO_ROOT/docker-compose.yml" up -d --wait +docker compose -f "$REPO_ROOT/compose.yml" up -d --wait echo "==> Provisioning infrastructure..." cd "$REPO_ROOT/terraform/envs/local" diff --git a/terraform/scripts/local-destroy.sh b/terraform/scripts/local-destroy.sh index 8956b1f..96223a9 100755 --- a/terraform/scripts/local-destroy.sh +++ b/terraform/scripts/local-destroy.sh @@ -28,7 +28,7 @@ echo "==> Destroying Terraform-managed infrastructure..." terraform destroy -input=false -auto-approve echo "==> Stopping Floci..." -docker compose -f "$REPO_ROOT/docker-compose.yml" down +docker compose -f "$REPO_ROOT/compose.yml" down echo "==> Removing Floci ECR sidecar and its data volume..." docker rm -f floci-ecr-registry 2>/dev/null || true