diff --git a/README.md b/README.md index 71d0072e..7b07a7b9 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,6 @@ Brokers. - [lager](https://github.com/cloudfoundry/lager) - [gorilla/mux](https://github.com/gorilla/mux) -We use [dep](https://github.com/golang/dep) to manager our dependencies. Use -`dep ensure` in order to download the required packages. - ## Usage `brokerapi` defines a diff --git a/api.go b/api.go index 96301ee2..f0573bc4 100644 --- a/api.go +++ b/api.go @@ -20,9 +20,9 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/auth" - "github.com/pivotal-cf/brokerapi/handlers" - "github.com/pivotal-cf/brokerapi/middlewares" + "github.com/pivotal-cf/brokerapi/v7/auth" + "github.com/pivotal-cf/brokerapi/v7/handlers" + "github.com/pivotal-cf/brokerapi/v7/middlewares" ) type BrokerCredentials struct { diff --git a/api_test.go b/api_test.go index d631e555..34922600 100644 --- a/api_test.go +++ b/api_test.go @@ -28,15 +28,15 @@ import ( "github.com/onsi/ginkgo/extensions/table" - "github.com/pivotal-cf/brokerapi/middlewares" + "github.com/pivotal-cf/brokerapi/v7/middlewares" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" "github.com/drewolson/testflight" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi" - "github.com/pivotal-cf/brokerapi/fakes" + "github.com/pivotal-cf/brokerapi/v7" + "github.com/pivotal-cf/brokerapi/v7/fakes" ) var _ = Describe("Service Broker API", func() { diff --git a/auth/auth_test.go b/auth/auth_test.go index 40eef9a5..c813ebea 100644 --- a/auth/auth_test.go +++ b/auth/auth_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/auth" + "github.com/pivotal-cf/brokerapi/v7/auth" ) var _ = Describe("Auth Wrapper", func() { diff --git a/catalog.go b/catalog.go index b95bce71..41cf543c 100644 --- a/catalog.go +++ b/catalog.go @@ -18,7 +18,7 @@ package brokerapi import ( "reflect" - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7/domain" ) //Deprecated: Use github.com/pivotal-cf/brokerapi/domain diff --git a/catalog_test.go b/catalog_test.go index 812fc301..a9b1db25 100644 --- a/catalog_test.go +++ b/catalog_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi" + "github.com/pivotal-cf/brokerapi/v7" ) var _ = Describe("Catalog", func() { diff --git a/context_utils.go b/context_utils.go index ad4908fe..1a4d1f62 100644 --- a/context_utils.go +++ b/context_utils.go @@ -3,7 +3,7 @@ package brokerapi import ( "context" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/utils" ) func AddServiceToContext(ctx context.Context, service *Service) context.Context { diff --git a/context_utils_test.go b/context_utils_test.go index 8a6e4bbb..d514e006 100644 --- a/context_utils_test.go +++ b/context_utils_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi" + "github.com/pivotal-cf/brokerapi/v7" ) var _ = Describe("Context Utilities", func() { diff --git a/domain/apiresponses/failure_responses_test.go b/domain/apiresponses/failure_responses_test.go index 68d6ef99..ee1d7be5 100644 --- a/domain/apiresponses/failure_responses_test.go +++ b/domain/apiresponses/failure_responses_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" "code.cloudfoundry.org/lager" "github.com/onsi/gomega/gbytes" diff --git a/domain/apiresponses/responses.go b/domain/apiresponses/responses.go index a1ff3f52..bb993872 100644 --- a/domain/apiresponses/responses.go +++ b/domain/apiresponses/responses.go @@ -15,7 +15,7 @@ package apiresponses -import "github.com/pivotal-cf/brokerapi/domain" +import "github.com/pivotal-cf/brokerapi/v7/domain" type EmptyResponse struct{} diff --git a/domain/apiresponses/responses_test.go b/domain/apiresponses/responses_test.go index db4b61d9..41b61c6a 100644 --- a/domain/apiresponses/responses_test.go +++ b/domain/apiresponses/responses_test.go @@ -5,8 +5,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) var _ = Describe("Catalog Response", func() { diff --git a/domain/maintenance_info_test.go b/domain/maintenance_info_test.go index b55d47bf..0d9c0061 100644 --- a/domain/maintenance_info_test.go +++ b/domain/maintenance_info_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7/domain" ) var _ = Describe("MaintenanceInfo", func() { diff --git a/domain/service_catalog_test.go b/domain/service_catalog_test.go index eaf546ba..a13185a9 100644 --- a/domain/service_catalog_test.go +++ b/domain/service_catalog_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7/domain" ) var _ = Describe("ServiceCatalog", func() { diff --git a/domain/service_metadata_test.go b/domain/service_metadata_test.go index a15a5762..61f86b66 100644 --- a/domain/service_metadata_test.go +++ b/domain/service_metadata_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7/domain" ) var _ = Describe("ServiceMetadata", func() { diff --git a/domain/service_plan_metadata_test.go b/domain/service_plan_metadata_test.go index 215dbde4..9876a90c 100644 --- a/domain/service_plan_metadata_test.go +++ b/domain/service_plan_metadata_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi" - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7" + "github.com/pivotal-cf/brokerapi/v7/domain" ) var _ = Describe("ServicePlanMetadata", func() { diff --git a/failure_response.go b/failure_response.go index 7463c4bd..ab7c85fc 100644 --- a/failure_response.go +++ b/failure_response.go @@ -7,7 +7,7 @@ package brokerapi import ( - "github.com/pivotal-cf/brokerapi/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) //Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses diff --git a/failure_response_test.go b/failure_response_test.go index 8a203335..3910e3cd 100644 --- a/failure_response_test.go +++ b/failure_response_test.go @@ -16,7 +16,7 @@ package brokerapi_test import ( - "github.com/pivotal-cf/brokerapi" + "github.com/pivotal-cf/brokerapi/v7" "errors" diff --git a/fakes/auto_fake_service_broker.go b/fakes/auto_fake_service_broker.go index 34b6ec78..80957a5d 100644 --- a/fakes/auto_fake_service_broker.go +++ b/fakes/auto_fake_service_broker.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7/domain" ) type AutoFakeServiceBroker struct { diff --git a/fakes/fake_service_broker.go b/fakes/fake_service_broker.go index c6175432..7707727c 100644 --- a/fakes/fake_service_broker.go +++ b/fakes/fake_service_broker.go @@ -5,9 +5,9 @@ import ( "errors" "reflect" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" - "github.com/pivotal-cf/brokerapi" + "github.com/pivotal-cf/brokerapi/v7" ) type FakeServiceBroker struct { diff --git a/go.mod b/go.mod index cfa3db8c..b296ed56 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pivotal-cf/brokerapi +module github.com/pivotal-cf/brokerapi/v7 require ( code.cloudfoundry.org/lager v1.1.1-0.20191008172124-a9afc05ee5be diff --git a/handlers/api_handler.go b/handlers/api_handler.go index ea7d0937..91a011a7 100644 --- a/handlers/api_handler.go +++ b/handlers/api_handler.go @@ -7,7 +7,7 @@ import ( "net/http" "code.cloudfoundry.org/lager" - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7/domain" ) const ( diff --git a/handlers/bind.go b/handlers/bind.go index 4f7ff40a..a81d1e9e 100644 --- a/handlers/bind.go +++ b/handlers/bind.go @@ -6,10 +6,10 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const ( diff --git a/handlers/catalog.go b/handlers/catalog.go index dacfd174..1383aaa1 100644 --- a/handlers/catalog.go +++ b/handlers/catalog.go @@ -3,7 +3,7 @@ package handlers import ( "net/http" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) func (h *APIHandler) Catalog(w http.ResponseWriter, req *http.Request) { diff --git a/handlers/deprovision.go b/handlers/deprovision.go index e8612a24..739bd51f 100644 --- a/handlers/deprovision.go +++ b/handlers/deprovision.go @@ -5,10 +5,10 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const deprovisionLogKey = "deprovision" diff --git a/handlers/get_binding.go b/handlers/get_binding.go index 966bf201..f53e0ff0 100644 --- a/handlers/get_binding.go +++ b/handlers/get_binding.go @@ -6,9 +6,9 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const getBindLogKey = "getBinding" diff --git a/handlers/get_instance.go b/handlers/get_instance.go index f9ea3a4b..93a4680a 100644 --- a/handlers/get_instance.go +++ b/handlers/get_instance.go @@ -6,9 +6,9 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const getInstanceLogKey = "getInstance" diff --git a/handlers/last_binding_operation.go b/handlers/last_binding_operation.go index f9bbecb9..8ac150c7 100644 --- a/handlers/last_binding_operation.go +++ b/handlers/last_binding_operation.go @@ -6,10 +6,10 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const lastBindingOperationLogKey = "lastBindingOperation" diff --git a/handlers/last_binding_operation_test.go b/handlers/last_binding_operation_test.go index e10f353b..b608bccc 100644 --- a/handlers/last_binding_operation_test.go +++ b/handlers/last_binding_operation_test.go @@ -7,17 +7,17 @@ import ( "net/http" "net/url" - "github.com/pivotal-cf/brokerapi/middlewares" + "github.com/pivotal-cf/brokerapi/v7/middlewares" "code.cloudfoundry.org/lager" "github.com/gorilla/mux" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - brokerFakes "github.com/pivotal-cf/brokerapi/fakes" - "github.com/pivotal-cf/brokerapi/handlers" - "github.com/pivotal-cf/brokerapi/handlers/fakes" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + brokerFakes "github.com/pivotal-cf/brokerapi/v7/fakes" + "github.com/pivotal-cf/brokerapi/v7/handlers" + "github.com/pivotal-cf/brokerapi/v7/handlers/fakes" "github.com/pkg/errors" ) diff --git a/handlers/last_operation.go b/handlers/last_operation.go index d185d7cf..9aecd7d1 100644 --- a/handlers/last_operation.go +++ b/handlers/last_operation.go @@ -5,10 +5,10 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const lastOperationLogKey = "lastOperation" diff --git a/handlers/provision.go b/handlers/provision.go index 859a6414..1d9677d5 100644 --- a/handlers/provision.go +++ b/handlers/provision.go @@ -6,10 +6,10 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const ( diff --git a/handlers/unbind.go b/handlers/unbind.go index ba19faa9..4126b2d7 100644 --- a/handlers/unbind.go +++ b/handlers/unbind.go @@ -6,10 +6,10 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const unbindLogKey = "unbind" diff --git a/handlers/update.go b/handlers/update.go index bebd212e..d8a7a95a 100644 --- a/handlers/update.go +++ b/handlers/update.go @@ -7,10 +7,10 @@ import ( "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/middlewares" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/middlewares" + "github.com/pivotal-cf/brokerapi/v7/utils" ) const updateLogKey = "update" diff --git a/maintenance_info.go b/maintenance_info.go index 5cb14661..3abe4d4d 100644 --- a/maintenance_info.go +++ b/maintenance_info.go @@ -1,7 +1,7 @@ package brokerapi import ( - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7/domain" ) //Deprecated: Use github.com/pivotal-cf/brokerapi/domain diff --git a/maintenance_info_test.go b/maintenance_info_test.go index 708ea223..8c0b6431 100644 --- a/maintenance_info_test.go +++ b/maintenance_info_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi" + "github.com/pivotal-cf/brokerapi/v7" ) var _ = Describe("MaintenanceInfo", func() { diff --git a/response.go b/response.go index cc1a67c2..4313dae8 100644 --- a/response.go +++ b/response.go @@ -16,8 +16,8 @@ package brokerapi import ( - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) //Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses diff --git a/response_test.go b/response_test.go index adc2338d..39cf1622 100644 --- a/response_test.go +++ b/response_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi" + "github.com/pivotal-cf/brokerapi/v7" ) var _ = Describe("Catalog Response", func() { diff --git a/service_broker.go b/service_broker.go index 9af996f2..34de1e50 100644 --- a/service_broker.go +++ b/service_broker.go @@ -16,8 +16,8 @@ package brokerapi import ( - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o fakes/auto_fake_service_broker.go -fake-name AutoFakeServiceBroker . ServiceBroker diff --git a/utils/context.go b/utils/context.go index 78fabb7f..34e4ce88 100644 --- a/utils/context.go +++ b/utils/context.go @@ -4,7 +4,7 @@ import ( "context" "code.cloudfoundry.org/lager" - "github.com/pivotal-cf/brokerapi/domain" + "github.com/pivotal-cf/brokerapi/v7/domain" ) type contextKey string diff --git a/utils/context_test.go b/utils/context_test.go index c8aeb84a..1f95756d 100644 --- a/utils/context_test.go +++ b/utils/context_test.go @@ -5,8 +5,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/domain" - "github.com/pivotal-cf/brokerapi/utils" + "github.com/pivotal-cf/brokerapi/v7/domain" + "github.com/pivotal-cf/brokerapi/v7/utils" ) var _ = Describe("Context", func() {