diff --git a/cmd/machine.go b/cmd/machine.go index d5148cb..3b97f15 100644 --- a/cmd/machine.go +++ b/cmd/machine.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" "github.com/spf13/cobra" v1 "github.com/tinkerbell/pbnj/api/v1" v1Client "github.com/tinkerbell/pbnj/client" diff --git a/cmd/server.go b/cmd/server.go index a043c66..c945724 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -17,7 +17,7 @@ import ( grpc_validator "github.com/grpc-ecosystem/go-grpc-middleware/validator" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/packethost/pkg/grpc/authz" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" "github.com/spf13/cobra" grpcsvr "github.com/tinkerbell/pbnj/grpc" "github.com/tinkerbell/pbnj/pkg/http" @@ -97,9 +97,9 @@ var ( ) httpServer := http.NewServer(metricsAddr) - httpServer.WithLogger(logger) + httpServer.WithLogger(logger.Logger) - if err := grpcsvr.RunServer(ctx, zaplog.RegisterLogger(logger), grpcServer, port, httpServer, grpcsvr.WithBmcTimeout(bmcTimeout)); err != nil { + if err := grpcsvr.RunServer(ctx, zaplog.RegisterLogger(logger.Logger), grpcServer, port, httpServer, grpcsvr.WithBmcTimeout(bmcTimeout)); err != nil { logger.Error(err, "error running server") os.Exit(1) } diff --git a/go.mod b/go.mod index 1d88c0b..6acca76 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,13 @@ module github.com/tinkerbell/pbnj go 1.16 require ( - github.com/bmc-toolbox/bmclib v0.4.14-0.20211027184927-2f9a20e0a479 + github.com/bmc-toolbox/bmclib v0.4.16-0.20211230160158-5afdbf3b6a65 github.com/cristalhq/jwt/v3 v3.0.9 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/equinix-labs/otel-init-go v0.0.4 github.com/fatih/color v1.7.0 - github.com/go-logr/logr v0.4.0 - github.com/go-logr/zapr v0.4.0 + github.com/go-logr/logr v1.2.2 + github.com/go-logr/zapr v1.2.2 github.com/go-test/deep v1.0.7 github.com/golang/protobuf v1.5.2 github.com/google/go-cmp v0.5.6 @@ -21,7 +21,7 @@ require ( github.com/mwitkow/go-proto-validators v0.3.2 github.com/onsi/gomega v1.10.4 github.com/packethost/pkg/grpc/authz v0.0.0-20210106215246-8e2e62dc8f0c - github.com/packethost/pkg/log/logr v0.0.0-20210106215246-8e2e62dc8f0c + github.com/packethost/pkg/log/logr/v2 v2.0.0 github.com/philippgille/gokv v0.6.0 github.com/philippgille/gokv/freecache v0.6.0 github.com/pkg/errors v0.9.1 @@ -33,10 +33,12 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.26.1 go.opentelemetry.io/otel v1.1.0 go.opentelemetry.io/otel/trace v1.1.0 - go.uber.org/zap v1.16.0 + go.uber.org/zap v1.19.0 goa.design/goa v2.2.5+incompatible golang.org/x/sync v0.0.0-20201207232520-09787c993a3a google.golang.org/grpc v1.41.0 google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v2 v2.4.0 ) + +replace github.com/packethost/pkg/log/logr/v2 v2.0.0 => github.com/joelrebel/pkg/log/logr/v2 v2.0.0 diff --git a/go.sum b/go.sum index a649473..e99e971 100644 --- a/go.sum +++ b/go.sum @@ -37,7 +37,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= @@ -63,16 +62,18 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bmc-toolbox/bmclib v0.4.14-0.20211027184927-2f9a20e0a479 h1:w9UfL3m53gsG7upl6RX4IjDGbkCA0r/F+3pR8KA3yqg= -github.com/bmc-toolbox/bmclib v0.4.14-0.20211027184927-2f9a20e0a479/go.mod h1:9YhAIIwp9tQtlo1LZtN5Qd89e+RfvgQ62ikbreEKOs0= -github.com/bombsimon/logrusr v1.0.0 h1:CTCkURYAt5nhCCnKH9eLShYayj2/8Kn/4Qg3QfiU+Ro= -github.com/bombsimon/logrusr v1.0.0/go.mod h1:Jq0nHtvxabKE5EMwAAdgTaz7dfWE8C4i11NOltxGQpc= +github.com/bmc-toolbox/bmclib v0.4.16-0.20211230160158-5afdbf3b6a65 h1:3VW5tcXOhRlFSMVTX7NLQF2Hty5bMTVGXj5NyQyjKEA= +github.com/bmc-toolbox/bmclib v0.4.16-0.20211230160158-5afdbf3b6a65/go.mod h1:znHXEDAdgcGD+MztYUpguts9VOY8C8AZ/fhr/NywGq0= +github.com/bombsimon/logrusr/v2 v2.0.1 h1:1VgxVNQMCvjirZIYaT9JYn6sAVGVEcNtRE0y4mvaOAM= +github.com/bombsimon/logrusr/v2 v2.0.1/go.mod h1:ByVAX+vHdLGAfdroiMg6q0zgq2FODY2lc5YJvzmOJio= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -158,16 +159,15 @@ github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgO github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.0.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= -github.com/go-logr/zapr v0.3.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= -github.com/go-logr/zapr v0.4.0 h1:uc1uML3hRYL9/ZZPdgHS/n8Nzo+eaYL/Efxkkamf7OM= -github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +github.com/go-logr/zapr v1.2.2 h1:5YNlIL6oZLydaV4dOFjL8YpgXF/tPeTbnpatnu3cq6o= +github.com/go-logr/zapr v1.2.2/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= @@ -303,11 +303,13 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jacobweinstock/registrar v0.4.2 h1:ifM6NNKpU3xrUIEZjwMLZZEeom5q7V8NfwDEEhdsAHo= -github.com/jacobweinstock/registrar v0.4.2/go.mod h1:69P9dxcMVsAKUwiVRwkchq/BJyBXSFSMJcvl7PhsI2k= +github.com/jacobweinstock/registrar v0.4.5 h1:rcrgmvJQUBcpi6RpMKItrQeb/tSIvD4dFbhtxUt6GKY= +github.com/jacobweinstock/registrar v0.4.5/go.mod h1:EDDfJ/mtb00aUG4k3wThbbUgl74xZjb3SLK2CVeCATk= github.com/jacobweinstock/rollzap v0.1.3 h1:9nkpwYew+JiDoMWwVIEUpFyos6hdfY3gDmaj6d+Hq9M= github.com/jacobweinstock/rollzap v0.1.3/go.mod h1:hlnp7hysC0vG3HB+EXl5k8UwCjTroVtvVNqoKUCotak= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/joelrebel/pkg/log/logr/v2 v2.0.0 h1:Ezvmz+gTZy5g4IdSY1OaEab56rcq81/Igo1p9BzgCEA= +github.com/joelrebel/pkg/log/logr/v2 v2.0.0/go.mod h1:HgwPEAktJOae2MFlgxV+pAl9sLYqMiqtR5EpdFKNIs4= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -326,12 +328,10 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -577,6 +577,8 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -586,8 +588,9 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= goa.design/goa v2.2.5+incompatible h1:mjAtiy7ZdZIkj974hpFxCR6bL69qprfV00Veu3Vybts= goa.design/goa v2.2.5+incompatible/go.mod h1:NnzBwdNktihbNek+pPiFMQP9PPFsUt8MMPPyo9opDSo= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -634,7 +637,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -730,7 +732,6 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -751,11 +752,10 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 h1:iGu644GcxtEcrInvDsQRCwJjtCIOlT2V7IRt6ah2Whw= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210608053332-aa57babbf139 h1:C+AwYEtBp/VQwoLntUmQ/yx3MS9vmZaKNdw5eOpoQe8= +golang.org/x/sys v0.0.0-20210608053332-aa57babbf139/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -791,6 +791,7 @@ golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -821,9 +822,8 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2 h1:vEtypaVub6UvKkiXZ2xx9QIvp9TL7sI7xp7vdi2kezA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -970,8 +970,9 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -979,7 +980,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/grpc/oob/common_test.go b/grpc/oob/common_test.go index 1e9d728..8302985 100644 --- a/grpc/oob/common_test.go +++ b/grpc/oob/common_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" v1 "github.com/tinkerbell/pbnj/api/v1" "github.com/tinkerbell/pbnj/pkg/repository" ) @@ -22,12 +22,12 @@ func TestParseAuth(t *testing.T) { "nil Direct Auth": {input: &v1.Authn{Authn: &v1.Authn_DirectAuthn{DirectAuthn: nil}}, want: &repository.Error{Code: v1.Code_value["UNAUTHENTICATED"], Message: "no auth found", Details: nil}}, "nil auth": {input: nil, want: &repository.Error{Code: v1.Code_value["UNAUTHENTICATED"], Message: "no auth found", Details: nil}}, } - l, _, _ := logr.NewPacketLogr() + packetLogr, _, _ := logr.NewPacketLogr() sm := make(chan string) for name, tc := range tests { t.Run(name, func(t *testing.T) { a := Accessory{ - Log: l, + Log: packetLogr.Logger, StatusMessages: sm, } @@ -66,14 +66,14 @@ func TestSendStatusMessage(t *testing.T) { "without chan receiver": {runChanReceiver: false, want: nil}, } - l, _, _ := logr.NewPacketLogr() + packetLogr, _, _ := logr.NewPacketLogr() sm := make(chan string) for name, tc := range tests { t.Run(name, func(t *testing.T) { var msgs []string done := make(chan bool, 1) a := Accessory{ - Log: l, + Log: packetLogr.Logger, StatusMessages: sm, } diff --git a/grpc/rpc/bmc_test.go b/grpc/rpc/bmc_test.go index bec2fe7..00cd95c 100644 --- a/grpc/rpc/bmc_test.go +++ b/grpc/rpc/bmc_test.go @@ -11,20 +11,18 @@ import ( "github.com/google/go-cmp/cmp" "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" "github.com/philippgille/gokv" "github.com/philippgille/gokv/freecache" v1 "github.com/tinkerbell/pbnj/api/v1" "github.com/tinkerbell/pbnj/grpc/persistence" "github.com/tinkerbell/pbnj/grpc/taskrunner" - "github.com/tinkerbell/pbnj/pkg/logging" "github.com/tinkerbell/pbnj/pkg/zaplog" ) const tempIPMITool = "/tmp/ipmitool" var ( - log logging.Logger ctx context.Context taskRunner *taskrunner.Runner bmcService BmcService @@ -39,8 +37,8 @@ func TestMain(m *testing.M) { func setup() { ctx = context.Background() - l, zapLogger, _ := logr.NewPacketLogr() - log = zaplog.RegisterLogger(l) + packetLogr, zapLogger, _ := logr.NewPacketLogr() + logger := zaplog.RegisterLogger(packetLogr.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) f := freecache.NewStore(freecache.DefaultOptions) s := gokv.Store(f) @@ -52,10 +50,10 @@ func setup() { taskRunner = &taskrunner.Runner{ Repository: repo, Ctx: ctx, - Log: log, + Log: logger, } bmcService = BmcService{ - Log: log, + Log: logger, TaskRunner: taskRunner, UnimplementedBMCServer: v1.UnimplementedBMCServer{}, } diff --git a/grpc/rpc/machine_test.go b/grpc/rpc/machine_test.go index 615cdef..d7605da 100644 --- a/grpc/rpc/machine_test.go +++ b/grpc/rpc/machine_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap" "github.com/onsi/gomega" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" "github.com/philippgille/gokv" "github.com/philippgille/gokv/freecache" v1 "github.com/tinkerbell/pbnj/api/v1" @@ -62,8 +62,8 @@ func TestDevice(t *testing.T) { ctx := context.Background() - l, zapLogger, _ := logr.NewPacketLogr() - logger := zaplog.RegisterLogger(l) + packetLogr, zapLogger, _ := logr.NewPacketLogr() + logger := zaplog.RegisterLogger(packetLogr.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) f := freecache.NewStore(freecache.DefaultOptions) s := gokv.Store(f) @@ -166,8 +166,8 @@ func TestPower(t *testing.T) { ctx := context.Background() - l, zapLogger, _ := logr.NewPacketLogr() - logger := zaplog.RegisterLogger(l) + packetLogr, zapLogger, _ := logr.NewPacketLogr() + logger := zaplog.RegisterLogger(packetLogr.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) f := freecache.NewStore(freecache.DefaultOptions) s := gokv.Store(f) diff --git a/grpc/rpc/task_test.go b/grpc/rpc/task_test.go index 6f23165..2d4f9c5 100644 --- a/grpc/rpc/task_test.go +++ b/grpc/rpc/task_test.go @@ -7,7 +7,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap" "github.com/onsi/gomega" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" "github.com/philippgille/gokv" "github.com/philippgille/gokv/freecache" "github.com/rs/xid" @@ -26,8 +26,8 @@ func TestTaskFound(t *testing.T) { Message: "", Details: nil, } - l, zapLogger, _ := logr.NewPacketLogr() - logger := zaplog.RegisterLogger(l) + packetLogr, zapLogger, _ := logr.NewPacketLogr() + logger := zaplog.RegisterLogger(packetLogr.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) f := freecache.NewStore(freecache.DefaultOptions) s := gokv.Store(f) @@ -82,9 +82,8 @@ func TestRecordNotFound(t *testing.T) { g := gomega.NewGomegaWithT(t) ctx := context.Background() - - l, zapLogger, _ := logr.NewPacketLogr() - logger := zaplog.RegisterLogger(l) + packetLogr, zapLogger, _ := logr.NewPacketLogr() + logger := zaplog.RegisterLogger(packetLogr.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) f := freecache.NewStore(freecache.DefaultOptions) s := gokv.Store(f) diff --git a/grpc/server.go b/grpc/server.go index a96d0d1..43b67f5 100644 --- a/grpc/server.go +++ b/grpc/server.go @@ -114,7 +114,7 @@ func RunServer(ctx context.Context, log logging.Logger, grpcServer *grpc.Server, signal.Notify(sigChan, os.Interrupt) go func() { for range sigChan { - log.Info("sig received, shutting down PBnJ") + log.Info(0, "sig received, shutting down PBnJ") grpcServer.GracefulStop() <-ctx.Done() } @@ -122,10 +122,10 @@ func RunServer(ctx context.Context, log logging.Logger, grpcServer *grpc.Server, go func() { <-ctx.Done() - log.Info("ctx cancelled, shutting down PBnJ") + log.Info(0, "ctx cancelled, shutting down PBnJ") grpcServer.GracefulStop() }() - log.Info("starting PBnJ gRPC server") + log.Info(0, "starting PBnJ gRPC server") return grpcServer.Serve(listen) } diff --git a/grpc/server_test.go b/grpc/server_test.go index b12cba5..7ee6928 100644 --- a/grpc/server_test.go +++ b/grpc/server_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" "github.com/philippgille/gokv" "github.com/philippgille/gokv/freecache" "github.com/tinkerbell/pbnj/grpc/persistence" @@ -24,8 +24,8 @@ import ( func TestRunServer(t *testing.T) { ctx := context.Background() ctx, cancel := context.WithTimeout(ctx, 9*time.Second) - l, zapLogger, err := logr.NewPacketLogr() - log := zaplog.RegisterLogger(l) + logger, zapLogger, err := logr.NewPacketLogr() + log := zaplog.RegisterLogger(logger.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) if err != nil { t.Fatal(err) @@ -43,7 +43,7 @@ func TestRunServer(t *testing.T) { grpcServer := grpc.NewServer() httpServer := http.NewServer(fmt.Sprintf(":%d", port+1)) - httpServer.WithLogger(l) + httpServer.WithLogger(logger.Logger) g := new(errgroup.Group) g.Go(func() error { @@ -61,8 +61,8 @@ func TestRunServerSignals(t *testing.T) { ctx := context.Background() ctx, cancel := context.WithTimeout(ctx, 3*time.Second) defer cancel() - l, zapLogger, err := logr.NewPacketLogr() - log := zaplog.RegisterLogger(l) + logger, zapLogger, err := logr.NewPacketLogr() + log := zaplog.RegisterLogger(logger.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) if err != nil { t.Fatal(err) @@ -74,7 +74,7 @@ func TestRunServerSignals(t *testing.T) { port := rand.Intn(max-min+1) + min grpcServer := grpc.NewServer() httpServer := http.NewServer(fmt.Sprintf(":%d", port+1)) - httpServer.WithLogger(l) + httpServer.WithLogger(logger.Logger) g := new(errgroup.Group) g.Go(func() error { @@ -105,8 +105,8 @@ func TestRunServerPortInUse(t *testing.T) { ctx := context.Background() ctx, cancel := context.WithTimeout(ctx, 5*time.Second) defer cancel() - l, zapLogger, err := logr.NewPacketLogr() - log := zaplog.RegisterLogger(l) + logger, zapLogger, err := logr.NewPacketLogr() + log := zaplog.RegisterLogger(logger.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) if err != nil { t.Fatal(err) @@ -114,7 +114,7 @@ func TestRunServerPortInUse(t *testing.T) { grpcServer := grpc.NewServer() httpServer := http.NewServer(fmt.Sprintf(":%d", port+1)) - httpServer.WithLogger(l) + httpServer.WithLogger(logger.Logger) err = RunServer(ctx, log, grpcServer, strconv.Itoa(port), httpServer) if err.Error() != "listen tcp :40039: bind: address already in use" { diff --git a/grpc/taskrunner/taskrunner_test.go b/grpc/taskrunner/taskrunner_test.go index f30d531..525ab34 100644 --- a/grpc/taskrunner/taskrunner_test.go +++ b/grpc/taskrunner/taskrunner_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" "github.com/philippgille/gokv" "github.com/philippgille/gokv/freecache" "github.com/rs/xid" @@ -27,8 +27,8 @@ func TestRoundTrip(t *testing.T) { s := gokv.Store(f) defer s.Close() repo := &persistence.GoKV{Store: s, Ctx: ctx} - l, zapLogger, _ := logr.NewPacketLogr() - logger := zaplog.RegisterLogger(l) + packetLogr, zapLogger, _ := logr.NewPacketLogr() + logger := zaplog.RegisterLogger(packetLogr.Logger) ctx = ctxzap.ToContext(ctx, zapLogger) runner := Runner{ Repository: repo, diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go index e2823e8..f20d4a2 100644 --- a/pkg/logging/logging.go +++ b/pkg/logging/logging.go @@ -8,6 +8,6 @@ import ( // Logger represent common interface for logging function. type Logger interface { - logr.Logger + logr.LogSink GetContextLogger(ctx context.Context) logr.Logger } diff --git a/pkg/zaplog/zap.go b/pkg/zaplog/zap.go index 0b9da6e..b8659c2 100644 --- a/pkg/zaplog/zap.go +++ b/pkg/zaplog/zap.go @@ -11,7 +11,7 @@ import ( // Logger is a wrapper around zap.SugaredLogger. type Logger struct { - logr.Logger + logr.LogSink } // GetContextLogger get and return a logger from a ctx. @@ -21,5 +21,5 @@ func (l Logger) GetContextLogger(ctx context.Context) logr.Logger { // RegisterLogger returns a logr and a zap logger (needed for use in grpc interceptors). func RegisterLogger(log logr.Logger) logging.Logger { - return Logger{log} + return Logger{log.GetSink()} } diff --git a/test/main.go b/test/main.go index f7ad685..a000115 100644 --- a/test/main.go +++ b/test/main.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/packethost/pkg/log/logr" + "github.com/packethost/pkg/log/logr/v2" "github.com/tinkerbell/pbnj/cmd" "github.com/tinkerbell/pbnj/test/runner" ) @@ -48,7 +48,7 @@ func main() { fmt.Println(*logLevel) logger, _, _ := logr.NewPacketLogr(logr.WithLogLevel(*logLevel)) - runner.RunTests(logger, cfgData) + runner.RunTests(logger.Logger, cfgData) } // Returns an int >= min, < max.