Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/api-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- 'lambdas/**'
- 'terraform/**'
- 'e2e/**'
- 'docker-compose.yml'
- 'compose.yml'
- '.github/workflows/e2e.yml'
push:
branches: [master]
Expand All @@ -28,7 +28,7 @@ on:
- 'lambdas/**'
- 'terraform/**'
- 'e2e/**'
- 'docker-compose.yml'
- 'compose.yml'
- '.github/workflows/e2e.yml'
workflow_dispatch:

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/k6-load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/lambdas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
- 'lambdas/**'
- 'terraform/**'
- '.github/workflows/lambdas.yml'
- 'docker-compose.yml'
- 'compose.yml'
pull_request:
branches: [master]
paths:
- 'api/src/main/resources/db/**'
- 'lambdas/**'
- 'terraform/**'
- '.github/workflows/lambdas.yml'
- 'docker-compose.yml'
- 'compose.yml'

permissions:
contents: read
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terraform-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion lambdas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/<repo>` (path-style URIs, set by `FLOCI_SERVICES_ECR_URI_STYLE=path` in `docker-compose.yml`).
- Floci ECR registry: `localhost:5100/000000000000/us-east-1/<repo>` (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.
2 changes: 1 addition & 1 deletion terraform/envs/local/terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ terraform {
}
}

required_version = ">= 1.2"
required_version = ">= 1.15"
}
2 changes: 1 addition & 1 deletion terraform/envs/prod/terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
}

required_version = ">= 1.2"
required_version = ">= 1.15"

backend "s3" {
bucket = "cloudledger-terraform-state"
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/bootstrap/terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion terraform/scripts/local-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion terraform/scripts/local-destroy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading