update deps, remove old errors and replace ioutils (#48)

Author: majst01

go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/Masterminds/squirrel v1.5.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/gogo/status v1.1.0
-	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.6
 	github.com/google/uuid v1.2.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
@@ -16,19 +15,14 @@ require (
 	github.com/lib/pq v1.10.2
 	github.com/lopezator/migrator v0.3.0
 	github.com/metal-stack/metal-lib v0.8.0
-	github.com/metal-stack/security v0.5.3
+	github.com/metal-stack/security v0.6.0
 	github.com/metal-stack/v v1.0.3
-	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.10.0
-	github.com/spf13/cobra v1.1.3
-	github.com/spf13/viper v1.7.1
+	github.com/prometheus/client_golang v1.11.0
+	github.com/spf13/cobra v1.2.1
+	github.com/spf13/viper v1.8.1
 	github.com/stretchr/testify v1.7.0
-	github.com/testcontainers/testcontainers-go v0.11.0
-	go.uber.org/zap v1.17.0
-	golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
-	google.golang.org/grpc v1.38.0
-	google.golang.org/protobuf v1.26.0
+	github.com/testcontainers/testcontainers-go v0.11.1
+	go.uber.org/zap v1.18.1
+	google.golang.org/grpc v1.39.0
+	google.golang.org/protobuf v1.27.1
 )
-
-// required because by default viper depends on etcd v3.3.10 which has a corrupt sum
-replace github.com/coreos/etcd => github.com/coreos/etcd v3.3.18+incompatible

go.sum

@@ -4,11 +4,11 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/metal-stack/masterdata-api/pkg/auth"
-	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
@@ -41,7 +41,7 @@ func NewClient(ctx context.Context, hostname string, port int, certFile string,
 	}
 
 	if caFile != "" {
-		ca, err := ioutil.ReadFile(caFile)
+		ca, err := os.ReadFile(caFile)
 		if err != nil {
 			return nil, fmt.Errorf("could not read ca certificate: %w", err)
 		}
@@ -76,7 +76,7 @@ func NewClient(ctx context.Context, hostname string, port int, certFile string,
 	// Set up the credentials for the connection.
 	perRPCHMACAuthenticator, err := auth.NewHMACAuther(logger, hmacKey, auth.EditUser)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to create hmac-authenticator")
+		return nil, fmt.Errorf("failed to create hmac-authenticator: %w", err)
 	}
 
 	opts := []grpc.DialOption{

pkg/client/client.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path"
 	"path/filepath"
 	"reflect"
@@ -61,7 +61,7 @@ func splitYamlDocs(doc string) []string {
 
 // processConfig processes all yaml docs contained in the given file
 func (ds *Datastore) processConfig(file string) error {
-	yaml, err := ioutil.ReadFile(file)
+	yaml, err := os.ReadFile(file)
 	if err != nil {
 		return err
 	}

pkg/datastore/bootstrap.go

@@ -1,8 +1,9 @@
 package datastore
 
 import (
+	"errors"
+
 	"github.com/lib/pq"
-	"github.com/pkg/errors"
 )
 
 // OptimisticLockError indicates that the operation could not be executed because the dataset to update has changed in the meantime.

pkg/datastore/dberrors.go

@@ -3,6 +3,7 @@ package datastore
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"fmt"
 	"reflect"
 	"time"
@@ -13,7 +14,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/jmoiron/sqlx"
 	v1 "github.com/metal-stack/masterdata-api/api/v1"
-	"github.com/pkg/errors"
 	"go.uber.org/zap"
 
 	// import for sqlx to use postgres driver
@@ -198,7 +198,7 @@ func (ds *Datastore) Update(ctx context.Context, ve VersionedJSONEntity) error {
 
 	err := ds.Get(ctx, id, existingVE)
 	if err != nil {
-		return errors.Errorf("update - no entity of type:%s with id:%s found", jsonField, id)
+		return fmt.Errorf("update - no entity of type:%s with id:%s found", jsonField, id)
 	}
 
 	if ve.GetMeta().GetVersion() < existingVE.GetMeta().GetVersion() {

pkg/datastore/postgres.go

@@ -352,7 +352,7 @@ func TestUpdate(t *testing.T) {
 	}
 	err = ds.Update(ctx, tcr1)
 	assert.Error(t, err)
-	assert.EqualError(t, err, "entity of type:tenant has no id, cannot update: meta:{}  name:\"ctenant\"  description:\"C Tenant\"")
+	assert.EqualError(t, err, "entity of type:tenant has no id, cannot update: meta:{} name:\"ctenant\" description:\"C Tenant\"")
 
 	// tenant with id is not found
 	tcr1 = &v1.Tenant{

pkg/datastore/postgres_test.go

@@ -14,14 +14,12 @@ import (
 	"flag"
 	"fmt"
 	"go/format"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
 	"strings"
 	"text/template"
 
-	errs "github.com/pkg/errors"
 	"go.uber.org/zap"
 )
 
@@ -72,7 +70,7 @@ func main() {
 		baseName := fmt.Sprintf("%s%s", *typeName, defaultFilenameSuffix)
 		outputName = filepath.Join(dir, strings.ToLower(baseName))
 	}
-	err = ioutil.WriteFile(outputName, src, 0644)
+	err = os.WriteFile(outputName, src, 0644)
 	if err != nil {
 		log.Fatal("error writing output", zap.Error(err))
 	}
@@ -92,11 +90,11 @@ func (g *Generator) generate(packageName, typeName string) error {
 
 	tmpl, err := template.New("sv").Parse(svTemplate)
 	if err != nil {
-		return errs.Wrapf(err, "error parsing template %s", svTemplate)
+		return fmt.Errorf("error parsing template %s error: %w", svTemplate, err)
 	}
 	stmpl, err := template.New("sv").Parse(schemaTemplate)
 	if err != nil {
-		return errs.Wrapf(err, "error parsing template %s", schemaTemplate)
+		return fmt.Errorf("error parsing template %s error: %w", schemaTemplate, err)
 	}
 
 	info := map[string]string{
@@ -109,15 +107,15 @@ func (g *Generator) generate(packageName, typeName string) error {
 	var renderedBytesSchema bytes.Buffer
 	err = stmpl.Execute(&renderedBytesSchema, info)
 	if err != nil {
-		return errs.Wrap(err, "error rendering template")
+		return fmt.Errorf("error rendering template: %w", err)
 	}
 
 	info["schema"] = fmt.Sprintf("`%s`", renderedBytesSchema.String())
 
 	var renderedBytes bytes.Buffer
 	err = tmpl.Execute(&renderedBytes, info)
 	if err != nil {
-		return errs.Wrap(err, "error rendering template")
+		return fmt.Errorf("error rendering template: %w", err)
 	}
 
 	g.Printf("%s", renderedBytes.String())

pkg/gen/genscanvaluer.go

@@ -4,7 +4,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	_ "net/http/pprof" //nolint:gosec
@@ -123,7 +122,7 @@ func run() {
 
 	if caFile != "" {
 		logger.Info("using ca", zap.String("ca", caFile))
-		ca, err := ioutil.ReadFile(caFile)
+		ca, err := os.ReadFile(caFile)
 		if err != nil {
 			logger.Fatal("could not read ca certificate", zap.Error(err))
 		}