From 79ee5868ee22578bacdc5c77f6f07ffc3906dfda Mon Sep 17 00:00:00 2001 From: Xavier Lario Date: Tue, 21 Apr 2026 08:58:41 +0200 Subject: [PATCH] revert last changes --- .github/workflows/apply.yml | 6 +++--- .github/workflows/plan.yml | 6 +++--- sites/BCN01-LAB/main.tf | 4 +--- sites/BCN01-LAB/variables.tf | 6 ------ 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/apply.yml b/.github/workflows/apply.yml index 15bfcc1..3de661b 100644 --- a/.github/workflows/apply.yml +++ b/.github/workflows/apply.yml @@ -79,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 - 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 }} + 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 75ff62f..4903a0f 100644 --- a/.github/workflows/plan.yml +++ b/.github/workflows/plan.yml @@ -83,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 - 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 }} + 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 d7da1b7..d58dc0f 100755 --- a/sites/BCN01-LAB/main.tf +++ b/sites/BCN01-LAB/main.tf @@ -9,9 +9,7 @@ terraform { } } -provider "meraki" { - meraki_dashboard_api_key = var.meraki_dashboard_api_key -} +provider "meraki" {} locals { organization_name = "Adevinta Information Services SLU" diff --git a/sites/BCN01-LAB/variables.tf b/sites/BCN01-LAB/variables.tf index d196690..e6aaeac 100755 --- a/sites/BCN01-LAB/variables.tf +++ b/sites/BCN01-LAB/variables.tf @@ -1,12 +1,6 @@ # 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