Add ephemeral to GCP storage enabling resources deletion

deployment/modules/gcp/conformance/main.tf

@@ -8,6 +8,7 @@ module "storage" {
   project_id = var.project_id
   base_name  = var.base_name
   location   = var.location
+  ephemeral  = true
 }
 
 module "secretmanager" {

deployment/modules/gcp/storage/main.tf

@@ -44,6 +44,8 @@ resource "google_spanner_instance" "log_spanner" {
   config           = "regional-${var.location}"
   display_name     = var.base_name
   processing_units = 100
+
+  force_destroy = var.ephemeral
 }
 
 resource "google_spanner_database" "log_db" {
@@ -54,6 +56,8 @@ resource "google_spanner_database" "log_db" {
     "CREATE TABLE Seq (id INT64 NOT NULL, seq INT64 NOT NULL, v BYTES(MAX),) PRIMARY KEY (id, seq)",
     "CREATE TABLE IntCoord (id INT64 NOT NULL, seq INT64 NOT NULL,) PRIMARY KEY (id)",
   ]
+
+  deletion_protection = !var.ephemeral
 }
 
 resource "google_spanner_database" "dedup_db" {
@@ -62,4 +66,6 @@ resource "google_spanner_database" "dedup_db" {
   ddl = [
     "CREATE TABLE IDSeq (id INT64 NOT NULL, h BYTES(MAX) NOT NULL, idx INT64 NOT NULL, timestamp INT64 NOT NULL,) PRIMARY KEY (id, h)",
   ]
+
+  deletion_protection = !var.ephemeral
 }

deployment/modules/gcp/storage/variables.tf

@@ -12,3 +12,8 @@ variable "location" {
   description = "Location in which to create resources"
   type        = string
 }
+
+variable "ephemeral" {
+  description = "Set to true if this is a throwaway/temporary log instance. Will set attributes on created resources to allow them to be disabled/deleted more easily."
+  type = bool
+}

deployment/modules/gcp/test/main.tf

@@ -8,6 +8,7 @@ module "storage" {
   project_id = var.project_id
   base_name  = var.base_name
   location   = var.location
+  ephemeral  = false
 }
 
 module "secretmanager" {