diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9cb7acfc..961457ea 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -28,6 +28,6 @@ jobs: call-dependabot-pr-workflow: needs: test if: ${{ success() && github.actor == 'dependabot[bot]' }} - uses: pivotal-cf/brokerapi/.github/workflows/dependabot-test.yml@main + uses: cloudfoundry/brokerapi/.github/workflows/dependabot-test.yml@main with: pr_number: ${{ github.event.number }} diff --git a/api.go b/api.go index 7c20d65b..1b9f2fe8 100644 --- a/api.go +++ b/api.go @@ -19,12 +19,12 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/internal/middleware" + "code.cloudfoundry.org/brokerapi/v13/internal/middleware" - "github.com/pivotal-cf/brokerapi/v12/auth" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/handlers" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/auth" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/handlers" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) type BrokerCredentials struct { diff --git a/api_test.go b/api_test.go index 2c84a972..48846d45 100644 --- a/api_test.go +++ b/api_test.go @@ -28,12 +28,12 @@ import ( "net/url" "strings" + "code.cloudfoundry.org/brokerapi/v13" + "code.cloudfoundry.org/brokerapi/v13/fakes" + "code.cloudfoundry.org/brokerapi/v13/middlewares" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" - "github.com/pivotal-cf/brokerapi/v12" - "github.com/pivotal-cf/brokerapi/v12/fakes" - "github.com/pivotal-cf/brokerapi/v12/middlewares" ) var _ = Describe("Service Broker API", func() { diff --git a/auth/auth_test.go b/auth/auth_test.go index 10faefe2..0c431a75 100644 --- a/auth/auth_test.go +++ b/auth/auth_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12/auth" + "code.cloudfoundry.org/brokerapi/v13/auth" ) var _ = Describe("Auth Wrapper", func() { diff --git a/catalog.go b/catalog.go index b1f71e6d..75d54fa8 100644 --- a/catalog.go +++ b/catalog.go @@ -18,60 +18,60 @@ package brokerapi import ( "reflect" - "github.com/pivotal-cf/brokerapi/v12/domain" + "code.cloudfoundry.org/brokerapi/v13/domain" ) -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type Service = domain.Service -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ServiceDashboardClient = domain.ServiceDashboardClient -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ServicePlan = domain.ServicePlan -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ServiceSchemas = domain.ServiceSchemas -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ServiceInstanceSchema = domain.ServiceInstanceSchema -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ServiceBindingSchema = domain.ServiceBindingSchema -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type Schema = domain.Schema -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ServicePlanMetadata = domain.ServicePlanMetadata -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ServicePlanCost = domain.ServicePlanCost -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ServiceMetadata = domain.ServiceMetadata -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain func FreeValue(v bool) *bool { return domain.FreeValue(v) } -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain func BindableValue(v bool) *bool { return domain.BindableValue(v) } -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type RequiredPermission = domain.RequiredPermission -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain const ( PermissionRouteForwarding = domain.PermissionRouteForwarding PermissionSyslogDrain = domain.PermissionSyslogDrain PermissionVolumeMount = domain.PermissionVolumeMount ) -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain func GetJsonNames(s reflect.Value) (res []string) { return domain.GetJsonNames(s) } diff --git a/catalog_test.go b/catalog_test.go index 96644bf8..d63823d0 100644 --- a/catalog_test.go +++ b/catalog_test.go @@ -20,9 +20,9 @@ import ( "reflect" "sync" + "code.cloudfoundry.org/brokerapi/v13" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12" ) var _ = Describe("Catalog", func() { diff --git a/context_utils.go b/context_utils.go index e77bf345..68b6df89 100644 --- a/context_utils.go +++ b/context_utils.go @@ -3,7 +3,7 @@ package brokerapi import ( "context" - "github.com/pivotal-cf/brokerapi/v12/utils" + "code.cloudfoundry.org/brokerapi/v13/utils" ) func AddServiceToContext(ctx context.Context, service *Service) context.Context { diff --git a/context_utils_test.go b/context_utils_test.go index acd7d438..6179a3da 100644 --- a/context_utils_test.go +++ b/context_utils_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12" + "code.cloudfoundry.org/brokerapi/v13" ) var _ = Describe("Context Utilities", func() { diff --git a/domain/apiresponses/failure_responses_test.go b/domain/apiresponses/failure_responses_test.go index 2458da33..4b19b99c 100644 --- a/domain/apiresponses/failure_responses_test.go +++ b/domain/apiresponses/failure_responses_test.go @@ -5,10 +5,10 @@ import ( "log/slog" "net/http" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" ) var _ = Describe("FailureResponse", func() { diff --git a/domain/apiresponses/responses.go b/domain/apiresponses/responses.go index eed81ce2..ec14ad2f 100644 --- a/domain/apiresponses/responses.go +++ b/domain/apiresponses/responses.go @@ -15,7 +15,7 @@ package apiresponses -import "github.com/pivotal-cf/brokerapi/v12/domain" +import "code.cloudfoundry.org/brokerapi/v13/domain" type EmptyResponse struct{} diff --git a/domain/apiresponses/responses_test.go b/domain/apiresponses/responses_test.go index 5d0fea37..5ee4bf7a 100644 --- a/domain/apiresponses/responses_test.go +++ b/domain/apiresponses/responses_test.go @@ -3,10 +3,10 @@ package apiresponses_test import ( "encoding/json" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" ) var _ = Describe("Catalog Response", func() { diff --git a/domain/maintenance_info_test.go b/domain/maintenance_info_test.go index f13ee741..2582f29e 100644 --- a/domain/maintenance_info_test.go +++ b/domain/maintenance_info_test.go @@ -1,9 +1,9 @@ package domain_test import ( + "code.cloudfoundry.org/brokerapi/v13/domain" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12/domain" ) var _ = Describe("MaintenanceInfo", func() { diff --git a/domain/service_catalog_test.go b/domain/service_catalog_test.go index c0e09839..f01efa02 100644 --- a/domain/service_catalog_test.go +++ b/domain/service_catalog_test.go @@ -3,9 +3,9 @@ package domain_test import ( "encoding/json" + "code.cloudfoundry.org/brokerapi/v13/domain" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12/domain" ) var maximumPollingDuration = 3600 diff --git a/domain/service_metadata_test.go b/domain/service_metadata_test.go index 3a79d4c9..252675de 100644 --- a/domain/service_metadata_test.go +++ b/domain/service_metadata_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "sync" + "code.cloudfoundry.org/brokerapi/v13/domain" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12/domain" ) var _ = Describe("ServiceMetadata", func() { diff --git a/domain/service_plan_metadata_test.go b/domain/service_plan_metadata_test.go index ea6d94d8..7fe104c0 100644 --- a/domain/service_plan_metadata_test.go +++ b/domain/service_plan_metadata_test.go @@ -5,10 +5,10 @@ import ( "reflect" "sync" + "code.cloudfoundry.org/brokerapi/v13" + "code.cloudfoundry.org/brokerapi/v13/domain" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12" - "github.com/pivotal-cf/brokerapi/v12/domain" ) var _ = Describe("ServicePlanMetadata", func() { diff --git a/failure_response.go b/failure_response.go index 6fe47565..0c85f6f0 100644 --- a/failure_response.go +++ b/failure_response.go @@ -7,16 +7,16 @@ package brokerapi import ( - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" ) -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses // FailureResponse can be returned from any of the `ServiceBroker` interface methods // which allow an error to be returned. Doing so will provide greater control over // the HTTP response. type FailureResponse = apiresponses.FailureResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses // NewFailureResponse returns an error of type FailureResponse. // err will by default be used as both a logging message and HTTP response description. // statusCode is the HTTP status code to be returned, must be 4xx or 5xx @@ -25,11 +25,11 @@ func NewFailureResponse(err error, statusCode int, loggerAction string) error { return apiresponses.NewFailureResponse(err, statusCode, loggerAction) } -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses // FailureResponseBuilder provides a fluent set of methods to build a *FailureResponse. type FailureResponseBuilder = apiresponses.FailureResponseBuilder -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses // NewFailureResponseBuilder returns a pointer to a newly instantiated FailureResponseBuilder // Accepts required arguments to create a FailureResponse. func NewFailureResponseBuilder(err error, statusCode int, loggerAction string) *FailureResponseBuilder { diff --git a/failure_response_test.go b/failure_response_test.go index 50d05153..1a19e8d3 100644 --- a/failure_response_test.go +++ b/failure_response_test.go @@ -20,11 +20,11 @@ import ( "log/slog" "net/http" + "code.cloudfoundry.org/brokerapi/v13" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" - "github.com/pivotal-cf/brokerapi/v12" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" ) var _ = Describe("FailureResponse", func() { diff --git a/fakes/auto_fake_service_broker.go b/fakes/auto_fake_service_broker.go index 734c6fdc..98df3bca 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/v12/domain" + "code.cloudfoundry.org/brokerapi/v13/domain" ) type AutoFakeServiceBroker struct { diff --git a/fakes/fake_service_broker.go b/fakes/fake_service_broker.go index 5d89a70e..0372bd4d 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/v12" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" ) type FakeServiceBroker struct { diff --git a/go.mod b/go.mod index 095eeb67..05414bf8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pivotal-cf/brokerapi/v12 +module code.cloudfoundry.org/brokerapi/v13 go 1.23 diff --git a/handlers/api_handler.go b/handlers/api_handler.go index 52a112ad..2ed3ee3d 100644 --- a/handlers/api_handler.go +++ b/handlers/api_handler.go @@ -7,8 +7,8 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" ) const ( diff --git a/handlers/bind.go b/handlers/bind.go index 6d552d77..eb52359a 100644 --- a/handlers/bind.go +++ b/handlers/bind.go @@ -6,10 +6,10 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const ( diff --git a/handlers/catalog.go b/handlers/catalog.go index 40c94de2..fbfde92d 100644 --- a/handlers/catalog.go +++ b/handlers/catalog.go @@ -5,8 +5,8 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const getCatalogLogKey = "getCatalog" diff --git a/handlers/catalog_test.go b/handlers/catalog_test.go index dcd1113d..b2d9cc77 100644 --- a/handlers/catalog_test.go +++ b/handlers/catalog_test.go @@ -6,14 +6,14 @@ import ( "log/slog" "net/http" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + brokerFakes "code.cloudfoundry.org/brokerapi/v13/fakes" + "code.cloudfoundry.org/brokerapi/v13/handlers" + "code.cloudfoundry.org/brokerapi/v13/handlers/fakes" + "code.cloudfoundry.org/brokerapi/v13/middlewares" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - brokerFakes "github.com/pivotal-cf/brokerapi/v12/fakes" - "github.com/pivotal-cf/brokerapi/v12/handlers" - "github.com/pivotal-cf/brokerapi/v12/handlers/fakes" - "github.com/pivotal-cf/brokerapi/v12/middlewares" ) var _ = Describe("Services", func() { diff --git a/handlers/deprovision.go b/handlers/deprovision.go index 77df4072..d63332ff 100644 --- a/handlers/deprovision.go +++ b/handlers/deprovision.go @@ -5,10 +5,10 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const deprovisionLogKey = "deprovision" diff --git a/handlers/get_binding.go b/handlers/get_binding.go index 2f841c72..27698c91 100644 --- a/handlers/get_binding.go +++ b/handlers/get_binding.go @@ -6,10 +6,10 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const getBindLogKey = "getBinding" diff --git a/handlers/get_instance.go b/handlers/get_instance.go index b4f841b4..629dba5d 100644 --- a/handlers/get_instance.go +++ b/handlers/get_instance.go @@ -6,11 +6,11 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const getInstanceLogKey = "getInstance" diff --git a/handlers/last_binding_operation.go b/handlers/last_binding_operation.go index f0e6b111..607da24c 100644 --- a/handlers/last_binding_operation.go +++ b/handlers/last_binding_operation.go @@ -6,10 +6,10 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const lastBindingOperationLogKey = "lastBindingOperation" diff --git a/handlers/last_binding_operation_test.go b/handlers/last_binding_operation_test.go index 900617e8..acb62858 100644 --- a/handlers/last_binding_operation_test.go +++ b/handlers/last_binding_operation_test.go @@ -10,13 +10,13 @@ import ( "net/http" "net/http/httptest" + "code.cloudfoundry.org/brokerapi/v13" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + brokerFakes "code.cloudfoundry.org/brokerapi/v13/fakes" + "code.cloudfoundry.org/brokerapi/v13/middlewares" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - brokerFakes "github.com/pivotal-cf/brokerapi/v12/fakes" - "github.com/pivotal-cf/brokerapi/v12/middlewares" ) var _ = Describe("LastBindingOperation", func() { diff --git a/handlers/last_operation.go b/handlers/last_operation.go index 2cd3746c..30a15f92 100644 --- a/handlers/last_operation.go +++ b/handlers/last_operation.go @@ -5,10 +5,10 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const lastOperationLogKey = "lastOperation" diff --git a/handlers/provision.go b/handlers/provision.go index 460428f5..59a06e70 100644 --- a/handlers/provision.go +++ b/handlers/provision.go @@ -6,11 +6,11 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" - "github.com/pivotal-cf/brokerapi/v12/utils" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" + "code.cloudfoundry.org/brokerapi/v13/utils" ) const ( diff --git a/handlers/unbind.go b/handlers/unbind.go index 8aec9a27..dac7907c 100644 --- a/handlers/unbind.go +++ b/handlers/unbind.go @@ -5,10 +5,10 @@ import ( "log/slog" "net/http" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const unbindLogKey = "unbind" diff --git a/handlers/update.go b/handlers/update.go index 6fd02b44..8513a7a9 100644 --- a/handlers/update.go +++ b/handlers/update.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const updateLogKey = "update" diff --git a/internal/blog/blog.go b/internal/blog/blog.go index c4aac60c..82fb2866 100644 --- a/internal/blog/blog.go +++ b/internal/blog/blog.go @@ -13,7 +13,7 @@ import ( "log/slog" "strings" - "github.com/pivotal-cf/brokerapi/v12/middlewares" + "code.cloudfoundry.org/brokerapi/v13/middlewares" ) const ( diff --git a/internal/blog/blog_test.go b/internal/blog/blog_test.go index dcf1b6af..a5789436 100644 --- a/internal/blog/blog_test.go +++ b/internal/blog/blog_test.go @@ -5,11 +5,11 @@ import ( "encoding/json" "log/slog" + "code.cloudfoundry.org/brokerapi/v13/internal/blog" + "code.cloudfoundry.org/brokerapi/v13/middlewares" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" - "github.com/pivotal-cf/brokerapi/v12/internal/blog" - "github.com/pivotal-cf/brokerapi/v12/middlewares" ) var _ = Describe("Context data", func() { diff --git a/internal/middleware/middleware_test.go b/internal/middleware/middleware_test.go index ccab766e..6552b617 100644 --- a/internal/middleware/middleware_test.go +++ b/internal/middleware/middleware_test.go @@ -4,9 +4,9 @@ import ( "net/http" "net/http/httptest" + "code.cloudfoundry.org/brokerapi/v13/internal/middleware" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12/internal/middleware" ) var _ = Describe("Use()", func() { diff --git a/maintenance_info.go b/maintenance_info.go index cd4e4c51..caaa9113 100644 --- a/maintenance_info.go +++ b/maintenance_info.go @@ -1,8 +1,8 @@ package brokerapi import ( - "github.com/pivotal-cf/brokerapi/v12/domain" + "code.cloudfoundry.org/brokerapi/v13/domain" ) -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type MaintenanceInfo = domain.MaintenanceInfo diff --git a/maintenance_info_test.go b/maintenance_info_test.go index d77eec1e..0c61bf0d 100644 --- a/maintenance_info_test.go +++ b/maintenance_info_test.go @@ -1,9 +1,9 @@ package brokerapi_test import ( + "code.cloudfoundry.org/brokerapi/v13" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12" ) var _ = Describe("MaintenanceInfo", func() { diff --git a/response.go b/response.go index a54abf3f..b99e3031 100644 --- a/response.go +++ b/response.go @@ -16,51 +16,51 @@ package brokerapi import ( - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" ) -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type EmptyResponse = apiresponses.EmptyResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type ErrorResponse = apiresponses.ErrorResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type CatalogResponse = apiresponses.CatalogResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type ProvisioningResponse = apiresponses.ProvisioningResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type GetInstanceResponse = apiresponses.GetInstanceResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type UpdateResponse = apiresponses.UpdateResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type DeprovisionResponse = apiresponses.DeprovisionResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type LastOperationResponse = apiresponses.LastOperationResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type AsyncBindResponse = apiresponses.AsyncBindResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type BindingResponse = apiresponses.BindingResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type GetBindingResponse = apiresponses.GetBindingResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type UnbindResponse = apiresponses.UnbindResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses type ExperimentalVolumeMountBindingResponse = apiresponses.ExperimentalVolumeMountBindingResponse -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ExperimentalVolumeMount = domain.ExperimentalVolumeMount -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ExperimentalVolumeMountPrivate = domain.ExperimentalVolumeMountPrivate diff --git a/response_test.go b/response_test.go index 0765067a..ec18a7dc 100644 --- a/response_test.go +++ b/response_test.go @@ -18,9 +18,9 @@ package brokerapi_test import ( "encoding/json" + "code.cloudfoundry.org/brokerapi/v13" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12" ) var _ = Describe("Catalog Response", func() { diff --git a/service_broker.go b/service_broker.go index 42d6cf25..9013a9fb 100644 --- a/service_broker.go +++ b/service_broker.go @@ -16,14 +16,14 @@ package brokerapi import ( - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/domain/apiresponses" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/domain/apiresponses" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate //counterfeiter:generate -o fakes/auto_fake_service_broker.go -fake-name AutoFakeServiceBroker . ServiceBroker -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain // Each method of the ServiceBroker interface maps to an individual endpoint of the Open Service Broker API. // // The specification is available here: https://github.com/openservicebrokerapi/servicebroker/blob/v2.14/spec.md @@ -33,81 +33,81 @@ type ServiceBroker interface { domain.ServiceBroker } -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type DetailsWithRawParameters interface { domain.DetailsWithRawParameters } -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type DetailsWithRawContext interface { domain.DetailsWithRawContext } -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ProvisionDetails = domain.ProvisionDetails -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type ProvisionedServiceSpec = domain.ProvisionedServiceSpec -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type GetInstanceDetailsSpec = domain.GetInstanceDetailsSpec -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type UnbindSpec = domain.UnbindSpec -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type BindDetails = domain.BindDetails -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type BindResource = domain.BindResource -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type UnbindDetails = domain.UnbindDetails -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type UpdateServiceSpec = domain.UpdateServiceSpec -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type DeprovisionServiceSpec = domain.DeprovisionServiceSpec -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type DeprovisionDetails = domain.DeprovisionDetails -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type UpdateDetails = domain.UpdateDetails -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type PreviousValues = domain.PreviousValues -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type PollDetails = domain.PollDetails -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type LastOperation = domain.LastOperation -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type LastOperationState = domain.LastOperationState -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain const ( InProgress LastOperationState = "in progress" Succeeded LastOperationState = "succeeded" Failed LastOperationState = "failed" ) -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type Binding = domain.Binding -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type GetBindingSpec = domain.GetBindingSpec -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type VolumeMount = domain.VolumeMount -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain type SharedDevice = domain.SharedDevice -// Deprecated: Use github.com/pivotal-cf/brokerapi/domain/apiresponses +// Deprecated: Use code.cloudfoundry.org/brokerapi/v13/domain/apiresponses var ( ErrInstanceAlreadyExists = apiresponses.ErrInstanceAlreadyExists diff --git a/utils/context.go b/utils/context.go index f4fa2062..31923f62 100644 --- a/utils/context.go +++ b/utils/context.go @@ -3,7 +3,7 @@ package utils import ( "context" - "github.com/pivotal-cf/brokerapi/v12/domain" + "code.cloudfoundry.org/brokerapi/v13/domain" ) type contextKey string diff --git a/utils/context_test.go b/utils/context_test.go index 40fd9c21..64a7b17e 100644 --- a/utils/context_test.go +++ b/utils/context_test.go @@ -3,10 +3,10 @@ package utils_test import ( "context" + "code.cloudfoundry.org/brokerapi/v13/domain" + "code.cloudfoundry.org/brokerapi/v13/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pivotal-cf/brokerapi/v12/domain" - "github.com/pivotal-cf/brokerapi/v12/utils" ) var _ = Describe("Context", func() {