Skip to content

Commit c7c077a

Browse files
JumiDeluxeJumiDeluxe
committed
Promote gemini_* resources to ga
1 parent 9449992 commit c7c077a

9 files changed

+84
-96
lines changed

‎mmv1/products/gemini/CodeRepositoryIndex.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
---
1515
name: CodeRepositoryIndex
1616
description: The resource for managing Code Repository Index for Gemini Code Assist.
17-
min_version: 'beta'
1817
base_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes
1918
self_link: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}
2019
create_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes?codeRepositoryIndexId={{code_repository_index_id}}
@@ -26,7 +25,6 @@ import_format:
2625
mutex: 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}'
2726
examples:
2827
- name: "gemini_code_repository_index_basic"
29-
min_version: 'beta'
3028
primary_resource_id: "example"
3129
test_vars_overrides:
3230
cri_id: '"cri-example"'

‎mmv1/products/gemini/RepositoryGroup.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
---
1515
name: RepositoryGroup
1616
description: The resource for managing Repository Group for Gemini Code Assist.
17-
min_version: 'beta'
1817
base_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups
1918
self_link: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}
2019
create_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups?repositoryGroupId={{repository_group_id}}
@@ -26,7 +25,6 @@ import_format:
2625
mutex: 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}'
2726
examples:
2827
- name: "gemini_repository_group_basic"
29-
min_version: 'beta'
3028
primary_resource_id: "example"
3129
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"])'
3230
vars:
@@ -62,7 +60,6 @@ async:
6260
resource_inside_response: true
6361
include_project: false
6462
iam_policy:
65-
min_version: 'beta'
6663
parent_resource_attribute: 'repository_group_id'
6764
method_name_separator: ':'
6865
fetch_iam_policy_verb: 'GET'

‎mmv1/products/gemini/product.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ display_name: Gemini for Google Cloud
1717
scopes:
1818
- https://www.googleapis.com/auth/cloud-platform
1919
versions:
20+
- base_url: https://cloudaicompanion.googleapis.com/v1/
21+
name: 'ga'
2022
- base_url: https://cloudaicompanion.googleapis.com/v1/
2123
name: 'beta'

‎mmv1/templates/terraform/examples/gemini_code_repository_index_basic.tf.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_gemini_code_repository_index" "example" {
2-
provider = google-beta
2+
provider = google
33
location = "us-central1"
44
code_repository_index_id = "{{index $.Vars "cri_id"}}"
55
kms_key = "projects/projectExample/locations/locationExample/keyRings/keyRingExample/cryptoKeys/cryptoKeyExample"

‎mmv1/templates/terraform/examples/gemini_repository_group_basic.tf.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_gemini_repository_group" "example" {
2-
provider = google-beta
2+
provider = google
33
location = "us-central1"
44
code_repository_index = "%{cri_id}"
55
repository_group_id = "{{index $.Vars "repository_group_id"}}"

‎mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl

+2-5
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"strings"
1010
"testing"
1111
"time"
12+
"net/http"
13+
1214
{{ if ne $.TargetVersionName `ga` -}}
1315
// For beta tests only
14-
"net/http"
1516
resourceManagerV3 "google.golang.org/api/cloudresourcemanager/v3"
1617
tpgservicusage "github.com/hashicorp/terraform-provider-google/google/services/serviceusage"
1718
"github.com/hashicorp/terraform-provider-google/google/services/kms"
18-
1919
{{- end }}
2020

2121
"github.com/hashicorp/terraform-provider-google/google/envvar"
@@ -1747,7 +1747,6 @@ func SetupProjectsAndGetAccessToken(org, billing, pid, service string, config *t
17471747
return accessToken, nil
17481748
}
17491749

1750-
{{ if ne $.TargetVersionName `ga` -}}
17511750
// For bootstrapping Developer Connect git repository link
17521751
const SharedGitRepositoryLinkIdPrefix = "tf-bootstrap-git-repository-"
17531752

@@ -2058,8 +2057,6 @@ func BootstrapSharedCodeRepositoryIndex(t *testing.T, codeRepositoryIndexId, loc
20582057
return codeRepositoryIndexId
20592058
}
20602059

2061-
{{- end }}
2062-
20632060
const sharedTagKeyPrefix = "tf-bootstrap-tagkey"
20642061

