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.

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

fix: explicitly do not log #558

Merged
merged 1 commit into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.21.5

require (
chainguard.dev/apko v0.13.4-0.20240116200834-c10dc551b827
chainguard.dev/melange v0.5.6-0.20240116222011-34a2130156b4
chainguard.dev/melange v0.5.6-0.20240118190540-d50de70a95bd
github.com/adrg/xdg v0.4.0
github.com/anchore/grype v0.74.0
github.com/anchore/syft v0.100.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
chainguard.dev/apko v0.13.4-0.20240116200834-c10dc551b827 h1:O5FUsm7JVXKlWGS2UrgP7A8HlEKoH0fLtuiV6rQ7KEs=
chainguard.dev/apko v0.13.4-0.20240116200834-c10dc551b827/go.mod h1:6WRsohsp9hXU2J7LTxOmplw28L6fYEcdjZLNR6BiYKU=
chainguard.dev/melange v0.5.6-0.20240116222011-34a2130156b4 h1:BkDqkZkWbIg7U7nZsBO5J0t0flKVzg7s1D3ZFxSE3PI=
chainguard.dev/melange v0.5.6-0.20240116222011-34a2130156b4/go.mod h1:3KNCNL1kAcCD+Xrm3JVCdimoitS4M5ZiD6NTm0WNAyY=
chainguard.dev/melange v0.5.6-0.20240118190540-d50de70a95bd h1:xoRrcT4AGBbUy9hDbENJL2djpKlJZSKfR2fUJmb0e8Q=
chainguard.dev/melange v0.5.6-0.20240118190540-d50de70a95bd/go.mod h1:3KNCNL1kAcCD+Xrm3JVCdimoitS4M5ZiD6NTm0WNAyY=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/advisory.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cli

import (
"fmt"
"io"
"log/slog"
"os"
"sort"
Expand All @@ -18,6 +17,7 @@ import (
"github.com/wolfi-dev/wolfictl/pkg/configs"
v2 "github.com/wolfi-dev/wolfictl/pkg/configs/advisory/v2"
"github.com/wolfi-dev/wolfictl/pkg/distro"
"github.com/wolfi-dev/wolfictl/pkg/internal"
"github.com/wolfi-dev/wolfictl/pkg/versions"
)

Expand Down Expand Up @@ -190,7 +190,7 @@ func newLogger(verbosity int) *slog.Logger {
case verbosity >= 2:
h = slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug})
default:
h = slog.NewTextHandler(io.Discard, nil)
return internal.NopLogger()
}

return slog.New(h)
Expand Down
4 changes: 3 additions & 1 deletion pkg/configs/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import (
"io/fs"

"chainguard.dev/melange/pkg/config"
"github.com/chainguard-dev/clog"
"github.com/wolfi-dev/wolfictl/pkg/configs"
"github.com/wolfi-dev/wolfictl/pkg/configs/rwfs"
"github.com/wolfi-dev/wolfictl/pkg/internal"
)

func NewIndex(fsys rwfs.FS) (*configs.Index[config.Configuration], error) {
Expand All @@ -19,7 +21,7 @@ func NewIndexFromPaths(fsys rwfs.FS, paths ...string) (*configs.Index[config.Con

func newConfigurationDecodeFunc(fsys fs.FS) func(string) (*config.Configuration, error) {
return func(path string) (*config.Configuration, error) {
ctx := context.Background()
ctx := clog.WithLogger(context.Background(), clog.NewLogger(internal.NopLogger()))
return config.ParseConfiguration(ctx, path, config.WithFS(fsys))
}
}
29 changes: 29 additions & 0 deletions pkg/internal/nop_slogger.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package internal

import (
"context"
"log/slog"
)

// NopLogger returns a new slog.Logger that does nothing.
func NopLogger() *slog.Logger {
return slog.New(nopHandler{})
}

type nopHandler struct{}

func (h nopHandler) Enabled(_ context.Context, _ slog.Level) bool {
return false
}

func (h nopHandler) Handle(_ context.Context, _ slog.Record) error {
return nil
}

func (h nopHandler) WithAttrs(_ []slog.Attr) slog.Handler {
return h
}

func (h nopHandler) WithGroup(_ string) slog.Handler {
return h
}