Merge pull request #1458 from Wandalen/willbe/fix-deploy-makefile

READY : Replace spaces in makefile with tabs
Wandalen · Sep 9, 2024 · 3a8e561 · 3a8e561
2 parents 1160b71 + 3a0204d
commit 3a8e561
Showing 1 changed file with 64 additions and 64 deletions.
diff --git a/module/move/willbe/template/deploy/Makefile.hbs b/module/move/willbe/template/deploy/Makefile.hbs
@@ -43,129 +43,129 @@ export AWS_ACCESS_KEY_ID ?= $(SECRET_AWS_ACCESS_KEY_ID)
 # AWS Secret Access key for deploying to an EC2 instance
 export AWS_SECRET_ACCESS_KEY ?= $(SECRET_AWS_ACCESS_KEY)
 
-# Check Hetzner and deployment related keys
+# Check Hetzner and deployment related keys 
 check-hetzner-keys:
-  @[ -f key/SECRET_CSP_HETZNER ] \
+	@[ -f key/SECRET_CSP_HETZNER ] \
     || [ ! -z "${SECRET_CSP_HETZNER}" ] \
     || { echo "ERROR: File key/SECRET_CSP_HETZNER does not exist"; exit 1; }
 
-# Check AWS and deployment related keys
+# Check AWS and deployment related keys 
 check-aws-keys:
-  @[ -f key/SECRET_AWS_ACCESS_KEY_ID ] \
+	@[ -f key/SECRET_AWS_ACCESS_KEY_ID ] \
     || [ ! -z "${SECRET_AWS_ACCESS_KEY_ID}" ] \
     || echo "ERROR: File key/SECRET_AWS_ACCESS_KEY_ID does not exist"
-  @[ -f key/SECRET_AWS_ACCESS_KEY ] \
+	@[ -f key/SECRET_AWS_ACCESS_KEY ] \
     || [ ! -z "${SECRET_AWS_ACCESS_KEY}" ] \
     || echo "ERROR: File key/SECRET_AWS_ACCESS_KEY does not exist"
-  @[ -f key/SECRET_AWS_ACCESS_KEY_ID ] \
+	@[ -f key/SECRET_AWS_ACCESS_KEY_ID ] \
     || [ ! -z "${SECRET_AWS_ACCESS_KEY_ID}" ] \
     || exit 1
-  @[ -f key/SECRET_AWS_ACCESS_KEY ] \
+	@[ -f key/SECRET_AWS_ACCESS_KEY ] \
     || [ ! -z "${SECRET_AWS_ACCESS_KEY}" ] \
     || exit 1
 
 check-gce-keys:
-  @echo "All required GCE keys are the same as GCP keys"
+	@echo "All required GCE keys are the same as GCP keys" 
 
 # Check if required GCP keys are present
 check-gcp-keys:
-  @[ -f key/service_account.json ] \
+	@[ -f key/service_account.json ] \
     || echo "ERROR: File key/service_account.json does not exist"
-  @[ -f key/SECRET_STATE_ARCHIVE_KEY ] \
+	@[ -f key/SECRET_STATE_ARCHIVE_KEY ] \
     || [ ! -z "${SECRET_STATE_ARCHIVE_KEY}" ] \
     || echo "ERROR: File key/SECRET_STATE_ARCHIVE_KEY does not exist"
-  @[ -f key/service_account.json ] \
+	@[ -f key/service_account.json ] \
     || exit 1
-  @[ -f key/SECRET_STATE_ARCHIVE_KEY ] \
+	@[ -f key/SECRET_STATE_ARCHIVE_KEY ] \
     || [ ! -z "${SECRET_STATE_ARCHIVE_KEY}" ] \
     || exit 1
 
 # Start local docker container
 start:
-  docker compose up -d
+	docker compose up -d
 
 # Stop local docker container
 stop:
-  docker compose down
+	docker compose down
 
 # Remove created docker image
 clean: stop
-  docker rmi $(TF_VAR_IMAGE_NAME)
-  docker buildx prune -af
+	docker rmi $(TF_VAR_IMAGE_NAME)
+	docker buildx prune -af
 
 # Install gcloud for Debian/Ubuntu
 install-gcloud:
-  # GCloud
-  sudo apt-get update
-  sudo apt-get install -y apt-transport-https ca-certificates gnupg curl sudo
-  curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg
-  echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-  sudo apt-get update && sudo apt-get install -y google-cloud-cli
+	# GCloud
+	sudo apt-get update
+	sudo apt-get install -y apt-transport-https ca-certificates gnupg curl sudo
+	curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg
+	echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+	sudo apt-get update && sudo apt-get install -y google-cloud-cli
 
 # Install terraform for Debian/Ubuntu
 install-terraform:
