Remove not needed beta tags, RepositoryGroup IAM test template

GoogleCloudPlatform · Nov 27, 2024 · 91bb8d1 · 91bb8d1
1 parent 601cc8b
commit 91bb8d1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 333 deletions.
diff --git a/mmv1/products/gemini/CodeRepositoryIndex.yaml b/mmv1/products/gemini/CodeRepositoryIndex.yaml
@@ -64,22 +64,19 @@ parameters:
   - name: location
     type: String
     description: The location of the Code Repository Index, for example `us-central1`.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
   - name: codeRepositoryIndexId
     type: String
     description: Required. Id of the Code Repository Index.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
 properties:
   - name: updateTime
     type: String
     description: Output only. Update time stamp.
-    min_version: 'beta'
     output: true
   - name: state
     type: String
@@ -91,27 +88,22 @@ properties:
       ACTIVE
       DELETING
       SUSPENDED
-    min_version: 'beta'
     output: true
   - name: labels
     type: KeyValueLabels
     description: Optional. Labels as key value pairs.
-    min_version: 'beta'
   - name: kmsKey
     type: String
     description: |-
       Optional. Immutable. Customer-managed encryption key name, in the format
       projects/*/locations/*/keyRings/*/cryptoKeys/*.
-    min_version: 'beta'
     immutable: true
   - name: name
     type: String
     description: Immutable. Identifier. Name of Code Repository Index.
-    min_version: 'beta'
     output: true
     immutable: true
   - name: createTime
     type: String
     description: Output only. Create time stamp.
-    min_version: 'beta'
     output: true
diff --git a/mmv1/products/gemini/RepositoryGroup.yaml b/mmv1/products/gemini/RepositoryGroup.yaml
@@ -15,33 +15,32 @@
 name: RepositoryGroup
 description: The resource for managing Repository Group for Gemini Code Assist.
 min_version: 'beta'
-base_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups
-self_link: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups/{{repository_group_id}}
-create_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups?repositoryGroupId={{repository_group_id}}
+base_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups
+self_link: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}
+create_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups?repositoryGroupId={{repository_group_id}}
 update_verb: 'PATCH'
 update_mask: true
-id_format: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups/{{repository_group_id}}
+id_format: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}
 import_format:
-  - projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups/{{repository_group_id}}
-mutex: 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}'
+  - projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}
+mutex: 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}'
 examples:
   - name: "gemini_repository_group_basic"
     min_version: 'beta'
     primary_resource_id: "example"
-    primary_resource_name: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "basic-rg-example%{random_suffix}", "us-central1", "", ""), "test-rg-repository-group-id"'
+    primary_resource_name: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "basic-rg-gen-example", "us-central1", "", map[string]string{}), fmt.Sprintf("tf-test-gen-repository-group-%s", context["random_suffix"])'
     vars:
-      repository_group_id: "example-repository-group-id"
+      repository_group_id: "gen-repository-group-"
       git_repository_link_id: 'example-git-repository-link-id'
       cri_id: "cri-example"
       repository_resource: "projects/example-project/locations/us-central1/connections/example-connection/gitRepositoryLinks/example-repo"
       connection_id: "example-connection-id"
     test_vars_overrides:
-      repository_group_id: '"example_repository_group_idx"'
       git_repository_link_id: 'acctest.BootstrapGitRepository(t, "basic", "us-central1", "https://github.com/CC-R-github-robot/tf-test.git", acctest.BootstrapDeveloperConnection(t, "basic", "us-central1", "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648))'
-      cri_id: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "test-rg", "us-central1", "", "")'
+      cri_id: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "basic-rg-gen-example", "us-central1", "", map[string]string{})'
       repository_resource: '"projects/"+envvar.GetTestProjectFromEnv()+"/locations/us-central1/connections/"+acctest.BootstrapDeveloperConnection(t, "basic", "us-central1", "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648)+"/gitRepositoryLinks/"+acctest.BootstrapGitRepository(t, "basic", "us-central1", "https://github.com/CC-R-github-robot/tf-test.git", acctest.BootstrapDeveloperConnection(t, "basic", "us-central1", "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648))'
       connection_id: 'acctest.BootstrapDeveloperConnection(t, "basic", "us-central1", "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648)'
-    exclude_test: true
+    exclude_test: false
 timeouts:
   insert_minutes: 30
   update_minutes: 30
@@ -75,7 +74,7 @@ iam_policy:
   fetch_iam_policy_verb: 'GET'
   set_iam_policy_verb: 'POST'
   import_format:
-    - 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups/{{repository_group_id}}'
+    - 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}'
     - '{{repository_group_id}}'
   allowed_iam_role: 'roles/cloudaicompanion.repositoryGroupsUser'
 error_retry_predicates:
@@ -85,29 +84,25 @@ parameters:
   - name: location
     type: String
     description: The location of the Code Repository Index, for example `us-central1`.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
-  - name: codeRepositoryIndexId
+  - name: codeRepositoryIndex
     type: String
     description: Required. Id of the Code Repository Index.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
   - name: repositoryGroupId
     type: String
     description: Required. Id of the Repository Group.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
 properties:
   - name: repositories
     type: Array
     description: Required. List of repositories to group
-    min_version: 'beta'
     required: true
     item_type:
       type: NestedObject
@@ -117,32 +112,26 @@ properties:
           description: |-
             Required. The DeveloperConnect repository full resource name, relative resource name
             or resource URL to be indexed.
-          min_version: 'beta'
           required: true
         - name: branchPattern
           type: String
           description: |-
             Required. The Git branch pattern used for indexing in RE2 syntax.
             See https://github.com/google/re2/wiki/syntax for syntax.
-          min_version: 'beta'
           required: true
   - name: name
     type: String
     description: Immutable. Identifier. name of resource
-    min_version: 'beta'
     output: true
     immutable: true
   - name: createTime
     type: String
     description: Output only. Create time stamp
-    min_version: 'beta'
     output: true
   - name: updateTime
     type: String
     description: Output only. Update time stamp
-    min_version: 'beta'
     output: true
   - name: labels
     type: KeyValueLabels
     description: Optional. Labels as key value pairs
-    min_version: 'beta'
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"
-  code_repository_index_id = "%{cri_id}"
+  code_repository_index = "%{cri_id}"
   repository_group_id = "{{index $.Vars "repository_group_id"}}"
   repositories {
     resource = "{{index $.Vars "repository_resource"}}"