Add PreApply to RepositoryGroup and CodeRepositoryIndex update tests

GoogleCloudPlatform · Nov 13, 2024 · 8dc3c36 · 8dc3c36
1 parent 40bc461
commit 8dc3c36
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/mmv1/products/cloudaicompanion/RepositoryGroup.yaml b/mmv1/products/cloudaicompanion/RepositoryGroup.yaml
@@ -25,7 +25,7 @@ examples:
   - name: "gemini_repository_group_basic"
     min_version: 'beta'
     primary_resource_id: "example"
-    primary_resource_name: '"cri-1", fmt.Sprintf("tf-test-my-repo-group%s", context["random_suffix"])'
+    primary_resource_name: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "basic-rg-example", "us-central1", "", ""), "test-rg-repository-group-id"'
     vars:
       repository_group_id: "example-repository-group-id"
       git_repository_link_id: 'example-git-repository-link-id'

diff --git a/mmv1/templates/terraform/examples/gemini_repository_group_basic.tf.tmpl b/mmv1/templates/terraform/examples/gemini_repository_group_basic.tf.tmpl
@@ -1,7 +1,7 @@
 resource "google_gemini_repository_group" "example" {
   provider = google-beta
   location = "us-central1"
-  coderepositoryindex = "{{index $.Vars "cri_id"}}"
+  coderepositoryindex = acctest.BootstrapSharedCodeRepositoryIndex(t, "basic-rg-example", "us-central1", "", ""),
   repository_group_id = "{{index $.Vars "repository_group_id"}}"
   repositories {
     resource = "{{index $.Vars "repository_resource"}}"

diff --git a/...ty/terraform/services/cloudaicompanion/resource_gemini_code_repository_index_test.go.tmpl b/...ty/terraform/services/cloudaicompanion/resource_gemini_code_repository_index_test.go.tmpl
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
 )
@@ -31,6 +32,11 @@ func TestAccGeminiCodeRepositoryIndex_update(t *testing.T) {
 			},
 			{
 				Config: testAccGeminiCodeRepositoryIndex_update(context),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction("google_gemini_code_repository_index.example", plancheck.ResourceActionUpdate),
+					},
+				},
 			},
 			{
 				ResourceName:            "google_gemini_code_repository_index.example",
@@ -53,6 +59,7 @@ resource "google_gemini_code_repository_index" "example" {
 }
 `, context)
 }
+
 func testAccGeminiCodeRepositoryIndex_update(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_gemini_code_repository_index" "example" {

diff --git a/...d_party/terraform/services/cloudaicompanion/resource_gemini_repository_group_test.go.tmpl b/...d_party/terraform/services/cloudaicompanion/resource_gemini_repository_group_test.go.tmpl
@@ -32,6 +32,11 @@ func TestAccGeminiRepositoryGroup_update(t *testing.T) {
 			},
 			{
 				Config: testAccGeminiRepositoryGroup_update(context),
+        ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction("google_gemini_repository_group.example", plancheck.ResourceActionUpdate),
+					},
+				},
 			},
 			{
 				ResourceName:            "google_gemini_repository_group.example",