Rename and refactor

Author: mrnicegyu11

scripts/common.Makefile

@@ -24,20 +24,6 @@ $(if $(shell wc -l $(REPO_BASE_DIR)/.config.location | grep 1),,$(error The .con
 
 # Extract DEPLOYMENT_FQDN using Make functions
 DEPLOYMENT_FQDN := $(notdir $(patsubst %/,%, $(dir $(REPO_CONFIG_LOCATION))))
-# Construct CI_ENV_FILE using Make functions
-CI_ENV_FILE := $(realpath $(dir $(REPO_CONFIG_LOCATION))/../../.gitlab/pipelines/1_configurations/$(DEPLOYMENT_FQDN)/ci.env)
-# Check if ci.env exists and is not empty
-ifeq ($(shell [ -e $(CI_ENV_FILE) ] && cat $(CI_ENV_FILE)),)
-    # If ci.env does not exist, check for ansible.env
-	ANSIBLE_ENV_FILE := $(REPO_CONFIG_LOCATION)/ansible.env
-    ifeq ($(shell [ -e $(ANSIBLE_ENV_FILE) ] && cat $(ANSIBLE_ENV_FILE)),)
-        $(error Neither the ci.env file nor the ansible.env file could be found. Aborting.)
-    else
-        $(warning ci.env file is missing. Falling back to ansible.env file. We assume that you are running in a CI pipeline.)
-        CI_ENV_FILE := $(ANSIBLE_ENV_FILE)
-    endif
-endif
-
 # Use SELECTED_ENV_FILE in your targets as needed
 ifeq ($(_yq),)
 _yq = docker run --rm -i -v $${PWD}:/workdir mikefarah/yq:4.30.4

services/monitoring/grafana/Makefile

@@ -7,37 +7,37 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile
 # Internal VARIABLES ------------------------------------------------
 TF_STATE_FILE := terraform/.terraform/terraform.tfstate
 
-terraform/main.tf: terraform/main.tf.j2 .venv $(CI_ENV_FILE)
+terraform/main.tf: terraform/main.tf.j2 .venv $(REPO_CONFIG_LOCATION)
 	# generate $@
-	@$(call jinja, $<, $(CI_ENV_FILE), $@)
+	@$(call jinja, $<, $(REPO_CONFIG_LOCATION), $@)
 	# validate and format $@
 
 terraform-init: $(TF_STATE_FILE)  ## init terraform
 
-$(TF_STATE_FILE): $(CI_ENV_FILE) terraform/main.tf
+$(TF_STATE_FILE): $(REPO_CONFIG_LOCATION) terraform/main.tf
 	# terraform init
 	@set -a; source $<; set +a; \
-	if [ "$${TF_STATE_BACKEND_TYPE}" = "local" ]; then \
+	if [ "$${GRAFANA_TERRAFORM_STATE_BACKEND_TYPE}" = "local" ]; then \
 	  terraform -chdir=./terraform init; \
 	else \
-	  terraform -chdir=./terraform init -backend-config="access_key=$${TF_BACKEND_ACCESS_KEY}" -backend-config="secret_key=$${TF_BACKEND_SECRET_KEY}"; \
+	  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}"; \
 	fi
 
 terraform/plan.cache:
 	@echo "$@ file not found. Run 'make terraform-plan' to generate it."
 	@exit 1
 
 .PHONY: terraform-plan
-terraform-plan: $(CI_ENV_FILE) $(TF_STATE_FILE) ensure-grafana-online ## terraform plan
+terraform-plan: $(REPO_CONFIG_LOCATION) $(TF_STATE_FILE) ensure-grafana-online ## terraform plan
 	# terraform plan
-	@set -a; source $<; source $${REPO_CONFIG_LOCATION}; set +a; \
-    TF_VAR_aws_region=$${TF_AWS_REGION} TF_VAR_aws_access_key=$${TF_AWS_ACCESS_KEY_ID} TF_VAR_aws_secret_key=$${TF_AWS_SECRET_ACCESS_KEY} terraform -chdir=./terraform plan -out=plan.cache
+	@set -a; source $<; set +a; \
+    terraform -chdir=./terraform plan -out=plan.cache
 
 .PHONY: terraform-apply
-terraform-apply: $(CI_ENV_FILE) terraform/plan.cache $(TF_STATE_FILE) ensure-grafana-online ## terraform apply
+terraform-apply: $(REPO_CONFIG_LOCATION) terraform/plan.cache $(TF_STATE_FILE) ensure-grafana-online ## terraform apply
 	# terraform apply
 	@set -a; source $<; set +a; \
-	TF_VAR_aws_region=$${TF_AWS_REGION} TF_VAR_aws_access_key=$${TF_AWS_ACCESS_KEY_ID} TF_VAR_aws_secret_key=$${TF_AWS_SECRET_ACCESS_KEY} terraform -chdir=./terraform apply plan.cache
+	terraform -chdir=./terraform apply plan.cache
 
 .PHONY: ensure-grafana-online
 ensure-grafana-online:

services/monitoring/grafana/terraform/main.tf.j2

@@ -1,17 +1,22 @@
 terraform {
-  required_version = "~> 1.5.1"
-  {% if TF_STATE_BACKEND_TYPE == "local" %}
-  backend "{{TF_STATE_BACKEND_TYPE}}" {
+  required_version = "~> 1.10.1"
+  {% if GRAFANA_TERRAFORM_STATE_BACKEND_TYPE == "local" %}
+  backend "{{ GRAFANA_TERRAFORM_STATE_BACKEND_TYPE }}" {
     path = "terraform.tfstate" # Specify the path for the state file, can be a different path if needed
   }
   {% endif %}
-  {% if TF_STATE_BACKEND_TYPE == "s3" %}
+  {% if GRAFANA_TERRAFORM_STATE_BACKEND_TYPE == "s3" %}
   backend "s3" {
-    key            = "{{ TF_STATE_S3_GRAFANAKEY}}"
-    dynamodb_table = "{{ TF_STATE_S3_DYNAMODB_LOCK_TABLE }}"
-    encrypt        = true
+    key            = "{{ GRAFANA_TERRAFORM_STATE_BACKEND_S3_KEY }}"
+    use_lockfile = true
+    encrypt        = false
     bucket         = "{{ TF_STATE_S3_BUCKET_NAME }}"
     region         = "{{ TF_STATE_S3_REGION }}"
+    {% if GRAFANA_TERRAFORM_STATE_BACKEND_S3_ENDPOINT %}
+    endpoints = {
+      s3 = "{{ GRAFANA_TERRAFORM_STATE_BACKEND_S3_ENDPOINT }}"
+    }
+    {% endif %}
   }
   {% endif %}
   required_providers {