Remove github.com/pkg/errors

Author: everesio

cmd/root.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"os/signal"
@@ -9,7 +10,6 @@ import (
 
 	"github.com/grepplabs/mqtt-proxy/pkg/log"
 	"github.com/oklog/run"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/common/version"
@@ -40,7 +40,7 @@ func Execute() {
 
 	cmd, err := app.Parse(os.Args[1:])
 	if err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, errors.Wrapf(err, "error parsing commandline arguments"))
+		_, _ = fmt.Fprintln(os.Stderr, fmt.Errorf("error parsing commandline arguments: %w", err))
 		app.Usage(os.Args[1:])
 		os.Exit(2)
 	}

cmd/server.go

@@ -2,6 +2,8 @@ package cmd
 
 import (
 	"crypto/tls"
+	"fmt"
+
 	"github.com/grepplabs/mqtt-proxy/apis"
 	authinst "github.com/grepplabs/mqtt-proxy/pkg/auth/instrument"
 	authnoop "github.com/grepplabs/mqtt-proxy/pkg/auth/noop"
@@ -19,7 +21,6 @@ import (
 	"github.com/grepplabs/mqtt-proxy/pkg/tls/cert/filesource"
 	tlscert "github.com/grepplabs/mqtt-proxy/pkg/tls/cert/source"
 	"github.com/oklog/run"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"gopkg.in/alecthomas/kingpin.v2"
@@ -122,10 +123,10 @@ func runServer(
 				authplain.WithCredentialsFile(cfg.MQTT.Handler.Authenticator.Plain.CredentialsFile),
 			)
 			if err != nil {
-				return errors.Wrap(err, "setup plain authenticator")
+				return fmt.Errorf("setup plain authenticator: %w", err)
 			}
 		default:
-			return errors.Errorf("unknown authenticator %s", cfg.MQTT.Handler.Authenticator.Name)
+			return fmt.Errorf("unknown authenticator %s", cfg.MQTT.Handler.Authenticator.Name)
 		}
 		authenticator = authinst.New(authenticator, registry)
 		defer func() {
@@ -154,10 +155,10 @@ func runServer(
 				pubkafka.WithWorkers(cfg.MQTT.Publisher.Kafka.Workers),
 			)
 			if err != nil {
-				return errors.Wrap(err, "setup kafka publisher")
+				return fmt.Errorf("setup kafka publisher: %w", err)
 			}
 		default:
-			return errors.Errorf("unknown publisher %s", cfg.MQTT.Publisher.Name)
+			return fmt.Errorf("unknown publisher %s", cfg.MQTT.Publisher.Name)
 		}
 		publisher = pubinst.New(publisher, registry)
 
@@ -187,14 +188,14 @@ func runServer(
 					filesource.WithRefresh(cfg.MQTT.TLSSrv.Refresh),
 				)
 				if err != nil {
-					return errors.Wrap(err, "setup cert file source")
+					return fmt.Errorf("setup cert file source: %w", err)
 				}
 			default:
-				return errors.Errorf("unknown cert source %s", cfg.MQTT.TLSSrv.CertSource)
+				return fmt.Errorf("unknown cert source %s", cfg.MQTT.TLSSrv.CertSource)
 			}
 			tlsConfig, err = servertls.NewServerConfig(logger, source)
 			if err != nil {
-				return errors.Wrap(err, "setup server TLS config")
+				return fmt.Errorf("setup server TLS config: %w", err)
 			}
 		}
 

go.mod

