Skip to content

Commit cbd9a6a

Browse files
Promote Gemini Gcp Enablement Setting Binding from google-beta to google (#13168)
[upstream:c554fe9ae40ee7c7b495cf207266433ffe928946] Signed-off-by: Modular Magician <[email protected]>
1 parent 509fa6f commit cbd9a6a

4 files changed

+9
-15
lines changed

.changelog/13168.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
`google_gemini_gcp_enablement_setting_binding` (GA)
3+
```

google-beta/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@ Please refer to the field 'effective_labels' for all of the labels present on th
9292
},
9393
"product": {
9494
Type: schema.TypeString,
95+
Computed: true,
9596
Optional: true,
96-
ValidateFunc: verify.ValidateEnum([]string{"GEMINI_CLOUD_ASSIST", "GEMINI_CODE_ASSIST", ""}),
97-
Description: `Product type of the setting binding. Possible values: ["GEMINI_CLOUD_ASSIST", "GEMINI_CODE_ASSIST"]`,
97+
ValidateFunc: verify.ValidateEnum([]string{"GEMINI_IN_BIGQUERY", ""}),
98+
Description: `Product type of the setting binding. Possible values: ["GEMINI_IN_BIGQUERY"]`,
9899
},
99100
"create_time": {
100101
Type: schema.TypeString,

google-beta/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccGeminiGeminiGcpEnablementSettingBinding_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: testAccGeminiGeminiGcpEnablementSettingBinding_basic(context),
@@ -54,19 +54,16 @@ func TestAccGeminiGeminiGcpEnablementSettingBinding_update(t *testing.T) {
5454
func testAccGeminiGeminiGcpEnablementSettingBinding_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_gemini_gcp_enablement_setting" "basic" {
61-
provider = google-beta
6260
gemini_gcp_enablement_setting_id = "%{gemini_gcp_enablement_setting_id}"
6361
location = "global"
6462
labels = {"my_key": "my_value"}
6563
enable_customer_data_sharing = true
6664
}
6765
6866
resource "google_gemini_gemini_gcp_enablement_setting_binding" "basic_binding" {
69-
provider = google-beta
7067
gemini_gcp_enablement_setting_id = google_gemini_gemini_gcp_enablement_setting.basic.gemini_gcp_enablement_setting_id
7168
setting_binding_id = "%{setting_binding_id}"
7269
location = "global"
@@ -78,25 +75,22 @@ resource "google_gemini_gemini_gcp_enablement_setting_binding" "basic_binding" {
7875
func testAccGeminiGeminiGcpEnablementSettingBinding_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_gemini_gcp_enablement_setting" "basic" {
85-
provider = google-beta
8681
gemini_gcp_enablement_setting_id = "%{gemini_gcp_enablement_setting_id}"
8782
location = "global"
8883
labels = {"my_key" = "my_value"}
8984
enable_customer_data_sharing = false
9085
}
9186
9287
resource "google_gemini_gemini_gcp_enablement_setting_binding" "basic_binding" {
93-
provider = google-beta
9488
gemini_gcp_enablement_setting_id = google_gemini_gemini_gcp_enablement_setting.basic.gemini_gcp_enablement_setting_id
9589
setting_binding_id = "%{setting_binding_id}"
9690
location = "global"
9791
target = "projects/${data.google_project.project.number}"
9892
labels = {"my_key" = "my_value"}
99-
product = "GEMINI_CODE_ASSIST"
93+
product = "GEMINI_IN_BIGQUERY"
10094
}
10195
`, context)
10296
}

website/docs/r/gemini_gemini_gcp_enablement_setting_binding.html.markdown

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ description: |-
2323

2424
The resource for managing GeminiGcpEnablementSetting setting bindings for Admin Control.
2525

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

2927
To get more information about GeminiGcpEnablementSettingBinding, see:
3028
* How-to Guides
@@ -35,15 +33,13 @@ To get more information about GeminiGcpEnablementSettingBinding, see:
3533

3634
```hcl
3735
resource "google_gemini_gemini_gcp_enablement_setting" "basic" {
38-
provider = google-beta
3936
gemini_gcp_enablement_setting_id = "ls-tf1"
4037
location = "global"
4138
labels = {"my_key": "my_value"}
4239
enable_customer_data_sharing = true
4340
}
4441
4542
resource "google_gemini_gemini_gcp_enablement_setting_binding" "example" {
46-
provider = google-beta
4743
gemini_gcp_enablement_setting_id = google_gemini_gemini_gcp_enablement_setting.basic.gemini_gcp_enablement_setting_id
4844
setting_binding_id = "ls-tf1b1"
4945
location = "global"
@@ -81,7 +77,7 @@ The following arguments are supported:
8177
* `product` -
8278
(Optional)
8379
Product type of the setting binding.
84-
Possible values are: `GEMINI_CLOUD_ASSIST`, `GEMINI_CODE_ASSIST`.
80+
Possible values are: `GEMINI_IN_BIGQUERY`.
8581

8682
* `location` -
8783
(Optional)

0 commit comments

Comments
 (0)