Merge master

.github/release-drafter.yml

@@ -0,0 +1,30 @@
+name-template: 'v$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
+
+template: |
+  ## General Changes
+
+  $CHANGES
+
+categories:
+- title: '🚀 Features'
+  labels:
+  - 'feature'
+  - 'enhancement'
+- title: '🐛 Bug Fixes'
+  labels:
+  - 'fix'
+  - 'bugfix'
+  - 'bug'
+
+version-resolver:
+  major:
+    labels:
+    - 'major'
+  minor:
+    labels:
+    - 'minor'
+  patch:
+    labels:
+    - 'patch'
+  default: patch

.github/workflows/release-drafter.yaml

@@ -0,0 +1,14 @@
+name: Latest
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: release-drafter/release-drafter@v6
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -35,4 +35,4 @@ protoc-ci: third-party
 .PHONY: mocks
 mocks:
 	rm -rf api/duros/v2/mocks/*
-	docker run --user $$(id -u):$$(id -g) --rm -w /work -v ${PWD}:/work vektra/mockery:v2.41.0 -r --all --keeptree --dir api/duros/v2 --output api/duros/v2/mocks 
+	docker run --user $$(id -u):$$(id -g) --rm -w /work -v ${PWD}:/work vektra/mockery:v2.42.0 -r --all --keeptree --dir api/duros/v2 --output api/duros/v2/mocks 

client.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"log/slog"
 	"math/rand"
 	"net"
 	"os"
@@ -13,11 +14,8 @@ import (
 	"strings"
 	"time"
 
-	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
+	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
 
-	grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/balancer/roundrobin"
@@ -55,7 +53,7 @@ type DialConfig struct {
 	Token           string
 	Credentials     *Credentials
 	ByteCredentials *ByteCredentials
-	Log             *zap.SugaredLogger
+	Log             *slog.Logger
 	// UserAgent to use, if empty duros-go is used
 	UserAgent string
 }
@@ -116,22 +114,12 @@ func Dial(ctx context.Context, config DialConfig) (durosv2.DurosAPIClient, error
 		ua = config.UserAgent
 	}
 
-	log.Infow("connecting...",
+	log.Info("connecting...",
 		"client", ua,
 		"target", config.Endpoint,
 		"client-id", id,
 	)
 
-	zapOpts := []grpc_zap.Option{
-		grpc_zap.WithLevels(grpcToZapLevel),
-	}
-	interceptors := []grpc.UnaryClientInterceptor{
-		grpc_zap.UnaryClientInterceptor(log.Desugar(), zapOpts...),
-		grpc_zap.PayloadUnaryClientInterceptor(log.Desugar(),
-			func(context.Context, string) bool { return true },
-		),
-	}
-
 	// these are broadly in line with the expected server SLOs:
 	kal := keepalive.ClientParameters{
 		Time:                10 * time.Second,
@@ -158,11 +146,11 @@ func Dial(ctx context.Context, config DialConfig) (durosv2.DurosAPIClient, error
 	}
 
 	opts := []grpc.DialOption{
-		grpc.WithBlock(),
 		grpc.WithDisableRetry(),
 		grpc.WithUserAgent(ua),
 		grpc.WithDefaultCallOptions(grpc.WaitForReady(true)),
-		grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(interceptors...)),
+		grpc.WithChainUnaryInterceptor(
+			logging.UnaryClientInterceptor(interceptorLogger(log))),
 		grpc.WithKeepaliveParams(kal),
 		grpc.WithConnectParams(cp),
 		grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"loadBalancingPolicy":"%s"}`, roundrobin.Name)),
@@ -173,10 +161,10 @@ func Dial(ctx context.Context, config DialConfig) (durosv2.DurosAPIClient, error
 	// Configure tls ca certificate based auth if credentials are given
 	switch config.Scheme {
 	case GRPC:
-		log.Infof("connecting insecurely")
+		log.Info("connecting insecurely")
 		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	case GRPCS:
-		log.Infof("connecting securely")
+		log.Info("connecting securely")
 		if config.Credentials != nil {
 			creds, err := config.Credentials.getTransportCredentials()
 			if err != nil {
@@ -199,11 +187,11 @@ func Dial(ctx context.Context, config DialConfig) (durosv2.DurosAPIClient, error
 
 	conn, err := grpc.DialContext(ctx, config.Endpoint, opts...)
 	if err != nil {
-		log.Errorw("failed to connect", "endpoints", config.Endpoint, "error", err.Error())
+		log.Error("failed to connect", "endpoints", config.Endpoint, "error", err.Error())
 		return nil, err
 	}
 
-	log.Infof("connected")
+	log.Info("connected")
 
 	return durosv2.NewDurosAPIClient(conn), nil
 }
@@ -222,33 +210,6 @@ func (tokenAuth) RequireTransportSecurity() bool {
 	return true
 }
 
-func grpcToZapLevel(code codes.Code) zapcore.Level {
-	switch code {
-	case codes.OK,
-		codes.Canceled,
-		codes.DeadlineExceeded,
-		codes.NotFound,
-		codes.Unavailable:
-		return zapcore.InfoLevel
-	case codes.Aborted,
-		codes.AlreadyExists,
-		codes.FailedPrecondition,
-		codes.InvalidArgument,
-		codes.OutOfRange,
-		codes.PermissionDenied,
-		codes.ResourceExhausted,
-		codes.Unauthenticated:
-		return zapcore.WarnLevel
-	case codes.DataLoss,
-		codes.Internal,
-		codes.Unimplemented,
-		codes.Unknown:
-		return zapcore.ErrorLevel
-	default:
-		return zapcore.ErrorLevel
-	}
-}
-
 func (c Credentials) getTransportCredentials() (credentials.TransportCredentials, error) {
 	certPool, err := x509.SystemCertPool()
 	if err != nil {
@@ -325,3 +286,22 @@ func isValid(endpoint string) error {
 	}
 	return nil
 }
+
+// interceptorLogger adapts slog logger to interceptor logger.
+// This code is simple enough to be copied and not imported.
+func interceptorLogger(l *slog.Logger) logging.Logger {
+	return logging.LoggerFunc(func(_ context.Context, lvl logging.Level, msg string, fields ...any) {
+		switch lvl {
+		case logging.LevelDebug:
+			l.Debug(msg, fields...)
+		case logging.LevelInfo:
+			l.Info(msg, fields...)
+		case logging.LevelWarn:
+			l.Warn(msg, fields...)
+		case logging.LevelError:
+			l.Error(msg, fields...)
+		default:
+			panic(fmt.Sprintf("unknown level %v", lvl))
+		}
+	})
+}

cmd/cli/cli.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"log/slog"
 
 	"github.com/google/uuid"
 	"github.com/metal-stack/duros-go"
 	v2 "github.com/metal-stack/duros-go/api/duros/v2"
-	"go.uber.org/zap"
 )
 
 const (
@@ -55,10 +55,6 @@ func main() {
 
 	flag.Parse()
 
-	zlog, err := zap.NewProduction()
-	if err != nil {
-		panic((err))
-	}
 	var grpcScheme duros.GRPCScheme
 	switch scheme {
 	case "grpc":
@@ -74,7 +70,7 @@ func main() {
 		Endpoint:  endpoint,
 		Scheme:    grpcScheme,
 		Token:     token,
-		Log:       zlog.Sugar(),
+		Log:       slog.Default(),
 		UserAgent: "duros-go-cli",
 	}
 	if caFile != "" && certFile != "" && keyFile != "" && serverName != "" {

go.mod

@@ -5,25 +5,24 @@ go 1.22
 require (
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/uuid v1.6.0
-	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/stretchr/testify v1.8.4
-	go.uber.org/zap v1.26.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9
-	google.golang.org/grpc v1.61.1
+	github.com/stretchr/testify v1.9.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8
+	google.golang.org/grpc v1.62.0
 	google.golang.org/protobuf v1.32.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/objx v0.5.1 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )