From 73c384fa6d5071728a64b268dae3bdd14308b099 Mon Sep 17 00:00:00 2001 From: Dustin Kaiser Date: Thu, 9 Jan 2025 11:38:35 +0100 Subject: [PATCH] wip --- services/monitoring/grafana/Makefile | 2 +- services/monitoring/grafana/terraform/main.tf.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/monitoring/grafana/Makefile b/services/monitoring/grafana/Makefile index ca970f40..d55bf3fd 100644 --- a/services/monitoring/grafana/Makefile +++ b/services/monitoring/grafana/Makefile @@ -20,7 +20,7 @@ $(TF_STATE_FILE): $(REPO_CONFIG_LOCATION) terraform/main.tf if [ "$${GRAFANA_TERRAFORM_STATE_BACKEND_TYPE}" = "local" ]; then \ terraform -chdir=./terraform init; \ else \ - terraform -chdir=./terraform init -backend-config="access_key=$${GRAFANA_TERRAFORM_STATE_BACKEND_AWS_ACCESS_KEY_ID}" -backend-config="secret_key=$${GRAFANA_TERRAFORM_STATE_BACKEND_AWS_SECRET_ACCESS_KEY}"; \ + terraform -chdir=./terraform init -backend-config="access_key=$${TF_GRAFANA_STATE_BACKEND_AWS_ACCESS_KEY_ID}" -backend-config="secret_key=$${TF_GRAFANA_STATE_BACKEND_AWS_SECRET_ACCESS_KEY}"; \ fi terraform/plan.cache: diff --git a/services/monitoring/grafana/terraform/main.tf.j2 b/services/monitoring/grafana/terraform/main.tf.j2 index 749408a8..d2a48303 100644 --- a/services/monitoring/grafana/terraform/main.tf.j2 +++ b/services/monitoring/grafana/terraform/main.tf.j2 @@ -10,8 +10,8 @@ terraform { key = "{{ GRAFANA_TERRAFORM_STATE_BACKEND_S3_KEY }}" use_lockfile = true encrypt = false - bucket = "{{ TF_STATE_S3_BUCKET_NAME }}" - region = "{{ TF_STATE_S3_REGION }}" + bucket = "{{ TF_GRAFANA_STATE_BACKEND_S3_BUCKET_NAME }}" + region = "{{ TF_GRAFANA_STATE_BACKEND_AWS_REGION }}" {% if GRAFANA_TERRAFORM_STATE_BACKEND_S3_ENDPOINT %} endpoints = { s3 = "{{ GRAFANA_TERRAFORM_STATE_BACKEND_S3_ENDPOINT }}"