opentofu · eranelbaz · Oct 5, 2023 · Oct 5, 2023 · Oct 5, 2023 · eranelbaz
diff --git a/.github/workflows/dev-deployment.yml b/.github/workflows/dev-deployment.yml
@@ -44,7 +44,9 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
 
       - name: Initialize Terraform
-        run: terraform init
+        run: |
+          cd iac
-          cd iac
+        run: terraform init
+        working-directory: "./iac"
-          cd iac
+        run: terraform init
+        working-directory: "./iac"
+          terraform init
 
       - name: Select Terraform Workspace
         run: terraform workspace select dev

diff --git a/.github/workflows/prod-deployment.yml b/.github/workflows/prod-deployment.yml
@@ -44,7 +44,9 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
 
       - name: Initialize Terraform
-        run: terraform init
+        run: |
+          cd iac
+          terraform init
 
       - name: Select Terraform Workspace
         run: terraform workspace select prod

diff --git a/.terraform-version → iac/.terraform-version b/.terraform-version → iac/.terraform-version
diff --git a/.terraform.lock.hcl → iac/.terraform.lock.hcl b/.terraform.lock.hcl → iac/.terraform.lock.hcl
diff --git a/apigw.tf → iac/apigw.tf b/apigw.tf → iac/apigw.tf
diff --git a/dynamo.tf → iac/dynamo.tf b/dynamo.tf → iac/dynamo.tf
diff --git a/iam.tf → iac/iam.tf b/iam.tf → iac/iam.tf
diff --git a/lambda.tf → iac/lambda.tf b/lambda.tf → iac/lambda.tf
@@ -1,7 +1,7 @@
 resource "null_resource" "api_function_binary" {
   provisioner "local-exec" {
     command     = "GOOS=linux GOARCH=amd64 CGO_ENABLED=0 GOFLAGS=-trimpath go build -mod=readonly -tags lambda.norpc -ldflags='-s -w' -o ../api_function_bootstrap/bootstrap ./lambda/api"
-    working_dir = "./src"
+    working_dir = "../src"
   }
 
   triggers = {
@@ -12,7 +12,7 @@ resource "null_resource" "api_function_binary" {
 resource "null_resource" "populate_provider_versions_binary" {
   provisioner "local-exec" {
     command     = "GOOS=linux GOARCH=amd64 CGO_ENABLED=0 GOFLAGS=-trimpath go build -mod=readonly -tags lambda.norpc -ldflags='-s -w' -o ../populate_provider_versions_bootstrap/bootstrap ./lambda/populate_provider_versions"
-    working_dir = "./src"
+    working_dir = "../src"
   }
 
   triggers = {
@@ -24,15 +24,15 @@ data "archive_file" "api_function_archive" {
   depends_on = [null_resource.api_function_binary]
 
   type        = "zip"
-  source_file = "./api_function_bootstrap/bootstrap"
+  source_file = "../api_function_bootstrap/bootstrap"
   output_path = "api_bootstrap.zip"
 }
 
 data "archive_file" "populate_provider_versions_archive" {
   depends_on = [null_resource.populate_provider_versions_binary]
 
   type        = "zip"
-  source_file = "./populate_provider_versions_bootstrap/bootstrap"
+  source_file = "../populate_provider_versions_bootstrap/bootstrap"
   output_path = "populate_provider_versions_bootstrap.zip"
 }
 

diff --git a/main.tf → iac/main.tf b/main.tf → iac/main.tf
diff --git a/r53.tf → iac/r53.tf b/r53.tf → iac/r53.tf
diff --git a/secrets.tf → iac/secrets.tf b/secrets.tf → iac/secrets.tf
diff --git a/variables.tf → iac/variables.tf b/variables.tf → iac/variables.tf