Merge branch 'main' into 141-update-workflows-with-infisical

Reviewed-on: #144

.gitea/workflows/changes.yaml

@@ -34,3 +34,5 @@ jobs:
               - 'api/**'
             client:
               - 'client/**'
+            infrastructure:
+              - 'infrastructure/**'

.gitea/workflows/main.yaml

@@ -23,7 +23,7 @@ jobs:
     name: deploy
     needs: 
       - changes
-      - build
+      - build-and-test
     uses: ./.gitea/workflows/deploy.yaml
     with:
       app_name: flying

.gitea/workflows/pull_request.yaml

@@ -17,3 +17,13 @@ jobs:
       environment_name: test
       version_number: ${{ github.run_id }}
     secrets: inherit
+
+  terraform:
+    if: ${{ needs.changes.outputs.infrastructure == 'true' }}
+    name: terraform-plan
+    needs: 
+      - changes
+    uses: ./.gitea/workflows/infrastructure.yaml
+    with:
+      environment_name: test
+    secrets: inherit

.gitea/workflows/tag.yaml

@@ -5,8 +5,8 @@ on:
       - '**'
 
 jobs:
-  build:
-    name: build
+  build-and-test:
+    name: build-and-test
     uses: ./.gitea/workflows/build_and_test.yaml
     with:
       environment_name: prod
@@ -16,7 +16,7 @@ jobs:
   deploy:
     name: deploy
     needs: 
-      - build
+      - build-and-test
     uses: ./.gitea/workflows/deploy.yaml
     with:
       app_name: flying

.gitea/workflows/terraform.yaml

@@ -1,4 +1,4 @@
-name: 'Infrastructure'
+name: 'Terraform'
 on:
   workflow_dispatch:
     inputs:
@@ -6,7 +6,7 @@ on:
         type: string
 
 jobs:
-  infrastructure:
+  terraform:
     runs-on: ubuntu-latest
     environment:
     steps:
@@ -30,14 +30,16 @@ jobs:
         uses: hashicorp/setup-terraform@v4
 
       - name: Terraform init
-        uses: |
-          terraform init -input=false
+        run: |
+          terraform -chdir=./infrastructure init -input=false
 
       - name: Terraform plan
-        uses: |
-          terraform plan -no-color -input=false
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          terraform -chdir=./infrastructure plan -no-color -input=false
 
       - name: Terraform apply
-        uses: |
-          terraform apply -no-color -
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
+          terraform -chdir=./infrastructure apply -no-color -input=false