Skip to content

Commit 3b38b67

Browse files
Promote Gemini Data Sharing With Google Setting Binding from google-beta to google (#13121)
1 parent 2696af1 commit 3b38b67

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

mmv1/products/gemini/DataSharingWithGoogleSettingBinding.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ description: The resource for managing DataSharingWithGoogle setting bindings fo
1818
references:
1919
guides:
2020
'Gemini Cloud Assist overview': 'https://cloud.google.com/gemini/docs/cloud-assist/overview'
21-
min_version: 'beta'
2221
base_url: projects/{{project}}/locations/{{location}}/dataSharingWithGoogleSettings/{{data_sharing_with_google_setting_id}}/settingBindings
2322
self_link: projects/{{project}}/locations/{{location}}/dataSharingWithGoogleSettings/{{data_sharing_with_google_setting_id}}/settingBindings/{{setting_binding_id}}
2423
create_url: projects/{{project}}/locations/{{location}}/dataSharingWithGoogleSettings/{{data_sharing_with_google_setting_id}}/settingBindings?settingBindingId={{setting_binding_id}}
@@ -30,7 +29,6 @@ import_format:
3029
mutex: projects/{{project}}/locations/{{location}}/dataSharingWithGoogleSettings/{{data_sharing_with_google_setting_id}}
3130
examples:
3231
- name: gemini_data_sharing_with_google_setting_binding_basic
33-
min_version: 'beta'
3432
primary_resource_id: example
3533
exclude_test: true
3634
vars:
@@ -80,7 +78,7 @@ properties:
8078
Product type of the setting binding.
8179
enum_values:
8280
- 'GEMINI_CLOUD_ASSIST'
83-
- 'GEMINI_CODE_ASSIST'
81+
default_from_api: true
8482
- name: name
8583
type: String
8684
description: |-

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

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

98
resource "google_gemini_data_sharing_with_google_setting_binding" "{{$.PrimaryResourceId}}" {
10-
provider = google-beta
119
data_sharing_with_google_setting_id = google_gemini_data_sharing_with_google_setting.basic.data_sharing_with_google_setting_id
1210
setting_binding_id = "{{index $.Vars "setting_binding_id"}}"
1311
location = "global"

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

+2-10
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 TestAccGeminiDataSharingWithGoogleSettingBinding_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: testAccGeminiDataSharingWithGoogleSettingBinding_basic(context),
@@ -53,19 +52,16 @@ func TestAccGeminiDataSharingWithGoogleSettingBinding_update(t *testing.T) {
5352
func testAccGeminiDataSharingWithGoogleSettingBinding_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_data_sharing_with_google_setting" "basic" {
60-
provider = google-beta
6158
data_sharing_with_google_setting_id = "%{data_sharing_with_google_setting_id}"
6259
location = "global"
6360
labels = {"my_key" = "my_value"}
6461
enable_preview_data_sharing = true
6562
}
6663

6764
resource "google_gemini_data_sharing_with_google_setting_binding" "basic_binding" {
68-
provider = google-beta
6965
data_sharing_with_google_setting_id = google_gemini_data_sharing_with_google_setting.basic.data_sharing_with_google_setting_id
7066
setting_binding_id = "%{setting_binding_id}"
7167
location = "global"
@@ -77,26 +73,22 @@ resource "google_gemini_data_sharing_with_google_setting_binding" "basic_binding
7773
func testAccGeminiDataSharingWithGoogleSettingBinding_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_data_sharing_with_google_setting" "basic" {
84-
provider = google-beta
8579
data_sharing_with_google_setting_id = "%{data_sharing_with_google_setting_id}"
8680
location = "global"
8781
labels = {"my_key" = "my_value"}
8882
enable_preview_data_sharing = true
8983
}
9084

9185
resource "google_gemini_data_sharing_with_google_setting_binding" "basic_binding" {
92-
provider = google-beta
9386
data_sharing_with_google_setting_id = google_gemini_data_sharing_with_google_setting.basic.data_sharing_with_google_setting_id
9487
setting_binding_id = "%{setting_binding_id}"
9588
location = "global"
9689
target = "projects/${data.google_project.project.number}"
9790
labels = {"my_key" = "my_value"}
98-
product = "GEMINI_CODE_ASSIST"
91+
product = "GEMINI_CLOUD_ASSIST"
9992
}
10093
`, context)
10194
}
102-
{{ end }}

0 commit comments

Comments
 (0)