chore: Format with goimports and metalinter

scribd · Oct 13, 2022 · 7f1ce3f · 7f1ce3f
1 parent 3aabb65
commit 7f1ce3f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/pkg/interceptors/database_logging.go b/pkg/interceptors/database_logging.go
@@ -4,11 +4,12 @@ import (
 	"context"
 
 	grpcmiddleware "github.com/grpc-ecosystem/go-grpc-middleware"
+	"google.golang.org/grpc"
+	"gorm.io/gorm"
+
 	sdkdatabasecontext "github.com/scribd/go-sdk/pkg/context/database"
 	sdkloggercontext "github.com/scribd/go-sdk/pkg/context/logger"
 	sdklogger "github.com/scribd/go-sdk/pkg/logger"
-	"google.golang.org/grpc"
-	"gorm.io/gorm"
 )
 
 // DatabaseLoggingUnaryServerInterceptor returns a unary server interceptor.
@@ -33,9 +34,9 @@ func DatabaseLoggingUnaryServerInterceptor() grpc.UnaryServerInterceptor {
 		}
 
 		newDB := db.Session(&gorm.Session{
-			Logger: sdklogger.NewGormLogger(l),
+			Logger:  sdklogger.NewGormLogger(l),
 			Context: ctx,
-			NewDB:  true,
+			NewDB:   true,
 		})
 
 		newCtx := sdkdatabasecontext.ToContext(ctx, newDB)
@@ -68,9 +69,9 @@ func DatabaseLoggingStreamServerInterceptor() grpc.StreamServerInterceptor {
 		streamCtx := stream.Context()
 
 		newDB := db.Session(&gorm.Session{
-			Logger: sdklogger.NewGormLogger(l),
+			Logger:  sdklogger.NewGormLogger(l),
 			Context: streamCtx,
-			NewDB:  true,
+			NewDB:   true,
 		})
 
 		newCtx := sdkdatabasecontext.ToContext(streamCtx, newDB)

diff --git a/pkg/interceptors/database_logging_test.go b/pkg/interceptors/database_logging_test.go
@@ -10,9 +10,6 @@ import (
 	"path"
 	"testing"
 
-	sdktesting "github.com/scribd/go-sdk/pkg/testing"
-	"github.com/scribd/go-sdk/pkg/logger"
-	"github.com/scribd/go-sdk/pkg/testing/testproto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
@@ -21,6 +18,10 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
+
+	"github.com/scribd/go-sdk/pkg/logger"
+	sdktesting "github.com/scribd/go-sdk/pkg/testing"
+	"github.com/scribd/go-sdk/pkg/testing/testproto"
 )
 
 type TestRecord struct {
@@ -194,7 +195,6 @@ func checkGormLoggerFields(t *testing.T, fields map[string]interface{}) {
 	assert.True(t, ok, "%s not found in log fields", logger.GormTraceFieldKey)
 	assert.NotEmpty(t, dbFields)
 
-
 	assert.NotEmpty(t, dbFields["elapsed_seconds"])
 	assert.NotEmpty(t, dbFields["affected_rows"])
 	assert.NotEmpty(t, dbFields["sql"])

diff --git a/pkg/logger/gorm.go b/pkg/logger/gorm.go
@@ -51,7 +51,7 @@ func (g gormLogger) Trace(ctx context.Context, begin time.Time, fc func() (strin
 	tracingLogger := g.logger.WithFields(Fields{
 		GormTraceFieldKey: Fields{
 			"elapsed_seconds": time.Since(begin).Seconds(),
-			"affected_rows":    rows,
+			"affected_rows":   rows,
 			"sql":             sql,
 		},
 	})

diff --git a/pkg/middleware/database_logging.go b/pkg/middleware/database_logging.go
@@ -3,10 +3,11 @@ package middleware
 import (
 	"net/http"
 
+	"gorm.io/gorm"
+
 	sdkdatabasecontext "github.com/scribd/go-sdk/pkg/context/database"
 	sdkloggercontext "github.com/scribd/go-sdk/pkg/context/logger"
 	sdklogger "github.com/scribd/go-sdk/pkg/logger"
-	"gorm.io/gorm"
 )
 
 // DatabaseLoggingMiddleware wraps an instantiated sdk.Logger that will be injected

diff --git a/pkg/tracking/sentry_test.go b/pkg/tracking/sentry_test.go
@@ -2,7 +2,7 @@ package tracking
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/getsentry/sentry-go"
@@ -74,7 +74,7 @@ func TestSentryHookManualTag(t *testing.T) {
 func newMockLogger(hook *Hook) *logrus.Logger {
 	logger := logrus.New()
 
-	logger.SetOutput(ioutil.Discard)
+	logger.SetOutput(io.Discard)
 	logger.Hooks.Add(hook)
 
 	return logger