Skip to content

fix: keep structured logs when --quiet is set #2694

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kgala2 merged 2 commits into from
Oct 13, 2026
Merged

fix: keep structured logs when --quiet is set #2694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8d5cb
test: cover --structured-logs with --quiet
Firehed Oct 7, 2026
ce69429
fix: keep structured logs when --quiet is set
Firehed Oct 7, 2026
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
4 changes: 1 addition & 3 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,7 @@ func loadConfig(c *Command, args []string, opts []Option) error {
// Handle logger separately from config
if c.conf.StructuredLogs {
c.logger = log.NewStructuredLogger(c.conf.Quiet)
}

if c.conf.Quiet {
} else if c.conf.Quiet {
c.logger = log.NewStdLogger(io.Discard, os.Stderr)
}

Expand Down
14 changes: 14 additions & 0 deletions cmd/root_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"time"

"cloud.google.com/go/cloudsqlconn"
"github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/internal/log"
"github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/internal/proxy"
"github.com/google/go-cmp/cmp"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -133,6 +134,19 @@ func TestUserAgent(t *testing.T) {
}
}

func TestStructuredLogsWithQuiet(t *testing.T) {
cmd, err := invokeProxyCommand(
[]string{"--structured-logs", "--quiet", "proj:region:inst"},
)
if err != nil {
t.Fatalf("want error = nil, got = %v", err)
}

if _, ok := cmd.logger.(*log.StructuredLogger); !ok {
t.Errorf("want logger = *log.StructuredLogger, got = %T", cmd.logger)
}
}

func TestNewCommandArguments(t *testing.T) {
tcs := []struct {
desc string
Expand Down
Loading