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
20 changes: 20 additions & 0 deletions .env.ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
APP_ENV=production

# Required — fake value for CI only
SECRET_KEY=ci-only-not-a-real-secret-key-do-not-use-in-production

# Postgres — matches docker-compose.ci.yml service credentials
DATABASE_URL=postgresql://user:password@postgres:5432/appdb

# LocalStack — fake AWS credentials accepted by LocalStack
AWS_ACCESS_KEY_ID=test
AWS_SECRET_ACCESS_KEY=test
AWS_DEFAULT_REGION=us-east-1
AWS_S3_BUCKET=media-bucket
AWS_S3_ENDPOINT_URL=http://localstack:4566
AWS_S3_PUBLIC_ENDPOINT_URL=http://localhost:4566
AWS_SQS_ENDPOINT_URL=http://localstack:4566
SQS_QUEUE_URL=http://localstack:4566/000000000000/events-queue

# Redis
REDIS_URL=redis://redis:6379/0
12 changes: 11 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
name: CI

on:
workflow_dispatch:
pull_request:
push:
branches:
- main
- develop

jobs:
lint:
Expand Down Expand Up @@ -38,6 +42,8 @@ jobs:
run: pip install -r requirements-test.txt

- name: Run tests
env:
SECRET_KEY: test-only-not-a-real-secret
run: pytest tests/app/unit tests/app/integration --cov=app --cov-report=term-missing

e2e:
Expand All @@ -58,6 +64,10 @@ jobs:
run: docker compose -f docker-compose.ci.yml up -d --wait
timeout-minutes: 5

- name: Dump logs on failure
if: failure()
run: docker compose -f docker-compose.ci.yml logs

- name: Run E2E tests
env:
E2E_BASE_URL: http://localhost/api/v1
Expand Down
33 changes: 16 additions & 17 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,22 @@ on:
# Required GitHub configuration (Settings → Environments → dev):
# vars.ECS_CLUSTER vars.ECS_SERVICE vars.APP_TASK_FAMILY
# vars.VPC_SUBNETS vars.VPC_SECURITY_GROUPS vars.LAMBDA_FUNCTION_NAME
# vars.ECR_APP_REPO — from: terraform output ecr_app_repository_name
# vars.ECR_WORKER_REPO — from: terraform output ecr_worker_repository_name
# vars.AWS_REGION
# (all values printed by: terraform output)
#
# Repository secret (Settings → Secrets → Actions):
# secrets.AWS_ROLE_ARN — from: terraform output github_actions_role_arn

env:
AWS_REGION: us-east-1
ECR_APP_REPO: fastapi-boilerplate/app
ECR_WORKER_REPO: fastapi-boilerplate/worker

jobs:

# ── 1. Build all service images ────────────────────────────────────────────
# Add one build step here per microservice.
build:
name: Build & Push Images
runs-on: ubuntu-latest
environment: dev
outputs:
image-tag: ${{ github.sha }}
ecr-registry: ${{ steps.ecr-login.outputs.registry }}
Expand All @@ -40,7 +39,7 @@ jobs:
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
aws-region: ${{ vars.AWS_REGION }}

- name: Login to Amazon ECR
id: ecr-login
Expand All @@ -50,11 +49,11 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile
file: services/app/Dockerfile
push: true
tags: |
${{ steps.ecr-login.outputs.registry }}/${{ env.ECR_APP_REPO }}:${{ github.sha }}
${{ steps.ecr-login.outputs.registry }}/${{ env.ECR_APP_REPO }}:develop
${{ steps.ecr-login.outputs.registry }}/${{ vars.ECR_APP_REPO }}:${{ github.sha }}
${{ steps.ecr-login.outputs.registry }}/${{ vars.ECR_APP_REPO }}:develop

- name: Build and push worker image
uses: docker/build-push-action@v6
Expand All @@ -63,13 +62,13 @@ jobs:
file: lambda/Dockerfile.lambda
push: true
tags: |
${{ steps.ecr-login.outputs.registry }}/${{ env.ECR_WORKER_REPO }}:${{ github.sha }}
${{ steps.ecr-login.outputs.registry }}/${{ env.ECR_WORKER_REPO }}:develop
${{ steps.ecr-login.outputs.registry }}/${{ vars.ECR_WORKER_REPO }}:${{ github.sha }}
${{ steps.ecr-login.outputs.registry }}/${{ vars.ECR_WORKER_REPO }}:develop

# - name: Build and push <service> image
# uses: docker/build-push-action@v6
# with:
# context: services/<service>
# context: .
# file: services/<service>/Dockerfile
# push: true
# tags: |
Expand All @@ -93,7 +92,7 @@ jobs:
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
aws-region: ${{ vars.AWS_REGION }}

- name: Run migrations
env:
Expand Down Expand Up @@ -139,15 +138,15 @@ jobs:
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
aws-region: ${{ vars.AWS_REGION }}

