merge #19466

ethanndickson · ethanndickson · commit f9d0f5c9a3e3 · 2025-08-22T00:34:42.000Z
diff --git a/scaletest/terraform/action/main.tf b/scaletest/terraform/action/main.tf
@@ -46,20 +46,19 @@ terraform {
 provider "google" {
 }
 
-data "google_container_cluster" "observability" {
-  name     = var.observability_cluster_name
-  location = var.observability_cluster_location
-  project  = var.project_id
-}
-
-# This is managed manually
-data "google_secret_manager_secret_version" "cloudflare_api_token_dns" {
-  secret  = var.cloudflare_api_token_secret
+data "google_secret_manager_secret_version_access" "cloudflare_api_token_dns" {
+  secret  = "cloudflare-api-token-dns"
   project = var.project_id
 }
 
 provider "cloudflare" {
-  api_token = data.google_secret_manager_secret_version.cloudflare_api_token_dns.secret_data
+  api_token = coalesce(var.cloudflare_api_token, data.google_secret_manager_secret_version_access.cloudflare_api_token_dns.secret_data)
+}
+
+data "google_container_cluster" "observability" {
+  name     = var.observability_cluster_name
+  location = var.observability_cluster_location
+  project  = var.project_id
 }
 
 provider "kubernetes" {
diff --git a/scaletest/terraform/action/vars.tf b/scaletest/terraform/action/vars.tf
@@ -17,13 +17,23 @@ variable "scenario" {
 // GCP
 variable "project_id" {
   description = "The project in which to provision resources"
+  default     = "coder-scaletest"
 }
 
 variable "k8s_version" {
   description = "Kubernetes version to provision."
   default     = "1.24"
 }
 
+// Cloudflare
+variable "cloudflare_api_token" {
+  description = "Cloudflare API token."
+  sensitive   = true
+  # only override if you want to change the cloudflare_domain; pulls the token for scaletest.dev from Google Secrets
+  # Manager if null.
+  default = null
+}
+
 variable "cloudflare_domain" {
   description = "Cloudflare coder domain."
 }