-  sudo apt-get update && sudo apt-get install -y gnupg software-properties-common
-  wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
-  gpg --no-default-keyring --keyring /usr/share/keyrings/hashicorp-archive-keyring.gpg --fingerprint
-  echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
-  sudo apt update && sudo apt-get install terraform
+	sudo apt-get update && sudo apt-get install -y gnupg software-properties-common
+	wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
+	gpg --no-default-keyring --keyring /usr/share/keyrings/hashicorp-archive-keyring.gpg --fingerprint
+	echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+	sudo apt update && sudo apt-get install terraform
 
 # Install gcloud and terraform
 install: install-gcloud install-terraform
-  gcloud --version
-  terraform -version
+	gcloud --version
+	terraform -version
 
 # Login to GCP with user account
 gcp-auth:
-  gcloud auth application-default login
+	gcloud auth application-default login
 
 # Authorize to GCP with service account
 gcp-service:
-  gcloud auth activate-service-account --key-file=$(google_sa_creds)
+	gcloud auth activate-service-account --key-file=$(google_sa_creds)
 
 # Add docker repo auth helper
 gcp-docker:
-  gcloud auth configure-docker $(TF_VAR_REGION)-docker.pkg.dev --quiet
+	gcloud auth configure-docker $(TF_VAR_REGION)-docker.pkg.dev --quiet
 
 # Initializes all terraform projects
 # Downloads required modules and validates .tf files
 tf-init:
-  terraform -chdir=$(tf_dir)/gar init
-  terraform -chdir=$(tf_dir)/gce init
-  terraform -chdir=$(tf_dir)/hetzner init
-  terraform -chdir=$(tf_dir)/aws init
+	terraform -chdir=$(tf_dir)/gar init
+	terraform -chdir=$(tf_dir)/gce init
+	terraform -chdir=$(tf_dir)/hetzner init
+	terraform -chdir=$(tf_dir)/aws init
 
 # Creates Artifact Registry repository on GCP in specified location
 create-artifact-repo: tf-init
-  terraform -chdir=$(tf_dir)/gar apply -auto-approve
+	terraform -chdir=$(tf_dir)/gar apply -auto-approve
 
 # Builds uarust_conf_site image
 build-image:
-  docker build . -t name:$(TF_VAR_IMAGE_NAME) -t $(tag)
+	docker build . -t name:$(TF_VAR_IMAGE_NAME) -t $(tag)
 
 # Builds and pushes local docker image to the private repository
 push-image: gcp-docker create-artifact-repo
-  docker push $(tag)
+	docker push $(tag)
 
 # Creates GCE instance with the website configured on boot
 create-gce: check-gce-keys gcp-service state_storage_pull push-image
-  terraform -chdir=$(tf_dir)/gce apply -auto-approve
+	terraform -chdir=$(tf_dir)/gce apply -auto-approve
 
 # Creates AWS EC2 instance with the website configured on boot
 create-aws: check-aws-keys gcp-service state_storage_pull push-image
-  terraform -chdir=$(tf_dir)/aws apply -auto-approve
+	terraform -chdir=$(tf_dir)/aws apply -auto-approve
 
 # Creates Hetzner instance with the website configured on boot
 create-hetzner: check-hetzner-keys gcp-service state_storage_pull push-image
-  terraform -chdir=$(tf_dir)/hetzner apply -auto-approve
+	terraform -chdir=$(tf_dir)/hetzner apply -auto-approve
 
 # Deploys everything and updates terraform states
 deploy-in-container: create-$(CSP) state_storage_push
 
 # Deploys using tools from the container
 deploy: check-gcp-keys build-image
-  docker build . -t deploy-$(TF_VAR_IMAGE_NAME) -f ./$(tf_dir)/Dockerfile --build-arg google_sa_creds="$(google_sa_creds)"
-  @docker run -v //var/run/docker.sock:/var/run/docker.sock -v .:/app \
+	docker build . -t deploy-$(TF_VAR_IMAGE_NAME) -f ./$(tf_dir)/Dockerfile --build-arg google_sa_creds="$(google_sa_creds)"
+	@docker run -v //var/run/docker.sock:/var/run/docker.sock -v .:/app \
     -e SECRET_STATE_ARCHIVE_KEY=$(SECRET_STATE_ARCHIVE_KEY) \
     -e SECRET_CSP_HETZNER=$(SECRET_CSP_HETZNER) \
     -e SECRET_AWS_ACCESS_KEY_ID=$(SECRET_AWS_ACCESS_KEY_ID) \
@@ -175,35 +175,35 @@ deploy: check-gcp-keys build-image
 
 # Review changes that terraform will do on apply
 tf-plan: tf-init
-  terraform -chdir=$(tf_dir)/gar plan
-  terraform -chdir=$(tf_dir)/gce plan
-  terraform -chdir=$(tf_dir)/hetzner plan
-  terraform -chdir=$(tf_dir)/aws plan
+	terraform -chdir=$(tf_dir)/gar plan
+	terraform -chdir=$(tf_dir)/gce plan
+	terraform -chdir=$(tf_dir)/hetzner plan
+	terraform -chdir=$(tf_dir)/aws plan
 
 # Destroy created infrastracture on GCP
 tf-destroy: tf-init
