fix tf module resource

edgelesssys · Oct 25, 2023 · 96b4e2f · 96b4e2f
1 parent 5c7f75e
commit 96b4e2f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 9 deletions.
diff --git a/terraform/aws-constellation/main.tf b/terraform/aws-constellation/main.tf
@@ -1,12 +1,12 @@
 module "aws_iam" {
-  source      = "../iam/aws"
+  source      = "../terraform/iam/aws"
   name_prefix = var.name_prefix
   region      = var.region
 }
 
 
 module "aws" {
-  source                             = "../aws"
+  source                             = "../terraform/aws"
   name                               = var.name
   node_groups                        = var.node_groups
   iam_instance_profile_worker_nodes  = module.aws_iam.worker_nodes_instance_profile
@@ -36,4 +36,5 @@ module "constellation" {
   region                             = var.region                                    # TODO CSP specific
   zone                               = var.zone                                      # TODO CSP specific
   node_groups                        = var.node_groups
+  dev                                = var.dev
 }
diff --git a/terraform/aws-constellation/variables.tf b/terraform/aws-constellation/variables.tf
@@ -108,3 +108,10 @@ variable "name_prefix" {
   type        = string
   description = "Prefix for all resources"
 }
+
+
+variable "dev" {
+  type        = bool
+  description = "Enable dev mode. This uses the current main branch for the CLI binary."
+  default     = false
+}
diff --git a/terraform/constellation-cluster/main.tf b/terraform/constellation-cluster/main.tf
@@ -11,14 +11,31 @@ locals {
   ]))
 }
 
-
+// TODO make null_resource and execute every time?
 resource "terraform_data" "ensure_cli" {
   provisioner "local-exec" {
-    command = "${path.module}/install-constellation.sh && ./constellation config generate ${var.csp}"
+    command = <<EOT
+         if [ "${var.dev}" ]; then
+         bazel run //:devbuild
+         else
+         ${path.module}/install-constellation.sh
+         fi
+    EOT
+  } # TODO bazel target to only build and link CLI?
+}
+# TODO ensure yq dependency?
+
+resource "terraform_data" "config_generate" {
+  provisioner "local-exec" {
+    command = <<EOT
+         ./constellation config generate ${var.csp}
+    EOT
   }
-  // generate config here to only create it once (csp won't change)
+  depends_on = [
+    terraform_data.ensure_cli
+  ]
+
 }
-# TODO ensure yq dependency
 
 # TODO how to handle CSP specific config without CSP specific input?
 resource "terraform_data" "csp_config" {
@@ -35,7 +52,7 @@ resource "terraform_data" "csp_config" {
   }
 
   depends_on = [
-    terraform_data.ensure_cli
+    terraform_data.config_generate
   ]
 }
 
@@ -50,11 +67,10 @@ resource "terraform_data" "config" {
       ${local.yq_node_groups}
       ./constellation config fetch-measurements
     EOT
-    # TODO use release constellation binary when 2.13.0 is released
   }
 
   depends_on = [
-    terraform_data.csp_config
+    terraform_data.config_generate
   ]
 }
 
@@ -70,6 +86,9 @@ resource "terraform_data" "infra_state" {
       yq eval '.infrastructure.name = "${var.name}"' -i constellation-state.yaml
     EOT
   }
+  depends_on = [
+    terraform_data.config_generate
+  ]
 }
 
 

diff --git a/terraform/constellation-cluster/variables.tf b/terraform/constellation-cluster/variables.tf
@@ -91,3 +91,9 @@ variable "microservice_version" {
   type        = string
   description = "Microservice version"
 }
+
+variable "dev" {
+  type        = bool
+  description = "Enable dev mode. This uses the current main branch for the CLI binary."
+  default     = false
+}