From 0b05ff97d45d1f9981913856a8414a208dd8e4c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 16:34:14 +0200 Subject: [PATCH] Renovate: Update github.com/sapcc/go-bits digest to 83eb3a7 (#100) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/sapcc/go-bits/assert/assert.go | 2 +- vendor/github.com/sapcc/go-bits/assert/values.go | 4 ++-- vendor/github.com/sapcc/go-bits/logg/log.go | 12 ++++++------ vendor/modules.txt | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 8ba9c446..0ae2de00 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/prometheus/client_golang v1.15.1 github.com/sapcc/go-api-declarations v1.5.1 - github.com/sapcc/go-bits v0.0.0-20230608160309-15c04a12a7c0 + github.com/sapcc/go-bits v0.0.0-20230614140115-83eb3a701632 go.uber.org/automaxprocs v1.5.2 ) diff --git a/go.sum b/go.sum index 70786035..c97999a0 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,8 @@ github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJf github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/sapcc/go-api-declarations v1.5.1 h1:K0dn7gy9uvBRn3qBUHOYli4J3eJCRrTBIUxWrpk+1yg= github.com/sapcc/go-api-declarations v1.5.1/go.mod h1:3OCDo75YJwpytM/I0SjwcZJf1ZNu89KeAZ55kdOTSqE= -github.com/sapcc/go-bits v0.0.0-20230608160309-15c04a12a7c0 h1:LJxCA2FopbvdALCd0FFTtfDz3N6B9toTUGqeZQ5FKTQ= -github.com/sapcc/go-bits v0.0.0-20230608160309-15c04a12a7c0/go.mod h1:kTwPywJ474TQzcXRhK2j1IKIEs72Cl0j419aOJdleZ8= +github.com/sapcc/go-bits v0.0.0-20230614140115-83eb3a701632 h1:GK/Gw800kfYHe1nlyusq2PYFfb4xzYCIgxZkvvJV8Rk= +github.com/sapcc/go-bits v0.0.0-20230614140115-83eb3a701632/go.mod h1:jjAzEgHWrGCqQFAsWA52Du/+2JC1EPaZkkLHs2PNXh0= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/vendor/github.com/sapcc/go-bits/assert/assert.go b/vendor/github.com/sapcc/go-bits/assert/assert.go index 5e9c79ce..b3579aac 100644 --- a/vendor/github.com/sapcc/go-bits/assert/assert.go +++ b/vendor/github.com/sapcc/go-bits/assert/assert.go @@ -31,7 +31,7 @@ import ( // DeepEqual checks if the actual and expected value are equal as // determined by reflect.DeepEqual(), and t.Error()s otherwise. -func DeepEqual(t *testing.T, variable string, actual, expected interface{}) bool { +func DeepEqual(t *testing.T, variable string, actual, expected any) bool { t.Helper() if reflect.DeepEqual(actual, expected) { return true diff --git a/vendor/github.com/sapcc/go-bits/assert/values.go b/vendor/github.com/sapcc/go-bits/assert/values.go index e8a992ad..c28ed89f 100644 --- a/vendor/github.com/sapcc/go-bits/assert/values.go +++ b/vendor/github.com/sapcc/go-bits/assert/values.go @@ -92,7 +92,7 @@ func (s StringData) AssertResponseBody(t *testing.T, requestInfo string, respons } // JSONObject implements HTTPRequestBody and HTTPResponseBody for JSON objects. -type JSONObject map[string]interface{} +type JSONObject map[string]any // GetRequestBody implements the HTTPRequestBody interface. func (o JSONObject) GetRequestBody() (io.Reader, error) { @@ -111,7 +111,7 @@ func (o JSONObject) AssertResponseBody(t *testing.T, requestInfo string, respons } //need to decode and re-encode the responseBody to ensure identical ordering of keys - var data map[string]interface{} + var data map[string]any err = json.Unmarshal(responseBody, &data) if err == nil { responseBody, err = json.Marshal(data) diff --git a/vendor/github.com/sapcc/go-bits/logg/log.go b/vendor/github.com/sapcc/go-bits/logg/log.go index e033909e..88edd281 100644 --- a/vendor/github.com/sapcc/go-bits/logg/log.go +++ b/vendor/github.com/sapcc/go-bits/logg/log.go @@ -59,34 +59,34 @@ func SetLogger(l *stdlog.Logger) { } // Fatal logs a fatal error and terminates the program. -func Fatal(msg string, args ...interface{}) { +func Fatal(msg string, args ...any) { doLog("FATAL: "+msg, args) os.Exit(1) } // Error logs a non-fatal error. -func Error(msg string, args ...interface{}) { +func Error(msg string, args ...any) { doLog("ERROR: "+msg, args) } // Info logs an informational message. -func Info(msg string, args ...interface{}) { +func Info(msg string, args ...any) { doLog("INFO: "+msg, args) } // Debug logs a debug message if debug logging is enabled. -func Debug(msg string, args ...interface{}) { +func Debug(msg string, args ...any) { if ShowDebug { doLog("DEBUG: "+msg, args) } } // Other logs a message with a custom log level. -func Other(level, msg string, args ...interface{}) { +func Other(level, msg string, args ...any) { doLog(level+": "+msg, args) } -func doLog(msg string, args []interface{}) { +func doLog(msg string, args []any) { msg = strings.TrimSpace(msg) //most importantly, skip trailing '\n' msg = strings.Replace(msg, "\n", "\\n", -1) //avoid multiline log messages if len(args) > 0 { diff --git a/vendor/modules.txt b/vendor/modules.txt index 958277f3..9c350014 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -37,7 +37,7 @@ github.com/prometheus/procfs/internal/util # github.com/sapcc/go-api-declarations v1.5.1 ## explicit; go 1.20 github.com/sapcc/go-api-declarations/bininfo -# github.com/sapcc/go-bits v0.0.0-20230608160309-15c04a12a7c0 +# github.com/sapcc/go-bits v0.0.0-20230614140115-83eb3a701632 ## explicit; go 1.20 github.com/sapcc/go-bits/assert github.com/sapcc/go-bits/httpapi