run terraform on deploy to QA

Author: devksingh4

.github/workflows/deploy-qa.yml

@@ -20,6 +20,12 @@ jobs:
         env:
           HUSKY: "0"
 
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v2
+        with:
+          terraform_version: 1.12.2
+
+
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
@@ -102,6 +108,11 @@ jobs:
           node-version: 22.x
           cache: "yarn"
 
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v2
+        with:
+          terraform_version: 1.12.2
+
       - name: Restore Yarn Cache
         uses: actions/cache@v4
         with:

Makefile

@@ -96,6 +96,8 @@ deploy_prod: check_account_prod
 deploy_dev: check_account_dev
 	@echo "Deploying CloudFormation stack..."
 	sam deploy $(common_params) --parameter-overrides $(run_env)=dev $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)" S3BucketPrefix="$(s3_bucket_prefix)"
+	@echo "Deploying Terraform..."
+	terraform -chdir=terraform/envs/qa apply -auto-approve
 	make postdeploy
 
 invalidate_cloudfront:
@@ -121,6 +123,10 @@ test_live_integration: install
 test_unit: install
 	yarn lint
 	cfn-lint cloudformation/**/*
+	terraform -chdir=terraform/envs/qa fmt -check
+	terraform -chdir=terraform/envs/prod fmt -check
+	terraform -chdir=terraform/envs/qa validate
+	terraform -chdir=terraform/envs/prod validate
 	yarn prettier
 	yarn test:unit
 

cloudformation/logs.yml

@@ -11,6 +11,7 @@ Resources:
   AppApiLambdaLogGroup:
     Type: AWS::Logs::LogGroup
     DeletionPolicy: Retain
+    UpdateReplacePolicy: Retain
     Properties:
       LogGroupName:
         Fn::Sub: /aws/lambda/${LambdaFunctionName}

terraform/modules/cloudwatch_logs/main.tf renamed to terraform/envs/prod/main.tf

@@ -9,14 +9,20 @@ terraform {
   required_version = ">= 1.2"
 }
 
+provider "aws" {
+  region = "us-east-1"
+  default_tags {
+    tags = {
+      project = var.ProjectId
+    }
+  }
+}
 
 import {
   to = aws_cloudwatch_log_group.main_app_logs
-  id = "${var.resource_prefix}-logs"
+  id = "/aws/lambda/${var.ProjectId}-lambda"
 }
-
-
 resource "aws_cloudwatch_log_group" "main_app_logs" {
-  name              = "${var.resource_prefix}-logs"
-  retention_in_days = var.retention_in_days
+  name              = "/aws/lambda/${var.ProjectId}-lambda"
+  retention_in_days = var.LogRetentionDays
 }

terraform/envs/prod/variables.tf

@@ -0,0 +1,10 @@
+variable "LogRetentionDays" {
+  type    = number
+  default = 90
+}
+
+variable "ProjectId" {
+  type    = string
+  default = "infra-core-api"
+}
+

terraform/envs/qa/.terraform.lock.hcl

@@ -11,10 +11,18 @@ terraform {
 
 provider "aws" {
   region = "us-east-1"
+  default_tags {
+    tags = {
+      project = var.ProjectId
+    }
+  }
 }
 
-module "cloudwatch_logs" {
-  source            = "../../modules/cloudwatch_logs"
-  resource_prefix   = var.ResourcePrefix
+import {
+  to = aws_cloudwatch_log_group.main_app_logs
+  id = "/aws/lambda/${var.ProjectId}-lambda"
+}
+resource "aws_cloudwatch_log_group" "main_app_logs" {
+  name              = "/aws/lambda/${var.ProjectId}-lambda"
   retention_in_days = var.LogRetentionDays
 }

terraform/envs/qa/main.tf

@@ -3,7 +3,7 @@ variable "LogRetentionDays" {
   default = 7
 }
 
-variable "ResourcePrefix" {
+variable "ProjectId" {
   type    = string
   default = "infra-core-api"
 }