flatten the infra structure

Author: max-ostapenko

.gitignore

@@ -1,4 +1,4 @@
-node_modules/
+**/node_modules/
 .DS_Store
-infra/tf/.terraform/
+**/.terraform/
 .env

Makefile

@@ -1,11 +1,9 @@
-.PHONY: *
-
 clean:
 	rm -rf ./infra/bigquery-export/node_modules
 	rm -rf ./infra/dataform-service/node_modules
 
 tf_plan:
-	terraform -chdir=infra/tf init -upgrade && terraform -chdir=infra/tf plan
+	cd infra && terraform init -upgrade && terraform plan
 
 tf_apply:
-	terraform -chdir=infra/tf init && terraform -chdir=infra/tf apply -auto-approve
+	cd infra && terraform init && terraform apply -auto-approve

infra/tf/.terraform.lock.hcl infra/.terraform.lock.hclinfra/tf/.terraform.lock.hcl renamed to infra/.terraform.lock.hcl

@@ -15,7 +15,7 @@ data "external" "source_hash" {
   program = [
     "bash",
     "-c",
-    "cd ../${var.function_name}/ && echo '{\"hash\":\"'$(git ls-files -s | sha1sum | cut -c1-8)'\"}'"
+    "cd ./${var.function_name}/src/ && echo '{\"hash\":\"'$(git ls-files -s | sha1sum | cut -c1-8)'\"}'"
   ]
 }
 
@@ -25,7 +25,7 @@ resource "docker_image" "function_image" {
   name = "${var.region}-docker.pkg.dev/${var.project}/dataform/${var.function_name}:${data.external.source_hash.result.hash}"
 
   build {
-    context    = "../${var.function_name}/"
+    context    = "./${var.function_name}/src/"
     platform   = "linux/amd64"
   }
 }