Adding upstream version 1.2.0.upstream/1.2.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 506 insertions, 0 deletions

diff --git a/dependencies/pkg/mod/go.uber.org/zap@v1.27.0/zapgrpc/zapgrpc.go b/dependencies/pkg/mod/go.uber.org/zap@v1.27.0/zapgrpc/zapgrpc.go
new file mode 100644
index 0000000..682de25
--- /dev/null
+++ b/dependencies/pkg/mod/go.uber.org/zap@v1.27.0/zapgrpc/zapgrpc.go
@@ -0,0 +1,243 @@
+// Copyright (c) 2016 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+// Package zapgrpc provides a logger that is compatible with grpclog.
+package zapgrpc // import "go.uber.org/zap/zapgrpc"
+
+import (
+	"fmt"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+// See https://github.com/grpc/grpc-go/blob/v1.35.0/grpclog/loggerv2.go#L77-L86
+const (
+	grpcLvlInfo int = iota
+	grpcLvlWarn
+	grpcLvlError
+	grpcLvlFatal
+)
+
+// _grpcToZapLevel maps gRPC log levels to zap log levels.
+// See https://pkg.go.dev/go.uber.org/zap@v1.16.0/zapcore#Level
+var _grpcToZapLevel = map[int]zapcore.Level{
+	grpcLvlInfo:  zapcore.InfoLevel,
+	grpcLvlWarn:  zapcore.WarnLevel,
+	grpcLvlError: zapcore.ErrorLevel,
+	grpcLvlFatal: zapcore.FatalLevel,
+}
+
+// An Option overrides a Logger's default configuration.
+type Option interface {
+	apply(*Logger)
+}
+
+type optionFunc func(*Logger)
+
+func (f optionFunc) apply(log *Logger) {
+	f(log)
+}
+
+// WithDebug configures a Logger to print at zap's DebugLevel instead of
+// InfoLevel.
+// It only affects the Printf, Println and Print methods, which are only used in the gRPC v1 grpclog.Logger API.
+//
+// Deprecated: use grpclog.SetLoggerV2() for v2 API.
+func WithDebug() Option {
+	return optionFunc(func(logger *Logger) {
+		logger.print = &printer{
+			enab:   logger.levelEnabler,
+			level:  zapcore.DebugLevel,
+			print:  logger.delegate.Debug,
+			printf: logger.delegate.Debugf,
+		}
+	})
+}
+
+// withWarn redirects the fatal level to the warn level, which makes testing
+// easier. This is intentionally unexported.
+func withWarn() Option {
+	return optionFunc(func(logger *Logger) {
+		logger.fatal = &printer{
+			enab:   logger.levelEnabler,
+			level:  zapcore.WarnLevel,
+			print:  logger.delegate.Warn,
+			printf: logger.delegate.Warnf,
+		}
+	})
+}
+
+// NewLogger returns a new Logger.
+func NewLogger(l *zap.Logger, options ...Option) *Logger {
+	logger := &Logger{
+		delegate:     l.Sugar(),
+		levelEnabler: l.Core(),
+	}
+	logger.print = &printer{
+		enab:   logger.levelEnabler,
+		level:  zapcore.InfoLevel,
+		print:  logger.delegate.Info,
+		printf: logger.delegate.Infof,
+	}
+	logger.fatal = &printer{
+		enab:   logger.levelEnabler,
+		level:  zapcore.FatalLevel,
+		print:  logger.delegate.Fatal,
+		printf: logger.delegate.Fatalf,
+	}
+	for _, option := range options {
+		option.apply(logger)
+	}
+	return logger
+}
+
+// printer implements Print, Printf, and Println operations for a Zap level.
+//
+// We use it to customize Debug vs Info, and Warn vs Fatal for Print and Fatal
+// respectively.
+type printer struct {
+	enab   zapcore.LevelEnabler
+	level  zapcore.Level
+	print  func(...interface{})
+	printf func(string, ...interface{})
+}
+
+func (v *printer) Print(args ...interface{}) {
+	v.print(args...)
+}
+
+func (v *printer) Printf(format string, args ...interface{}) {
+	v.printf(format, args...)
+}
+
+func (v *printer) Println(args ...interface{}) {
+	if v.enab.Enabled(v.level) {
+		v.print(sprintln(args))
+	}
+}
+
+// Logger adapts zap's Logger to be compatible with grpclog.LoggerV2 and the deprecated grpclog.Logger.
+type Logger struct {
+	delegate     *zap.SugaredLogger
+	levelEnabler zapcore.LevelEnabler
+	print        *printer
+	fatal        *printer
+	// printToDebug bool
+	// fatalToWarn  bool
+}
+
+// Print implements grpclog.Logger.
+//
+// Deprecated: use [Logger.Info].
+func (l *Logger) Print(args ...interface{}) {
+	l.print.Print(args...)
+}
+
+// Printf implements grpclog.Logger.
+//
+// Deprecated: use [Logger.Infof].
+func (l *Logger) Printf(format string, args ...interface{}) {
+	l.print.Printf(format, args...)
+}
+
+// Println implements grpclog.Logger.
+//
+// Deprecated: use [Logger.Info].
+func (l *Logger) Println(args ...interface{}) {
+	l.print.Println(args...)
+}
+
+// Info implements grpclog.LoggerV2.
+func (l *Logger) Info(args ...interface{}) {
+	l.delegate.Info(args...)
+}
+
+// Infoln implements grpclog.LoggerV2.
+func (l *Logger) Infoln(args ...interface{}) {
+	if l.levelEnabler.Enabled(zapcore.InfoLevel) {
+		l.delegate.Info(sprintln(args))
+	}
+}
+
+// Infof implements grpclog.LoggerV2.
+func (l *Logger) Infof(format string, args ...interface{}) {
+	l.delegate.Infof(format, args...)
+}
+
+// Warning implements grpclog.LoggerV2.
+func (l *Logger) Warning(args ...interface{}) {
+	l.delegate.Warn(args...)
+}
+
+// Warningln implements grpclog.LoggerV2.
+func (l *Logger) Warningln(args ...interface{}) {
+	if l.levelEnabler.Enabled(zapcore.WarnLevel) {
+		l.delegate.Warn(sprintln(args))
+	}
+}
+
+// Warningf implements grpclog.LoggerV2.
+func (l *Logger) Warningf(format string, args ...interface{}) {
+	l.delegate.Warnf(format, args...)
+}
+
+// Error implements grpclog.LoggerV2.
+func (l *Logger) Error(args ...interface{}) {
+	l.delegate.Error(args...)
+}
+
+// Errorln implements grpclog.LoggerV2.
+func (l *Logger) Errorln(args ...interface{}) {
+	if l.levelEnabler.Enabled(zapcore.ErrorLevel) {
+		l.delegate.Error(sprintln(args))
+	}
+}
+
+// Errorf implements grpclog.LoggerV2.
+func (l *Logger) Errorf(format string, args ...interface{}) {
+	l.delegate.Errorf(format, args...)
+}
+
+// Fatal implements grpclog.LoggerV2.
+func (l *Logger) Fatal(args ...interface{}) {
+	l.fatal.Print(args...)
+}
+
+// Fatalln implements grpclog.LoggerV2.
+func (l *Logger) Fatalln(args ...interface{}) {
+	l.fatal.Println(args...)
+}
+
+// Fatalf implements grpclog.LoggerV2.
+func (l *Logger) Fatalf(format string, args ...interface{}) {
+	l.fatal.Printf(format, args...)
+}
+
+// V implements grpclog.LoggerV2.
+func (l *Logger) V(level int) bool {
+	return l.levelEnabler.Enabled(_grpcToZapLevel[level])
+}
+
+func sprintln(args []interface{}) string {
+	s := fmt.Sprintln(args...)
+	// Drop the new line character added by Sprintln
+	return s[:len(s)-1]
+}
diff --git a/dependencies/pkg/mod/go.uber.org/zap@v1.27.0/zapgrpc/zapgrpc_test.go b/dependencies/pkg/mod/go.uber.org/zap@v1.27.0/zapgrpc/zapgrpc_test.go
new file mode 100644
index 0000000..a231d65
--- /dev/null
+++ b/dependencies/pkg/mod/go.uber.org/zap@v1.27.0/zapgrpc/zapgrpc_test.go
@@ -0,0 +1,263 @@
+// Copyright (c) 2016 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package zapgrpc
+
+import (
+	"fmt"
+	"testing"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"go.uber.org/zap/zaptest/observer"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestLoggerInfoExpected(t *testing.T) {
+	checkMessages(t, zapcore.DebugLevel, nil, zapcore.InfoLevel, []string{
+		"hello",
+		"s1s21 2 3s34s56",
+		"hello world",
+		"",
+		"foo",
+		"foo bar",
+		"s1 s2 1 2 3 s3 4 s5 6",
+		"hello",
+		"s1s21 2 3s34s56",
+		"hello world",
+		"",
+		"foo",
+		"foo bar",
+		"s1 s2 1 2 3 s3 4 s5 6",
+	}, func(logger *Logger) {
+		logger.Info("hello")
+		logger.Info("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+		logger.Infof("%s world", "hello")
+		logger.Infoln()
+		logger.Infoln("foo")
+		logger.Infoln("foo", "bar")
+		logger.Infoln("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+		logger.Print("hello")
+		logger.Print("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+		logger.Printf("%s world", "hello")
+		logger.Println()
+		logger.Println("foo")
+		logger.Println("foo", "bar")
+		logger.Println("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+	})
+}
+
+func TestLoggerDebugExpected(t *testing.T) {
+	checkMessages(t, zapcore.DebugLevel, []Option{WithDebug()}, zapcore.DebugLevel, []string{
+		"hello",
+		"s1s21 2 3s34s56",
+		"hello world",
+		"",
+		"foo",
+		"foo bar",
+		"s1 s2 1 2 3 s3 4 s5 6",
+	}, func(logger *Logger) {
+		logger.Print("hello")
+		logger.Print("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+		logger.Printf("%s world", "hello")
+		logger.Println()
+		logger.Println("foo")
+		logger.Println("foo", "bar")
+		logger.Println("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+	})
+}
+
+func TestLoggerDebugSuppressed(t *testing.T) {
+	checkMessages(t, zapcore.InfoLevel, []Option{WithDebug()}, zapcore.DebugLevel, nil, func(logger *Logger) {
+		logger.Print("hello")
+		logger.Printf("%s world", "hello")
+		logger.Println()
+		logger.Println("foo")
+		logger.Println("foo", "bar")
+	})
+}
+
+func TestLoggerWarningExpected(t *testing.T) {
+	checkMessages(t, zapcore.DebugLevel, nil, zapcore.WarnLevel, []string{
+		"hello",
+		"s1s21 2 3s34s56",
+		"hello world",
+		"",
+		"foo",
+		"foo bar",
+		"s1 s2 1 2 3 s3 4 s5 6",
+	}, func(logger *Logger) {
+		logger.Warning("hello")
+		logger.Warning("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+		logger.Warningf("%s world", "hello")
+		logger.Warningln()
+		logger.Warningln("foo")
+		logger.Warningln("foo", "bar")
+		logger.Warningln("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+	})
+}
+
+func TestLoggerErrorExpected(t *testing.T) {
+	checkMessages(t, zapcore.DebugLevel, nil, zapcore.ErrorLevel, []string{
+		"hello",
+		"s1s21 2 3s34s56",
+		"hello world",
+		"",
+		"foo",
+		"foo bar",
+		"s1 s2 1 2 3 s3 4 s5 6",
+	}, func(logger *Logger) {
+		logger.Error("hello")
+		logger.Error("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+		logger.Errorf("%s world", "hello")
+		logger.Errorln()
+		logger.Errorln("foo")
+		logger.Errorln("foo", "bar")
+		logger.Errorln("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+	})
+}
+
+func TestLoggerFatalExpected(t *testing.T) {
+	checkMessages(t, zapcore.DebugLevel, nil, zapcore.FatalLevel, []string{
+		"hello",
+		"s1s21 2 3s34s56",
+		"hello world",
+		"",
+		"foo",
+		"foo bar",
+		"s1 s2 1 2 3 s3 4 s5 6",
+	}, func(logger *Logger) {
+		logger.Fatal("hello")
+		logger.Fatal("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+		logger.Fatalf("%s world", "hello")
+		logger.Fatalln()
+		logger.Fatalln("foo")
+		logger.Fatalln("foo", "bar")
+		logger.Fatalln("s1", "s2", 1, 2, 3, "s3", 4, "s5", 6)
+	})
+}
+
+func TestLoggerV(t *testing.T) {
+	tests := []struct {
+		zapLevel     zapcore.Level
+		grpcEnabled  []int
+		grpcDisabled []int
+	}{
+		{
+			zapLevel:     zapcore.DebugLevel,
+			grpcEnabled:  []int{grpcLvlInfo, grpcLvlWarn, grpcLvlError, grpcLvlFatal},
+			grpcDisabled: []int{}, // everything is enabled, nothing is disabled
+		},
+		{
+			zapLevel:     zapcore.InfoLevel,
+			grpcEnabled:  []int{grpcLvlInfo, grpcLvlWarn, grpcLvlError, grpcLvlFatal},
+			grpcDisabled: []int{}, // everything is enabled, nothing is disabled
+		},
+		{
+			zapLevel:     zapcore.WarnLevel,
+			grpcEnabled:  []int{grpcLvlWarn, grpcLvlError, grpcLvlFatal},
+			grpcDisabled: []int{grpcLvlInfo},
+		},
+		{
+			zapLevel:     zapcore.ErrorLevel,
+			grpcEnabled:  []int{grpcLvlError, grpcLvlFatal},
+			grpcDisabled: []int{grpcLvlInfo, grpcLvlWarn},
+		},
+		{
+			zapLevel:     zapcore.DPanicLevel,
+			grpcEnabled:  []int{grpcLvlFatal},
+			grpcDisabled: []int{grpcLvlInfo, grpcLvlWarn, grpcLvlError},
+		},
+		{
+			zapLevel:     zapcore.PanicLevel,
+			grpcEnabled:  []int{grpcLvlFatal},
+			grpcDisabled: []int{grpcLvlInfo, grpcLvlWarn, grpcLvlError},
+		},
+		{
+			zapLevel:     zapcore.FatalLevel,
+			grpcEnabled:  []int{grpcLvlFatal},
+			grpcDisabled: []int{grpcLvlInfo, grpcLvlWarn, grpcLvlError},
+		},
+	}
+	for _, tst := range tests {
+		for _, grpcLvl := range tst.grpcEnabled {
+			t.Run(fmt.Sprintf("enabled %s %d", tst.zapLevel, grpcLvl), func(t *testing.T) {
+				checkLevel(t, tst.zapLevel, true, func(logger *Logger) bool {
+					return logger.V(grpcLvl)
+				})
+			})
+		}
+		for _, grpcLvl := range tst.grpcDisabled {
+			t.Run(fmt.Sprintf("disabled %s %d", tst.zapLevel, grpcLvl), func(t *testing.T) {
+				checkLevel(t, tst.zapLevel, false, func(logger *Logger) bool {
+					return logger.V(grpcLvl)
+				})
+			})
+		}
+	}
+}
+
+func checkLevel(
+	t testing.TB,
+	enab zapcore.LevelEnabler,
+	expectedBool bool,
+	f func(*Logger) bool,
+) {
+	withLogger(enab, nil, func(logger *Logger, observedLogs *observer.ObservedLogs) {
+		actualBool := f(logger)
+		if expectedBool {
+			require.True(t, actualBool)
+		} else {
+			require.False(t, actualBool)
+		}
+	})
+}
+
+func checkMessages(
+	t testing.TB,
+	enab zapcore.LevelEnabler,
+	opts []Option,
+	expectedLevel zapcore.Level,
+	expectedMessages []string,
+	f func(*Logger),
+) {
+	if expectedLevel == zapcore.FatalLevel {
+		expectedLevel = zapcore.WarnLevel
+	}
+	withLogger(enab, opts, func(logger *Logger, observedLogs *observer.ObservedLogs) {
+		f(logger)
+		logEntries := observedLogs.All()
+		require.Equal(t, len(expectedMessages), len(logEntries))
+		for i, logEntry := range logEntries {
+			require.Equal(t, expectedLevel, logEntry.Level)
+			require.Equal(t, expectedMessages[i], logEntry.Message)
+		}
+	})
+}
+
+func withLogger(
+	enab zapcore.LevelEnabler,
+	opts []Option,
+	f func(*Logger, *observer.ObservedLogs),
+) {
+	core, observedLogs := observer.New(enab)
+	f(NewLogger(zap.New(core), append(opts, withWarn())...), observedLogs)
+}