Adds default_release field to UnitKind resource (#15224)

Author: g-dreva

mmv1/products/saasservicemgmt/UnitKind.yaml

@@ -1,4 +1,4 @@
-# Copyright 2024 Google Inc.
+# Copyright 2025 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -31,6 +31,7 @@ examples:
       saas_name: example-saas
       cluster_unitkind_name: cluster-unitkind
       app_unitkind_name: app-unitkind
+      release_name: example-release
     test_env_vars:
       project: 'PROJECT_NAME'
     bootstrap_iam:
@@ -64,6 +65,13 @@ properties:
     type: String
     description: The timestamp when the resource was created.
     output: true
+  - name: defaultRelease
+    type: String
+    description: |-
+      A reference to the Release object to use as default for creating new units
+      of this UnitKind.
+      If not specified, a new unit must explicitly reference which release to use
+      for its creation.
   - name: dependencies
     type: Array
     description: |-

mmv1/templates/terraform/examples/saas_runtime_unit_kind_basic.tf.tmpl

@@ -1,23 +1,24 @@
 resource "google_saas_runtime_saas" "example_saas" {
   provider = google-beta
   saas_id  = "{{index $.Vars "saas_name"}}"
-  location = "global"
+  location = "us-east1"
 
   locations {
-    name = "us-central1"
+    name = "us-east1"
   }
 }
 
 resource "google_saas_runtime_unit_kind" "cluster_unit_kind" {
   provider = google-beta
-  location = "global"
+  location = "us-east1"
   unit_kind_id = "{{index $.Vars "cluster_unitkind_name"}}"
   saas = google_saas_runtime_saas.example_saas.id
+  default_release = "projects/{{index $.TestEnvVars "project"}}/locations/us-east1/releases/{{index $.Vars "release_name"}}"
 }
 
 resource "google_saas_runtime_unit_kind" "{{$.PrimaryResourceId}}" {
   provider = google-beta
-  location = "global"
+  location = "us-east1"
   unit_kind_id = "{{index $.Vars "app_unitkind_name"}}"
   saas = google_saas_runtime_saas.example_saas.id
 
@@ -26,3 +27,13 @@ resource "google_saas_runtime_unit_kind" "{{$.PrimaryResourceId}}" {
     alias     = "cluster"
   }
 }
+
+resource "google_saas_runtime_release" "example_release" {
+  provider          = google-beta
+  location          = "us-east1"
+  release_id        = "{{index $.Vars "release_name"}}"
+  unit_kind         = google_saas_runtime_unit_kind.cluster_unit_kind.id
+  blueprint {
+    package = "us-central1-docker.pkg.dev/ci-test-project-188019/test-repo/tf-test-easysaas-alpha-image@sha256:7992fdbaeaf998ecd31a7f937bb26e38a781ecf49b24857a6176c1e9bfc299ee"
+  }
+}

mmv1/third_party/terraform/services/saasruntime/resource_saas_runtime_unit_kind_test.go.tmpl

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
 )
 
 func TestAccSaasRuntimeUnitKind_update(t *testing.T) {
@@ -21,6 +22,7 @@ func TestAccSaasRuntimeUnitKind_update(t *testing.T) {
 	})
 
 	context := map[string]interface{}{
+		"project":       envvar.GetTestProjectFromEnv(),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 
@@ -60,23 +62,24 @@ func testAccSaasRuntimeUnitKind_basic(context map[string]interface{}) string {
 resource "google_saas_runtime_saas" "example_saas" {
   provider = google-beta
   saas_id  = "tf-test-example-saas%{random_suffix}"
-  location = "global"
+  location = "us-east1"
 
   locations {
-    name = "us-central1"
+    name = "us-east1"
   }
 }
 
 resource "google_saas_runtime_unit_kind" "cluster_unit_kind" {
   provider = google-beta
-  location = "global"
+  location = "us-east1"
   unit_kind_id = "tf-test-cluster-unitkind%{random_suffix}"
   saas = google_saas_runtime_saas.example_saas.id
+  default_release = "projects/%{project}/locations/us-east1/releases/tf-test-example-release%{random_suffix}"
 }
 
 resource "google_saas_runtime_unit_kind" "example" {
   provider = google-beta
-  location = "global"
+  location = "us-east1"
   unit_kind_id = "tf-test-app-unitkind%{random_suffix}"
   saas = google_saas_runtime_saas.example_saas.id
 
@@ -85,6 +88,16 @@ resource "google_saas_runtime_unit_kind" "example" {
     alias     = "cluster"
   }
 }
+
+resource "google_saas_runtime_release" "example_release" {
+  provider          = google-beta
+  location          = "us-east1"
+  release_id        = "tf-test-example-release%{random_suffix}"
+  unit_kind         = google_saas_runtime_unit_kind.cluster_unit_kind.id
+  blueprint {
+    package = "us-central1-docker.pkg.dev/ci-test-project-188019/test-repo/tf-test-easysaas-alpha-image@sha256:7992fdbaeaf998ecd31a7f937bb26e38a781ecf49b24857a6176c1e9bfc299ee"
+  }
+}
 `, context)
 }
 
@@ -93,23 +106,24 @@ func testAccSaasRuntimeUnitKind_update(context map[string]interface{}) string {
 resource "google_saas_runtime_saas" "example_saas" {
   provider = google-beta
   saas_id  = "tf-test-example-saas%{random_suffix}"
-  location = "global"
+  location = "us-east1"
 
   locations {
-    name = "us-central1"
+    name = "us-east1"
   }
 }
 
 resource "google_saas_runtime_unit_kind" "cluster_unit_kind" {
   provider = google-beta
-  location = "global"
+  location = "us-east1"
   unit_kind_id = "tf-test-cluster-unitkind%{random_suffix}"
   saas = google_saas_runtime_saas.example_saas.id
+  default_release = "projects/%{project}/locations/us-east1/releases/tf-test-example-release%{random_suffix}"
 }
 
 resource "google_saas_runtime_unit_kind" "example" {
   provider = google-beta
-  location = "global"
+  location = "us-east1"
   unit_kind_id = "tf-test-app-unitkind%{random_suffix}"
   saas = google_saas_runtime_saas.example_saas.id
 
@@ -159,6 +173,16 @@ resource "google_saas_runtime_unit_kind" "example" {
     "annotation-one": "bar"
   }
 }
+
+resource "google_saas_runtime_release" "example_release" {
+  provider          = google-beta
+  location          = "us-east1"
+  release_id        = "tf-test-example-release%{random_suffix}"
+  unit_kind         = google_saas_runtime_unit_kind.cluster_unit_kind.id
+  blueprint {
+    package = "us-central1-docker.pkg.dev/ci-test-project-188019/test-repo/tf-test-easysaas-alpha-image@sha256:7992fdbaeaf998ecd31a7f937bb26e38a781ecf49b24857a6176c1e9bfc299ee"
+  }
+}
 `, context)
 }
 {{- end }}