Revert "Supporting custom project ID, outputting service account JSON"

nomad-gcp/nomad-autoscaler.tf

@@ -1,16 +1,11 @@
 ### SERVICE ACCOUNT ###
 data "google_project" "project" {
-  count = var.project_id == "" ? 1 : 0
-}
-
-locals {
-  project_id = var.project_id == "" ? data.google_project.project[0].project_id : var.project_id
 }
 
 resource "google_service_account" "nomad_as_service_account" {
   count = var.nomad_auto_scaler ? 1 : 0
 
-  project      = local.project_id
+  project      = data.google_project.project.project_id
   account_id   = "${var.name}-nomad-autoscaler-sa"
   display_name = "${var.name}-nomad-autoscaler-sa"
   description  = "${var.name} service account for CircleCI Server cluster component"
@@ -33,7 +28,7 @@ resource "google_service_account_iam_binding" "nomad_as_work_identity_k8s" {
   service_account_id = google_service_account.nomad_as_service_account[0].name
   role               = "roles/iam.workloadIdentityUser"
   members = [
-    "serviceAccount:${local.project_id}.svc.id.goog[${var.k8s_namespace}/nomad-autoscaler]",
+    "serviceAccount:${data.google_project.project.project_id}.svc.id.goog[${var.k8s_namespace}/nomad-autoscaler]",
   ]
 }
 

nomad-gcp/output.tf

@@ -38,12 +38,6 @@ output "managed_instance_group_zone" {
   value = google_compute_instance_group_manager.nomad.zone
 }
 
-output "service_account_key" {
-  value       = base64decode(google_service_account_key.nomad-as-key[0].private_key)
-  sensitive   = true
-  description = "Base64 decoded service account key."
-}
-
 output "service_account_key_location" {
   value = var.enable_workload_identity ? "" : "${path.cwd}/nomad-as-key.json"
 }

nomad-gcp/variables.tf

@@ -1,9 +1,3 @@
-variable "project_id" {
-  type        = string
-  description = "GCP project ID to deploy resources into. By default uses the data sourced GCP project ID."
-  default     = ""
-}
-
 variable "zone" {
   type        = string
   description = "GCP compute zone to deploy nomad clients into (e.g us-east1-a)"