fix(deps): update module github.com/pivotal-cf/brokerapi/v10 to v11 (#…

…2823) * fix(deps): update module github.com/pivotal-cf/brokerapi/v10 to v11 * adapt to `lager` to `slog` change in `brokerapi` --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Silvestre Zabala <[email protected]>
cloudfoundry · Apr 5, 2024 · 6c67e64 · 6c67e64
1 parent 2e99d7c
commit 6c67e64
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 22 deletions.
diff --git a/packages/golangapiserver/spec b/packages/golangapiserver/spec
@@ -101,13 +101,14 @@ files:
 - autoscaler/vendor/github.com/openzipkin/zipkin-go/model/* # gosub
 - autoscaler/vendor/github.com/patrickmn/go-cache/* # gosub
 - autoscaler/vendor/github.com/pborman/uuid/* # gosub
-- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v10/* # gosub
-- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v10/auth/* # gosub
-- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v10/domain/* # gosub
-- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v10/domain/apiresponses/* # gosub
-- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v10/handlers/* # gosub
-- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v10/middlewares/* # gosub
-- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v10/utils/* # gosub
+- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v11/* # gosub
+- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v11/auth/* # gosub
+- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v11/domain/* # gosub
+- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v11/domain/apiresponses/* # gosub
+- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v11/handlers/* # gosub
+- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v11/internal/blog/* # gosub
+- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v11/middlewares/* # gosub
+- autoscaler/vendor/github.com/pivotal-cf/brokerapi/v11/utils/* # gosub
 - autoscaler/vendor/github.com/pkg/errors/* # gosub
 - autoscaler/vendor/github.com/prometheus/client_golang/prometheus/* # gosub
 - autoscaler/vendor/github.com/prometheus/client_golang/prometheus/collectors/* # gosub

diff --git a/src/autoscaler/api/broker/broker.go b/src/autoscaler/api/broker/broker.go
@@ -19,8 +19,8 @@ import (
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/models"
 	"code.cloudfoundry.org/lager/v3"
 	uuid "github.com/nu7hatch/gouuid"
-	"github.com/pivotal-cf/brokerapi/v10/domain"
-	"github.com/pivotal-cf/brokerapi/v10/domain/apiresponses"
+	"github.com/pivotal-cf/brokerapi/v11/domain"
+	"github.com/pivotal-cf/brokerapi/v11/domain/apiresponses"
 	"golang.org/x/exp/slices"
 )
 

diff --git a/src/autoscaler/api/broker/broker_suite_test.go b/src/autoscaler/api/broker/broker_suite_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/models"
-	"github.com/pivotal-cf/brokerapi/v10/domain"
+	"github.com/pivotal-cf/brokerapi/v11/domain"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/api/config"
 	. "github.com/onsi/ginkgo/v2"

diff --git a/src/autoscaler/api/broker/broker_test.go b/src/autoscaler/api/broker/broker_test.go
@@ -13,8 +13,8 @@ import (
 	"code.cloudfoundry.org/lager/v3/lagertest"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/pivotal-cf/brokerapi/v10/domain"
-	"github.com/pivotal-cf/brokerapi/v10/domain/apiresponses"
+	"github.com/pivotal-cf/brokerapi/v11/domain"
+	"github.com/pivotal-cf/brokerapi/v11/domain/apiresponses"
 )
 
 var _ = Describe("Broker", func() {

diff --git a/src/autoscaler/api/brokerserver/broker_handler_test.go b/src/autoscaler/api/brokerserver/broker_handler_test.go
@@ -7,14 +7,16 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/api/broker"
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/testhelpers"
 
-	"github.com/pivotal-cf/brokerapi/v10/handlers"
+	"github.com/go-logr/logr"
+	"github.com/pivotal-cf/brokerapi/v11/handlers"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/db"
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/fakes"
@@ -51,7 +53,7 @@ var _ = Describe("BrokerHandler", func() {
 
 	JustBeforeEach(func() {
 		autoscalerBroker = broker.New(lagertest.NewTestLogger("testbroker"), conf, bindingdb, policydb, services, fakeCredentials)
-		handler = handlers.NewApiHandler(autoscalerBroker, lagertest.NewTestLogger(("testhandler")))
+		handler = handlers.NewApiHandler(autoscalerBroker, slog.New(logr.ToSlogHandler(GinkgoLogr)))
 		if fakePlanChecker != nil {
 			autoscalerBroker.PlanChecker = fakePlanChecker
 		}

diff --git a/src/autoscaler/api/brokerserver/broker_server.go b/src/autoscaler/api/brokerserver/broker_server.go
@@ -2,6 +2,7 @@ package brokerserver
 
 import (
 	"encoding/json"
+	"log/slog"
 	"net/http"
 	"os"
 
@@ -14,8 +15,8 @@ import (
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/helpers"
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/helpers/handlers"
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/routes"
-	"github.com/pivotal-cf/brokerapi/v10"
-	"github.com/pivotal-cf/brokerapi/v10/domain"
+	"github.com/pivotal-cf/brokerapi/v11"
+	"github.com/pivotal-cf/brokerapi/v11/domain"
 
 	"code.cloudfoundry.org/lager/v3"
 	"github.com/go-chi/chi/v5"
@@ -116,7 +117,7 @@ func NewBrokerServer(logger lager.Logger, conf *config.Config, bindingdb db.Bind
 
 	r.Use(basicAuthentication.Middleware)
 	r.Use(httpStatusCollectMiddleware.Collect)
-	brokerapi.AttachRoutes(r, autoscalerBroker, logger.Session("broker_handler"))
+	brokerapi.AttachRoutes(r, autoscalerBroker, slog.New(lager.NewHandler(logger.Session("broker_handler"))))
 
 	r.HandleFunc(routes.BrokerHealthPath, GetHealth)
 

diff --git a/src/autoscaler/api/brokerserver/broker_server_suite_test.go b/src/autoscaler/api/brokerserver/broker_server_suite_test.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/helpers"
-	"github.com/pivotal-cf/brokerapi/v10/domain"
+	"github.com/pivotal-cf/brokerapi/v11/domain"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/api/brokerserver"
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/api/config"

diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/go-chi/chi/v5 v5.0.12
 	github.com/go-faster/errors v0.7.1
 	github.com/go-faster/jx v1.1.0
+	github.com/go-logr/logr v1.4.1
 	github.com/go-sql-driver/mysql v1.8.1
 	github.com/golang/protobuf v1.5.4
 	github.com/gorilla/mux v1.8.1
@@ -27,7 +28,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.32.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/pivotal-cf/brokerapi/v10 v10.2.0
+	github.com/pivotal-cf/brokerapi/v11 v11.0.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.0
 	github.com/rubyist/circuitbreaker v2.2.1+incompatible
@@ -65,7 +66,6 @@ require (
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-faster/yaml v0.4.6 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect

diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum
@@ -968,8 +968,8 @@ github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pivotal-cf/brokerapi/v10 v10.2.0 h1:cdXk5FMkxuBONiaPS+H9aIu0v5aSYv4qvo5keBcUTGA=
-github.com/pivotal-cf/brokerapi/v10 v10.2.0/go.mod h1:UEwbfVgaY8FpQ3NOfjoVRPLW/Ar0c7uYQP5TJj3r3OE=
+github.com/pivotal-cf/brokerapi/v11 v11.0.0 h1:FxIrKdrFNAUyX8NAgPpdkJjwQ0vHmjbaPoxTPcAvcmY=
+github.com/pivotal-cf/brokerapi/v11 v11.0.0/go.mod h1:MY40lQBKIChtmOpTVluTOyKQ9bW9p5fDszvXOEViIBQ=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=