From f6ed0b66adb8608889584e3cfde968cc2f4f1533 Mon Sep 17 00:00:00 2001 From: George Blue Date: Tue, 2 Apr 2024 17:12:01 +0100 Subject: [PATCH] build(deps): bump github.com/pivotal-cf/brokerapi/v11 --- brokerapi/broker/bind.go | 4 ++-- brokerapi/broker/bind_test.go | 6 +++--- brokerapi/broker/decider/decider.go | 2 +- brokerapi/broker/decider/decider_test.go | 2 +- brokerapi/broker/deprovision.go | 4 ++-- brokerapi/broker/deprovision_test.go | 6 +++--- brokerapi/broker/get_binding.go | 4 ++-- brokerapi/broker/get_binding_test.go | 2 +- brokerapi/broker/get_instance.go | 4 ++-- brokerapi/broker/get_instance_test.go | 2 +- brokerapi/broker/last_binding_operation.go | 4 ++-- brokerapi/broker/last_binding_operation_test.go | 2 +- brokerapi/broker/last_instance_operation.go | 4 ++-- brokerapi/broker/last_instance_operation_test.go | 6 +++--- brokerapi/broker/provision.go | 4 ++-- brokerapi/broker/provision_test.go | 6 +++--- brokerapi/broker/services.go | 2 +- brokerapi/broker/services_test.go | 2 +- brokerapi/broker/unbind.go | 4 ++-- brokerapi/broker/unbind_test.go | 6 +++--- brokerapi/broker/update.go | 4 ++-- brokerapi/broker/update_test.go | 4 ++-- brokerpaktestframework/osbapi_helper.go | 4 ++-- brokerpaktestframework/test_instance.go | 2 +- cmd/client.go | 2 +- cmd/serve.go | 7 ++++--- go.mod | 4 ++-- go.sum | 8 ++++---- integrationtest/global_labels_propagation_test.go | 2 +- integrationtest/maintenance_info_test.go | 4 ++-- integrationtest/prevent_destroy_during_update_test.go | 2 +- integrationtest/subsume_test.go | 2 +- integrationtest/termination_recovery_test.go | 2 +- .../terraform_block_action_before_upgrade_test.go | 2 +- integrationtest/terraform_module_upgrade_test.go | 2 +- integrationtest/terraform_rename_provider_test.go | 2 +- integrationtest/terraform_upgrade_test.go | 2 +- internal/displaycatalog/displaycatalog.go | 2 +- internal/displaycatalog/displaycatalog_test.go | 2 +- internal/local/catalog.go | 2 +- internal/local/update_service.go | 2 +- internal/local/upgrade_service.go | 2 +- internal/paramparser/parse_bind_details.go | 2 +- internal/paramparser/parse_bind_details_test.go | 2 +- internal/paramparser/parse_provision_details.go | 2 +- internal/paramparser/parse_provision_details_test.go | 2 +- internal/paramparser/parse_update_details.go | 2 +- internal/paramparser/parse_update_details_test.go | 2 +- internal/testdrive/broker_deprovision.go | 2 +- internal/testdrive/broker_last_operation.go | 2 +- internal/testdrive/broker_provision.go | 2 +- internal/testdrive/broker_update.go | 2 +- internal/testdrive/broker_upgrade.go | 2 +- pkg/broker/broker_test.go | 2 +- pkg/broker/catalog.go | 2 +- pkg/broker/registry.go | 2 +- pkg/broker/registry_test.go | 2 +- pkg/broker/service_definition.go | 2 +- pkg/broker/service_definition_test.go | 2 +- pkg/brokerpak/registrar.go | 2 +- pkg/client/client.go | 2 +- pkg/client/example_runner.go | 2 +- pkg/providers/tf/definition.go | 2 +- pkg/providers/tf/definition_test.go | 2 +- pkg/server/cf_sharing.go | 4 ++-- pkg/server/cf_sharing_test.go | 2 +- pkg/server/fakes/servicebroker.go | 2 +- utils/correlation/correlation.go | 2 +- utils/correlation/correlation_test.go | 2 +- utils/request/request_parser.go | 2 +- utils/request/request_parser_test.go | 2 +- 71 files changed, 101 insertions(+), 100 deletions(-) diff --git a/brokerapi/broker/bind.go b/brokerapi/broker/bind.go index ec21758c7..78acf638a 100644 --- a/brokerapi/broker/bind.go +++ b/brokerapi/broker/bind.go @@ -14,8 +14,8 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/varcontext" "github.com/cloudfoundry/cloud-service-broker/utils/correlation" "github.com/cloudfoundry/cloud-service-broker/utils/request" - "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 ( diff --git a/brokerapi/broker/bind_test.go b/brokerapi/broker/bind_test.go index cfda94f9d..d67e79f6e 100644 --- a/brokerapi/broker/bind_test.go +++ b/brokerapi/broker/bind_test.go @@ -8,9 +8,9 @@ import ( "code.cloudfoundry.org/lager/v3" . "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/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/middlewares" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker/brokerfakes" diff --git a/brokerapi/broker/decider/decider.go b/brokerapi/broker/decider/decider.go index fb00cb0e7..6a6948783 100644 --- a/brokerapi/broker/decider/decider.go +++ b/brokerapi/broker/decider/decider.go @@ -6,7 +6,7 @@ import ( "net/http" "github.com/hashicorp/go-version" - "github.com/pivotal-cf/brokerapi/v10/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" ) diff --git a/brokerapi/broker/decider/decider_test.go b/brokerapi/broker/decider/decider_test.go index f97e15877..b9d3b3b41 100644 --- a/brokerapi/broker/decider/decider_test.go +++ b/brokerapi/broker/decider/decider_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/go-version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker/decider" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" diff --git a/brokerapi/broker/deprovision.go b/brokerapi/broker/deprovision.go index aee04754d..12dc9b416 100644 --- a/brokerapi/broker/deprovision.go +++ b/brokerapi/broker/deprovision.go @@ -12,8 +12,8 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/providers/tf/workspace" "github.com/cloudfoundry/cloud-service-broker/utils/correlation" "github.com/cloudfoundry/cloud-service-broker/utils/request" - "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" ) // Deprovision destroys an existing instance of a service. diff --git a/brokerapi/broker/deprovision_test.go b/brokerapi/broker/deprovision_test.go index 09b5ad762..050c78f13 100644 --- a/brokerapi/broker/deprovision_test.go +++ b/brokerapi/broker/deprovision_test.go @@ -16,9 +16,9 @@ import ( "github.com/cloudfoundry/cloud-service-broker/utils" . "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/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/middlewares" "golang.org/x/net/context" ) diff --git a/brokerapi/broker/get_binding.go b/brokerapi/broker/get_binding.go index a91f687f6..0ce835c96 100644 --- a/brokerapi/broker/get_binding.go +++ b/brokerapi/broker/get_binding.go @@ -6,8 +6,8 @@ import ( "net/http" "code.cloudfoundry.org/lager/v3" - "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" "github.com/cloudfoundry/cloud-service-broker/utils/correlation" ) diff --git a/brokerapi/broker/get_binding_test.go b/brokerapi/broker/get_binding_test.go index 5945fa5e6..23de2b71d 100644 --- a/brokerapi/broker/get_binding_test.go +++ b/brokerapi/broker/get_binding_test.go @@ -3,7 +3,7 @@ package broker_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "golang.org/x/net/context" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker" diff --git a/brokerapi/broker/get_instance.go b/brokerapi/broker/get_instance.go index f4916896b..0abcdb493 100644 --- a/brokerapi/broker/get_instance.go +++ b/brokerapi/broker/get_instance.go @@ -6,8 +6,8 @@ import ( "net/http" "code.cloudfoundry.org/lager/v3" - "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" "github.com/cloudfoundry/cloud-service-broker/utils/correlation" ) diff --git a/brokerapi/broker/get_instance_test.go b/brokerapi/broker/get_instance_test.go index bde0b27c8..473b948b3 100644 --- a/brokerapi/broker/get_instance_test.go +++ b/brokerapi/broker/get_instance_test.go @@ -3,7 +3,7 @@ package broker_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "golang.org/x/net/context" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker/brokerfakes" diff --git a/brokerapi/broker/last_binding_operation.go b/brokerapi/broker/last_binding_operation.go index 32ec218e7..d2168eddf 100644 --- a/brokerapi/broker/last_binding_operation.go +++ b/brokerapi/broker/last_binding_operation.go @@ -4,8 +4,8 @@ import ( "context" "code.cloudfoundry.org/lager/v3" - "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" "github.com/cloudfoundry/cloud-service-broker/utils/correlation" ) diff --git a/brokerapi/broker/last_binding_operation_test.go b/brokerapi/broker/last_binding_operation_test.go index e732acf40..00af61e24 100644 --- a/brokerapi/broker/last_binding_operation_test.go +++ b/brokerapi/broker/last_binding_operation_test.go @@ -3,7 +3,7 @@ package broker_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "golang.org/x/net/context" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker/brokerfakes" diff --git a/brokerapi/broker/last_instance_operation.go b/brokerapi/broker/last_instance_operation.go index 97cfee65c..148a37aba 100644 --- a/brokerapi/broker/last_instance_operation.go +++ b/brokerapi/broker/last_instance_operation.go @@ -5,8 +5,8 @@ import ( "fmt" "code.cloudfoundry.org/lager/v3" - "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" "github.com/cloudfoundry/cloud-service-broker/dbservice/models" "github.com/cloudfoundry/cloud-service-broker/pkg/broker" diff --git a/brokerapi/broker/last_instance_operation_test.go b/brokerapi/broker/last_instance_operation_test.go index 3f975fb1a..93e7b1613 100644 --- a/brokerapi/broker/last_instance_operation_test.go +++ b/brokerapi/broker/last_instance_operation_test.go @@ -13,9 +13,9 @@ import ( "github.com/cloudfoundry/cloud-service-broker/utils" . "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/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/middlewares" "golang.org/x/net/context" ) diff --git a/brokerapi/broker/provision.go b/brokerapi/broker/provision.go index 935add4b6..cd114f027 100644 --- a/brokerapi/broker/provision.go +++ b/brokerapi/broker/provision.go @@ -19,8 +19,8 @@ import ( "fmt" "code.cloudfoundry.org/lager/v3" - "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" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" "github.com/cloudfoundry/cloud-service-broker/utils/correlation" diff --git a/brokerapi/broker/provision_test.go b/brokerapi/broker/provision_test.go index e7da7a3ae..87dd56484 100644 --- a/brokerapi/broker/provision_test.go +++ b/brokerapi/broker/provision_test.go @@ -9,9 +9,9 @@ import ( "code.cloudfoundry.org/lager/v3" . "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/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/middlewares" "github.com/spf13/viper" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker" diff --git a/brokerapi/broker/services.go b/brokerapi/broker/services.go index 0a52e298d..ca608c1ec 100644 --- a/brokerapi/broker/services.go +++ b/brokerapi/broker/services.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/cloudfoundry/cloud-service-broker/pkg/broker" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) // Services lists services in the broker's catalog. diff --git a/brokerapi/broker/services_test.go b/brokerapi/broker/services_test.go index 467217fa7..3c144ce07 100644 --- a/brokerapi/broker/services_test.go +++ b/brokerapi/broker/services_test.go @@ -3,7 +3,7 @@ package broker_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "golang.org/x/net/context" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker" diff --git a/brokerapi/broker/unbind.go b/brokerapi/broker/unbind.go index 145bdb900..915f923c6 100644 --- a/brokerapi/broker/unbind.go +++ b/brokerapi/broker/unbind.go @@ -11,8 +11,8 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/providers/tf/workspace" "github.com/cloudfoundry/cloud-service-broker/utils/correlation" "github.com/cloudfoundry/cloud-service-broker/utils/request" - "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" ) // Unbind destroys an account and credentials with access to an instance of a service. diff --git a/brokerapi/broker/unbind_test.go b/brokerapi/broker/unbind_test.go index e68a1e29b..a49008bf7 100644 --- a/brokerapi/broker/unbind_test.go +++ b/brokerapi/broker/unbind_test.go @@ -17,9 +17,9 @@ import ( "github.com/cloudfoundry/cloud-service-broker/utils" . "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/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/middlewares" ) var _ = Describe("Unbind", func() { diff --git a/brokerapi/broker/update.go b/brokerapi/broker/update.go index 87d7777e9..5aae3211f 100644 --- a/brokerapi/broker/update.go +++ b/brokerapi/broker/update.go @@ -8,8 +8,8 @@ import ( "code.cloudfoundry.org/lager/v3" "github.com/hashicorp/go-version" - "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" "github.com/cloudfoundry/cloud-service-broker/brokerapi/broker/decider" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" diff --git a/brokerapi/broker/update_test.go b/brokerapi/broker/update_test.go index f047ca58f..eda29af20 100644 --- a/brokerapi/broker/update_test.go +++ b/brokerapi/broker/update_test.go @@ -10,8 +10,8 @@ import ( "code.cloudfoundry.org/lager/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" - "github.com/pivotal-cf/brokerapi/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/middlewares" "github.com/spf13/viper" "golang.org/x/net/context" diff --git a/brokerpaktestframework/osbapi_helper.go b/brokerpaktestframework/osbapi_helper.go index 0dab42a6a..cda3e2d64 100644 --- a/brokerpaktestframework/osbapi_helper.go +++ b/brokerpaktestframework/osbapi_helper.go @@ -3,8 +3,8 @@ package brokerpaktestframework import ( "fmt" - "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" ) func FindService(catalog *apiresponses.CatalogResponse, s string) domain.Service { diff --git a/brokerpaktestframework/test_instance.go b/brokerpaktestframework/test_instance.go index 69f623988..86004824e 100644 --- a/brokerpaktestframework/test_instance.go +++ b/brokerpaktestframework/test_instance.go @@ -9,7 +9,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" ) type TestInstance struct { diff --git a/cmd/client.go b/cmd/client.go index 4f0de4b7f..5758b6a6f 100644 --- a/cmd/client.go +++ b/cmd/client.go @@ -23,7 +23,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/server" "github.com/cloudfoundry/cloud-service-broker/utils" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/spf13/cobra" ) diff --git a/cmd/serve.go b/cmd/serve.go index e75d7f6c0..aedf59aba 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -18,6 +18,7 @@ import ( "context" "database/sql" "fmt" + "log/slog" "net/http" "strings" @@ -33,8 +34,8 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/server" "github.com/cloudfoundry/cloud-service-broker/pkg/toggles" "github.com/cloudfoundry/cloud-service-broker/utils" - "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" "github.com/spf13/cobra" "github.com/spf13/viper" "gorm.io/gorm" @@ -117,7 +118,7 @@ func serve() { logger.Info("service catalog", lager.Data{"catalog": displaycatalog.DisplayCatalog(services)}) } - brokerAPI := brokerapi.New(serviceBroker, logger, credentials) + brokerAPI := brokerapi.New(serviceBroker, slog.New(lager.NewHandler(logger)), credentials) sqldb, err := db.DB() if err != nil { diff --git a/go.mod b/go.mod index 5c2e310eb..e8f3c0366 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/onsi/gomega v1.32.0 github.com/otiai10/copy v1.14.0 github.com/pborman/uuid v1.2.1 - github.com/pivotal-cf/brokerapi/v10 v10.2.0 + github.com/pivotal-cf/brokerapi/v11 v11.0.0 github.com/russross/blackfriday/v2 v2.1.0 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 @@ -52,7 +52,7 @@ require ( github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect github.com/cloudfoundry/socks5-proxy v0.2.60 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-chi/chi/v5 v5.0.11 // indirect + github.com/go-chi/chi/v5 v5.0.12 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect diff --git a/go.sum b/go.sum index a59a1ebc1..8ce4bc478 100644 --- a/go.sum +++ b/go.sum @@ -260,8 +260,8 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-chi/chi/v5 v5.0.11 h1:BnpYbFZ3T3S1WMpD79r7R5ThWX40TaFB7L31Y8xqSwA= -github.com/go-chi/chi/v5 v5.0.11/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s= +github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -497,8 +497,8 @@ github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -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/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/integrationtest/global_labels_propagation_test.go b/integrationtest/global_labels_propagation_test.go index 8e76fc41c..284783302 100644 --- a/integrationtest/global_labels_propagation_test.go +++ b/integrationtest/global_labels_propagation_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/cloudfoundry/cloud-service-broker/dbservice/models" "github.com/cloudfoundry/cloud-service-broker/integrationtest/packer" diff --git a/integrationtest/maintenance_info_test.go b/integrationtest/maintenance_info_test.go index ce0f72e65..4ea947fc2 100644 --- a/integrationtest/maintenance_info_test.go +++ b/integrationtest/maintenance_info_test.go @@ -5,8 +5,8 @@ import ( . "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" "github.com/cloudfoundry/cloud-service-broker/integrationtest/packer" "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" diff --git a/integrationtest/prevent_destroy_during_update_test.go b/integrationtest/prevent_destroy_during_update_test.go index 69826cc88..6df1757e0 100644 --- a/integrationtest/prevent_destroy_during_update_test.go +++ b/integrationtest/prevent_destroy_during_update_test.go @@ -7,7 +7,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("Preventing destroy during update", func() { diff --git a/integrationtest/subsume_test.go b/integrationtest/subsume_test.go index 898b5e514..dc268df5a 100644 --- a/integrationtest/subsume_test.go +++ b/integrationtest/subsume_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("Subsume", func() { diff --git a/integrationtest/termination_recovery_test.go b/integrationtest/termination_recovery_test.go index c98b3dafe..a889a0c8e 100644 --- a/integrationtest/termination_recovery_test.go +++ b/integrationtest/termination_recovery_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("Recovery From Broker Termination", func() { diff --git a/integrationtest/terraform_block_action_before_upgrade_test.go b/integrationtest/terraform_block_action_before_upgrade_test.go index d3986cbeb..d84e6de3f 100644 --- a/integrationtest/terraform_block_action_before_upgrade_test.go +++ b/integrationtest/terraform_block_action_before_upgrade_test.go @@ -9,7 +9,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("Terraform block action before upgrade", func() { diff --git a/integrationtest/terraform_module_upgrade_test.go b/integrationtest/terraform_module_upgrade_test.go index a67ab2c66..aaceb665c 100644 --- a/integrationtest/terraform_module_upgrade_test.go +++ b/integrationtest/terraform_module_upgrade_test.go @@ -7,7 +7,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("Terraform Module Upgrade", func() { diff --git a/integrationtest/terraform_rename_provider_test.go b/integrationtest/terraform_rename_provider_test.go index a8ef6254a..ef0cf29a8 100644 --- a/integrationtest/terraform_rename_provider_test.go +++ b/integrationtest/terraform_rename_provider_test.go @@ -5,7 +5,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("Terraform Rename Provider", func() { diff --git a/integrationtest/terraform_upgrade_test.go b/integrationtest/terraform_upgrade_test.go index 579dbe274..b8149f5db 100644 --- a/integrationtest/terraform_upgrade_test.go +++ b/integrationtest/terraform_upgrade_test.go @@ -9,7 +9,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("Terraform Upgrade", func() { diff --git a/internal/displaycatalog/displaycatalog.go b/internal/displaycatalog/displaycatalog.go index 1fb144368..dbb25013c 100644 --- a/internal/displaycatalog/displaycatalog.go +++ b/internal/displaycatalog/displaycatalog.go @@ -2,7 +2,7 @@ // printing out binary images etc... which also form part of the catalog package displaycatalog -import "github.com/pivotal-cf/brokerapi/v10/domain" +import "github.com/pivotal-cf/brokerapi/v11/domain" func DisplayCatalog(services []domain.Service) []any { return mapSlice(services, func(service domain.Service) any { diff --git a/internal/displaycatalog/displaycatalog_test.go b/internal/displaycatalog/displaycatalog_test.go index bbb2a4359..8690564be 100644 --- a/internal/displaycatalog/displaycatalog_test.go +++ b/internal/displaycatalog/displaycatalog_test.go @@ -4,7 +4,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/displaycatalog" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("DisplayCatalog", func() { diff --git a/internal/local/catalog.go b/internal/local/catalog.go index a86671eff..67d8ec29a 100644 --- a/internal/local/catalog.go +++ b/internal/local/catalog.go @@ -8,7 +8,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/client" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) func catalog(clnt *client.Client) []domain.Service { diff --git a/internal/local/update_service.go b/internal/local/update_service.go index 166b02e4d..99227cfc9 100644 --- a/internal/local/update_service.go +++ b/internal/local/update_service.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" ) diff --git a/internal/local/upgrade_service.go b/internal/local/upgrade_service.go index bfda1a32a..43bdfb4cc 100644 --- a/internal/local/upgrade_service.go +++ b/internal/local/upgrade_service.go @@ -4,7 +4,7 @@ import ( "log" "github.com/cloudfoundry/cloud-service-broker/internal/testdrive" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) func UpgradeService(name, previousVersion, cachePath string) { diff --git a/internal/paramparser/parse_bind_details.go b/internal/paramparser/parse_bind_details.go index 7c3f6c5cd..3ae544801 100644 --- a/internal/paramparser/parse_bind_details.go +++ b/internal/paramparser/parse_bind_details.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type BindDetails struct { diff --git a/internal/paramparser/parse_bind_details_test.go b/internal/paramparser/parse_bind_details_test.go index 807fd7b5c..1c485fe2c 100644 --- a/internal/paramparser/parse_bind_details_test.go +++ b/internal/paramparser/parse_bind_details_test.go @@ -3,7 +3,7 @@ package paramparser_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" ) diff --git a/internal/paramparser/parse_provision_details.go b/internal/paramparser/parse_provision_details.go index 1e21c9101..81f350d00 100644 --- a/internal/paramparser/parse_provision_details.go +++ b/internal/paramparser/parse_provision_details.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type ProvisionDetails struct { diff --git a/internal/paramparser/parse_provision_details_test.go b/internal/paramparser/parse_provision_details_test.go index 64608d062..3ce625160 100644 --- a/internal/paramparser/parse_provision_details_test.go +++ b/internal/paramparser/parse_provision_details_test.go @@ -3,7 +3,7 @@ package paramparser_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" ) diff --git a/internal/paramparser/parse_update_details.go b/internal/paramparser/parse_update_details.go index 090475334..7ef436e43 100644 --- a/internal/paramparser/parse_update_details.go +++ b/internal/paramparser/parse_update_details.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/go-version" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type UpdateDetails struct { diff --git a/internal/paramparser/parse_update_details_test.go b/internal/paramparser/parse_update_details_test.go index ba1a3ac38..38f3d17ac 100644 --- a/internal/paramparser/parse_update_details_test.go +++ b/internal/paramparser/parse_update_details_test.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/go-version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" ) diff --git a/internal/testdrive/broker_deprovision.go b/internal/testdrive/broker_deprovision.go index 10a407add..c80150eef 100644 --- a/internal/testdrive/broker_deprovision.go +++ b/internal/testdrive/broker_deprovision.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) func (b *Broker) Deprovision(s ServiceInstance) error { diff --git a/internal/testdrive/broker_last_operation.go b/internal/testdrive/broker_last_operation.go index d488d1815..4125492d0 100644 --- a/internal/testdrive/broker_last_operation.go +++ b/internal/testdrive/broker_last_operation.go @@ -7,7 +7,7 @@ import ( "time" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) func (b *Broker) LastOperation(serviceInstanceGUID string) (domain.LastOperation, error) { diff --git a/internal/testdrive/broker_provision.go b/internal/testdrive/broker_provision.go index 027e088f1..3faf7a45a 100644 --- a/internal/testdrive/broker_provision.go +++ b/internal/testdrive/broker_provision.go @@ -7,7 +7,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/steps" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type ServiceInstance struct { diff --git a/internal/testdrive/broker_update.go b/internal/testdrive/broker_update.go index 15c778103..15ca87afa 100644 --- a/internal/testdrive/broker_update.go +++ b/internal/testdrive/broker_update.go @@ -7,7 +7,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/steps" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type updateConfig struct { diff --git a/internal/testdrive/broker_upgrade.go b/internal/testdrive/broker_upgrade.go index 4739317d3..4276fc8ee 100644 --- a/internal/testdrive/broker_upgrade.go +++ b/internal/testdrive/broker_upgrade.go @@ -7,7 +7,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/internal/steps" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type upgradeConfig struct { diff --git a/pkg/broker/broker_test.go b/pkg/broker/broker_test.go index 5030d3e77..e37342035 100644 --- a/pkg/broker/broker_test.go +++ b/pkg/broker/broker_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/spf13/viper" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" diff --git a/pkg/broker/catalog.go b/pkg/broker/catalog.go index c50421cb3..8c35fcc5f 100755 --- a/pkg/broker/catalog.go +++ b/pkg/broker/catalog.go @@ -16,7 +16,7 @@ package broker import ( "github.com/cloudfoundry/cloud-service-broker/pkg/validation" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) // Service overrides the canonical Service Broker service type using a custom diff --git a/pkg/broker/registry.go b/pkg/broker/registry.go index 3951727bb..5c199df1d 100644 --- a/pkg/broker/registry.go +++ b/pkg/broker/registry.go @@ -18,7 +18,7 @@ import ( "fmt" "sort" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/cloudfoundry/cloud-service-broker/pkg/validation" diff --git a/pkg/broker/registry_test.go b/pkg/broker/registry_test.go index 986ada50e..4fb39d43a 100644 --- a/pkg/broker/registry_test.go +++ b/pkg/broker/registry_test.go @@ -6,7 +6,7 @@ import ( . "github.com/cloudfoundry/cloud-service-broker/pkg/broker" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/spf13/viper" ) diff --git a/pkg/broker/service_definition.go b/pkg/broker/service_definition.go index 473fd6272..11705bc9c 100644 --- a/pkg/broker/service_definition.go +++ b/pkg/broker/service_definition.go @@ -21,7 +21,7 @@ import ( "strings" "code.cloudfoundry.org/lager/v3" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/spf13/viper" "github.com/cloudfoundry/cloud-service-broker/internal/paramparser" diff --git a/pkg/broker/service_definition_test.go b/pkg/broker/service_definition_test.go index 2eefe7ee8..8af674515 100644 --- a/pkg/broker/service_definition_test.go +++ b/pkg/broker/service_definition_test.go @@ -9,7 +9,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/varcontext" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/spf13/viper" ) diff --git a/pkg/brokerpak/registrar.go b/pkg/brokerpak/registrar.go index bde9dada6..b8e692795 100644 --- a/pkg/brokerpak/registrar.go +++ b/pkg/brokerpak/registrar.go @@ -20,7 +20,7 @@ import ( "os" "code.cloudfoundry.org/lager/v3" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/spf13/cast" "github.com/spf13/viper" diff --git a/pkg/client/client.go b/pkg/client/client.go index c0b0e9373..1d7ff33b2 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -23,7 +23,7 @@ import ( "net/http" "net/url" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/spf13/viper" ) diff --git a/pkg/client/example_runner.go b/pkg/client/example_runner.go index 23e9c184c..27243a1d1 100644 --- a/pkg/client/example_runner.go +++ b/pkg/client/example_runner.go @@ -26,7 +26,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/broker" "github.com/pborman/uuid" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) // RunExamplesForService runs all the examples for a given service name against diff --git a/pkg/providers/tf/definition.go b/pkg/providers/tf/definition.go index 9c479690a..a0b39c26f 100644 --- a/pkg/providers/tf/definition.go +++ b/pkg/providers/tf/definition.go @@ -21,7 +21,7 @@ import ( "strings" "code.cloudfoundry.org/lager/v3" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/spf13/viper" "github.com/cloudfoundry/cloud-service-broker/internal/serviceimage" diff --git a/pkg/providers/tf/definition_test.go b/pkg/providers/tf/definition_test.go index e69fb20cf..98c53c01d 100644 --- a/pkg/providers/tf/definition_test.go +++ b/pkg/providers/tf/definition_test.go @@ -5,7 +5,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/pkg/providers/tf/executor" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) var _ = Describe("Definition", func() { diff --git a/pkg/server/cf_sharing.go b/pkg/server/cf_sharing.go index 3e5359ad4..d578e0cce 100644 --- a/pkg/server/cf_sharing.go +++ b/pkg/server/cf_sharing.go @@ -17,8 +17,8 @@ package server import ( "context" - "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" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/pkg/server/cf_sharing_test.go b/pkg/server/cf_sharing_test.go index 44ba3cd90..485a1a3fe 100644 --- a/pkg/server/cf_sharing_test.go +++ b/pkg/server/cf_sharing_test.go @@ -19,7 +19,7 @@ import ( "errors" "testing" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/cloudfoundry/cloud-service-broker/pkg/server/fakes" ) diff --git a/pkg/server/fakes/servicebroker.go b/pkg/server/fakes/servicebroker.go index ee99c6268..ab86a3111 100644 --- a/pkg/server/fakes/servicebroker.go +++ b/pkg/server/fakes/servicebroker.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/pivotal-cf/brokerapi/v10/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type FakeServiceBroker struct { diff --git a/utils/correlation/correlation.go b/utils/correlation/correlation.go index 7e55e0c30..a6f9fe8cf 100644 --- a/utils/correlation/correlation.go +++ b/utils/correlation/correlation.go @@ -5,7 +5,7 @@ import ( "context" "code.cloudfoundry.org/lager/v3" - "github.com/pivotal-cf/brokerapi/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/middlewares" ) func ID(ctx context.Context) lager.Data { diff --git a/utils/correlation/correlation_test.go b/utils/correlation/correlation_test.go index ec86c91ab..4095373e2 100644 --- a/utils/correlation/correlation_test.go +++ b/utils/correlation/correlation_test.go @@ -6,7 +6,7 @@ import ( "github.com/cloudfoundry/cloud-service-broker/utils/correlation" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/middlewares" ) var _ = Describe("Correlation", func() { diff --git a/utils/request/request_parser.go b/utils/request/request_parser.go index 27133652f..cef160cd8 100644 --- a/utils/request/request_parser.go +++ b/utils/request/request_parser.go @@ -7,7 +7,7 @@ import ( "encoding/json" "strings" - "github.com/pivotal-cf/brokerapi/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/middlewares" ) func DecodeOriginatingIdentityHeader(ctx context.Context) map[string]any { diff --git a/utils/request/request_parser_test.go b/utils/request/request_parser_test.go index 5f61a02f9..ead7412f8 100644 --- a/utils/request/request_parser_test.go +++ b/utils/request/request_parser_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/cloudfoundry/cloud-service-broker/utils/request" - "github.com/pivotal-cf/brokerapi/v10/middlewares" + "github.com/pivotal-cf/brokerapi/v11/middlewares" ) func TestDecodeOriginatingIdentityHeader(t *testing.T) {