20652062
func BootstrapSharedTestTagKey(t *testing.T, testId string) string {

‎mmv1/third_party/terraform/services/gemini/iam_gemini_repository_group_test.go.tmpl

+37-39
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
package gemini_test
2-
{{- if ne $.TargetVersionName "ga" }}
32

43
import (
54
"fmt"
@@ -22,18 +21,18 @@ func TestAccGeminiRepositoryGroupIamBinding(t *testing.T) {
2221
repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10)
2322

2423
context := map[string]interface{}{
25-
"role": "roles/cloudaicompanion.repositoryGroupsUser",
26-
"code_repository_index": codeRepositoryIndexId,
27-
"location": location,
28-
"project": envvar.GetTestProjectFromEnv(),
29-
"connection_id": developerConnectionId,
30-
"git_link_id": gitRepositoryLinkId,
31-
"repository_group_id": repositoryGroupId,
24+
"role": "roles/cloudaicompanion.repositoryGroupsUser",
25+
"code_repository_index": codeRepositoryIndexId,
26+
"location": location,
27+
"project": envvar.GetTestProjectFromEnv(),
28+
"connection_id": developerConnectionId,
29+
"git_link_id": gitRepositoryLinkId,
30+
"repository_group_id": repositoryGroupId,
3231
}
3332

3433
acctest.VcrTest(t, resource.TestCase{
3534
PreCheck: func() { acctest.AccTestPreCheck(t) },
36-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
35+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
3736
Steps: []resource.TestStep{
3837
{
3938
Config: testAccGeminiRepositoryGroupIamBinding_basic(context),
@@ -66,18 +65,18 @@ func TestAccGeminiRepositoryGroupIamMember(t *testing.T) {
6665
repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10)
6766

6867
context := map[string]interface{}{
69-
"role": "roles/cloudaicompanion.repositoryGroupsUser",
70-
"code_repository_index": codeRepositoryIndexId,
71-
"location": location,
72-
"project": envvar.GetTestProjectFromEnv(),
73-
"connection_id": developerConnectionId,
74-
"git_link_id": gitRepositoryLinkId,
75-
"repository_group_id": repositoryGroupId,
68+
"role": "roles/cloudaicompanion.repositoryGroupsUser",
69+
"code_repository_index": codeRepositoryIndexId,
70+
"location": location,
71+
"project": envvar.GetTestProjectFromEnv(),
72+
"connection_id": developerConnectionId,
73+
"git_link_id": gitRepositoryLinkId,
74+
"repository_group_id": repositoryGroupId,
7675
}
7776

7877
acctest.VcrTest(t, resource.TestCase{
7978
PreCheck: func() { acctest.AccTestPreCheck(t) },
80-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
79+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
8180
Steps: []resource.TestStep{
8281
{
8382
// Test Iam Member creation (no update for member, no need to test)
@@ -101,18 +100,18 @@ func TestAccGeminiRepositoryGroupIamPolicy(t *testing.T) {
101100
repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10)
102101

103102
context := map[string]interface{}{
104-
"role": "roles/cloudaicompanion.repositoryGroupsUser",
105-
"code_repository_index": codeRepositoryIndexId,
106-
"location": location,
107-
"project": envvar.GetTestProjectFromEnv(),
108-
"connection_id": developerConnectionId,
109-
"git_link_id": gitRepositoryLinkId,
110-
"repository_group_id": repositoryGroupId,
103+
"role": "roles/cloudaicompanion.repositoryGroupsUser",
104+
"code_repository_index": codeRepositoryIndexId,
105+
"location": location,
106+
"project": envvar.GetTestProjectFromEnv(),
107+
"connection_id": developerConnectionId,
108+
"git_link_id": gitRepositoryLinkId,
109+
"repository_group_id": repositoryGroupId,
111110
}
112111

113112
acctest.VcrTest(t, resource.TestCase{
114113
PreCheck: func() { acctest.AccTestPreCheck(t) },
115-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
114+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
116115
Steps: []resource.TestStep{
117116
{
118117
Config: testAccGeminiRepositoryGroupIamPolicy_basic(context),
@@ -140,7 +139,7 @@ func TestAccGeminiRepositoryGroupIamPolicy(t *testing.T) {
140139
func testAccGeminiRepositoryGroupIamMember_basic(context map[string]interface{}) string {
141140
return acctest.Nprintf(`
142141
resource "google_gemini_repository_group_iam_member" "foo" {
143-
provider = google-beta
142+
provider = google
144143
project = "%{project}"
145144
location = "%{location}"
146145
code_repository_index = "%{code_repository_index}"
@@ -150,7 +149,7 @@ resource "google_gemini_repository_group_iam_member" "foo" {
150149
}
151150

152151
resource "google_gemini_repository_group" "example" {
153-
provider = google-beta
152+
provider = google
154153
location = "us-central1"
155154
code_repository_index = "%{code_repository_index}"
156155
repository_group_id = "%{repository_group_id}"
@@ -166,15 +165,15 @@ resource "google_gemini_repository_group" "example" {
166165
func testAccGeminiRepositoryGroupIamPolicy_basic(context map[string]interface{}) string {
167166
return acctest.Nprintf(`
168167
data "google_iam_policy" "foo" {
169-
provider = google-beta
168+
provider = google
170169
binding {
171170
role = "%{role}"
172171
members = ["user:[email protected]"]
173172
}
174173
}
175174

176175
resource "google_gemini_repository_group_iam_policy" "foo" {
177-
provider = google-beta
176+
provider = google
178177
project = "%{project}"
179178
location = "%{location}"
180179
code_repository_index = "%{code_repository_index}"
@@ -183,7 +182,7 @@ resource "google_gemini_repository_group_iam_policy" "foo" {
183182
}
184183

185184
data "google_gemini_repository_group_iam_policy" "foo" {
186-
provider = google-beta
185+
provider = google
187186
project = "%{project}"
188187
location = "%{location}"
189188
code_repository_index = "%{code_repository_index}"
@@ -194,7 +193,7 @@ data "google_gemini_repository_group_iam_policy" "foo" {
194193
}
195194

196195
resource "google_gemini_repository_group" "example" {
197-
provider = google-beta
196+
provider = google
198197
location = "us-central1"
199198
code_repository_index = "%{code_repository_index}"
200199
repository_group_id = "%{repository_group_id}"
@@ -210,11 +209,11 @@ resource "google_gemini_repository_group" "example" {
210209
func testAccGeminiRepositoryGroupIamPolicy_emptyBinding(context map[string]interface{}) string {
211210
return acctest.Nprintf(`
212211
data "google_iam_policy" "foo" {
213-
provider = google-beta
212+
provider = google
214213
}
215214

216215
resource "google_gemini_repository_group_iam_policy" "foo" {
217-
provider = google-beta
216+
provider = google
218217
project = "%{project}"
219218
location = "%{location}"
220219
code_repository_index = "%{code_repository_index}"
@@ -223,7 +222,7 @@ resource "google_gemini_repository_group_iam_policy" "foo" {
223222
}
224223

225224
resource "google_gemini_repository_group" "example" {
226-
provider = google-beta
225+
provider = google
227226
location = "us-central1"
228227
code_repository_index = "%{code_repository_index}"
229228
repository_group_id = "%{repository_group_id}"
@@ -239,7 +238,7 @@ resource "google_gemini_repository_group" "example" {
239238
func testAccGeminiRepositoryGroupIamBinding_basic(context map[string]interface{}) string {
240239
return acctest.Nprintf(`
241240
resource "google_gemini_repository_group_iam_binding" "foo" {
242-
provider = google-beta
241+
provider = google
243242
project = "%{project}"
244243
location = "%{location}"
245244
code_repository_index = "%{code_repository_index}"
@@ -249,7 +248,7 @@ resource "google_gemini_repository_group_iam_binding" "foo" {
249248
}
250249

251250
resource "google_gemini_repository_group" "example" {
252-
provider = google-beta
251+
provider = google
253252
location = "us-central1"
254253
code_repository_index = "%{code_repository_index}"
255254
repository_group_id = "%{repository_group_id}"
@@ -265,7 +264,7 @@ resource "google_gemini_repository_group" "example" {
265264
func testAccGeminiRepositoryGroupIamBinding_update(context map[string]interface{}) string {
266265
return acctest.Nprintf(`
267266
resource "google_gemini_repository_group_iam_binding" "foo" {
268-
provider = google-beta
267+
provider = google
269268
project = "%{project}"
270269
location = "%{location}"
271270
code_repository_index = "%{code_repository_index}"
@@ -275,7 +274,7 @@ resource "google_gemini_repository_group_iam_binding" "foo" {
275274
}
276275

277276
resource "google_gemini_repository_group" "example" {
278-
provider = google-beta
277+
provider = google
279278
location = "us-central1"
280279
code_repository_index = "%{code_repository_index}"
281280
repository_group_id = "%{repository_group_id}"
@@ -287,4 +286,3 @@ resource "google_gemini_repository_group" "example" {
287286
}
288287
`, context)
289288
}
290-
{{ end }}

0 commit comments

Comments
 (0)