# Tier 1 — services with no inter-service dependencies
- name: Deploy app
run: |
CURRENT=$(aws ecs describe-task-definition \
--task-definition "${{ vars.APP_TASK_FAMILY }}" --query taskDefinition)
NEW_DEF=$(echo "$CURRENT" | jq \
--arg img "${{ env.ECR_REGISTRY }}/${{ env.ECR_APP_REPO }}:${{ env.IMAGE_TAG }}" \
--arg img "${{ env.ECR_REGISTRY }}/${{ vars.ECR_APP_REPO }}:${{ env.IMAGE_TAG }}" \
'del(.taskDefinitionArn,.revision,.status,.requiresAttributes,.compatibilities,.registeredAt,.registeredBy)
| .containerDefinitions[0].image = $img')
ARN=$(aws ecs register-task-definition --cli-input-json "$NEW_DEF" \
Expand Down Expand Up @@ -183,13 +182,13 @@ jobs:
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
aws-region: ${{ vars.AWS_REGION }}

- name: Update SQS worker
run: |
aws lambda update-function-code \
--function-name "${{ vars.LAMBDA_FUNCTION_NAME }}" \
--image-uri "${{ env.ECR_REGISTRY }}/${{ env.ECR_WORKER_REPO }}:${{ env.IMAGE_TAG }}"
--image-uri "${{ env.ECR_REGISTRY }}/${{ vars.ECR_WORKER_REPO }}:${{ env.IMAGE_TAG }}"
aws lambda wait function-updated \
--function-name "${{ vars.LAMBDA_FUNCTION_NAME }}"
echo "✓ SQS worker updated"
Expand Down
33 changes: 16 additions & 17 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,21 @@ on:
# Required GitHub configuration (Settings → Environments → production):
# vars.ECS_CLUSTER vars.ECS_SERVICE vars.APP_TASK_FAMILY
# vars.VPC_SUBNETS vars.VPC_SECURITY_GROUPS vars.LAMBDA_FUNCTION_NAME
# vars.ECR_APP_REPO — from: terraform output ecr_app_repository_name
# vars.ECR_WORKER_REPO — from: terraform output ecr_worker_repository_name
# vars.AWS_REGION
# (all values printed by: terraform output)
#
# Repository secret (Settings → Secrets → Actions):
# secrets.AWS_ROLE_ARN — from: terraform output github_actions_role_arn

env:
AWS_REGION: us-east-1
ECR_APP_REPO: fastapi-boilerplate/app
ECR_WORKER_REPO: fastapi-boilerplate/worker

jobs:

# ── 1. Build all service images ────────────────────────────────────────────
build:
name: Build & Push Images
runs-on: ubuntu-latest
environment: production
outputs:
image-tag: ${{ github.sha }}
ecr-registry: ${{ steps.ecr-login.outputs.registry }}
Expand All @@ -41,7 +40,7 @@ jobs:
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
aws-region: ${{ vars.AWS_REGION }}

- name: Login to Amazon ECR
id: ecr-login
Expand All @@ -51,11 +50,11 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile
file: services/app/Dockerfile
push: true
tags: |
${{ steps.ecr-login.outputs.registry }}/${{ env.ECR_APP_REPO }}:${{ github.sha }}
${{ steps.ecr-login.outputs.registry }}/${{ env.ECR_APP_REPO }}:main
${{ steps.ecr-login.outputs.registry }}/${{ vars.ECR_APP_REPO }}:${{ github.sha }}
${{ steps.ecr-login.outputs.registry }}/${{ vars.ECR_APP_REPO }}:main

- name: Build and push worker image
uses: docker/build-push-action@v6
Expand All @@ -64,13 +63,13 @@ jobs:
file: lambda/Dockerfile.lambda
push: true
tags: |
${{ steps.ecr-login.outputs.registry }}/${{ env.ECR_WORKER_REPO }}:${{ github.sha }}
${{ steps.ecr-login.outputs.registry }}/${{ env.ECR_WORKER_REPO }}:main
${{ steps.ecr-login.outputs.registry }}/${{ vars.ECR_WORKER_REPO }}:${{ github.sha }}
${{ steps.ecr-login.outputs.registry }}/${{ vars.ECR_WORKER_REPO }}:main

# - name: Build and push <service> image
# uses: docker/build-push-action@v6
# with:
# context: services/<service>
# context: .
# file: services/<service>/Dockerfile
# push: true
# tags: |
Expand All @@ -94,7 +93,7 @@ jobs:
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
aws-region: ${{ vars.AWS_REGION }}

- name: Run migrations
env:
Expand Down Expand Up @@ -139,15 +138,15 @@ jobs:
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
aws-region: ${{ vars.AWS_REGION }}

# Tier 1 — services with no inter-service dependencies
- name: Deploy app
run: |
CURRENT=$(aws ecs describe-task-definition \
--task-definition "${{ vars.APP_TASK_FAMILY }}" --query taskDefinition)
NEW_DEF=$(echo "$CURRENT" | jq \
--arg img "${{ env.ECR_REGISTRY }}/${{ env.ECR_APP_REPO }}:${{ env.IMAGE_TAG }}" \
--arg img "${{ env.ECR_REGISTRY }}/${{ vars.ECR_APP_REPO }}:${{ env.IMAGE_TAG }}" \
'del(.taskDefinitionArn,.revision,.status,.requiresAttributes,.compatibilities,.registeredAt,.registeredBy)
| .containerDefinitions[0].image = $img')
ARN=$(aws ecs register-task-definition --cli-input-json "$NEW_DEF" \
Expand Down Expand Up @@ -182,13 +181,13 @@ jobs:
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}
aws-region: ${{ vars.AWS_REGION }}

- name: Update SQS worker
run: |
aws lambda update-function-code \
--function-name "${{ vars.LAMBDA_FUNCTION_NAME }}" \
--image-uri "${{ env.ECR_REGISTRY }}/${{ env.ECR_WORKER_REPO }}:${{ env.IMAGE_TAG }}"
--image-uri "${{ env.ECR_REGISTRY }}/${{ vars.ECR_WORKER_REPO }}:${{ env.IMAGE_TAG }}"
aws lambda wait function-updated \
--function-name "${{ vars.LAMBDA_FUNCTION_NAME }}"
echo "✓ SQS worker updated"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ terraform/*_override.tf.json
terraform/bootstrap/.terraform/
terraform/bootstrap/terraform.tfstate
terraform/bootstrap/terraform.tfstate.backup
terraform/environments/*.tfvars
Loading
Loading