Merge branch 'main' into dependabot/npm_and_yarn/infra/dataform-service/src/multi-116f458471

Author: max-ostapenko

.github/workflows/infra.yaml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - main
-    paths:
-      - "infra/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,35 +20,20 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-        with:
-          persist-credentials: false
 
       - name: Authenticate with Google Cloud
         uses: google-github-actions/auth@v3
         with:
-          project_id: "httparchive"
-          credentials_json: "${{ secrets.GCP_SA_KEY }}"
+          project_id: 'httparchive'
+          credentials_json: ${{ secrets.GCP_SA_KEY }}
 
       - name: Set up Terraform
-        uses: hashicorp/setup-terraform@v3.1.2
-
-      - name: Terraform Format Check
-        working-directory: ./infra
-        run: terraform fmt -check
+        uses: hashicorp/setup-terraform@v3
 
       - name: Initialize Terraform
-        working-directory: ./infra
-        run: terraform init
-
-      - name: Validate Terraform
-        working-directory: ./infra
-        run: terraform validate
-
-      - name: Plan Terraform
-        working-directory: ./infra
-        run: terraform plan -out=tfplan
+        run: |
+          make tf_init
+          make tf_lint
 
       - name: Apply Terraform
-        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-        working-directory: ./infra
-        run: terraform apply -auto-approve tfplan
+        run: make tf_apply

Makefile

@@ -2,8 +2,14 @@ clean:
 	rm -rf ./infra/bigquery-export/node_modules
 	rm -rf ./infra/dataform-service/node_modules
 
+tf_init:
+	cd infra && terraform init -upgrade
+
+tf_lint:
+	cd infra && terraform fmt -check && terraform validate
+
 tf_plan:
-	cd infra && terraform init -upgrade && terraform plan
+	cd infra && terraform plan
 
 tf_apply:
-	cd infra && terraform init && terraform apply -auto-approve
+	cd infra && terraform apply -auto-approve