Merge pull request #1 from buildrun-tech/develop

Develop

Author: brunograna

.github/workflows/terraform.yml

@@ -41,35 +41,42 @@ jobs:
       - name: Terraform Validate
         run: terraform validate
 
-      - name: Terraform Create/Select Dev Workspace
-        if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
-        id: select-dev-workspace
-        run: |
-          terraform workspace list | grep -q "dev" || terraform workspace new dev
-          terraform workspace select dev
+#      - name: Terraform Create Dev Workspace
+#        if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
+#        id: select-dev-workspace
+#        run: |
+#          terraform workspace list | grep -q "dev" || terraform workspace new dev
 
       - name: Terraform Plan for Dev
         if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
         id: terraform-plan-dev
-        run: cd infra && terraform plan -var-file="./envs/dev/terraform.tfvars" -out=dev.plan
+        run: cd infra &&
+          terraform workspace select dev || terraform workspace new dev &&
+          terraform plan -var-file="./envs/dev/terraform.tfvars" -out=dev.plan
 
       - name: Terraform Apply for Dev
         id: terraform-apply-dev
         if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
-        run: cd infra && terraform apply "dev.plan"
+        run: cd infra &&
+          terraform workspace select dev || terraform workspace new dev &&
+          terraform apply "dev.plan"
 
-      - name: Terraform Create/Select Prod Workspace
-        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-        id: select-prod-workspace
-        run: |
-          terraform workspace list | grep -q "prod" || terraform workspace new prod
-          terraform workspace select prod
+#      - name: Terraform Create Prod Workspace
+#        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+#        id: select-prod-workspace
+#        run: |
+#          terraform workspace list | grep -q "prod" || terraform workspace new prod
 
       - name: Terraform Plan for Prod
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         id: terraform-plan-prod
-        run: cd infra && terraform plan -var-file="./envs/prod/terraform.tfvars" -out=prod.plan
+        run: cd infra &&
+          terraform workspace select prod || terraform workspace new prod &&
+          terraform plan -var-file="./envs/prod/terraform.tfvars" -out=prod.plan
 
       - name: Terraform Apply for Prod
-        id: terraform-apply-prod
         if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-        run: cd infra && terraform apply "prod.plan"
+        id: terraform-apply-prod
+        run: cd infra &&
+          terraform workspace select prod || terraform workspace new prod &&
+          terraform apply "prod.plan"

infra/envs/dev/terraform.tfvars

@@ -1 +1 @@
-bucket_name="DEV-buildrun-pipeline-123-bucket"
+bucket_name="dev-buildrun-pipeline-123-bucket"

infra/envs/prod/terraform.tfvars

@@ -1 +1 @@
-bucket_name="PROD-buildrun-pipeline-123-bucket"
+bucket_name="prod-buildrun-pipeline-123-bucket"