fix(gcptf): Fix provider versions and output issues

cloud/aws/deploytf/deploy.go

@@ -93,6 +93,10 @@ func (a *NitricAwsTerraformProvider) CdkTfModules() (string, fs.FS, error) {
 	return ".nitric/modules", modules, nil
 }
 
+func (a *NitricAwsTerraformProvider) RequiredProviders() map[string]interface{} {
+	return map[string]interface{}{}
+}
+
 func (a *NitricAwsTerraformProvider) Pre(stack cdktf.TerraformStack, resources []*deploymentspb.Resource) error {
 	tfRegion := cdktf.NewTerraformVariable(stack, jsii.String("region"), &cdktf.TerraformVariableConfig{
 		Type:        jsii.String("string"),

cloud/azure/deploy/deploy.go

@@ -170,6 +170,10 @@ func createStorageAccount(ctx *pulumi.Context, group *resources.ResourceGroup, t
 	return storageAccount, nil
 }
 
+func (a *NitricAzurePulumiProvider) RequiredProviders() map[string]interface{} {
+	return map[string]interface{}{}
+}
+
 func (a *NitricAzurePulumiProvider) createDatabaseServer(ctx *pulumi.Context, tags map[string]string) error {
 	var err error
 

cloud/common/deploy/provider/terraform.go

@@ -43,6 +43,9 @@ type NitricTerraformProvider interface {
 	// CdkTfModules - Return the relative parent directory (root golang packed) and embedded modules directory
 	CdkTfModules() (string, fs.FS, error)
 
+	// RequiredProviders - Return a list of required providers for this provider
+	RequiredProviders() map[string]interface{}
+
 	// Order - Return the order that resources should be deployed in.
 	// The order of resources is important as some resources depend on others.
 	// Changing the default order is not recommended unless you know what you are doing.
@@ -199,6 +202,8 @@ func createTerraformStackForNitricProvider(req *deploymentspb.DeploymentUpReques
 
 	stack := cdktf.NewTerraformStack(app, &fullStackName)
 
+	stack.AddOverride(jsii.String("terraform.required_providers"), nitricProvider.RequiredProviders())
+
 	// The code that defines your stack goes here
 	resources := nitricProvider.Order(req.Spec.Resources)
 

cloud/gcp/Makefile

@@ -89,7 +89,7 @@ generate-mocks:
 generate-sources: generate-mocks
 
 generate-terraform:
-	@cd deploytf && npx -y [email protected].8 get
+	@cd deploytf && npx -y [email protected].10 get
 
 tidy:
 	@go mod tidy

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

@@ -64,57 +64,63 @@ resource "google_cloud_run_v2_service" "service" {
   location = var.region
   project  = var.project_id
   # set launch_stage to BETA if gpus set otherwise GA
-  launch_stage = var.gpus > 0 ? "BETA" : "GA"
+  # launch_stage        = var.gpus > 0 ? "BETA" : "GA"
+  launch_stage        = "GA"
   deletion_protection = false
 
   template {
     scaling {
       max_instance_count = var.min_instances
       min_instance_count = var.max_instances
     }
+
+    # dynamic "node_selector" {
+    #   for_each = var.gpus > 0 ? [1] : []
+    #   content {
+    #     accelerator = "nvidia-l4"
+    #   }
+    # }
     containers {
       image = "${local.service_image_url}@${docker_registry_image.push.sha256_digest}"
       resources {
-        limits = merge({
-          cpu    = "${var.cpus}"
+        limits = {
+          cpu    = var.cpus
           memory = "${var.memory_mb}Mi"
-        }, var.gpus > 0 ? { "nvidia.com/gpu" = var.gpus } : {})
-      }
-
-      dynamic "node_selector" {
-        for_each = var.gpus > 0 ? [1] : []
-        content {
-          accelerator = "nvidia-l4"
         }
+
+        # limits = merge({
+        #   cpu    = "${var.cpus}"
+        #   memory = "${var.memory_mb}Mi"
+        # }, var.gpus > 0 ? { "nvidia.com/gpu" = var.gpus } : {})
       }
 
       ports {
         container_port = 9001
       }
       env {
-          name  = "EVENT_TOKEN"
-          value = random_password.event_token.result
-        }
-        env {
-          name  = "SERVICE_ACCOUNT_EMAIL"
-          value = google_service_account.service_account.email
-        }
-        env {
-          name  = "GCP_REGION"
-          value = var.region
-        }
+        name  = "EVENT_TOKEN"
+        value = random_password.event_token.result
+      }
+      env {
+        name  = "SERVICE_ACCOUNT_EMAIL"
+        value = google_service_account.service_account.email
+      }
+      env {
+        name  = "GCP_REGION"
+        value = var.region
+      }
 
-        dynamic "env" {
-          for_each = var.environment
-          content {
-            name  = env.key
-            value = env.value
-          }
+      dynamic "env" {
+        for_each = var.environment
+        content {
+          name  = env.key
+          value = env.value
         }
+      }
     }
-    
+
     service_account = google_service_account.service_account.email
-    timeout = var.timeout_seconds
+    timeout         = var.timeout_seconds
   }
 
   depends_on = [docker_registry_image.push]
@@ -137,8 +143,8 @@ resource "google_service_account" "invoker_service_account" {
 
 # Give the above service account permissions to execute the CloudRun service
 resource "google_cloud_run_service_iam_member" "invoker" {
-  service  = google_cloud_run_service.service.name
-  location = google_cloud_run_service.service.location
+  service  = google_cloud_run_v2_service.service.name
+  location = google_cloud_run_v2_service.service.location
   role     = "roles/run.invoker"
   member   = "serviceAccount:${google_service_account.invoker_service_account.email}"
 }

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

@@ -1,5 +1,5 @@
 output "service_endpoint" { 
-  value = google_cloud_run_service.service.status[0].url
+  value = google_cloud_run_v2_service.service.uri
 }
 
 output "service_account_email" {
@@ -15,5 +15,5 @@ output "event_token" {
 }
 
 output "service_name" {
-  value = google_cloud_run_service.service.name
+  value = google_cloud_run_v2_service.service.name
 }

cloud/gcp/deploytf/deploy.go

@@ -83,6 +83,19 @@ func (a *NitricGcpTerraformProvider) Init(attributes map[string]interface{}) err
 //go:embed .nitric/modules/**/*
 var modules embed.FS
 
+func (a *NitricGcpTerraformProvider) RequiredProviders() map[string]interface{} {
+	return map[string]interface{}{
+		"google": map[string]string{
+			"source":  "hashicorp/google",
+			"version": "~> 6.12.0",
+		},
+		"google-beta": map[string]string{
+			"source":  "hashicorp/google-beta",
+			"version": "~> 6.12.0",
+		},
+	}
+}
+
 func (a *NitricGcpTerraformProvider) CdkTfModules() (string, fs.FS, error) {
 	return ".nitric/modules", modules, nil
 }

cloud/gcp/deploytf/generated/constraints.json

@@ -1,4 +1,4 @@
 {
-  "cdktf": "0.20.8",
+  "cdktf": "0.20.10",
   "providers": {}
 }