diff --git a/.github/workflows/apply.yml b/.github/workflows/apply.yml index 0a5ce0d..15bfcc1 100644 --- a/.github/workflows/apply.yml +++ b/.github/workflows/apply.yml @@ -71,7 +71,6 @@ jobs: 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 Apply working-directory: sites/${{ matrix.site }} @@ -80,6 +79,6 @@ jobs: 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 }} + TF_VAR_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 }} diff --git a/.github/workflows/plan.yml b/.github/workflows/plan.yml index 846307a..75ff62f 100644 --- a/.github/workflows/plan.yml +++ b/.github/workflows/plan.yml @@ -74,7 +74,6 @@ jobs: 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 @@ -84,9 +83,9 @@ jobs: 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 }} + TF_VAR_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 diff --git a/sites/BCN01-LAB/main.tf b/sites/BCN01-LAB/main.tf index d58dc0f..d7da1b7 100755 --- a/sites/BCN01-LAB/main.tf +++ b/sites/BCN01-LAB/main.tf @@ -9,7 +9,9 @@ terraform { } } -provider "meraki" {} +provider "meraki" { + meraki_dashboard_api_key = var.meraki_dashboard_api_key +} locals { organization_name = "Adevinta Information Services SLU" diff --git a/sites/BCN01-LAB/variables.tf b/sites/BCN01-LAB/variables.tf index e6aaeac..d196690 100755 --- a/sites/BCN01-LAB/variables.tf +++ b/sites/BCN01-LAB/variables.tf @@ -1,6 +1,12 @@ # Sensitive variables — injected via TF_VAR_* environment variables (GitHub Secrets). # Never put values for these in any .tf file. +variable "meraki_dashboard_api_key" { + type = string + sensitive = true + description = "Meraki Dashboard API key. Pass via TF_VAR_meraki_dashboard_api_key (GitHub Secret: MERAKI_DASHBOARD_API_KEY)." +} + variable "radius_secret" { type = string sensitive = true