Set up empty strings as defaults

e2b-dev · Sep 6, 2024 · c6f2bc2 · c6f2bc2
1 parent 7af40c5
commit c6f2bc2
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 5 deletions.
diff --git a/main.tf b/main.tf
@@ -110,10 +110,11 @@ module "github_tf" {
 module "cluster" {
   source = "./packages/cluster"
 
-  gcp_project_id             = var.gcp_project_id
-  gcp_region                 = var.gcp_region
-  gcp_zone                   = var.gcp_zone
-  google_service_account_key = module.init.google_service_account_key
+  cloudflare_api_token_secret_name = module.init.cloudflare_api_token_secret_name
+  gcp_project_id                   = var.gcp_project_id
+  gcp_region                       = var.gcp_region
+  gcp_zone                         = var.gcp_zone
+  google_service_account_key       = module.init.google_service_account_key
 
   server_cluster_size = var.server_cluster_size
   client_cluster_size = var.client_cluster_size

diff --git a/packages/api/main.tf b/packages/api/main.tf
@@ -52,6 +52,15 @@ resource "google_secret_manager_secret" "posthog_api_key" {
   }
 }
 
+resource "google_secret_manager_secret_version" "posthog_api_key" {
+  secret      = google_secret_manager_secret.posthog_api_key.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "random_password" "api_secret" {
   length  = 32
   special = false

diff --git a/packages/cluster/main.tf b/packages/cluster/main.tf
@@ -140,6 +140,8 @@ module "client_cluster" {
 module "network" {
   source = "./network"
 
+  cloudflare_api_token_secret_name = var.cloudflare_api_token_secret_name
+
   gcp_project_id = var.gcp_project_id
 
   api_port                  = var.api_port

diff --git a/packages/cluster/network/main.tf b/packages/cluster/network/main.tf
@@ -8,7 +8,7 @@ terraform {
 }
 
 data "google_secret_manager_secret_version" "cloudflare_api_token" {
-  secret = "${var.prefix}cloudflare-api-token"
+  secret = var.cloudflare_api_token_secret_name
 }
 
 provider "cloudflare" {

diff --git a/packages/cluster/network/variables.tf b/packages/cluster/network/variables.tf
@@ -18,6 +18,10 @@ variable "gcp_project_id" {
 }
 
 
+variable "cloudflare_api_token_secret_name" {
+  type = string
+}
+
 variable "api_port" {
   type = object({
     name        = string

diff --git a/packages/cluster/variables.tf b/packages/cluster/variables.tf
@@ -2,6 +2,10 @@ variable "prefix" {
   type = string
 }
 
+variable "cloudflare_api_token_secret_name" {
+  type = string
+}
+
 variable "cluster_tag_name" {
   description = "The tag name the Compute Instances will look for to automatically discover each other and form a cluster. TIP: If running more than one server Server cluster, each cluster should have its own unique tag name."
   type        = string

diff --git a/packages/init/main.tf b/packages/init/main.tf
@@ -54,6 +54,15 @@ resource "google_secret_manager_secret" "grafana_api_key" {
   }
 }
 
+resource "google_secret_manager_secret_version" "grafana_api_key" {
+  secret      = google_secret_manager_secret.grafana_api_key.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_secret_manager_secret" "grafana_traces_endpoint" {
   secret_id = "${var.prefix}grafana-traces-endpoint"
 
@@ -62,6 +71,15 @@ resource "google_secret_manager_secret" "grafana_traces_endpoint" {
   }
 }
 
+resource "google_secret_manager_secret_version" "grafana_traces_endpoint" {
+  secret      = google_secret_manager_secret.grafana_traces_endpoint.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_secret_manager_secret" "grafana_logs_endpoint" {
   secret_id = "${var.prefix}grafana-logs-endpoint"
 
@@ -70,6 +88,15 @@ resource "google_secret_manager_secret" "grafana_logs_endpoint" {
   }
 }
 
+resource "google_secret_manager_secret_version" "grafana_logs_endpoint" {
+  secret      = google_secret_manager_secret.grafana_logs_endpoint.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_secret_manager_secret" "grafana_metrics_endpoint" {
   secret_id = "${var.prefix}grafana-metrics-endpoint"
 
@@ -78,6 +105,15 @@ resource "google_secret_manager_secret" "grafana_metrics_endpoint" {
   }
 }
 
+resource "google_secret_manager_secret_version" "grafana_metrics_endpoint" {
+  secret      = google_secret_manager_secret.grafana_metrics_endpoint.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_secret_manager_secret" "grafana_traces_username" {
   secret_id = "${var.prefix}grafana-traces-username"
 
@@ -86,6 +122,15 @@ resource "google_secret_manager_secret" "grafana_traces_username" {
   }
 }
 
+resource "google_secret_manager_secret_version" "grafana_traces_username" {
+  secret      = google_secret_manager_secret.grafana_traces_username.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_secret_manager_secret" "grafana_logs_username" {
   secret_id = "${var.prefix}grafana-logs-username"
 
@@ -94,6 +139,15 @@ resource "google_secret_manager_secret" "grafana_logs_username" {
   }
 }
 
+resource "google_secret_manager_secret_version" "grafana_logs_username" {
+  secret      = google_secret_manager_secret.grafana_logs_username.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_secret_manager_secret" "grafana_metrics_username" {
   secret_id = "${var.prefix}grafana-metrics-username"
 
@@ -102,6 +156,15 @@ resource "google_secret_manager_secret" "grafana_metrics_username" {
   }
 }
 
+resource "google_secret_manager_secret_version" "grafana_metrics_username" {
+  secret      = google_secret_manager_secret.grafana_metrics_username.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_secret_manager_secret" "analytics_collector_host" {
   secret_id = "${var.prefix}analytics-collector-host"
 
@@ -110,6 +173,15 @@ resource "google_secret_manager_secret" "analytics_collector_host" {
   }
 }
 
+resource "google_secret_manager_secret_version" "analytics_collector_host" {
+  secret      = google_secret_manager_secret.analytics_collector_host.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_secret_manager_secret" "analytics_collector_api_token" {
   secret_id = "${var.prefix}analytics-collector-api-token"
 
@@ -118,6 +190,15 @@ resource "google_secret_manager_secret" "analytics_collector_api_token" {
   }
 }
 
+resource "google_secret_manager_secret_version" "analytics_collector_api_token" {
+  secret      = google_secret_manager_secret.analytics_collector_api_token.name
+  secret_data = " "
+
+  lifecycle {
+    ignore_changes = [secret_data]
+  }
+}
+
 resource "google_artifact_registry_repository" "orchestration_repository" {
   format        = "DOCKER"
   repository_id = "e2b-orchestration"

diff --git a/packages/init/outputs.tf b/packages/init/outputs.tf
@@ -53,3 +53,7 @@ output "analytics_collector_api_token_secret_name" {
 output "orchestration_repository_name" {
   value = google_artifact_registry_repository.orchestration_repository.name
 }
+
+output "cloudflare_api_token_secret_name" {
+  value = google_secret_manager_secret.cloudflare_api_token.name
+}