mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-08-09 23:42:21 -04:00
fixed issues detected by bazel check
This commit is contained in:
parent
972f832a6e
commit
081d357e58
6 changed files with 9 additions and 8 deletions
|
@ -304,7 +304,7 @@ type cmdLogger struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *cmdLogger) Write(p []byte) (n int, err error) {
|
func (c *cmdLogger) Write(p []byte) (n int, err error) {
|
||||||
c.logger.Info(fmt.Sprintf("%s", p))
|
c.logger.Info(string(p))
|
||||||
return len(p), nil
|
return len(p), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -224,7 +224,7 @@ func (m *Maintainer) put(ctx context.Context, hash string, data io.Reader) error
|
||||||
m.log.Debug(fmt.Sprintf("DryRun: s3 put object {Bucket: %v, Key: %v}", m.bucket, key))
|
m.log.Debug(fmt.Sprintf("DryRun: s3 put object {Bucket: %v, Key: %v}", m.bucket, key))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
m.log.Debug(fmt.Sprintf(fmt.Sprintf("Uploading object with hash %v to s3://%v/%v", hash, m.bucket, key)))
|
m.log.Debug(fmt.Sprintf("Uploading object with hash %v to s3://%v/%v", hash, m.bucket, key))
|
||||||
_, err := m.uploadClient.Upload(ctx, &s3.PutObjectInput{
|
_, err := m.uploadClient.Upload(ctx, &s3.PutObjectInput{
|
||||||
Bucket: &m.bucket,
|
Bucket: &m.bucket,
|
||||||
Key: &key,
|
Key: &key,
|
||||||
|
|
|
@ -52,10 +52,10 @@ type Logger interface {
|
||||||
// NOPLogger is a no-op implementation of [Logger].
|
// NOPLogger is a no-op implementation of [Logger].
|
||||||
type NOPLogger struct{}
|
type NOPLogger struct{}
|
||||||
|
|
||||||
// Infof is a no-op.
|
// Info is a no-op.
|
||||||
func (NOPLogger) Info(string, ...interface{}) {}
|
func (NOPLogger) Info(string, ...interface{}) {}
|
||||||
|
|
||||||
// Warnf is a no-op.
|
// Warn is a no-op.
|
||||||
func (NOPLogger) Warn(string, ...interface{}) {}
|
func (NOPLogger) Warn(string, ...interface{}) {}
|
||||||
|
|
||||||
// DeriveClusterID derives the cluster ID from a salt and secret value.
|
// DeriveClusterID derives the cluster ID from a salt and secret value.
|
||||||
|
|
|
@ -87,7 +87,7 @@ type spyLog struct {
|
||||||
msgs []string
|
msgs []string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *spyLog) Debug(msg string, args ...any) {
|
func (f *spyLog) Debug(msg string, _ ...any) {
|
||||||
f.msgs = append(f.msgs, msg)
|
f.msgs = append(f.msgs, msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,14 +28,14 @@ func replaceGRPCLogger(log *slog.Logger) {
|
||||||
func (l *grpcLogger) log(level slog.Level, args ...interface{}) {
|
func (l *grpcLogger) log(level slog.Level, args ...interface{}) {
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(3, pcs[:])
|
runtime.Callers(3, pcs[:])
|
||||||
r := slog.NewRecord(time.Now(), slog.LevelInfo, fmt.Sprint(args...), pcs[0])
|
r := slog.NewRecord(time.Now(), level, fmt.Sprint(args...), pcs[0])
|
||||||
_ = l.logger.Handler().Handle(context.Background(), r)
|
_ = l.logger.Handler().Handle(context.Background(), r)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *grpcLogger) logf(level slog.Level, format string, args ...interface{}) {
|
func (l *grpcLogger) logf(level slog.Level, format string, args ...interface{}) {
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(3, pcs[:])
|
runtime.Callers(3, pcs[:])
|
||||||
r := slog.NewRecord(time.Now(), slog.LevelInfo, fmt.Sprintf(format, args...), pcs[0])
|
r := slog.NewRecord(time.Now(), level, fmt.Sprintf(format, args...), pcs[0])
|
||||||
_ = l.logger.Handler().Handle(context.Background(), r)
|
_ = l.logger.Handler().Handle(context.Background(), r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -105,11 +105,12 @@ func middlewareLogger(l *slog.Logger) logging.Logger {
|
||||||
panic(fmt.Sprintf("unknown level %v", lvl))
|
panic(fmt.Sprintf("unknown level %v", lvl))
|
||||||
}
|
}
|
||||||
|
|
||||||
r := slog.NewRecord(time.Now(), level, fmt.Sprintf(msg, fields...), pcs[0])
|
r := slog.NewRecord(time.Now(), level, fmt.Sprintf(msg, f), pcs[0])
|
||||||
_ = l.Handler().Handle(context.Background(), r)
|
_ = l.Handler().Handle(context.Background(), r)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewTest creates a new slog.Logger that writes to a testing.T.
|
||||||
func NewTest(t *testing.T) *slog.Logger {
|
func NewTest(t *testing.T) *slog.Logger {
|
||||||
return slog.New(slog.NewTextHandler(testWriter{t: t}, nil))
|
return slog.New(slog.NewTextHandler(testWriter{t: t}, nil))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue