Skip to content

Commit f955290

Browse files
Promote Gemini Release Channel Setting Binding from google-beta to google (#13051)
1 parent d886321 commit f955290

6 files changed

+2
-21
lines changed

mmv1/products/gemini/ReleaseChannelSetting.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
---
1515
name: ReleaseChannelSetting
1616
description: The resource for managing ReleaseChannel settings for Admin Control.
17-
min_version: 'beta'
1817
base_url: projects/{{project}}/locations/{{location}}/releaseChannelSettings
1918
update_mask: true
2019
self_link: projects/{{project}}/locations/{{location}}/releaseChannelSettings/{{release_channel_setting_id}}
@@ -29,7 +28,6 @@ sweeper:
2928
- region: "global"
3029
examples:
3130
- name: gemini_release_channel_setting_basic
32-
min_version: 'beta'
3331
primary_resource_id: example
3432
vars:
3533
release_channel_setting_id: ls1-tf

mmv1/products/gemini/ReleaseChannelSettingBinding.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ description: The resource for managing ReleaseChannel setting bindings for Admin
1717
references:
1818
guides:
1919
'Gemini Cloud Assist overview': 'https://cloud.google.com/gemini/docs/cloud-assist/overview'
20-
min_version: 'beta'
2120
base_url: projects/{{project}}/locations/{{location}}/releaseChannelSettings/{{release_channel_setting_id}}/settingBindings
2221
self_link: projects/{{project}}/locations/{{location}}/releaseChannelSettings/{{release_channel_setting_id}}/settingBindings/{{setting_binding_id}}
2322
create_url: projects/{{project}}/locations/{{location}}/releaseChannelSettings/{{release_channel_setting_id}}/settingBindings?settingBindingId={{setting_binding_id}}
@@ -29,7 +28,6 @@ import_format:
2928
mutex: projects/{{project}}/locations/{{location}}/releaseChannelSettings/{{release_channel_setting_id}}
3029
examples:
3130
- name: gemini_release_channel_setting_binding_basic
32-
min_version: 'beta'
3331
primary_resource_id: example
3432
exclude_test: true
3533
vars:

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
resource "google_gemini_release_channel_setting" "{{$.PrimaryResourceId}}" {
2-
provider = google-beta
32
release_channel_setting_id = "{{index $.Vars "release_channel_setting_id"}}"
43
location = "global"
54
labels = {"my_key": "my_value"}

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

-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
resource "google_gemini_release_channel_setting" "basic" {
2-
provider = google-beta
32
release_channel_setting_id = "{{index $.Vars "release_channel_setting_id"}}"
43
location = "global"
54
labels = {"my_key": "my_value"}
65
release_channel = "EXPERIMENTAL"
76
}
87

98
resource "google_gemini_release_channel_setting_binding" "{{$.PrimaryResourceId}}" {
10-
provider = google-beta
119
release_channel_setting_id = google_gemini_release_channel_setting.basic.release_channel_setting_id
1210
setting_binding_id = "{{index $.Vars "setting_binding_id"}}"
1311
location = "global"

mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go.tmpl

+1-9
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"
@@ -21,7 +20,7 @@ func TestAccGeminiReleaseChannelSettingBinding_update(t *testing.T) {
2120

2221
acctest.VcrTest(t, resource.TestCase{
2322
PreCheck: func() { acctest.AccTestPreCheck(t) },
24-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
23+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2524
Steps: []resource.TestStep{
2625
{
2726
Config: testAccGeminiReleaseChannelSettingBinding_basic(context),
@@ -53,19 +52,16 @@ func TestAccGeminiReleaseChannelSettingBinding_update(t *testing.T) {
5352
func testAccGeminiReleaseChannelSettingBinding_basic(context map[string]interface{}) string {
5453
return acctest.Nprintf(`
5554
data "google_project" "project" {
56-
provider = google-beta
5755
}
5856

5957
resource "google_gemini_release_channel_setting" "basic" {
60-
provider = google-beta
6158
release_channel_setting_id = "%{release_channel_setting_id}"
6259
location = "global"
6360
labels = {"my_key" = "my_value"}
6461
release_channel = "EXPERIMENTAL"
6562
}
6663

6764
resource "google_gemini_release_channel_setting_binding" "basic_binding" {
68-
provider = google-beta
6965
release_channel_setting_id = google_gemini_release_channel_setting.basic.release_channel_setting_id
7066
setting_binding_id = "%{setting_binding_id}"
7167
location = "global"
@@ -77,19 +73,16 @@ resource "google_gemini_release_channel_setting_binding" "basic_binding" {
7773
func testAccGeminiReleaseChannelSettingBinding_update(context map[string]interface{}) string {
7874
return acctest.Nprintf(`
7975
data "google_project" "project" {
80-
provider = google-beta
8176
}
8277

8378
resource "google_gemini_release_channel_setting" "basic" {
84-
provider = google-beta
8579
release_channel_setting_id = "%{release_channel_setting_id}"
8680
location = "global"
8781
labels = {"my_key" = "my_value"}
8882
release_channel = "EXPERIMENTAL"
8983
}
9084

9185
resource "google_gemini_release_channel_setting_binding" "basic_binding" {
92-
provider = google-beta
9386
release_channel_setting_id = google_gemini_release_channel_setting.basic.release_channel_setting_id
9487
setting_binding_id = "%{setting_binding_id}"
9588
location = "global"
@@ -99,4 +92,3 @@ resource "google_gemini_release_channel_setting_binding" "basic_binding" {
9992
}
10093
`, context)
10194
}
102-
{{ end }}

mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_test.go.tmpl

+1-5
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"
@@ -17,7 +16,7 @@ func TestAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_
1716
}
1817
acctest.VcrTest(t, resource.TestCase{
1918
PreCheck: func() { acctest.AccTestPreCheck(t) },
20-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
19+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2120
Steps: []resource.TestStep{
2221
{
2322
Config: testAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_basic(context),
@@ -48,7 +47,6 @@ func TestAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_
4847
func testAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_basic(context map[string]interface{}) string {
4948
return acctest.Nprintf(`
5049
resource "google_gemini_release_channel_setting" "example" {
51-
provider = google-beta
5250
release_channel_setting_id = "%{setting_id}"
5351
location = "global"
5452
release_channel = "EXPERIMENTAL"
@@ -58,12 +56,10 @@ resource "google_gemini_release_channel_setting" "example" {
5856
func testAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_update(context map[string]interface{}) string {
5957
return acctest.Nprintf(`
6058
resource "google_gemini_release_channel_setting" "example" {
61-
provider = google-beta
6259
release_channel_setting_id = "%{setting_id}"
6360
location = "global"
6461
labels = {"my_key" = "my_value"}
6562
release_channel = "STABLE"
6663
}
6764
`, context)
6865
}
69-
{{ end }}

0 commit comments

Comments
 (0)