Skip to content

Commit 4143c73

Browse files
Promote Gemini Release Channel Setting Binding from google-beta to google (#13051) (#9311)
[upstream:f955290d208a8a996a2048cda774a4d7181487d9] Signed-off-by: Modular Magician <[email protected]>
1 parent 00d6c4f commit 4143c73

6 files changed

+6
-19
lines changed

.changelog/13051.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:note
2+
gemini: promoted `google_gemini_release_channel_setting_binding` from Beta to GA
3+
```

google-beta/services/gemini/resource_gemini_release_channel_setting_binding_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccGeminiReleaseChannelSettingBinding_update(t *testing.T) {
2222

2323
acctest.VcrTest(t, resource.TestCase{
2424
PreCheck: func() { acctest.AccTestPreCheck(t) },
25-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
25+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2626
Steps: []resource.TestStep{
2727
{
2828
Config: testAccGeminiReleaseChannelSettingBinding_basic(context),
@@ -54,19 +54,16 @@ func TestAccGeminiReleaseChannelSettingBinding_update(t *testing.T) {
5454
func testAccGeminiReleaseChannelSettingBinding_basic(context map[string]interface{}) string {
5555
return acctest.Nprintf(`
5656
data "google_project" "project" {
57-
provider = google-beta
5857
}
5958
6059
resource "google_gemini_release_channel_setting" "basic" {
61-
provider = google-beta
6260
release_channel_setting_id = "%{release_channel_setting_id}"
6361
location = "global"
6462
labels = {"my_key" = "my_value"}
6563
release_channel = "EXPERIMENTAL"
6664
}
6765
6866
resource "google_gemini_release_channel_setting_binding" "basic_binding" {
69-
provider = google-beta
7067
release_channel_setting_id = google_gemini_release_channel_setting.basic.release_channel_setting_id
7168
setting_binding_id = "%{setting_binding_id}"
7269
location = "global"
@@ -78,19 +75,16 @@ resource "google_gemini_release_channel_setting_binding" "basic_binding" {
7875
func testAccGeminiReleaseChannelSettingBinding_update(context map[string]interface{}) string {
7976
return acctest.Nprintf(`
8077
data "google_project" "project" {
81-
provider = google-beta
8278
}
8379
8480
resource "google_gemini_release_channel_setting" "basic" {
85-
provider = google-beta
8681
release_channel_setting_id = "%{release_channel_setting_id}"
8782
location = "global"
8883
labels = {"my_key" = "my_value"}
8984
release_channel = "EXPERIMENTAL"
9085
}
9186
9287
resource "google_gemini_release_channel_setting_binding" "basic_binding" {
93-
provider = google-beta
9488
release_channel_setting_id = google_gemini_release_channel_setting.basic.release_channel_setting_id
9589
setting_binding_id = "%{setting_binding_id}"
9690
location = "global"

google-beta/services/gemini/resource_gemini_release_channel_setting_generated_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample(
3939

4040
acctest.VcrTest(t, resource.TestCase{
4141
PreCheck: func() { acctest.AccTestPreCheck(t) },
42-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
42+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
4343
CheckDestroy: testAccCheckGeminiReleaseChannelSettingDestroyProducer(t),
4444
Steps: []resource.TestStep{
4545
{
@@ -58,7 +58,6 @@ func TestAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample(
5858
func testAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample(context map[string]interface{}) string {
5959
return acctest.Nprintf(`
6060
resource "google_gemini_release_channel_setting" "example" {
61-
provider = google-beta
6261
release_channel_setting_id = "tf-test-ls1-tf%{random_suffix}"
6362
location = "global"
6463
labels = {"my_key": "my_value"}

google-beta/services/gemini/resource_gemini_release_channel_setting_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_
1818
}
1919
acctest.VcrTest(t, resource.TestCase{
2020
PreCheck: func() { acctest.AccTestPreCheck(t) },
21-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
21+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2222
Steps: []resource.TestStep{
2323
{
2424
Config: testAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_basic(context),
@@ -49,7 +49,6 @@ func TestAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_
4949
func testAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_basic(context map[string]interface{}) string {
5050
return acctest.Nprintf(`
5151
resource "google_gemini_release_channel_setting" "example" {
52-
provider = google-beta
5352
release_channel_setting_id = "%{setting_id}"
5453
location = "global"
5554
release_channel = "EXPERIMENTAL"
@@ -59,7 +58,6 @@ resource "google_gemini_release_channel_setting" "example" {
5958
func testAccGeminiReleaseChannelSetting_geminiReleaseChannelSettingBasicExample_update(context map[string]interface{}) string {
6059
return acctest.Nprintf(`
6160
resource "google_gemini_release_channel_setting" "example" {
62-
provider = google-beta
6361
release_channel_setting_id = "%{setting_id}"
6462
location = "global"
6563
labels = {"my_key" = "my_value"}

website/docs/r/gemini_release_channel_setting.html.markdown

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ description: |-
2121

2222
The resource for managing ReleaseChannel settings for Admin Control.
2323

24-
~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
25-
See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
2624

2725

2826
<div class = "oics-button" style="float: right; margin: 0 0 -15px">
@@ -35,7 +33,6 @@ See [Provider Versions](https://terraform.io/docs/providers/google/guides/provid
3533

3634
```hcl
3735
resource "google_gemini_release_channel_setting" "example" {
38-
provider = google-beta
3936
release_channel_setting_id = "ls1-tf"
4037
location = "global"
4138
labels = {"my_key": "my_value"}

website/docs/r/gemini_release_channel_setting_binding.html.markdown

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ description: |-
2121

2222
The resource for managing ReleaseChannel setting bindings for Admin Control.
2323

24-
~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
25-
See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
2624

2725
To get more information about ReleaseChannelSettingBinding, see:
2826
* How-to Guides
@@ -33,15 +31,13 @@ To get more information about ReleaseChannelSettingBinding, see:
3331

3432
```hcl
3533
resource "google_gemini_release_channel_setting" "basic" {
36-
provider = google-beta
3734
release_channel_setting_id = "ls-tf1"
3835
location = "global"
3936
labels = {"my_key": "my_value"}
4037
release_channel = "EXPERIMENTAL"
4138
}
4239
4340
resource "google_gemini_release_channel_setting_binding" "example" {
44-
provider = google-beta
4541
release_channel_setting_id = google_gemini_release_channel_setting.basic.release_channel_setting_id
4642
setting_binding_id = "ls-tf1b1"
4743
location = "global"

0 commit comments

Comments
 (0)