diff --git a/mmv1/products/gemini/LoggingSetting.yaml b/mmv1/products/gemini/LoggingSetting.yaml index cdbf798720b9..b3e01e52e1d7 100644 --- a/mmv1/products/gemini/LoggingSetting.yaml +++ b/mmv1/products/gemini/LoggingSetting.yaml @@ -14,7 +14,6 @@ --- name: LoggingSetting description: The resource for managing Logging settings for Admin Control. -min_version: beta base_url: projects/{{project}}/locations/{{location}}/loggingSettings update_mask: true self_link: projects/{{project}}/locations/{{location}}/loggingSettings/{{logging_setting_id}} @@ -29,7 +28,6 @@ sweeper: - region: "global" examples: - name: gemini_logging_setting_basic - min_version: 'beta' primary_resource_id: "example" vars: logging_setting_id: ls1-tf diff --git a/mmv1/templates/terraform/examples/gemini_logging_setting_basic.tf.tmpl b/mmv1/templates/terraform/examples/gemini_logging_setting_basic.tf.tmpl index bf33756e6d82..a26fc09a95d7 100644 --- a/mmv1/templates/terraform/examples/gemini_logging_setting_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/gemini_logging_setting_basic.tf.tmpl @@ -1,5 +1,4 @@ resource "google_gemini_logging_setting" "{{$.PrimaryResourceId}}" { - provider = google-beta logging_setting_id = "{{index $.Vars "logging_setting_id"}}" location = "global" labels = {"my_key": "my_value"} diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_test.go similarity index 90% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_test.go index 896922b4ae77..6423dc8166ff 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_test.go.tmpl +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_test.go @@ -1,8 +1,7 @@ package gemini_test -{{- if ne $.TargetVersionName "ga" }} import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -17,7 +16,7 @@ func TestAccGeminiLoggingSetting_geminiLoggingSettingBasicExample_update(t *test } acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { Config: testAccGeminiLoggingSetting_geminiLoggingSettingBasicExample_basic(context), @@ -48,18 +47,16 @@ func TestAccGeminiLoggingSetting_geminiLoggingSettingBasicExample_update(t *test func testAccGeminiLoggingSetting_geminiLoggingSettingBasicExample_basic(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_gemini_logging_setting" "example" { - provider = google-beta logging_setting_id = "%{setting_id}" location = "global" - log_prompts_and_responses = true - log_metadata = true + log_prompts_and_responses = true + log_metadata = true } `, context) } func testAccGeminiLoggingSetting_geminiLoggingSettingBasicExample_update(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_gemini_logging_setting" "example" { - provider = google-beta logging_setting_id = "%{setting_id}" location = "global" labels = {"my_key" = "my_value"} @@ -68,4 +65,3 @@ resource "google_gemini_logging_setting" "example" { } `, context) } -{{ end }} \ No newline at end of file