jose.martinez/eqt-network-meraki
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: multi-site scalability, locals refactor, README

Browse Source
This commit is contained in:
Xavier Lario
2026-04-20 10:16:49 +02:00
parent 881d0ac5b8
commit 8ff53503db
23 changed files with 1155 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/apply.yml
+45 -5
View File
@@ -3,10 +3,47 @@ name: Terraform Apply
on:
push:
branches: [main]
paths:
- 'sites/**'
- 'modules/**'
- 'backend.hcl'
jobs:
detect-sites:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.detect.outputs.matrix }}
has-changes: ${{ steps.detect.outputs.has-changes }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2
- id: detect
run: |
all_sites=$(find sites -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | sort | jq -sRc '.')
if git diff HEAD~1...HEAD --name-only | grep -qE '^(modules/|backend\.hcl)'; then
echo "has-changes=true" >> $GITHUB_OUTPUT
echo "matrix={\"site\": $all_sites}" >> $GITHUB_OUTPUT
else
changed=$(git diff HEAD~1...HEAD --name-only | grep '^sites/' | cut -d/ -f2 | sort -u | jq -sRc '.')
if [ "$changed" = "[]" ] || [ -z "$changed" ]; then
echo "has-changes=false" >> $GITHUB_OUTPUT
echo "matrix={\"site\": []}" >> $GITHUB_OUTPUT
else
echo "has-changes=true" >> $GITHUB_OUTPUT
echo "matrix={\"site\": $changed}" >> $GITHUB_OUTPUT
fi
fi
apply:
name: Terraform Apply - BCN01-LAB
needs: detect-sites
if: needs.detect-sites.outputs.has-changes == 'true'
strategy:
matrix: ${{ fromJSON(needs.detect-sites.outputs.matrix) }}
max-parallel: 1 # serializar applies para evitar conflictos de estado en DynamoDB
fail-fast: false
name: Terraform Apply - ${{ matrix.site }}
runs-on: self-hosted
steps:
@@ -22,8 +59,11 @@ jobs:
terraform_version: 1.5.0
- name: Terraform Init
working-directory: sites/BCN01-LAB
run: terraform init
working-directory: sites/${{ matrix.site }}
run: |
terraform init \
-backend-config=../../backend.hcl \
-backend-config="key=${{ matrix.site }}/terraform.tfstate"
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -31,7 +71,7 @@ jobs:
MERAKI_DASHBOARD_API_KEY: ${{ secrets.MERAKI_DASHBOARD_API_KEY }}
- name: Terraform Apply
working-directory: sites/BCN01-LAB
working-directory: sites/${{ matrix.site }}
run: terraform apply -auto-approve
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -39,4 +79,4 @@ jobs:
AWS_REGION: us-east-1
MERAKI_DASHBOARD_API_KEY: ${{ secrets.MERAKI_DASHBOARD_API_KEY }}
TF_VAR_radius_secret: ${{ secrets.RADIUS_SECRET }}
TF_VAR_wifi_password_psk: ${{ secrets.WIFI_PASSWORD_PSK }}
TF_VAR_wifi_password_psk: ${{ secrets.WIFI_PASSWORD_PSK }}
.github/workflows/plan.yml
+56 -15
View File
@@ -3,10 +3,47 @@ name: Terraform Plan
on:
pull_request:
branches: [main]
paths:
- 'sites/**'
- 'modules/**'
- 'backend.hcl'
- '.github/workflows/**'
jobs:
detect-sites:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.detect.outputs.matrix }}
has-changes: ${{ steps.detect.outputs.has-changes }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- id: detect
run: |
all_sites=$(find sites -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | sort | jq -sRc '.')
if git diff origin/main...HEAD --name-only | grep -qE '^(modules/|backend\.hcl)'; then
echo "has-changes=true" >> $GITHUB_OUTPUT
echo "matrix={\"site\": $all_sites}" >> $GITHUB_OUTPUT
else
changed=$(git diff origin/main...HEAD --name-only | grep '^sites/' | cut -d/ -f2 | sort -u | jq -sRc '.')
if [ "$changed" = "[]" ] || [ -z "$changed" ]; then
echo "has-changes=false" >> $GITHUB_OUTPUT
echo "matrix={\"site\": []}" >> $GITHUB_OUTPUT
else
echo "has-changes=true" >> $GITHUB_OUTPUT
echo "matrix={\"site\": $changed}" >> $GITHUB_OUTPUT
fi
fi
plan:
name: Terraform Plan - BCN01-LAB
needs: detect-sites
if: needs.detect-sites.outputs.has-changes == 'true'
strategy:
matrix: ${{ fromJSON(needs.detect-sites.outputs.matrix) }}
fail-fast: false
name: Terraform Plan - ${{ matrix.site }}
runs-on: self-hosted
permissions:
pull-requests: write
@@ -24,24 +61,28 @@ jobs:
terraform_version: 1.5.0
- name: Terraform Init
working-directory: sites/BCN01-LAB
run: terraform init
working-directory: sites/${{ matrix.site }}
run: |
terraform init \
-backend-config=../../backend.hcl \
-backend-config="key=${{ matrix.site }}/terraform.tfstate"
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: us-east-1
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: us-east-1
MERAKI_DASHBOARD_API_KEY: ${{ secrets.MERAKI_DASHBOARD_API_KEY }}
- name: Terraform Plan
id: plan
working-directory: sites/BCN01-LAB
working-directory: sites/${{ matrix.site }}
run: terraform plan -no-color 2>&1 | tee plan_output.txt
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: us-east-1
MERAKI_DASHBOARD_API_KEY: ${{ secrets.MERAKI_DASHBOARD_API_KEY }}
TF_VAR_radius_secret: ${{ secrets.RADIUS_SECRET }}
TF_VAR_wifi_password_psk: ${{ secrets.WIFI_PASSWORD_PSK }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: us-east-1
MERAKI_DASHBOARD_API_KEY: ${{ secrets.MERAKI_DASHBOARD_API_KEY }}
TF_VAR_radius_secret: ${{ secrets.RADIUS_SECRET }}
TF_VAR_wifi_password_psk: ${{ secrets.WIFI_PASSWORD_PSK }}
- name: Comentar Plan en el PR
uses: actions/github-script@v7
@@ -49,11 +90,11 @@ jobs:
with:
script: |
const fs = require('fs');
const plan = fs.readFileSync('sites/BCN01-LAB/plan_output.txt', 'utf8');
const plan = fs.readFileSync('sites/${{ matrix.site }}/plan_output.txt', 'utf8');
const truncated = plan.length > 60000 ? plan.substring(0, 60000) + '\n...(truncado)' : plan;
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `## Terraform Plan - BCN01-LAB\n\`\`\`\n${truncated}\n\`\`\``
body: `## Terraform Plan - ${{ matrix.site }}\n\`\`\`\n${truncated}\n\`\`\``
});