-  terraform -chdir=$(tf_dir)/gar destroy
-  terraform -chdir=$(tf_dir)/gce destroy
-  terraform -chdir=$(tf_dir)/hetzner destroy
-  terraform -chdir=$(tf_dir)/aws destroy
+	terraform -chdir=$(tf_dir)/gar destroy
+	terraform -chdir=$(tf_dir)/gce destroy
+	terraform -chdir=$(tf_dir)/hetzner destroy
+	terraform -chdir=$(tf_dir)/aws destroy
 
 # Pushes encrypted terraform state files to the GCS Bucket
 state_storage_push:
-  @echo Pushing encrypted terraform state files to the GCS Bucket
-  @gcloud storage cp $(tf_dir)/gce/terraform.tfstate gs://$(TF_VAR_BUCKET_NAME)/gce.tfstate --encryption-key="$(SECRET_STATE_ARCHIVE_KEY)"
-  @gcloud storage cp $(tf_dir)/gar/terraform.tfstate gs://$(TF_VAR_BUCKET_NAME)/gar.tfstate --encryption-key="$(SECRET_STATE_ARCHIVE_KEY)"
-  @gcloud storage cp $(tf_dir)/hetzner/terraform.tfstate gs://$(TF_VAR_BUCKET_NAME)/hetzner.tfstate --encryption-key="$(SECRET_STATE_ARCHIVE_KEY)"
-  @gcloud storage cp $(tf_dir)/aws/terraform.tfstate gs://$(TF_VAR_BUCKET_NAME)/aws.tfstate --encryption-key="$(SECRET_STATE_ARCHIVE_KEY)"
+	@echo Pushing encrypted terraform state files to the GCS Bucket
+	-@gcloud storage cp $(tf_dir)/gce/terraform.tfstate gs://$(TF_VAR_BUCKET_NAME)/gce.tfstate --encryption-key="$(SECRET_STATE_ARCHIVE_KEY)"
+	-@gcloud storage cp $(tf_dir)/gar/terraform.tfstate gs://$(TF_VAR_BUCKET_NAME)/gar.tfstate --encryption-key="$(SECRET_STATE_ARCHIVE_KEY)"
+	-@gcloud storage cp $(tf_dir)/hetzner/terraform.tfstate gs://$(TF_VAR_BUCKET_NAME)/hetzner.tfstate --encryption-key="$(SECRET_STATE_ARCHIVE_KEY)"
+	-@gcloud storage cp $(tf_dir)/aws/terraform.tfstate gs://$(TF_VAR_BUCKET_NAME)/aws.tfstate --encryption-key="$(SECRET_STATE_ARCHIVE_KEY)"
 
 # Pulls and decrypts terraform state files to the GCS Bucket
 state_storage_pull:
-  @echo Pulling terraform state files to the GCS Bucket
-  -@gcloud storage cp gs://$(TF_VAR_BUCKET_NAME)/gce.tfstate $(tf_dir)/gce/terraform.tfstate --decryption-keys="$(SECRET_STATE_ARCHIVE_KEY)"
-  -@gcloud storage cp gs://$(TF_VAR_BUCKET_NAME)/gar.tfstate $(tf_dir)/gar/terraform.tfstate --decryption-keys="$(SECRET_STATE_ARCHIVE_KEY)"
-  -@gcloud storage cp gs://$(TF_VAR_BUCKET_NAME)/hetzner.tfstate $(tf_dir)/hetzner/terraform.tfstate --decryption-keys="$(SECRET_STATE_ARCHIVE_KEY)"
-  -@gcloud storage cp gs://$(TF_VAR_BUCKET_NAME)/aws.tfstate $(tf_dir)/aws/terraform.tfstate --decryption-keys="$(SECRET_STATE_ARCHIVE_KEY)"
+	@echo Pulling terraform state files to the GCS Bucket
+	-@gcloud storage cp gs://$(TF_VAR_BUCKET_NAME)/gce.tfstate $(tf_dir)/gce/terraform.tfstate --decryption-keys="$(SECRET_STATE_ARCHIVE_KEY)"
+	-@gcloud storage cp gs://$(TF_VAR_BUCKET_NAME)/gar.tfstate $(tf_dir)/gar/terraform.tfstate --decryption-keys="$(SECRET_STATE_ARCHIVE_KEY)"
+	-@gcloud storage cp gs://$(TF_VAR_BUCKET_NAME)/hetzner.tfstate $(tf_dir)/hetzner/terraform.tfstate --decryption-keys="$(SECRET_STATE_ARCHIVE_KEY)"
+	-@gcloud storage cp gs://$(TF_VAR_BUCKET_NAME)/aws.tfstate $(tf_dir)/aws/terraform.tfstate --decryption-keys="$(SECRET_STATE_ARCHIVE_KEY)"
 
 # Creates GCS Bucket for terraform states
 state_storage_init:
-  terraform -chdir=$(tf_dir)/gcs init
-  terraform -chdir=$(tf_dir)/gcs apply
+	terraform -chdir=$(tf_dir)/gcs init
+	terraform -chdir=$(tf_dir)/gcs apply