fix clashing resources.

cloud/gcp/deploytf/.nitric/modules/api/main.tf

@@ -1,6 +1,6 @@
 resource "google_api_gateway_api" "api" {
   provider = google-beta
-  api_id   = var.name
+  api_id   = "${var.name}-${random_string.api_config_id.result}"
   labels = {
     "x-nitric-${var.stack_id}-name" = var.name
     "x-nitric-${var.stack_id}-type" = "api"
@@ -21,7 +21,7 @@ resource "random_string" "api_config_id" {
 
 resource "google_service_account" "service_account" {
   provider   = google-beta
-  account_id = "${var.name}-api"
+  account_id = "${var.name}-api-${random_string.api_config_id.result}"
 }
 
 # Get the current service account email and ensure it has service account user role on the service account
@@ -82,7 +82,7 @@ resource "google_api_gateway_api_config" "api_config" {
 
 resource "google_api_gateway_gateway" "gateway" {
   provider   = google-beta
-  gateway_id = "${var.name}-gateway"
+  gateway_id = "${var.name}-gateway-${random_string.api_config_id.result}"
   api_config = google_api_gateway_api_config.api_config.id
 
   labels = {

cloud/gcp/deploytf/.nitric/modules/queue/main.tf

@@ -1,7 +1,13 @@
 
+resource "random_string" "unique_id" {
+  length = 4
+  special = false
+  upper   = false
+}
+
 # Deploy a PubSub topic to serve as the queue
 resource "google_pubsub_topic" "queue" {
-  name = "${var.queue_name}-nitricqueue"
+  name = "${var.queue_name}-nitricqueue-${random_string.unique_id.result}"
 
   kms_key_name = var.kms_key != "" ? var.kms_key : null
   labels = {
@@ -12,7 +18,7 @@ resource "google_pubsub_topic" "queue" {
 
 # Create a pull subscription for the topic to emulate a queue
 resource "google_pubsub_subscription" "queue_subscription" {
-  name = "${var.queue_name}-nitricqueue"
+  name = "${var.queue_name}-nitricqueue-${random_string.unique_id.result}"
   topic = google_pubsub_topic.queue.name
   expiration_policy {
     # TODO: this is blank in the Pulumi provider - verify this is still correct

cloud/gcp/deploytf/.nitric/modules/service/main.tf

@@ -33,6 +33,12 @@ locals {
   ids_prefix = "nitric-"
 }
 
+resource "random_string" "unique_id" {
+  length = 4
+  special = false
+  upper   = false
+}
+
 # Create a random ID for the service name, so that it confirms to regex restrictions
 resource "random_string" "service_account_id" {
   length  = 30 - length(local.ids_prefix)
@@ -57,9 +63,13 @@ resource "random_password" "event_token" {
   }
 }
 
+locals{
+  service_name = replace(var.service_name, "_", "-")
+}
+
 # Create a cloud run service
 resource "google_cloud_run_v2_service" "service" {
-  name = replace(var.service_name, "_", "-")
+  name = "${local.service_name}-${random_string.unique_id.result}"
 
   location = var.region
   project  = var.project_id

cloud/gcp/deploytf/.nitric/modules/service/variables.tf

@@ -91,6 +91,7 @@ variable "kms_key" {
 variable "vpc" {
   description = "cloud run service directvpc config"
   nullable = true
+  default = null
   type = object({
     network = string
     subnet = string

cloud/gcp/deploytf/.nitric/modules/topic/main.tf

@@ -1,6 +1,12 @@
+resource "random_string" "unique_id" {
+  length = 4
+  special = false
+  upper   = false
+}
+
 # Create a new pubsub topic
 resource "google_pubsub_topic" "topic" {
-  name = var.topic_name
+  name = "${var.topic_name}-${random_string.unique_id.result}"
 
   kms_key_name = var.kms_key != "" ? var.kms_key : null
 

cloud/gcp/deploytf/generated/service/ServiceConfig.go

@@ -29,8 +29,6 @@ type ServiceConfig struct {
 	ServiceName *string `field:"required" json:"serviceName" yaml:"serviceName"`
 	// The ID of the Nitric stack.
 	StackId *string `field:"required" json:"stackId" yaml:"stackId"`
-	// cloud run service directvpc config.
-	Vpc interface{} `field:"required" json:"vpc" yaml:"vpc"`
 	// The number of concurrent requests the CloudRun service can handle 80.
 	ContainerConcurrency *float64 `field:"optional" json:"containerConcurrency" yaml:"containerConcurrency"`
 	// The amount of cpus to allocate to the CloudRun service 1.
@@ -47,5 +45,7 @@ type ServiceConfig struct {
 	MinInstances *float64 `field:"optional" json:"minInstances" yaml:"minInstances"`
 	// The timeout for the CloudRun service in seconds 10.
 	TimeoutSeconds *float64 `field:"optional" json:"timeoutSeconds" yaml:"timeoutSeconds"`
+	// cloud run service directvpc config.
+	Vpc interface{} `field:"optional" json:"vpc" yaml:"vpc"`
 }