@@ -5,7 +5,6 @@ go 1.19
 require (
 	github.com/confluentinc/confluent-kafka-go v1.9.2
 	github.com/oklog/run v1.1.0
-	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.13.0
 	github.com/prometheus/common v0.37.0
 	github.com/stretchr/testify v1.8.1

go.sum

@@ -261,7 +261,6 @@ github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=

pkg/auth/plain/option.go

@@ -1,11 +1,11 @@
 package plain
 
 import (
+	"fmt"
 	"io"
 	"os"
 
 	"encoding/csv"
-	"github.com/pkg/errors"
 )
 
 type options struct {
@@ -75,7 +75,7 @@ func credentialsFromCSV(reader io.Reader) (map[string]string, error) {
 			return nil, err
 		}
 		if len(record) != 2 {
-			return nil, errors.Errorf("csv record username,password expected but got %v", record)
+			return nil, fmt.Errorf("csv record username,password expected but got %v", record)
 		}
 		credentials[record[0]] = record[1]
 	}

pkg/auth/plain/plain.go

@@ -2,7 +2,7 @@ package plain
 
 import (
 	"context"
-	"github.com/pkg/errors"
+	"fmt"
 
 	"github.com/grepplabs/mqtt-proxy/apis"
 	"github.com/grepplabs/mqtt-proxy/pkg/log"
@@ -26,7 +26,7 @@ func New(logger log.Logger, _ *prometheus.Registry, opts ...Option) (apis.UserPa
 	for _, o := range opts {
 		err := o.apply(&options)
 		if err != nil {
-			return nil, errors.Wrapf(err, "apply plain authenticator options")
+			return nil, fmt.Errorf("apply plain authenticator options: %w", err)
 		}
 	}
 

pkg/config/config.go

@@ -1,13 +1,13 @@
 package config
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 	"strings"
 	"time"
 
 	"github.com/confluentinc/confluent-kafka-go/kafka"
-	"github.com/pkg/errors"
 )
 
 // publisher names
@@ -183,20 +183,20 @@ func (c *TopicMappings) Set(value string) error {
 	for _, pair := range strings.Split(value, ",") {
 		kv := strings.Split(pair, "=")
 		if len(kv) != 2 {
-			return errors.Errorf("expected key=value, but got %s", pair)
+			return fmt.Errorf("expected key=value, but got %s", pair)
 		}
 		k := strings.TrimSpace(kv[0])
 		v := strings.TrimSpace(kv[1])
 		if k == "" {
-			return errors.Errorf("empty topic key %s", pair)
+			return fmt.Errorf("empty topic key %s", pair)
 		}
 		if v == "" {
-			return errors.Errorf("empty regex value %s", pair)
+			return fmt.Errorf("empty regex value %s", pair)
 		}
 
 		r, err := regexp.Compile(v)
 		if err != nil {
-			return errors.Wrapf(err, "invalid topic mapping regexp '%s'", v)
+			return fmt.Errorf("invalid topic mapping regexp '%s': %w", v, err)
 		}
 
 		c.Mappings = append(c.Mappings, TopicMapping{Topic: k, RegExp: r})

pkg/mqtt/codec/connack.go

@@ -20,7 +20,7 @@ func (p *ConnackPacket) Name() string {
 }
 
 func (p *ConnackPacket) String() string {
-	return fmt.Sprintf("%s SessionPresent: %t ReturnCode: %d", p.FixedHeader, p.SessionPresent, p.ReturnCode)
+	return fmt.Sprintf("%v SessionPresent: %t ReturnCode: %d", p.FixedHeader, p.SessionPresent, p.ReturnCode)
 }
 
 func (p *ConnackPacket) Write(w io.Writer) (err error) {

pkg/mqtt/codec/connect.go

@@ -36,7 +36,7 @@ func (p *ConnectPacket) Name() string {
 
 func (p *ConnectPacket) String() string {
 	// Password is not provided
-	return fmt.Sprintf("%s ProtocolName: %s ProtocolLevel: %d  CleanSession: %t WillFlag: %t WillQos: %d WillRetain: %t HasUsername: %t HasPassword: %t KeepAliveSeconds: %d ClientID: %s WillTopic: %s Willmessage: %s Username: %s", p.FixedHeader, p.ProtocolName, p.ProtocolLevel, p.CleanSession, p.WillFlag, p.WillQos, p.WillRetain, p.HasUsername, p.HasPassword, p.KeepAliveSeconds, p.ClientIdentifier, p.WillTopic, p.WillMessage, p.Username)
+	return fmt.Sprintf("%v ProtocolName: %s ProtocolLevel: %d  CleanSession: %t WillFlag: %t WillQos: %d WillRetain: %t HasUsername: %t HasPassword: %t KeepAliveSeconds: %d ClientID: %s WillTopic: %s Willmessage: %s Username: %s", p.FixedHeader, p.ProtocolName, p.ProtocolLevel, p.CleanSession, p.WillFlag, p.WillQos, p.WillRetain, p.HasUsername, p.HasPassword, p.KeepAliveSeconds, p.ClientIdentifier, p.WillTopic, p.WillMessage, p.Username)
 }
 
 func (p *ConnectPacket) Write(w io.Writer) (err error) {

pkg/mqtt/codec/fixedheader.go

@@ -5,8 +5,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-
-	"github.com/pkg/errors"
 )
 
 const maxRemainingLength = 268435455
@@ -25,10 +23,10 @@ func (fh *FixedHeader) MessageName() string {
 
 func (fh *FixedHeader) validate() error {
 	if fh.RemainingLength < 0 {
-		return errors.Errorf("negative remaining length %d", fh.RemainingLength)
+		return fmt.Errorf("negative remaining length %d", fh.RemainingLength)
 	}
 	if fh.RemainingLength > maxRemainingLength {
-		return errors.Errorf("the maximum remaining length is %d, but was %d", maxRemainingLength, fh.RemainingLength)
+		return fmt.Errorf("the maximum remaining length is %d, but was %d", maxRemainingLength, fh.RemainingLength)
 	}
 	return nil
 }
@@ -58,7 +56,7 @@ func (fh *FixedHeader) pack() bytes.Buffer {
 	return header
 }
 
-func (fh FixedHeader) String() string {
+func (fh *FixedHeader) String() string {
 	return fmt.Sprintf("%s: Dup: %t QoS: %s Retain: %t rLength: %d", MqttMessageTypeNames[fh.MessageType], fh.Dup, MqttQoSNames[fh.Qos], fh.Retain, fh.RemainingLength)
 }
 
@@ -94,7 +92,7 @@ func decodeLength(r io.Reader) (int, error) {
 		return 0, err
 	}
 	if byteReader.bytesRead > 4 {
-		return 0, errors.Errorf("the maximum number of bytes in the remaining length is 4, but was %d", byteReader.bytesRead)
+		return 0, fmt.Errorf("the maximum number of bytes in the remaining length is 4, but was %d", byteReader.bytesRead)
 	}
 	return int(remainingLength), nil
 }