From 7641acc05db2a36c42be9f3218e8b2021412c08b Mon Sep 17 00:00:00 2001 From: Andrei-Robert Alexandrescu Date: Tue, 11 Feb 2025 10:34:48 +0000 Subject: [PATCH 1/2] Promote Logging Setting from google-beta to google --- mmv1/products/gemini/LoggingSetting.yaml | 2 -- .../examples/gemini_logging_setting_basic.tf.tmpl | 1 - .../gemini/resource_gemini_logging_setting_test.go.tmpl | 8 ++------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/mmv1/products/gemini/LoggingSetting.yaml b/mmv1/products/gemini/LoggingSetting.yaml index a658231661c6..1212bbf95f29 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}} @@ -26,7 +25,6 @@ import_format: mutex: projects/{{project}}/locations/{{location}}/loggingSettings/{{logging_setting_id}} 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 ed02e7b0aca8..a1dcb955dcac 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" log_prompts_and_responses = true 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.tmpl index a37823a928a6..b11124f32357 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.tmpl @@ -1,5 +1,4 @@ package gemini_test -{{- if ne $.TargetVersionName "ga" }} import ( "testing" @@ -16,7 +15,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), @@ -47,7 +46,6 @@ 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 @@ -58,12 +56,10 @@ resource "google_gemini_logging_setting" "example" { 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" log_prompts_and_responses = false log_metadata = false } `, context) -} -{{ end }} \ No newline at end of file +} \ No newline at end of file From 5410abb763579144b13038aa7afab5dae30562d7 Mon Sep 17 00:00:00 2001 From: Andrei-Robert Alexandrescu Date: Wed, 12 Feb 2025 10:17:12 +0000 Subject: [PATCH 2/2] Rename file --- ...go.tmpl => resource_gemini_logging_setting_test.go} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_logging_setting_test.go.tmpl => resource_gemini_logging_setting_test.go} (94%) 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 94% 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 b11124f32357..6a769dde2181 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 @@ -48,8 +48,8 @@ func testAccGeminiLoggingSetting_geminiLoggingSettingBasicExample_basic(context resource "google_gemini_logging_setting" "example" { logging_setting_id = "%{setting_id}" location = "global" - log_prompts_and_responses = true - log_metadata = true + log_prompts_and_responses = true + log_metadata = true } `, context) } @@ -58,8 +58,8 @@ func testAccGeminiLoggingSetting_geminiLoggingSettingBasicExample_update(context resource "google_gemini_logging_setting" "example" { logging_setting_id = "%{setting_id}" location = "global" - log_prompts_and_responses = false - log_metadata = false + log_prompts_and_responses = false + log_metadata = false } `, context) -} \ No newline at end of file +}