From 0e7860bfe7c781bba6b3ab4af0de995da3e17990 Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Fri, 18 Apr 2025 11:35:01 +0100 Subject: [PATCH] Worflow: changes vars --- .gitea/workflows/terraform-apply.yml | 11 +++-------- .gitea/workflows/terraform-destroy.yml | 11 +++-------- .gitea/workflows/terraform-plan.yml | 11 +++-------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/terraform-apply.yml b/.gitea/workflows/terraform-apply.yml index 15cd552..bd1fbf3 100644 --- a/.gitea/workflows/terraform-apply.yml +++ b/.gitea/workflows/terraform-apply.yml @@ -16,8 +16,9 @@ jobs: pull-requests: write env: - TF_VAR_SSH_KEY_PUBLIC: ${{ secrets.SSH_KEY_PUBLIC }} - TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }} + TF_VAR_SSH_KEY: ${{ secrets.TF_VAR_SSH_KEY_PUBLIC }} + TF_VAR_TS_AUTHKEY: ${{ secrets.TF_VAR_TS_AUTHKEY }} + TF_VAR_PROXMOX_PASSWORD: ${{ secrets.TF_VAR_PROXMOX_PASSWORD }} steps: - name: Checkout repository @@ -28,12 +29,6 @@ jobs: with: terraform_version: 1.6.6 - - name: Inject sensitive secrets - working-directory: terraform - run: | - echo 'proxmox_password = "${{ secrets.PROXMOX_PASSWORD }}"' >> terraform.tfvars - echo 'SSH_KEY_PUBLIC = "${{ secrets.SSH_KEY_PUBLIC }}"' >> terraform.tfvars - - name: Terraform Init working-directory: terraform run: terraform init diff --git a/.gitea/workflows/terraform-destroy.yml b/.gitea/workflows/terraform-destroy.yml index 0ab30af..f082b60 100644 --- a/.gitea/workflows/terraform-destroy.yml +++ b/.gitea/workflows/terraform-destroy.yml @@ -14,9 +14,9 @@ jobs: pull-requests: write env: - TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY }} - TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }} - TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }} + TF_VAR_SSH_KEY: ${{ secrets.TF_VAR_SSH_KEY_PUBLIC }} + TF_VAR_TS_AUTHKEY: ${{ secrets.TF_VAR_TS_AUTHKEY }} + TF_VAR_PROXMOX_PASSWORD: ${{ secrets.TF_VAR_PROXMOX_PASSWORD }} steps: @@ -28,11 +28,6 @@ jobs: with: terraform_version: 1.6.6 - - name: Inject sensitive secrets - working-directory: terraform - run: | - echo 'proxmox_password = "${{ secrets.PROXMOX_PASSWORD }}"' >> terraform.tfvars - - name: Terraform Init working-directory: terraform run: terraform init diff --git a/.gitea/workflows/terraform-plan.yml b/.gitea/workflows/terraform-plan.yml index 67dab5d..ffaa5a5 100644 --- a/.gitea/workflows/terraform-plan.yml +++ b/.gitea/workflows/terraform-plan.yml @@ -17,8 +17,9 @@ jobs: pull-requests: write env: - TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY_PUBLIC }} - TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }} + TF_VAR_SSH_KEY: ${{ secrets.TF_VAR_SSH_KEY_PUBLIC }} + TF_VAR_TS_AUTHKEY: ${{ secrets.TF_VAR_TS_AUTHKEY }} + TF_VAR_PROXMOX_PASSWORD: ${{ secrets.TF_VAR_PROXMOX_PASSWORD }} steps: - name: Checkout repository @@ -29,12 +30,6 @@ jobs: with: terraform_version: 1.6.6 - - name: Inject sensitive secrets - working-directory: terraform - run: | - echo 'proxmox_password = "${{ secrets.PROXMOX_PASSWORD }}"' >> terraform.tfvars - echo 'SSH_KEY_PUBLIC = "${{ secrets.SSH_KEY_PUBLIC }}"' >> terraform.tfvars - - name: Terraform Init working-directory: terraform run: terraform init