update provisioner

Author: devksingh4

Makefile

@@ -1,38 +1,11 @@
-run_env = ParameterKey=RunEnvironment,ParameterValue
-set_application_prefix = ParameterKey=ApplicationPrefix,ParameterValue
-set_application_name = ParameterKey=ApplicationFriendlyName,ParameterValue
-
 prod_aws_account = 298118738376
 dev_aws_account = 427040638965
 current_aws_account := $(shell aws sts get-caller-identity --query Account --output text)
 
 src_directory_root = src/
 dist_ui_directory_root = dist_ui/
 integration_test_directory_root = tests/live_integration/
-
-# CHANGE ME (as needed)
-application_key=infra-core-api
-application_name="InfraCoreApi"
-techlead="[email protected]"
-region="us-east-1"
-
-# DO NOT CHANGE
-common_params = --no-confirm-changeset \
-								--no-fail-on-empty-changeset \
-								--capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND \
-								--region $(region) \
-								--stack-name $(application_key) \
-				--tags "project=$(application_key)" "techlead=$(techlead)" \
-				--s3-prefix $(application_key) \
-				--resolve-s3
-
-s3_bucket_prefix = "$(current_aws_account)-$(region)-$(application_key)"
-ui_s3_bucket = "$(s3_bucket_prefix)-ui"
-docs_s3_bucket = "$(s3_bucket_prefix)-docs"
-
-
 GIT_HASH := $(shell git rev-parse --short HEAD)
-ORIGIN_SECRET := $(shell openssl rand -hex 32)
 
 .PHONY: clean
 
@@ -81,40 +54,15 @@ build: src/
 local:
 	VITE_BUILD_HASH=$(GIT_HASH) yarn run dev
 
-
-postdeploy:
-	@echo "Syncing S3 UI bucket..."
-	aws s3 sync $(dist_ui_directory_root) s3://$(ui_s3_bucket)/ --delete
-	aws s3 sync $(dist_ui_directory_root) s3://$(s3_bucket_prefix)/ --delete
-	make invalidate_cloudfront
-
 deploy_prod: check_account_prod
-	@echo "Deploying CloudFormation stack..."
-	@sam deploy $(common_params) --parameter-overrides $(run_env)=prod $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)" S3BucketPrefix="$(s3_bucket_prefix)" CloudfrontOriginSecret="$(ORIGIN_SECRET)"
 	@echo "Deploying Terraform..."
-	$(eval MAIN_DISTRIBUTION_ID := $(shell aws cloudformation describe-stacks --stack-name $(application_key) --query "Stacks[0].Outputs[?OutputKey=='CloudfrontDistributionId'].OutputValue" --output text))
 	terraform -chdir=terraform/envs/prod init -lockfile=readonly
-	terraform -chdir=terraform/envs/prod apply -auto-approve -var main_cloudfront_distribution_id="$(MAIN_DISTRIBUTION_ID)"
-	make postdeploy
+	terraform -chdir=terraform/envs/prod apply -auto-approve
 
 deploy_dev: check_account_dev
 	@echo "Deploying Terraform..."
 	terraform -chdir=terraform/envs/qa init -lockfile=readonly
 	terraform -chdir=terraform/envs/qa apply -auto-approve
-	make postdeploy
-
-invalidate_cloudfront:
-	@echo "Creating CloudFront invalidation..."
-	$(eval DISTRIBUTION_ID := $(shell aws cloudformation describe-stacks --stack-name $(application_key) --query "Stacks[0].Outputs[?OutputKey=='CloudfrontDistributionId'].OutputValue" --output text))
-	$(eval DISTRIBUTION_ID_2 := $(shell aws cloudformation describe-stacks --stack-name $(application_key) --query "Stacks[0].Outputs[?OutputKey=='CloudfrontIcalDistributionId'].OutputValue" --output text))
-	$(eval INVALIDATION_ID := $(shell aws cloudfront create-invalidation --distribution-id $(DISTRIBUTION_ID) --paths "/*" --query 'Invalidation.Id' --output text --no-cli-page))
-	$(eval INVALIDATION_ID_2 := $(shell aws cloudfront create-invalidation --distribution-id $(DISTRIBUTION_ID_2) --paths "/*" --query 'Invalidation.Id' --output text --no-cli-page))
-	@echo "Triggered invalidation jobs $(INVALIDATION_ID) and $(INVALIDATION_ID_2)..."
-	@echo "Waiting on job $(INVALIDATION_ID)..."
-	aws cloudfront wait invalidation-completed --distribution-id $(DISTRIBUTION_ID) --id $(INVALIDATION_ID)
-	@echo "Waiting on job $(INVALIDATION_ID_2)..."
-	aws cloudfront wait invalidation-completed --distribution-id $(DISTRIBUTION_ID_2) --id $(INVALIDATION_ID_2)
-	@echo "CloudFront invalidation completed!"
 
 init_terraform:
 	terraform -chdir=terraform/envs/qa init

terraform/envs/prod/.terraform.lock.hcl

@@ -2,6 +2,37 @@ resource "aws_s3_bucket" "frontend" {
   bucket = "${var.BucketPrefix}-${var.ProjectId}"
 }
 
+data "archive_file" "ui" {
+  type        = "zip"
+  source_dir  = "${path.module}/../../../dist_ui/"
+  output_path = "/tmp/ui_archive.zip"
+}
+resource "null_resource" "upload_frontend" {
+  triggers = {
+    ui_bucket_sha = data.archive_file.ui.output_sha
+  }
+
+  provisioner "local-exec" {
+    command = "aws s3 sync ${data.archive_file.ui.source_dir} s3://${aws_s3_bucket.frontend.id} --delete"
+  }
+}
+
+resource "null_resource" "invalidate_frontend" {
+  triggers = {
+    ui_bucket_sha = data.archive_file.ui.output_sha
+  }
+
+  provisioner "local-exec" {
+    command     = <<-EOT
+      set -e
+      INVALIDATION_ID=$(aws cloudfront create-invalidation --distribution-id ${aws_cloudfront_distribution.app_cloudfront_distribution.id} --paths "/*" --query 'Invalidation.Id' --output text)
+      aws cloudfront wait invalidation-completed --distribution-id ${aws_cloudfront_distribution.app_cloudfront_distribution.id} --id "$INVALIDATION_ID"
+    EOT
+    interpreter = ["bash", "-c"]
+  }
+}
+
+
 resource "aws_cloudfront_origin_access_control" "frontend_oac" {
   origin_access_control_origin_type = "s3"
   signing_behavior                  = "always"