Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Apr 5, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a3137
fix(deps): update module github.com/pivotal-cf/brokerapi/v10 to v11
renovate[bot] Apr 5, 2024
fc94ffa
adapt to `lager` to `slog` change in `brokerapi`
silvestre Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions packages/golangapiserver/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/autoscaler/api/broker/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion src/autoscaler/api/broker/broker_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/autoscaler/api/broker/broker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 4 additions & 2 deletions src/autoscaler/api/brokerserver/broker_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
7 changes: 4 additions & 3 deletions src/autoscaler/api/brokerserver/broker_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package brokerserver

import (
"encoding/json"
"log/slog"
"net/http"
"os"

Expand All @@ -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"
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/autoscaler/api/brokerserver/broker_server_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/autoscaler/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/autoscaler/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
Loading