Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote Gemini Logging Setting from google-beta to google #13034

Merged
merged 3 commits into from
Feb 13, 2025
Merged

Promote Gemini Logging Setting from google-beta to google #13034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7641acc
Promote Logging Setting from google-beta to google
PerlMonker303 Feb 11, 2025
5410abb
Rename file
PerlMonker303 Feb 12, 2025
21f40c1
Solve conflict
PerlMonker303 Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions mmv1/products/gemini/LoggingSetting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion mmv1/templates/terraform/examples/gemini_logging_setting_basic.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"}
Expand Down
12 changes: 4 additions & 8 deletions ...ource_gemini_logging_setting_test.go.tmpl → ...i/resource_gemini_logging_setting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package gemini_test
{{- if ne $.TargetVersionName "ga" }}

import (
"fmt"
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-testing/helper/resource"
Expand All @@ -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),
Expand Down Expand Up @@ -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"}
Expand All @@ -68,4 +65,3 @@ resource "google_gemini_logging_setting" "example" {
}
`, context)
}
{{ end }}
Loading