Simplify service name to Gemini, add Acc tests and .teamcity, modif…

…y timeouts
GoogleCloudPlatform · Oct 29, 2024 · 9376ec2 · 9376ec2
1 parent 67544d1
commit 9376ec2
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 77 deletions.
diff --git a/mmv1/products/cloudaicompanion/CodeRepositoryIndex.yaml b/mmv1/products/cloudaicompanion/CodeRepositoryIndex.yaml
@@ -13,32 +13,32 @@
 
 ---
 name: CodeRepositoryIndex
-description: The resource for managing Code Repository Indexes for Gemini Code Assist. 
+description: The resource for managing Code Repository Indexes for Gemini Code Assist.
 base_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes
 self_link: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}
 create_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes?codeRepositoryIndexId={{code_repository_index_id}}
 id_format: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}
 import_format:
-- projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}
+  - projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}
 examples:
-  - name: "geminifor_google_cloud_code_repository_index_basic"
+  - name: "gemini_code_repository_index_basic"
     primary_resource_id: "example"
     vars:
       cri_id: "example-coderepositoryindex-id"
 autogen_async: true
 async:
   operation:
     timeouts:
-      insert_minutes: 20
-      update_minutes: 20
-      delete_minutes: 20
+      insert_minutes: 90
+      update_minutes: 90
+      delete_minutes: 90
     path: name
-    base_url: '{{op_id}}'
+    base_url: "{{op_id}}"
     wait_ms: 1000
   actions:
-  - create
-  - delete
-  - update
+    - create
+    - delete
+    - update
   type: OpAsync
   result:
     resource_inside_response: true
@@ -48,49 +48,49 @@ async:
     message: message
   include_project: false
 parameters:
-- name: location
-  type: String
-  description: Resource ID segment making up resource `name`. It identifies the resource within its parent collection as described in https://google.aip.dev/122.
-  immutable: true
-  url_param_only: true
-  required: true
-- name: codeRepositoryIndexId
-  type: String
-  description: Required. Id of the requesting object
-  immutable: true
-  url_param_only: true
-  required: true
+  - name: location
+    type: String
+    description: Resource ID segment making up resource `name`. It identifies the resource within its parent collection as described in https://google.aip.dev/122.
+    immutable: true
+    url_param_only: true
+    required: true
+  - name: codeRepositoryIndexId
+    type: String
+    description: Required. Id of the requesting object
+    immutable: true
+    url_param_only: true
+    required: true
 properties:
-- name: updateTime
-  type: String
-  description: Output only. Update time stamp
-  output: true
-- name: state
-  type: String
-  description: |-
-    Output only. Code Repository Index instance State
-    Possible values:
-    STATE_UNSPECIFIED
-    CREATING
-    ACTIVE
-    DELETING
-    SUSPENDED
-  output: true
-- name: labels
-  type: KeyValueLabels
-  description: Optional. Labels as key value pairs
-- name: kmsKey
-  type: String
-  description: |-
-    Optional. Immutable. Customer-managed encryption key name, in the format
-    projects/*/locations/*/keyRings/*/cryptoKeys/*.
-  immutable: true
-- name: name
-  type: String
-  description: Immutable. Identifier. name of resource
-  output: true
-  immutable: true
-- name: createTime
-  type: String
-  description: Output only. Create time stamp
-  output: true
+  - name: updateTime
+    type: String
+    description: Output only. Update time stamp
+    output: true
+  - name: state
+    type: String
+    description: |-
+      Output only. Code Repository Index instance State
+      Possible values:
+      STATE_UNSPECIFIED
+      CREATING
+      ACTIVE
+      DELETING
+      SUSPENDED
+    output: true
+  - name: labels
+    type: KeyValueLabels
+    description: Optional. Labels as key value pairs
+  - name: kmsKey
+    type: String
+    description: |-
+      Optional. Immutable. Customer-managed encryption key name, in the format
+      projects/*/locations/*/keyRings/*/cryptoKeys/*.
+    immutable: true
+  - name: name
+    type: String
+    description: Immutable. Identifier. name of resource
+    output: true
+    immutable: true
+  - name: createTime
+    type: String
+    description: Output only. Create time stamp
+    output: true
diff --git a/mmv1/products/cloudaicompanion/RepositoryGroup.yaml b/mmv1/products/cloudaicompanion/RepositoryGroup.yaml
@@ -21,7 +21,7 @@ id_format: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{c
 import_format:
   - projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{coderepositoryindex}}/repositoryGroups/{{repository_group_id}}
 examples:
-  - name: "geminifor_google_cloud_repository_group_basic"
+  - name: "gemini_repository_group_basic"
     primary_resource_id: "example"
     vars:
       repository_resource: "projects/example-location/locations/us-central1/connections/example-connection/gitRepositoryLinks/example-repo"
@@ -31,11 +31,11 @@ autogen_async: true
 async:
   operation:
     timeouts:
-      insert_minutes: 20
-      update_minutes: 20
-      delete_minutes: 20
+      insert_minutes: 30
+      update_minutes: 30
+      delete_minutes: 30
     path: name
-    base_url: '{{op_id}}'
+    base_url: "{{op_id}}"
     wait_ms: 1000
   actions:
     - create
@@ -76,18 +76,18 @@ properties:
     item_type:
       type: NestedObject
       properties:
-      - name: resource
-        type: String
-        description: |-
-          Required. The DeveloperConnect repository full resource name, relative resource name
-          or resource URL to be indexed.
-        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.
-        required: true
+        - name: resource
+          type: String
+          description: |-
+            Required. The DeveloperConnect repository full resource name, relative resource name
+            or resource URL to be indexed.
+          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.
+          required: true
   - name: name
     type: String
     description: Immutable. Identifier. name of resource

diff --git a/mmv1/products/cloudaicompanion/product.yaml b/mmv1/products/cloudaicompanion/product.yaml
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 ---
-name: GeminiforGoogleCloud
+name: Gemini
 display_name: Gemini for Google Cloud
 scopes:
   - https://www.googleapis.com/auth/cloud-platform

diff --git a/...cloud_code_repository_index_basic.tf.tmpl → ...emini_code_repository_index_basic.tf.tmpl b/...cloud_code_repository_index_basic.tf.tmpl → ...emini_code_repository_index_basic.tf.tmpl
@@ -1,4 +1,4 @@
-resource "google_geminifor_google_cloud_code_repository_index" "example_cri" {
+resource "google_gemini_code_repository_index" "example_cri" {
   location = "us-central1"
   code_repository_index_id = "{{index $.Vars "cri_id"}}"
 }
diff --git a/...ogle_cloud_repository_group_basic.tf.tmpl → ...les/gemini_repository_group_basic.tf.tmpl b/...ogle_cloud_repository_group_basic.tf.tmpl → ...les/gemini_repository_group_basic.tf.tmpl
@@ -1,14 +1,14 @@
-resource "google_geminifor_google_cloud_repository_group" "example_repository_group" {
+resource "google_gemini_repository_group" "example_repository_group" {
   location = "us-central1"
-  coderepositoryindex = google_geminifor_google_cloud_code_repository_index.example_cri.code_repository_index_id
+  coderepositoryindex = google_gemini_code_repository_index.example_cri.code_repository_index_id
   repository_group_id = "{{index $.Vars "repository_group_id"}}"
   repositories {
       resource = "{{index $.Vars "repository_resource"}}" 
       branch_pattern = "main"
   }
 }
 
-resource "google_geminifor_google_cloud_code_repository_index" "example_cri" {
+resource "google_gemini_code_repository_index" "example_cri" {
   code_repository_index_id = "{{index $.Vars "cri_id"}}"
   location = "us-central1"
 }
diff --git a/mmv1/third_party/terraform/.teamcity/components/inputs/services_beta.kt b/mmv1/third_party/terraform/.teamcity/components/inputs/services_beta.kt
@@ -141,6 +141,11 @@ var ServicesListBeta = mapOf(
         "displayName" to "Certificatemanager",
         "path" to "./google-beta/services/certificatemanager"
     ),
+    "cloudaicompanion" to mapOf(
+        "name" to "cloudaicompanion",
+        "displayName" to "Cloudaicompanion",
+        "path" to "./google-beta/services/cloudaicompanion"
+    ),
     "cloudasset" to mapOf(
         "name" to "cloudasset",
         "displayName" to "Cloudasset",

diff --git a/mmv1/third_party/terraform/.teamcity/components/inputs/services_ga.kt b/mmv1/third_party/terraform/.teamcity/components/inputs/services_ga.kt
@@ -141,6 +141,11 @@ var ServicesListGa = mapOf(
         "displayName" to "Certificatemanager",
         "path" to "./google/services/certificatemanager"
     ),
+    "cloudaicompanion" to mapOf(
+        "name" to "cloudaicompanion",
+        "displayName" to "Cloudaicompanion",
+        "path" to "./google/services/cloudaicompanion"
+    ),
     "cloudasset" to mapOf(
         "name" to "cloudasset",
         "displayName" to "Cloudasset",