golangci-lint fixes

Author: benc-uk

cmd/cart/main.go

@@ -19,8 +19,8 @@ import (
 	"github.com/benc-uk/go-rest-api/pkg/auth"
 	"github.com/benc-uk/go-rest-api/pkg/env"
 	"github.com/benc-uk/go-rest-api/pkg/logging"
-	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
 
 	_ "github.com/joho/godotenv/autoload" // Autoloads .env file if it exists
 )

cmd/frontend-host/main.go

@@ -17,7 +17,7 @@ import (
 
 	"github.com/benc-uk/go-rest-api/pkg/env"
 	"github.com/benc-uk/go-rest-api/pkg/static"
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	_ "github.com/joho/godotenv/autoload" // Autoloads .env file if it exists
 )
 

cmd/orders/main.go

@@ -20,8 +20,8 @@ import (
 	"github.com/benc-uk/go-rest-api/pkg/dapr/pubsub"
 	"github.com/benc-uk/go-rest-api/pkg/env"
 	"github.com/benc-uk/go-rest-api/pkg/logging"
-	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
 
 	_ "github.com/joho/godotenv/autoload" // Autoloads .env file if it exists
 )

cmd/orders/orders_test.go

@@ -41,6 +41,7 @@ func TestOrders(t *testing.T) {
 
 	t.Run("process empty order", func(t *testing.T) {
 		emptyOrder := spec.Order{}
+
 		err := mockOrdersSvc.ProcessOrder(emptyOrder)
 		if err != nil && strings.Contains(err.Error(), "validation") {
 		} else {
@@ -53,6 +54,7 @@ func TestOrders(t *testing.T) {
 			LineItems: []spec.LineItem{},
 			ForUserID: "",
 		}
+
 		err := mockOrdersSvc.ProcessOrder(badOrder)
 		if err != nil && strings.Contains(err.Error(), "validation") {
 		} else {
@@ -62,6 +64,7 @@ func TestOrders(t *testing.T) {
 
 	t.Run("process valid new order", func(t *testing.T) {
 		goodOrder := mock.MockOrders[0]
+
 		err := mockOrdersSvc.ProcessOrder(goodOrder)
 		if err != nil {
 			t.Errorf("'process valid new order' failed %+v", err)
@@ -81,6 +84,7 @@ func TestOrders(t *testing.T) {
 
 	t.Run("order processing completed", func(t *testing.T) {
 		time.Sleep(time.Second * 3)
+
 		newOrder, err := mockOrdersSvc.GetOrder("ord-mock")
 		if err != nil {
 			t.Errorf("'order processing completed' failed: %+v", err)

cmd/products/main.go

@@ -19,8 +19,8 @@ import (
 	"github.com/benc-uk/go-rest-api/pkg/api"
 	"github.com/benc-uk/go-rest-api/pkg/env"
 	"github.com/benc-uk/go-rest-api/pkg/logging"
-	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
 
 	_ "github.com/joho/godotenv/autoload" // Autoloads .env file if it exists
 	_ "github.com/mattn/go-sqlite3"

cmd/users/main.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/azure-samples/dapr-store/cmd/users/impl"
 	"github.com/azure-samples/dapr-store/cmd/users/spec"
-	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
 
 	"github.com/benc-uk/go-rest-api/pkg/api"
 	"github.com/benc-uk/go-rest-api/pkg/auth"

go.mod

@@ -5,7 +5,6 @@ go 1.21
 require (
 	github.com/benc-uk/go-rest-api v1.0.11
 	github.com/dapr/go-sdk v1.9.1
-	github.com/go-chi/chi v4.1.1+incompatible
 	github.com/go-chi/chi/v5 v5.0.11
 	github.com/joho/godotenv v1.5.1
 	github.com/mattn/go-sqlite3 v1.14.19
@@ -18,6 +17,7 @@ require (
 	github.com/dapr/dapr v1.12.0-rc.4 // indirect
 	github.com/elastic/go-sysinfo v1.11.1 // indirect
 	github.com/elastic/go-windows v1.0.0 // indirect
+	github.com/go-chi/chi v4.1.1+incompatible // indirect
 	github.com/go-chi/cors v1.2.1 // indirect
 	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect