diff --git a/Makefile b/Makefile index d7149b85d27..9cc5b25536f 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,10 @@ CF_BUILD_VERSION ?= v9.0.0 CF_BUILD_SHA ?= $$(git rev-parse --short HEAD) CF_BUILD_DATE ?= $$(date -u +"%Y-%m-%d") LD_FLAGS_COMMON=-w -s \ - -X code.cloudfoundry.org/cli/version.binarySHA=$(CF_BUILD_SHA) \ - -X code.cloudfoundry.org/cli/version.binaryBuildDate=$(CF_BUILD_DATE) + -X code.cloudfoundry.org/cli/v9/version.binarySHA=$(CF_BUILD_SHA) \ + -X code.cloudfoundry.org/cli/v9/version.binaryBuildDate=$(CF_BUILD_DATE) LD_FLAGS =$(LD_FLAGS_COMMON) \ - -X code.cloudfoundry.org/cli/version.binaryVersion=$(CF_BUILD_VERSION) + -X code.cloudfoundry.org/cli/v9/version.binaryVersion=$(CF_BUILD_VERSION) LD_FLAGS_LINUX = -extldflags \"-static\" $(LD_FLAGS) REQUIRED_FOR_STATIC_BINARY =-a -tags "netgo" -installsuffix netgo GOSRC = $(shell find . -name "*.go" ! -name "*test.go" ! -name "*fake*" ! -path "./integration/*") diff --git a/README.md b/README.md index 0d8708b7bf0..63a25869eed 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,6 @@ information follow: * [The CF CLI plugin development guide](https://github.com/cloudfoundry/cli/tree/main/plugin/plugin_examples) * [The official plugins repository](https://plugins.cloudfoundry.org/) -When importing the plugin code use `import "code.cloudfoundry.org/cli/plugin"`. +When importing the plugin code use `import "code.cloudfoundry.org/cli/v9/plugin"`. Older plugins that import `github.com/cloudfoundry/cli/plugin` will still work as long they vendor the plugins directory. diff --git a/actor/actionerror/duplicate_service_error_test.go b/actor/actionerror/duplicate_service_error_test.go index b20248eabf4..bab3cbfe96c 100644 --- a/actor/actionerror/duplicate_service_error_test.go +++ b/actor/actionerror/duplicate_service_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/duplicate_service_plan_error_test.go b/actor/actionerror/duplicate_service_plan_error_test.go index 5064f30a299..6cedf402b25 100644 --- a/actor/actionerror/duplicate_service_plan_error_test.go +++ b/actor/actionerror/duplicate_service_plan_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/enrich_api_errors.go b/actor/actionerror/enrich_api_errors.go index d372f412210..95bae170693 100644 --- a/actor/actionerror/enrich_api_errors.go +++ b/actor/actionerror/enrich_api_errors.go @@ -1,6 +1,6 @@ package actionerror -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" func EnrichAPIErrors(e error) error { switch err := e.(type) { diff --git a/actor/actionerror/enrich_api_errors_test.go b/actor/actionerror/enrich_api_errors_test.go index d579b5179e9..afc57ee36bd 100644 --- a/actor/actionerror/enrich_api_errors_test.go +++ b/actor/actionerror/enrich_api_errors_test.go @@ -3,9 +3,9 @@ package actionerror_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/actionerror/package_not_found_in_app_error_test.go b/actor/actionerror/package_not_found_in_app_error_test.go index a6bef9120b2..9e2a727bbb7 100644 --- a/actor/actionerror/package_not_found_in_app_error_test.go +++ b/actor/actionerror/package_not_found_in_app_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/route_not_found_error_test.go b/actor/actionerror/route_not_found_error_test.go index e6dedb1a806..5f19189edad 100644 --- a/actor/actionerror/route_not_found_error_test.go +++ b/actor/actionerror/route_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/security_group_not_bound_to_space_error.go b/actor/actionerror/security_group_not_bound_to_space_error.go index 7714874d621..7fab584226d 100644 --- a/actor/actionerror/security_group_not_bound_to_space_error.go +++ b/actor/actionerror/security_group_not_bound_to_space_error.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // SecurityGroupNotBoundToSpaceError is returned when a requested security group is diff --git a/actor/actionerror/service_instance_type_error.go b/actor/actionerror/service_instance_type_error.go index 9021fcd0591..46a8c34bea3 100644 --- a/actor/actionerror/service_instance_type_error.go +++ b/actor/actionerror/service_instance_type_error.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/resources" ) type ServiceInstanceTypeError struct { diff --git a/actor/actionerror/service_not_found_error_test.go b/actor/actionerror/service_not_found_error_test.go index 5062830a5c7..500b8541e94 100644 --- a/actor/actionerror/service_not_found_error_test.go +++ b/actor/actionerror/service_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/service_offering_name_ambiguity_error.go b/actor/actionerror/service_offering_name_ambiguity_error.go index b7ec5351959..7da5a045c21 100644 --- a/actor/actionerror/service_offering_name_ambiguity_error.go +++ b/actor/actionerror/service_offering_name_ambiguity_error.go @@ -1,6 +1,6 @@ package actionerror -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" type ServiceOfferingNameAmbiguityError struct { ccerror.ServiceOfferingNameAmbiguityError diff --git a/actor/actionerror/service_plan_not_found_error_test.go b/actor/actionerror/service_plan_not_found_error_test.go index 4ea762f5ad5..3f4ebf28df0 100644 --- a/actor/actionerror/service_plan_not_found_error_test.go +++ b/actor/actionerror/service_plan_not_found_error_test.go @@ -3,7 +3,7 @@ package actionerror_test import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/space_not_found_error_test.go b/actor/actionerror/space_not_found_error_test.go index ad8647e8030..30bbbf89ab7 100644 --- a/actor/actionerror/space_not_found_error_test.go +++ b/actor/actionerror/space_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/user_not_found.go b/actor/actionerror/user_not_found.go index 57f50c8ee19..7cf937fedb3 100644 --- a/actor/actionerror/user_not_found.go +++ b/actor/actionerror/user_not_found.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // UserNotFoundError is an error wrapper that represents the case diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go index f83e102f681..74739119239 100644 --- a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go +++ b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go @@ -4,9 +4,9 @@ package cfnetworkingactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeCloudControllerClient struct { @@ -84,15 +84,16 @@ func (fake *FakeCloudControllerClient) GetApplicationByNameAndSpace(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationByNameAndSpaceStub + fakeReturns := fake.getApplicationByNameAndSpaceReturns fake.recordInvocation("GetApplicationByNameAndSpace", []interface{}{arg1, arg2}) fake.getApplicationByNameAndSpaceMutex.Unlock() - if fake.GetApplicationByNameAndSpaceStub != nil { - return fake.GetApplicationByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -150,15 +151,16 @@ func (fake *FakeCloudControllerClient) GetApplications(arg1 ...ccv3.Query) ([]re fake.getApplicationsArgsForCall = append(fake.getApplicationsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetApplicationsStub + fakeReturns := fake.getApplicationsReturns fake.recordInvocation("GetApplications", []interface{}{arg1}) fake.getApplicationsMutex.Unlock() - if fake.GetApplicationsStub != nil { - return fake.GetApplicationsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -216,15 +218,16 @@ func (fake *FakeCloudControllerClient) GetOrganizations(arg1 ...ccv3.Query) ([]r fake.getOrganizationsArgsForCall = append(fake.getOrganizationsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetOrganizationsStub + fakeReturns := fake.getOrganizationsReturns fake.recordInvocation("GetOrganizations", []interface{}{arg1}) fake.getOrganizationsMutex.Unlock() - if fake.GetOrganizationsStub != nil { - return fake.GetOrganizationsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -282,15 +285,16 @@ func (fake *FakeCloudControllerClient) GetSpaces(arg1 ...ccv3.Query) ([]resource fake.getSpacesArgsForCall = append(fake.getSpacesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetSpacesStub + fakeReturns := fake.getSpacesReturns fake.recordInvocation("GetSpaces", []interface{}{arg1}) fake.getSpacesMutex.Unlock() - if fake.GetSpacesStub != nil { - return fake.GetSpacesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4 } - fakeReturns := fake.getSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4 } diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go index ce5fc06a3e2..748af078b4e 100644 --- a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go +++ b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go @@ -4,8 +4,8 @@ package cfnetworkingactionfakes import ( "sync" - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" ) type FakeNetworkingClient struct { @@ -59,15 +59,16 @@ func (fake *FakeNetworkingClient) CreatePolicies(arg1 []cfnetv1.Policy) error { fake.createPoliciesArgsForCall = append(fake.createPoliciesArgsForCall, struct { arg1 []cfnetv1.Policy }{arg1Copy}) + stub := fake.CreatePoliciesStub + fakeReturns := fake.createPoliciesReturns fake.recordInvocation("CreatePolicies", []interface{}{arg1Copy}) fake.createPoliciesMutex.Unlock() - if fake.CreatePoliciesStub != nil { - return fake.CreatePoliciesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createPoliciesReturns return fakeReturns.result1 } @@ -119,15 +120,16 @@ func (fake *FakeNetworkingClient) ListPolicies(arg1 ...string) ([]cfnetv1.Policy fake.listPoliciesArgsForCall = append(fake.listPoliciesArgsForCall, struct { arg1 []string }{arg1}) + stub := fake.ListPoliciesStub + fakeReturns := fake.listPoliciesReturns fake.recordInvocation("ListPolicies", []interface{}{arg1}) fake.listPoliciesMutex.Unlock() - if fake.ListPoliciesStub != nil { - return fake.ListPoliciesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listPoliciesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -187,15 +189,16 @@ func (fake *FakeNetworkingClient) RemovePolicies(arg1 []cfnetv1.Policy) error { fake.removePoliciesArgsForCall = append(fake.removePoliciesArgsForCall, struct { arg1 []cfnetv1.Policy }{arg1Copy}) + stub := fake.RemovePoliciesStub + fakeReturns := fake.removePoliciesReturns fake.recordInvocation("RemovePolicies", []interface{}{arg1Copy}) fake.removePoliciesMutex.Unlock() - if fake.RemovePoliciesStub != nil { - return fake.RemovePoliciesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.removePoliciesReturns return fakeReturns.result1 } diff --git a/actor/cfnetworkingaction/cloud_controller_client.go b/actor/cfnetworkingaction/cloud_controller_client.go index c5d6c48c91b..ebf75af73ef 100644 --- a/actor/cfnetworkingaction/cloud_controller_client.go +++ b/actor/cfnetworkingaction/cloud_controller_client.go @@ -1,8 +1,8 @@ package cfnetworkingaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/cfnetworkingaction/networking_client.go b/actor/cfnetworkingaction/networking_client.go index 46fe668573a..a647fd92c95 100644 --- a/actor/cfnetworkingaction/networking_client.go +++ b/actor/cfnetworkingaction/networking_client.go @@ -1,6 +1,6 @@ package cfnetworkingaction -import "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" +import "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkingClient diff --git a/actor/cfnetworkingaction/policy.go b/actor/cfnetworkingaction/policy.go index a0e44b246ed..97e25eaafce 100644 --- a/actor/cfnetworkingaction/policy.go +++ b/actor/cfnetworkingaction/policy.go @@ -1,13 +1,13 @@ package cfnetworkingaction import ( - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) type Policy struct { diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go index 539a7aab427..4dfc333325b 100644 --- a/actor/cfnetworkingaction/policy_test.go +++ b/actor/cfnetworkingaction/policy_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction/cfnetworkingactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction/cfnetworkingactionfakes" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/checksum.go b/actor/pluginaction/checksum.go index 0d0a0f9e073..b99afbb7429 100644 --- a/actor/pluginaction/checksum.go +++ b/actor/pluginaction/checksum.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/util/configv3" +import "code.cloudfoundry.org/cli/v9/util/configv3" func (actor Actor) ValidateFileChecksum(path string, checksum string) bool { plugin := configv3.Plugin{Location: path} diff --git a/actor/pluginaction/checksum_test.go b/actor/pluginaction/checksum_test.go index c3e4f0fdd82..394a32f218b 100644 --- a/actor/pluginaction/checksum_test.go +++ b/actor/pluginaction/checksum_test.go @@ -3,8 +3,8 @@ package pluginaction_test import ( "os" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/config.go b/actor/pluginaction/config.go index 74410faa41f..7826f9c1b1c 100644 --- a/actor/pluginaction/config.go +++ b/actor/pluginaction/config.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/util/configv3" +import "code.cloudfoundry.org/cli/v9/util/configv3" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/pluginaction/install.go b/actor/pluginaction/install.go index a548e9ef0f2..77d9b3c2e3a 100644 --- a/actor/pluginaction/install.go +++ b/actor/pluginaction/install.go @@ -8,10 +8,10 @@ import ( "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/generic" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/actor/pluginaction/install_test.go b/actor/pluginaction/install_test.go index 4b66ef1cb90..2448d9855a4 100644 --- a/actor/pluginaction/install_test.go +++ b/actor/pluginaction/install_test.go @@ -5,13 +5,13 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/install_unix_test.go b/actor/pluginaction/install_unix_test.go index 5f0fa9b6113..0e6f50b492a 100644 --- a/actor/pluginaction/install_unix_test.go +++ b/actor/pluginaction/install_unix_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/install_windows_test.go b/actor/pluginaction/install_windows_test.go index b62c3da5d8e..c5dcc3ce423 100644 --- a/actor/pluginaction/install_windows_test.go +++ b/actor/pluginaction/install_windows_test.go @@ -6,8 +6,8 @@ package pluginaction_test import ( "os" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/list.go b/actor/pluginaction/list.go index 0ea20b8a87d..5cac33d8eb0 100644 --- a/actor/pluginaction/list.go +++ b/actor/pluginaction/list.go @@ -1,7 +1,7 @@ package pluginaction import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" "github.com/blang/semver/v4" ) diff --git a/actor/pluginaction/list_test.go b/actor/pluginaction/list_test.go index 55ba1158bb0..1c9e328ca8e 100644 --- a/actor/pluginaction/list_test.go +++ b/actor/pluginaction/list_test.go @@ -3,11 +3,11 @@ package pluginaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/plugin_client.go b/actor/pluginaction/plugin_client.go index b7cb8071711..5839e06ea19 100644 --- a/actor/pluginaction/plugin_client.go +++ b/actor/pluginaction/plugin_client.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/api/plugin" +import "code.cloudfoundry.org/cli/v9/api/plugin" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginClient diff --git a/actor/pluginaction/plugin_info.go b/actor/pluginaction/plugin_info.go index 8ca0133f286..171535e6965 100644 --- a/actor/pluginaction/plugin_info.go +++ b/actor/pluginaction/plugin_info.go @@ -3,9 +3,9 @@ package pluginaction import ( "runtime" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/generic" ) type PluginInfo struct { diff --git a/actor/pluginaction/plugin_info_test.go b/actor/pluginaction/plugin_info_test.go index 2ec6c6d3e15..ded59901486 100644 --- a/actor/pluginaction/plugin_info_test.go +++ b/actor/pluginaction/plugin_info_test.go @@ -3,11 +3,11 @@ package pluginaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/plugin_repository.go b/actor/pluginaction/plugin_repository.go index 600ba67a91c..9f4ee449d06 100644 --- a/actor/pluginaction/plugin_repository.go +++ b/actor/pluginaction/plugin_repository.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/util/configv3" ) func (actor Actor) AddPluginRepository(repoName string, repoURL string) error { diff --git a/actor/pluginaction/plugin_repository_test.go b/actor/pluginaction/plugin_repository_test.go index 468e18ea737..0ccb2de66fc 100644 --- a/actor/pluginaction/plugin_repository_test.go +++ b/actor/pluginaction/plugin_repository_test.go @@ -4,11 +4,11 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/pluginactionfakes/fake_command_list.go b/actor/pluginaction/pluginactionfakes/fake_command_list.go index 8d72e434889..870ae30749b 100644 --- a/actor/pluginaction/pluginactionfakes/fake_command_list.go +++ b/actor/pluginaction/pluginactionfakes/fake_command_list.go @@ -4,7 +4,7 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" ) type FakeCommandList struct { @@ -40,15 +40,16 @@ func (fake *FakeCommandList) HasAlias(arg1 string) bool { fake.hasAliasArgsForCall = append(fake.hasAliasArgsForCall, struct { arg1 string }{arg1}) + stub := fake.HasAliasStub + fakeReturns := fake.hasAliasReturns fake.recordInvocation("HasAlias", []interface{}{arg1}) fake.hasAliasMutex.Unlock() - if fake.HasAliasStub != nil { - return fake.HasAliasStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasAliasReturns return fakeReturns.result1 } @@ -100,15 +101,16 @@ func (fake *FakeCommandList) HasCommand(arg1 string) bool { fake.hasCommandArgsForCall = append(fake.hasCommandArgsForCall, struct { arg1 string }{arg1}) + stub := fake.HasCommandStub + fakeReturns := fake.hasCommandReturns fake.recordInvocation("HasCommand", []interface{}{arg1}) fake.hasCommandMutex.Unlock() - if fake.HasCommandStub != nil { - return fake.HasCommandStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasCommandReturns return fakeReturns.result1 } diff --git a/actor/pluginaction/pluginactionfakes/fake_config.go b/actor/pluginaction/pluginactionfakes/fake_config.go index 4d2581800e7..ac7722f837d 100644 --- a/actor/pluginaction/pluginactionfakes/fake_config.go +++ b/actor/pluginaction/pluginactionfakes/fake_config.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeConfig struct { @@ -97,9 +97,10 @@ func (fake *FakeConfig) AddPlugin(arg1 configv3.Plugin) { fake.addPluginArgsForCall = append(fake.addPluginArgsForCall, struct { arg1 configv3.Plugin }{arg1}) + stub := fake.AddPluginStub fake.recordInvocation("AddPlugin", []interface{}{arg1}) fake.addPluginMutex.Unlock() - if fake.AddPluginStub != nil { + if stub != nil { fake.AddPluginStub(arg1) } } @@ -129,9 +130,10 @@ func (fake *FakeConfig) AddPluginRepository(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.AddPluginRepositoryStub fake.recordInvocation("AddPluginRepository", []interface{}{arg1, arg2}) fake.addPluginRepositoryMutex.Unlock() - if fake.AddPluginRepositoryStub != nil { + if stub != nil { fake.AddPluginRepositoryStub(arg1, arg2) } } @@ -160,15 +162,16 @@ func (fake *FakeConfig) BinaryVersion() string { ret, specificReturn := fake.binaryVersionReturnsOnCall[len(fake.binaryVersionArgsForCall)] fake.binaryVersionArgsForCall = append(fake.binaryVersionArgsForCall, struct { }{}) + stub := fake.BinaryVersionStub + fakeReturns := fake.binaryVersionReturns fake.recordInvocation("BinaryVersion", []interface{}{}) fake.binaryVersionMutex.Unlock() - if fake.BinaryVersionStub != nil { - return fake.BinaryVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.binaryVersionReturns return fakeReturns.result1 } @@ -213,15 +216,16 @@ func (fake *FakeConfig) GetPlugin(arg1 string) (configv3.Plugin, bool) { fake.getPluginArgsForCall = append(fake.getPluginArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPluginStub + fakeReturns := fake.getPluginReturns fake.recordInvocation("GetPlugin", []interface{}{arg1}) fake.getPluginMutex.Unlock() - if fake.GetPluginStub != nil { - return fake.GetPluginStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPluginReturns return fakeReturns.result1, fakeReturns.result2 } @@ -275,15 +279,16 @@ func (fake *FakeConfig) PluginHome() string { ret, specificReturn := fake.pluginHomeReturnsOnCall[len(fake.pluginHomeArgsForCall)] fake.pluginHomeArgsForCall = append(fake.pluginHomeArgsForCall, struct { }{}) + stub := fake.PluginHomeStub + fakeReturns := fake.pluginHomeReturns fake.recordInvocation("PluginHome", []interface{}{}) fake.pluginHomeMutex.Unlock() - if fake.PluginHomeStub != nil { - return fake.PluginHomeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginHomeReturns return fakeReturns.result1 } @@ -327,15 +332,16 @@ func (fake *FakeConfig) PluginRepositories() []configv3.PluginRepository { ret, specificReturn := fake.pluginRepositoriesReturnsOnCall[len(fake.pluginRepositoriesArgsForCall)] fake.pluginRepositoriesArgsForCall = append(fake.pluginRepositoriesArgsForCall, struct { }{}) + stub := fake.PluginRepositoriesStub + fakeReturns := fake.pluginRepositoriesReturns fake.recordInvocation("PluginRepositories", []interface{}{}) fake.pluginRepositoriesMutex.Unlock() - if fake.PluginRepositoriesStub != nil { - return fake.PluginRepositoriesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginRepositoriesReturns return fakeReturns.result1 } @@ -379,15 +385,16 @@ func (fake *FakeConfig) Plugins() []configv3.Plugin { ret, specificReturn := fake.pluginsReturnsOnCall[len(fake.pluginsArgsForCall)] fake.pluginsArgsForCall = append(fake.pluginsArgsForCall, struct { }{}) + stub := fake.PluginsStub + fakeReturns := fake.pluginsReturns fake.recordInvocation("Plugins", []interface{}{}) fake.pluginsMutex.Unlock() - if fake.PluginsStub != nil { - return fake.PluginsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginsReturns return fakeReturns.result1 } @@ -431,9 +438,10 @@ func (fake *FakeConfig) RemovePlugin(arg1 string) { fake.removePluginArgsForCall = append(fake.removePluginArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RemovePluginStub fake.recordInvocation("RemovePlugin", []interface{}{arg1}) fake.removePluginMutex.Unlock() - if fake.RemovePluginStub != nil { + if stub != nil { fake.RemovePluginStub(arg1) } } @@ -462,15 +470,16 @@ func (fake *FakeConfig) WritePluginConfig() error { ret, specificReturn := fake.writePluginConfigReturnsOnCall[len(fake.writePluginConfigArgsForCall)] fake.writePluginConfigArgsForCall = append(fake.writePluginConfigArgsForCall, struct { }{}) + stub := fake.WritePluginConfigStub + fakeReturns := fake.writePluginConfigReturns fake.recordInvocation("WritePluginConfig", []interface{}{}) fake.writePluginConfigMutex.Unlock() - if fake.WritePluginConfigStub != nil { - return fake.WritePluginConfigStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.writePluginConfigReturns return fakeReturns.result1 } diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_client.go b/actor/pluginaction/pluginactionfakes/fake_plugin_client.go index 4cd201cd615..222feee548a 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_client.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_client.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/api/plugin" ) type FakePluginClient struct { @@ -47,15 +47,16 @@ func (fake *FakePluginClient) DownloadPlugin(arg1 string, arg2 string, arg3 plug arg2 string arg3 plugin.ProxyReader }{arg1, arg2, arg3}) + stub := fake.DownloadPluginStub + fakeReturns := fake.downloadPluginReturns fake.recordInvocation("DownloadPlugin", []interface{}{arg1, arg2, arg3}) fake.downloadPluginMutex.Unlock() - if fake.DownloadPluginStub != nil { - return fake.DownloadPluginStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.downloadPluginReturns return fakeReturns.result1 } @@ -107,15 +108,16 @@ func (fake *FakePluginClient) GetPluginRepository(arg1 string) (plugin.PluginRep fake.getPluginRepositoryArgsForCall = append(fake.getPluginRepositoryArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPluginRepositoryStub + fakeReturns := fake.getPluginRepositoryReturns fake.recordInvocation("GetPluginRepository", []interface{}{arg1}) fake.getPluginRepositoryMutex.Unlock() - if fake.GetPluginRepositoryStub != nil { - return fake.GetPluginRepositoryStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPluginRepositoryReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go b/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go index 47d16dc403e..e68ab5676e3 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakePluginMetadata struct { @@ -32,15 +32,16 @@ func (fake *FakePluginMetadata) GetMetadata(arg1 string) (configv3.Plugin, error fake.getMetadataArgsForCall = append(fake.getMetadataArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetMetadataStub + fakeReturns := fake.getMetadataReturns fake.recordInvocation("GetMetadata", []interface{}{arg1}) fake.getMetadataMutex.Unlock() - if fake.GetMetadataStub != nil { - return fake.GetMetadataStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getMetadataReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go b/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go index 060fa438753..a05f8a739b5 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go @@ -4,7 +4,7 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" ) type FakePluginUninstaller struct { @@ -31,15 +31,16 @@ func (fake *FakePluginUninstaller) Run(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.RunStub + fakeReturns := fake.runReturns fake.recordInvocation("Run", []interface{}{arg1, arg2}) fake.runMutex.Unlock() - if fake.RunStub != nil { - return fake.RunStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.runReturns return fakeReturns.result1 } diff --git a/actor/pluginaction/uninstall.go b/actor/pluginaction/uninstall.go index 4359d903a49..0f808a1e0b6 100644 --- a/actor/pluginaction/uninstall.go +++ b/actor/pluginaction/uninstall.go @@ -5,7 +5,7 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginUninstaller diff --git a/actor/pluginaction/uninstall_test.go b/actor/pluginaction/uninstall_test.go index 944ee5c5075..4d9bdda4599 100644 --- a/actor/pluginaction/uninstall_test.go +++ b/actor/pluginaction/uninstall_test.go @@ -6,10 +6,10 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/auth_test.go b/actor/sharedaction/auth_test.go index c1271a7f8f2..56d276f12df 100644 --- a/actor/sharedaction/auth_test.go +++ b/actor/sharedaction/auth_test.go @@ -3,8 +3,8 @@ package sharedaction_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/check_target.go b/actor/sharedaction/check_target.go index 5621e845054..3ded7b7208e 100644 --- a/actor/sharedaction/check_target.go +++ b/actor/sharedaction/check_target.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/actor/actionerror" +import "code.cloudfoundry.org/cli/v9/actor/actionerror" // CheckTarget confirms that the user is logged in. Optionally it will also // check if an organization and space are targeted. diff --git a/actor/sharedaction/check_target_test.go b/actor/sharedaction/check_target_test.go index d59d7e0994d..19b444371b9 100644 --- a/actor/sharedaction/check_target_test.go +++ b/actor/sharedaction/check_target_test.go @@ -3,9 +3,9 @@ package sharedaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/help.go b/actor/sharedaction/help.go index a1120cd3ed3..8a13c434261 100644 --- a/actor/sharedaction/help.go +++ b/actor/sharedaction/help.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/util/sorting" ) const ( diff --git a/actor/sharedaction/help_test.go b/actor/sharedaction/help_test.go index 26f5676bcc2..a99bbfa35af 100644 --- a/actor/sharedaction/help_test.go +++ b/actor/sharedaction/help_test.go @@ -1,9 +1,9 @@ package sharedaction_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/sharedaction/is_org_targeted_test.go b/actor/sharedaction/is_org_targeted_test.go index 0006bcdd593..52d41988cba 100644 --- a/actor/sharedaction/is_org_targeted_test.go +++ b/actor/sharedaction/is_org_targeted_test.go @@ -1,8 +1,8 @@ package sharedaction_test import ( - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/is_space_targeted_test.go b/actor/sharedaction/is_space_targeted_test.go index 981f0a992a7..1e2dfed7712 100644 --- a/actor/sharedaction/is_space_targeted_test.go +++ b/actor/sharedaction/is_space_targeted_test.go @@ -1,8 +1,8 @@ package sharedaction_test import ( - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/logging_test.go b/actor/sharedaction/logging_test.go index ad32d23f92c..8ba6369c13c 100644 --- a/actor/sharedaction/logging_test.go +++ b/actor/sharedaction/logging_test.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" . "github.com/onsi/ginkgo/v2" diff --git a/actor/sharedaction/resource.go b/actor/sharedaction/resource.go index 1a98ef16761..de0d5f16f59 100644 --- a/actor/sharedaction/resource.go +++ b/actor/sharedaction/resource.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" "code.cloudfoundry.org/ykk" ignore "github.com/sabhiram/go-gitignore" log "github.com/sirupsen/logrus" diff --git a/actor/sharedaction/resource_darwin_test.go b/actor/sharedaction/resource_darwin_test.go index 107b564bc73..fda16f9205d 100644 --- a/actor/sharedaction/resource_darwin_test.go +++ b/actor/sharedaction/resource_darwin_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_linux_test.go b/actor/sharedaction/resource_linux_test.go index 1f717317f63..d76d380d016 100644 --- a/actor/sharedaction/resource_linux_test.go +++ b/actor/sharedaction/resource_linux_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_test.go b/actor/sharedaction/resource_test.go index 1bfadd2309e..f0634611600 100644 --- a/actor/sharedaction/resource_test.go +++ b/actor/sharedaction/resource_test.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/sharedaction/resource_unix_test.go b/actor/sharedaction/resource_unix_test.go index 1f19be1308f..58191450e57 100644 --- a/actor/sharedaction/resource_unix_test.go +++ b/actor/sharedaction/resource_unix_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/sharedaction/resource_windows_test.go b/actor/sharedaction/resource_windows_test.go index b29cf9858ca..d760683f112 100644 --- a/actor/sharedaction/resource_windows_test.go +++ b/actor/sharedaction/resource_windows_test.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/sharedaction/secure_shell_client.go b/actor/sharedaction/secure_shell_client.go index af276009b0c..a828b8e3728 100644 --- a/actor/sharedaction/secure_shell_client.go +++ b/actor/sharedaction/secure_shell_client.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/util/clissh" +import "code.cloudfoundry.org/cli/v9/util/clissh" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecureShellClient diff --git a/actor/sharedaction/sharedactionfakes/fake_config.go b/actor/sharedaction/sharedactionfakes/fake_config.go index 9bad4b6fb7d..6fffa7978c7 100644 --- a/actor/sharedaction/sharedactionfakes/fake_config.go +++ b/actor/sharedaction/sharedactionfakes/fake_config.go @@ -4,7 +4,7 @@ package sharedactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" ) type FakeConfig struct { @@ -111,15 +111,16 @@ func (fake *FakeConfig) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -163,15 +164,16 @@ func (fake *FakeConfig) BinaryName() string { ret, specificReturn := fake.binaryNameReturnsOnCall[len(fake.binaryNameArgsForCall)] fake.binaryNameArgsForCall = append(fake.binaryNameArgsForCall, struct { }{}) + stub := fake.BinaryNameStub + fakeReturns := fake.binaryNameReturns fake.recordInvocation("BinaryName", []interface{}{}) fake.binaryNameMutex.Unlock() - if fake.BinaryNameStub != nil { - return fake.BinaryNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.binaryNameReturns return fakeReturns.result1 } @@ -215,15 +217,16 @@ func (fake *FakeConfig) CurrentUserName() (string, error) { ret, specificReturn := fake.currentUserNameReturnsOnCall[len(fake.currentUserNameArgsForCall)] fake.currentUserNameArgsForCall = append(fake.currentUserNameArgsForCall, struct { }{}) + stub := fake.CurrentUserNameStub + fakeReturns := fake.currentUserNameReturns fake.recordInvocation("CurrentUserName", []interface{}{}) fake.currentUserNameMutex.Unlock() - if fake.CurrentUserNameStub != nil { - return fake.CurrentUserNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.currentUserNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -270,15 +273,16 @@ func (fake *FakeConfig) HasTargetedOrganization() bool { ret, specificReturn := fake.hasTargetedOrganizationReturnsOnCall[len(fake.hasTargetedOrganizationArgsForCall)] fake.hasTargetedOrganizationArgsForCall = append(fake.hasTargetedOrganizationArgsForCall, struct { }{}) + stub := fake.HasTargetedOrganizationStub + fakeReturns := fake.hasTargetedOrganizationReturns fake.recordInvocation("HasTargetedOrganization", []interface{}{}) fake.hasTargetedOrganizationMutex.Unlock() - if fake.HasTargetedOrganizationStub != nil { - return fake.HasTargetedOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasTargetedOrganizationReturns return fakeReturns.result1 } @@ -322,15 +326,16 @@ func (fake *FakeConfig) HasTargetedSpace() bool { ret, specificReturn := fake.hasTargetedSpaceReturnsOnCall[len(fake.hasTargetedSpaceArgsForCall)] fake.hasTargetedSpaceArgsForCall = append(fake.hasTargetedSpaceArgsForCall, struct { }{}) + stub := fake.HasTargetedSpaceStub + fakeReturns := fake.hasTargetedSpaceReturns fake.recordInvocation("HasTargetedSpace", []interface{}{}) fake.hasTargetedSpaceMutex.Unlock() - if fake.HasTargetedSpaceStub != nil { - return fake.HasTargetedSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasTargetedSpaceReturns return fakeReturns.result1 } @@ -374,15 +379,16 @@ func (fake *FakeConfig) IsCFOnK8s() bool { ret, specificReturn := fake.isCFOnK8sReturnsOnCall[len(fake.isCFOnK8sArgsForCall)] fake.isCFOnK8sArgsForCall = append(fake.isCFOnK8sArgsForCall, struct { }{}) + stub := fake.IsCFOnK8sStub + fakeReturns := fake.isCFOnK8sReturns fake.recordInvocation("IsCFOnK8s", []interface{}{}) fake.isCFOnK8sMutex.Unlock() - if fake.IsCFOnK8sStub != nil { - return fake.IsCFOnK8sStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isCFOnK8sReturns return fakeReturns.result1 } @@ -426,15 +432,16 @@ func (fake *FakeConfig) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -478,15 +485,16 @@ func (fake *FakeConfig) TargetedOrganizationName() string { ret, specificReturn := fake.targetedOrganizationNameReturnsOnCall[len(fake.targetedOrganizationNameArgsForCall)] fake.targetedOrganizationNameArgsForCall = append(fake.targetedOrganizationNameArgsForCall, struct { }{}) + stub := fake.TargetedOrganizationNameStub + fakeReturns := fake.targetedOrganizationNameReturns fake.recordInvocation("TargetedOrganizationName", []interface{}{}) fake.targetedOrganizationNameMutex.Unlock() - if fake.TargetedOrganizationNameStub != nil { - return fake.TargetedOrganizationNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.targetedOrganizationNameReturns return fakeReturns.result1 } @@ -530,15 +538,16 @@ func (fake *FakeConfig) Verbose() (bool, []string) { ret, specificReturn := fake.verboseReturnsOnCall[len(fake.verboseArgsForCall)] fake.verboseArgsForCall = append(fake.verboseArgsForCall, struct { }{}) + stub := fake.VerboseStub + fakeReturns := fake.verboseReturns fake.recordInvocation("Verbose", []interface{}{}) fake.verboseMutex.Unlock() - if fake.VerboseStub != nil { - return fake.VerboseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.verboseReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go b/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go index c1ea84c096d..c0859ab810a 100644 --- a/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go +++ b/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" client "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" ) @@ -41,15 +41,16 @@ func (fake *FakeLogCacheClient) Read(arg1 context.Context, arg2 string, arg3 tim arg3 time.Time arg4 []client.ReadOption }{arg1, arg2, arg3, arg4}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1, arg2, arg3, arg4}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1, arg2, arg3, arg4...) + if stub != nil { + return stub(arg1, arg2, arg3, arg4...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go b/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go index a9fa609a871..6122f5ffc17 100644 --- a/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go +++ b/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go @@ -4,8 +4,8 @@ package sharedactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/util/clissh" ) type FakeSecureShellClient struct { @@ -76,15 +76,16 @@ func (fake *FakeSecureShellClient) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -133,15 +134,16 @@ func (fake *FakeSecureShellClient) Connect(arg1 string, arg2 string, arg3 string arg4 string arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.ConnectStub + fakeReturns := fake.connectReturns fake.recordInvocation("Connect", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.connectMutex.Unlock() - if fake.ConnectStub != nil { - return fake.ConnectStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1 } - fakeReturns := fake.connectReturns return fakeReturns.result1 } @@ -199,15 +201,16 @@ func (fake *FakeSecureShellClient) InteractiveSession(arg1 []string, arg2 clissh arg1 []string arg2 clissh.TTYRequest }{arg1Copy, arg2}) + stub := fake.InteractiveSessionStub + fakeReturns := fake.interactiveSessionReturns fake.recordInvocation("InteractiveSession", []interface{}{arg1Copy, arg2}) fake.interactiveSessionMutex.Unlock() - if fake.InteractiveSessionStub != nil { - return fake.InteractiveSessionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.interactiveSessionReturns return fakeReturns.result1 } @@ -264,15 +267,16 @@ func (fake *FakeSecureShellClient) LocalPortForward(arg1 []clissh.LocalPortForwa fake.localPortForwardArgsForCall = append(fake.localPortForwardArgsForCall, struct { arg1 []clissh.LocalPortForward }{arg1Copy}) + stub := fake.LocalPortForwardStub + fakeReturns := fake.localPortForwardReturns fake.recordInvocation("LocalPortForward", []interface{}{arg1Copy}) fake.localPortForwardMutex.Unlock() - if fake.LocalPortForwardStub != nil { - return fake.LocalPortForwardStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.localPortForwardReturns return fakeReturns.result1 } @@ -323,15 +327,16 @@ func (fake *FakeSecureShellClient) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/actor/sharedaction/ssh.go b/actor/sharedaction/ssh.go index 600d4cc3ec8..458b8f36aae 100644 --- a/actor/sharedaction/ssh.go +++ b/actor/sharedaction/ssh.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/util/clissh" +import "code.cloudfoundry.org/cli/v9/util/clissh" type TTYOption clissh.TTYRequest diff --git a/actor/sharedaction/ssh_test.go b/actor/sharedaction/ssh_test.go index 9a6519f9657..4943026bd98 100644 --- a/actor/sharedaction/ssh_test.go +++ b/actor/sharedaction/ssh_test.go @@ -3,9 +3,9 @@ package sharedaction_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/util/clissh" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/util/clissh" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/actor.go b/actor/v7action/actor.go index 6fb6cbe0a35..b5f4385dad4 100644 --- a/actor/v7action/actor.go +++ b/actor/v7action/actor.go @@ -2,9 +2,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/util/configv3" "code.cloudfoundry.org/clock" ) diff --git a/actor/v7action/application.go b/actor/v7action/application.go index e86ca01c34a..2c1aa473478 100644 --- a/actor/v7action/application.go +++ b/actor/v7action/application.go @@ -5,13 +5,13 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/unique" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/unique" ) func (actor Actor) DeleteApplicationByNameAndSpace(name, spaceGUID string, deleteRoutes bool) (Warnings, error) { @@ -382,7 +382,7 @@ func (actor Actor) PollProcesses(processes []resources.Process, handleInstanceDe return true, allWarnings, actionerror.AllInstancesCrashedError{} } - //precondition: !instances.Empty() && no instances are running + // precondition: !instances.Empty() && no instances are running // do not increment numStableProcesses return false, allWarnings, nil } diff --git a/actor/v7action/application_feature.go b/actor/v7action/application_feature.go index 24c00e7e0d3..e21da2da9e1 100644 --- a/actor/v7action/application_feature.go +++ b/actor/v7action/application_feature.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) GetAppFeature(appGUID string, featureName string) (resources.ApplicationFeature, Warnings, error) { diff --git a/actor/v7action/application_feature_test.go b/actor/v7action/application_feature_test.go index 24990daeada..610697c54d2 100644 --- a/actor/v7action/application_feature_test.go +++ b/actor/v7action/application_feature_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/application_manifest.go b/actor/v7action/application_manifest.go index 9e23a1ee87e..642e789f9e1 100644 --- a/actor/v7action/application_manifest.go +++ b/actor/v7action/application_manifest.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ManifestParser diff --git a/actor/v7action/application_manifest_test.go b/actor/v7action/application_manifest_test.go index a6c3d1da16c..74613058cec 100644 --- a/actor/v7action/application_manifest_test.go +++ b/actor/v7action/application_manifest_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" @@ -303,7 +303,7 @@ var _ = Describe("Application Manifest Actions", func() { It("returns the error and warnings", func() { Expect(executeErr).To(Equal(expectedErr)) Expect(warnings).To(ConsistOf("get-application-warning")) - _ = manifestBytes //TODO DELETE ME + _ = manifestBytes // TODO DELETE ME }) }) }) diff --git a/actor/v7action/application_summary.go b/actor/v7action/application_summary.go index 783720538af..9f92a0b6dd2 100644 --- a/actor/v7action/application_summary.go +++ b/actor/v7action/application_summary.go @@ -3,11 +3,11 @@ package v7action import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" ) type ApplicationSummary struct { diff --git a/actor/v7action/application_summary_test.go b/actor/v7action/application_summary_test.go index 7caf75b3da7..94396e1dcbd 100644 --- a/actor/v7action/application_summary_test.go +++ b/actor/v7action/application_summary_test.go @@ -4,16 +4,16 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/application_test.go b/actor/v7action/application_test.go index 06c79bb8f62..c0aab3d4839 100644 --- a/actor/v7action/application_test.go +++ b/actor/v7action/application_test.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/batcher" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/auth.go b/actor/v7action/auth.go index aef734c2c66..0e87d321204 100644 --- a/actor/v7action/auth.go +++ b/actor/v7action/auth.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type defaultAuthActor struct { diff --git a/actor/v7action/auth_test.go b/actor/v7action/auth_test.go index 98ec4c3547f..fbd1d7c827f 100644 --- a/actor/v7action/auth_test.go +++ b/actor/v7action/auth_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/build.go b/actor/v7action/build.go index 1517acfdde0..6a7f36c9a4c 100644 --- a/actor/v7action/build.go +++ b/actor/v7action/build.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) @@ -90,7 +90,7 @@ func (actor Actor) StagePackage(packageGUID, appName, spaceGUID string) (<-chan timer.Reset(actor.Config.PollingInterval()) default: - //TODO: uncomment after #150569020 + // TODO: uncomment after #150569020 // droplet, warnings, err := actor.CloudControllerClient.GetDroplet(build.DropletGUID) // warningsStream <- Warnings(warnings) // if err != nil { diff --git a/actor/v7action/build_test.go b/actor/v7action/build_test.go index 28e6b1129f7..3d9a0253da5 100644 --- a/actor/v7action/build_test.go +++ b/actor/v7action/build_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -138,7 +138,7 @@ var _ = Describe("Build Actions", func() { fakeCloudControllerClient.GetBuildReturnsOnCall(1, resources.Build{CreatedAt: "some-time", GUID: buildGUID, State: constant.BuildStaged, DropletGUID: "some-droplet-guid"}, ccv3.Warnings{"get-warnings-3", "get-warnings-4"}, nil) }) - //TODO: uncommend after #150569020 + // TODO: uncommend after #150569020 // FWhen("looking up the droplet fails", func() { // BeforeEach(func() { // fakeCloudControllerClient.GetDropletReturns(resources.Droplet{}, ccv3.Warnings{"droplet-warnings-1", "droplet-warnings-2"}, errors.New("some-droplet-error")) diff --git a/actor/v7action/buildpack.go b/actor/v7action/buildpack.go index 0fc3eab27cd..5757c55448c 100644 --- a/actor/v7action/buildpack.go +++ b/actor/v7action/buildpack.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util" ) type JobURL ccv3.JobURL diff --git a/actor/v7action/buildpack_test.go b/actor/v7action/buildpack_test.go index 8af4b5078e2..e54f22a001a 100644 --- a/actor/v7action/buildpack_test.go +++ b/actor/v7action/buildpack_test.go @@ -7,13 +7,13 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -607,7 +607,7 @@ var _ = Describe("Buildpack", func() { }) Describe("Zipit", func() { - //tested in buildpack_linux_test.go and buildpack_windows_test.go + // tested in buildpack_linux_test.go and buildpack_windows_test.go var ( source string target string diff --git a/actor/v7action/buildpack_unix_test.go b/actor/v7action/buildpack_unix_test.go index 96e2bc52f10..9e376b3b1b3 100644 --- a/actor/v7action/buildpack_unix_test.go +++ b/actor/v7action/buildpack_unix_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v7action/buildpack_windows_test.go b/actor/v7action/buildpack_windows_test.go index 7c28ae42803..0a095106098 100644 --- a/actor/v7action/buildpack_windows_test.go +++ b/actor/v7action/buildpack_windows_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v7action/cloud_controller_client.go b/actor/v7action/cloud_controller_client.go index e8793ed0ea4..43c4c41f659 100644 --- a/actor/v7action/cloud_controller_client.go +++ b/actor/v7action/cloud_controller_client.go @@ -4,10 +4,10 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/v7action/config.go b/actor/v7action/config.go index 8c4eb01020a..30c214386e2 100644 --- a/actor/v7action/config.go +++ b/actor/v7action/config.go @@ -3,7 +3,7 @@ package v7action import ( "time" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/v7action/curl.go b/actor/v7action/curl.go index dfae0ede22e..25bb11d3c84 100644 --- a/actor/v7action/curl.go +++ b/actor/v7action/curl.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) func (actor Actor) MakeCurlRequest( diff --git a/actor/v7action/curl_test.go b/actor/v7action/curl_test.go index 6380e07d1ed..bb3d8d8628e 100644 --- a/actor/v7action/curl_test.go +++ b/actor/v7action/curl_test.go @@ -5,9 +5,9 @@ import ( "net/http" "os" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/deployment.go b/actor/v7action/deployment.go index e21873d8f40..11c32d95475 100644 --- a/actor/v7action/deployment.go +++ b/actor/v7action/deployment.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) CreateDeployment(dep resources.Deployment) (string, Warnings, error) { diff --git a/actor/v7action/deployment_test.go b/actor/v7action/deployment_test.go index 33afe3c3312..660590d2ac8 100644 --- a/actor/v7action/deployment_test.go +++ b/actor/v7action/deployment_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/domain.go b/actor/v7action/domain.go index c2d2fef2c90..21cabe6abc5 100644 --- a/actor/v7action/domain.go +++ b/actor/v7action/domain.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type SharedOrgs ccv3.SharedOrgs diff --git a/actor/v7action/domain_test.go b/actor/v7action/domain_test.go index de8f7d2c7e8..68050c6cefb 100644 --- a/actor/v7action/domain_test.go +++ b/actor/v7action/domain_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/droplet.go b/actor/v7action/droplet.go index 920599045b0..e75c849b0e9 100644 --- a/actor/v7action/droplet.go +++ b/actor/v7action/droplet.go @@ -3,10 +3,10 @@ package v7action import ( "io" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateApplicationDroplet creates a new droplet without a package for the app with diff --git a/actor/v7action/droplet_test.go b/actor/v7action/droplet_test.go index b120d55dcd6..76dc4774fca 100644 --- a/actor/v7action/droplet_test.go +++ b/actor/v7action/droplet_test.go @@ -5,13 +5,13 @@ import ( "io" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/environment_variable.go b/actor/v7action/environment_variable.go index a5588b5a5d5..0b66f196b72 100644 --- a/actor/v7action/environment_variable.go +++ b/actor/v7action/environment_variable.go @@ -1,11 +1,11 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) // EnvironmentVariableGroups represents all environment variables for application diff --git a/actor/v7action/environment_variable_test.go b/actor/v7action/environment_variable_test.go index c83493c4d22..f233963fa37 100644 --- a/actor/v7action/environment_variable_test.go +++ b/actor/v7action/environment_variable_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/event.go b/actor/v7action/event.go index addf22250d3..f5ac3b9715d 100644 --- a/actor/v7action/event.go +++ b/actor/v7action/event.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/util/generic" ) type Event struct { diff --git a/actor/v7action/event_test.go b/actor/v7action/event_test.go index 96e58ad3204..e14ce3acc8e 100644 --- a/actor/v7action/event_test.go +++ b/actor/v7action/event_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/feature_flag.go b/actor/v7action/feature_flag.go index 00b97402fb1..687c634e0bf 100644 --- a/actor/v7action/feature_flag.go +++ b/actor/v7action/feature_flag.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" ) // GetFeatureFlagByName returns a featureFlag with the provided name. diff --git a/actor/v7action/feature_flag_test.go b/actor/v7action/feature_flag_test.go index 9bee3c3f219..dd69f7c5f2c 100644 --- a/actor/v7action/feature_flag_test.go +++ b/actor/v7action/feature_flag_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/info.go b/actor/v7action/info.go index 723c1b58520..ee1183662e7 100644 --- a/actor/v7action/info.go +++ b/actor/v7action/info.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" type Info ccv3.Info diff --git a/actor/v7action/info_test.go b/actor/v7action/info_test.go index ed4324db5c0..e30d0d0bd6b 100644 --- a/actor/v7action/info_test.go +++ b/actor/v7action/info_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/isolation_segment.go b/actor/v7action/isolation_segment.go index 72c0e0d590a..d0e484b9c99 100644 --- a/actor/v7action/isolation_segment.go +++ b/actor/v7action/isolation_segment.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) type IsolationSegmentSummary struct { diff --git a/actor/v7action/isolation_segment_test.go b/actor/v7action/isolation_segment_test.go index 9c2fcfbf3a7..e751612fa63 100644 --- a/actor/v7action/isolation_segment_test.go +++ b/actor/v7action/isolation_segment_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/job.go b/actor/v7action/job.go index 03244778eb3..ac0741b606c 100644 --- a/actor/v7action/job.go +++ b/actor/v7action/job.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type JobState constant.JobState diff --git a/actor/v7action/job_test.go b/actor/v7action/job_test.go index 004b8b60575..ba91e8cb211 100644 --- a/actor/v7action/job_test.go +++ b/actor/v7action/job_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/k8s_auth.go b/actor/v7action/k8s_auth.go index bbbfadb9059..29c82c05732 100644 --- a/actor/v7action/k8s_auth.go +++ b/actor/v7action/k8s_auth.go @@ -5,11 +5,11 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/actor/v7action/k8s_auth_test.go b/actor/v7action/k8s_auth_test.go index c4047524904..2e200b4cf13 100644 --- a/actor/v7action/k8s_auth_test.go +++ b/actor/v7action/k8s_auth_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/actor/v7action/label.go b/actor/v7action/label.go index 5ed9845e869..3e1789d88f7 100644 --- a/actor/v7action/label.go +++ b/actor/v7action/label.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) func (actor *Actor) GetApplicationLabels(appName string, spaceGUID string) (map[string]types.NullString, Warnings, error) { diff --git a/actor/v7action/label_test.go b/actor/v7action/label_test.go index bb5b8471b03..11834cd8677 100644 --- a/actor/v7action/label_test.go +++ b/actor/v7action/label_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/logging.go b/actor/v7action/logging.go index 5c77b2d1595..6820fd721df 100644 --- a/actor/v7action/logging.go +++ b/actor/v7action/logging.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" "github.com/SermoDigital/jose/jws" ) diff --git a/actor/v7action/logging_test.go b/actor/v7action/logging_test.go index 2ce49da8f4e..9842b6ff508 100644 --- a/actor/v7action/logging_test.go +++ b/actor/v7action/logging_test.go @@ -5,12 +5,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" . "github.com/onsi/ginkgo/v2" diff --git a/actor/v7action/marketplace.go b/actor/v7action/marketplace.go index cc6f3a3ffbf..b936671c450 100644 --- a/actor/v7action/marketplace.go +++ b/actor/v7action/marketplace.go @@ -1,7 +1,7 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" ) type ServiceOfferingWithPlans ccv3.ServiceOfferingWithPlans diff --git a/actor/v7action/marketplace_test.go b/actor/v7action/marketplace_test.go index d74282ad50f..3d0b8c79e8d 100644 --- a/actor/v7action/marketplace_test.go +++ b/actor/v7action/marketplace_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization.go b/actor/v7action/organization.go index ef320f53c4a..df33490377a 100644 --- a/actor/v7action/organization.go +++ b/actor/v7action/organization.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) GetOrganizations(labelSelector string) ([]resources.Organization, Warnings, error) { diff --git a/actor/v7action/organization_quota.go b/actor/v7action/organization_quota.go index 0384e25cbe4..0592e5a4b35 100644 --- a/actor/v7action/organization_quota.go +++ b/actor/v7action/organization_quota.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type QuotaLimits struct { diff --git a/actor/v7action/organization_quota_test.go b/actor/v7action/organization_quota_test.go index 6b8e5defba6..98c4c3d3d41 100644 --- a/actor/v7action/organization_quota_test.go +++ b/actor/v7action/organization_quota_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization_summary.go b/actor/v7action/organization_summary.go index 2fdc28c4a01..f7e67cdead3 100644 --- a/actor/v7action/organization_summary.go +++ b/actor/v7action/organization_summary.go @@ -3,7 +3,7 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/resources" ) type OrganizationSummary struct { diff --git a/actor/v7action/organization_summary_test.go b/actor/v7action/organization_summary_test.go index 9ee72781a08..3f4ea5998c4 100644 --- a/actor/v7action/organization_summary_test.go +++ b/actor/v7action/organization_summary_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" diff --git a/actor/v7action/organization_test.go b/actor/v7action/organization_test.go index f3175ba2e41..83c4c32376e 100644 --- a/actor/v7action/organization_test.go +++ b/actor/v7action/organization_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/package.go b/actor/v7action/package.go index 8a0ff9aef18..86d728a492b 100644 --- a/actor/v7action/package.go +++ b/actor/v7action/package.go @@ -5,11 +5,11 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/package_test.go b/actor/v7action/package_test.go index e4612e3992b..2b32beff83c 100644 --- a/actor/v7action/package_test.go +++ b/actor/v7action/package_test.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/process.go b/actor/v7action/process.go index c25884e94c8..31d0e7c7e66 100644 --- a/actor/v7action/process.go +++ b/actor/v7action/process.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) GetProcess(processGUID string) (resources.Process, Warnings, error) { diff --git a/actor/v7action/process_health_check.go b/actor/v7action/process_health_check.go index 51f2edb57fe..6bc78e1174c 100644 --- a/actor/v7action/process_health_check.go +++ b/actor/v7action/process_health_check.go @@ -3,7 +3,7 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type ProcessHealthCheck struct { diff --git a/actor/v7action/process_health_check_test.go b/actor/v7action/process_health_check_test.go index 3ba1df8deb6..64c3d5108ed 100644 --- a/actor/v7action/process_health_check_test.go +++ b/actor/v7action/process_health_check_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_instance.go b/actor/v7action/process_instance.go index 53938990a2c..ad3fd704036 100644 --- a/actor/v7action/process_instance.go +++ b/actor/v7action/process_instance.go @@ -3,11 +3,11 @@ package v7action import ( "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type ProcessInstance ccv3.ProcessInstance diff --git a/actor/v7action/process_instance_test.go b/actor/v7action/process_instance_test.go index f884c2a33c2..f484afff06e 100644 --- a/actor/v7action/process_instance_test.go +++ b/actor/v7action/process_instance_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_summary.go b/actor/v7action/process_summary.go index 72f1e9aa66a..0b381d13d97 100644 --- a/actor/v7action/process_summary.go +++ b/actor/v7action/process_summary.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/process_summary_test.go b/actor/v7action/process_summary_test.go index f34a5ec2811..ea9c10573dd 100644 --- a/actor/v7action/process_summary_test.go +++ b/actor/v7action/process_summary_test.go @@ -1,9 +1,9 @@ package v7action_test import ( - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/process_test.go b/actor/v7action/process_test.go index 256dbf33a2b..2428c9795df 100644 --- a/actor/v7action/process_test.go +++ b/actor/v7action/process_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v7action/resource_match.go b/actor/v7action/resource_match.go index dc5db1c3429..93ec5e79f41 100644 --- a/actor/v7action/resource_match.go +++ b/actor/v7action/resource_match.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/resource_match_test.go b/actor/v7action/resource_match_test.go index 688cf387901..240940613eb 100644 --- a/actor/v7action/resource_match_test.go +++ b/actor/v7action/resource_match_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/revisions.go b/actor/v7action/revisions.go index f159ab64364..b74cf9d4332 100644 --- a/actor/v7action/revisions.go +++ b/actor/v7action/revisions.go @@ -3,11 +3,11 @@ package v7action import ( "strconv" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/versioncheck" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/versioncheck" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) const MinimumCCAPIVersionForDeployable = "3.86.0" diff --git a/actor/v7action/revisions_test.go b/actor/v7action/revisions_test.go index 2a8c74368d4..04adb9c4d25 100644 --- a/actor/v7action/revisions_test.go +++ b/actor/v7action/revisions_test.go @@ -4,14 +4,13 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -403,7 +402,7 @@ var _ = Describe("Revisions Actions", func() { Describe("GetEnvironmentVariableGroupByRevision", func() { var ( actor *Actor - environmentVariablesGroup v7action.EnvironmentVariableGroup + environmentVariablesGroup EnvironmentVariableGroup executeErr error fakeCloudControllerClient *v7actionfakes.FakeCloudControllerClient fakeConfig *v7actionfakes.FakeConfig diff --git a/actor/v7action/role.go b/actor/v7action/role.go index 316f1bb5314..bed5893ad1f 100644 --- a/actor/v7action/role.go +++ b/actor/v7action/role.go @@ -1,11 +1,11 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) CreateOrgRole(roleType constant.RoleType, orgGUID string, userNameOrGUID string, userOrigin string, isClient bool) (Warnings, error) { diff --git a/actor/v7action/role_test.go b/actor/v7action/role_test.go index ed556689199..3158af4efac 100644 --- a/actor/v7action/role_test.go +++ b/actor/v7action/role_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/route.go b/actor/v7action/route.go index 7bccf6bdb38..8bc8db5324b 100644 --- a/actor/v7action/route.go +++ b/actor/v7action/route.go @@ -5,16 +5,16 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/extract" - "code.cloudfoundry.org/cli/util/lookuptable" - "code.cloudfoundry.org/cli/util/railway" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/extract" + "code.cloudfoundry.org/cli/v9/util/lookuptable" + "code.cloudfoundry.org/cli/v9/util/railway" + "code.cloudfoundry.org/cli/v9/util/sorting" ) type RouteSummary struct { diff --git a/actor/v7action/route_binding.go b/actor/v7action/route_binding.go index b5e5c3b9cdf..bed04c81d96 100644 --- a/actor/v7action/route_binding.go +++ b/actor/v7action/route_binding.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type CreateRouteBindingParams struct { diff --git a/actor/v7action/route_binding_test.go b/actor/v7action/route_binding_test.go index c8e32c68aa2..51356d5789e 100644 --- a/actor/v7action/route_binding_test.go +++ b/actor/v7action/route_binding_test.go @@ -1,15 +1,15 @@ package v7action_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/route_test.go b/actor/v7action/route_test.go index 1143b1c1282..1030a09f877 100644 --- a/actor/v7action/route_test.go +++ b/actor/v7action/route_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/router_group.go b/actor/v7action/router_group.go index 2be81f31aef..a5df848b453 100644 --- a/actor/v7action/router_group.go +++ b/actor/v7action/router_group.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" ) type RouterGroup router.RouterGroup diff --git a/actor/v7action/router_group_test.go b/actor/v7action/router_group_test.go index 6892bad5b7e..ded8c84e650 100644 --- a/actor/v7action/router_group_test.go +++ b/actor/v7action/router_group_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/routing_client.go b/actor/v7action/routing_client.go index 29229591612..cc7c6be362a 100644 --- a/actor/v7action/routing_client.go +++ b/actor/v7action/routing_client.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/api/router" +import "code.cloudfoundry.org/cli/v9/api/router" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RoutingClient diff --git a/actor/v7action/security_group.go b/actor/v7action/security_group.go index fa09b9fa43d..12b018f86b1 100644 --- a/actor/v7action/security_group.go +++ b/actor/v7action/security_group.go @@ -5,13 +5,13 @@ import ( "io" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) type SecurityGroupSummary struct { diff --git a/actor/v7action/security_group_test.go b/actor/v7action/security_group_test.go index f27e20434e6..c2f909a4631 100644 --- a/actor/v7action/security_group_test.go +++ b/actor/v7action/security_group_test.go @@ -6,14 +6,14 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_access.go b/actor/v7action/service_access.go index 7f32b7736c9..dccdae8de31 100644 --- a/actor/v7action/service_access.go +++ b/actor/v7action/service_access.go @@ -5,9 +5,9 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) type ServicePlanWithSpaceAndOrganization ccv3.ServicePlanWithSpaceAndOrganization diff --git a/actor/v7action/service_access_test.go b/actor/v7action/service_access_test.go index c3f11c00902..41515abb89c 100644 --- a/actor/v7action/service_access_test.go +++ b/actor/v7action/service_access_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_app_binding.go b/actor/v7action/service_app_binding.go index ac108f7f39a..71326c39808 100644 --- a/actor/v7action/service_app_binding.go +++ b/actor/v7action/service_app_binding.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type CreateServiceAppBindingParams struct { diff --git a/actor/v7action/service_app_binding_test.go b/actor/v7action/service_app_binding_test.go index 16ad7161997..8203077cde1 100644 --- a/actor/v7action/service_app_binding_test.go +++ b/actor/v7action/service_app_binding_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_broker.go b/actor/v7action/service_broker.go index 2d607d143e7..b7ba8f0a244 100644 --- a/actor/v7action/service_broker.go +++ b/actor/v7action/service_broker.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/railway" ) func (actor Actor) GetServiceBrokers() ([]resources.ServiceBroker, Warnings, error) { diff --git a/actor/v7action/service_broker_test.go b/actor/v7action/service_broker_test.go index b5b0d08bc66..fe517b5f129 100644 --- a/actor/v7action/service_broker_test.go +++ b/actor/v7action/service_broker_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance.go b/actor/v7action/service_instance.go index 616becf7a6f..04b0586484b 100644 --- a/actor/v7action/service_instance.go +++ b/actor/v7action/service_instance.go @@ -1,13 +1,13 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type UpdateManagedServiceInstanceParams struct { diff --git a/actor/v7action/service_instance_details.go b/actor/v7action/service_instance_details.go index 80597c0fc4f..f86ae6f6184 100644 --- a/actor/v7action/service_instance_details.go +++ b/actor/v7action/service_instance_details.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/extract" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/extract" + "code.cloudfoundry.org/cli/v9/util/railway" ) const featureFlagServiceInstanceSharing string = "service_instance_sharing" diff --git a/actor/v7action/service_instance_details_test.go b/actor/v7action/service_instance_details_test.go index 95c57ef3c01..f20e0d030e4 100644 --- a/actor/v7action/service_instance_details_test.go +++ b/actor/v7action/service_instance_details_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance_list.go b/actor/v7action/service_instance_list.go index d090b6ba5fc..947e6e76736 100644 --- a/actor/v7action/service_instance_list.go +++ b/actor/v7action/service_instance_list.go @@ -3,13 +3,13 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/extract" - "code.cloudfoundry.org/cli/util/lookuptable" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/extract" + "code.cloudfoundry.org/cli/v9/util/lookuptable" + "code.cloudfoundry.org/cli/v9/util/railway" ) type ServiceInstance struct { diff --git a/actor/v7action/service_instance_list_test.go b/actor/v7action/service_instance_list_test.go index 9e922d49bb1..345f3ca069f 100644 --- a/actor/v7action/service_instance_list_test.go +++ b/actor/v7action/service_instance_list_test.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/batcher" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance_sharing.go b/actor/v7action/service_instance_sharing.go index d02118579db..9977ffc0068 100644 --- a/actor/v7action/service_instance_sharing.go +++ b/actor/v7action/service_instance_sharing.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type ServiceInstanceSharingParams struct { diff --git a/actor/v7action/service_instance_sharing_test.go b/actor/v7action/service_instance_sharing_test.go index 8a36e430aeb..87df0ba734b 100644 --- a/actor/v7action/service_instance_sharing_test.go +++ b/actor/v7action/service_instance_sharing_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance_test.go b/actor/v7action/service_instance_test.go index 20e439e1c9b..d6db920f8dd 100644 --- a/actor/v7action/service_instance_test.go +++ b/actor/v7action/service_instance_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_key.go b/actor/v7action/service_key.go index 7c6989000b0..1239afbc511 100644 --- a/actor/v7action/service_key.go +++ b/actor/v7action/service_key.go @@ -3,12 +3,12 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type CreateServiceKeyParams struct { diff --git a/actor/v7action/service_key_test.go b/actor/v7action/service_key_test.go index f30d764bdd0..9a1175204b3 100644 --- a/actor/v7action/service_key_test.go +++ b/actor/v7action/service_key_test.go @@ -1,15 +1,15 @@ package v7action_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_offering.go b/actor/v7action/service_offering.go index 0b61ec4b143..0e051f2acce 100644 --- a/actor/v7action/service_offering.go +++ b/actor/v7action/service_offering.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/railway" ) func (actor Actor) PurgeServiceOfferingByNameAndBroker(serviceOfferingName, serviceBrokerName string) (Warnings, error) { diff --git a/actor/v7action/service_offering_test.go b/actor/v7action/service_offering_test.go index add0f64e302..ec819d211d0 100644 --- a/actor/v7action/service_offering_test.go +++ b/actor/v7action/service_offering_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/service_plan.go b/actor/v7action/service_plan.go index 0fcd2373488..633f0bb5234 100644 --- a/actor/v7action/service_plan.go +++ b/actor/v7action/service_plan.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) GetServicePlanByNameOfferingAndBroker(servicePlanName, serviceOfferingName, serviceBrokerName string) (resources.ServicePlan, Warnings, error) { diff --git a/actor/v7action/service_plan_test.go b/actor/v7action/service_plan_test.go index 8c58f426fd1..66d36622d3c 100644 --- a/actor/v7action/service_plan_test.go +++ b/actor/v7action/service_plan_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/shared_actor.go b/actor/v7action/shared_actor.go index 95dab5aea24..3c4211fead7 100644 --- a/actor/v7action/shared_actor.go +++ b/actor/v7action/shared_actor.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/actor/sharedaction" +import "code.cloudfoundry.org/cli/v9/actor/sharedaction" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedActor diff --git a/actor/v7action/space.go b/actor/v7action/space.go index 3f38c0a911c..5305fbfde37 100644 --- a/actor/v7action/space.go +++ b/actor/v7action/space.go @@ -4,11 +4,11 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) type SpaceSummary struct { diff --git a/actor/v7action/space_feature.go b/actor/v7action/space_feature.go index d60a8d8a103..accfb560f0b 100644 --- a/actor/v7action/space_feature.go +++ b/actor/v7action/space_feature.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/actor/actionerror" +import "code.cloudfoundry.org/cli/v9/actor/actionerror" func (actor Actor) UpdateSpaceFeature(spaceName string, orgGUID string, enabled bool, feature string) (Warnings, error) { var allWarnings Warnings diff --git a/actor/v7action/space_feature_test.go b/actor/v7action/space_feature_test.go index 9d1b1ad8cab..1f1e8ded2ca 100644 --- a/actor/v7action/space_feature_test.go +++ b/actor/v7action/space_feature_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/resources" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_manifest.go b/actor/v7action/space_manifest.go index 763ccfc12fe..b5827f84afe 100644 --- a/actor/v7action/space_manifest.go +++ b/actor/v7action/space_manifest.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) DiffSpaceManifest(spaceGUID string, rawManifest []byte) (resources.ManifestDiff, Warnings, error) { diff --git a/actor/v7action/space_manifest_test.go b/actor/v7action/space_manifest_test.go index bb83846c730..fadbe58186b 100644 --- a/actor/v7action/space_manifest_test.go +++ b/actor/v7action/space_manifest_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/space_quota.go b/actor/v7action/space_quota.go index 59d351aaf56..e66ca5cb730 100644 --- a/actor/v7action/space_quota.go +++ b/actor/v7action/space_quota.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) ApplySpaceQuotaByName(quotaName, spaceGUID, orgGUID string) (Warnings, error) { diff --git a/actor/v7action/space_quota_test.go b/actor/v7action/space_quota_test.go index 90eb40bc1a3..412966347f0 100644 --- a/actor/v7action/space_quota_test.go +++ b/actor/v7action/space_quota_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_test.go b/actor/v7action/space_test.go index fe87240e72d..d0677fe9406 100644 --- a/actor/v7action/space_test.go +++ b/actor/v7action/space_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/ssh.go b/actor/v7action/ssh.go index 30fcc6ff9e6..c6cf515ef8f 100644 --- a/actor/v7action/ssh.go +++ b/actor/v7action/ssh.go @@ -3,8 +3,8 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/resources" ) type SSHAuthentication struct { diff --git a/actor/v7action/ssh_actor.go b/actor/v7action/ssh_actor.go index 84fd26091ef..0e5dfbcf7fb 100644 --- a/actor/v7action/ssh_actor.go +++ b/actor/v7action/ssh_actor.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/actor/sharedaction" +import "code.cloudfoundry.org/cli/v9/actor/sharedaction" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHActor diff --git a/actor/v7action/ssh_test.go b/actor/v7action/ssh_test.go index e41dd38fd59..c9b76ebca79 100644 --- a/actor/v7action/ssh_test.go +++ b/actor/v7action/ssh_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/stack.go b/actor/v7action/stack.go index e27ef3ae269..43c891947fd 100644 --- a/actor/v7action/stack.go +++ b/actor/v7action/stack.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor *Actor) GetStackByName(stackName string) (resources.Stack, Warnings, error) { diff --git a/actor/v7action/stack_test.go b/actor/v7action/stack_test.go index d92989ecbba..84efcd99631 100644 --- a/actor/v7action/stack_test.go +++ b/actor/v7action/stack_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/target.go b/actor/v7action/target.go index a63a02711c2..f811c24d9bd 100644 --- a/actor/v7action/target.go +++ b/actor/v7action/target.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type TargetSettings ccv3.TargetSettings diff --git a/actor/v7action/target_test.go b/actor/v7action/target_test.go index 0d036efc8e3..d2a7c889774 100644 --- a/actor/v7action/target_test.go +++ b/actor/v7action/target_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/task.go b/actor/v7action/task.go index cdebf7d7c7d..981543f7a90 100644 --- a/actor/v7action/task.go +++ b/actor/v7action/task.go @@ -5,11 +5,11 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/task_test.go b/actor/v7action/task_test.go index a8df6f2ebad..7d6920dba7c 100644 --- a/actor/v7action/task_test.go +++ b/actor/v7action/task_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/token_test.go b/actor/v7action/token_test.go index 22dc83a0553..42c8a57d10a 100644 --- a/actor/v7action/token_test.go +++ b/actor/v7action/token_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/uaa_client.go b/actor/v7action/uaa_client.go index e11903e8d30..71a70a674b8 100644 --- a/actor/v7action/uaa_client.go +++ b/actor/v7action/uaa_client.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/actor/v7action/user.go b/actor/v7action/user.go index ceee43a9d92..56368987c14 100644 --- a/actor/v7action/user.go +++ b/actor/v7action/user.go @@ -3,10 +3,10 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateUser creates a new user in UAA and registers it with cloud controller. diff --git a/actor/v7action/user_test.go b/actor/v7action/user_test.go index 9e1aebec339..4aae286c2e1 100644 --- a/actor/v7action/user_test.go +++ b/actor/v7action/user_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/v7action_suite_test.go b/actor/v7action/v7action_suite_test.go index 10e8c893109..2bd6dcc6b8c 100644 --- a/actor/v7action/v7action_suite_test.go +++ b/actor/v7action/v7action_suite_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go index f9035d65ab1..fb5e582fbc1 100644 --- a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go +++ b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go @@ -6,11 +6,11 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type FakeCloudControllerClient struct { diff --git a/actor/v7action/v7actionfakes/fake_config.go b/actor/v7action/v7actionfakes/fake_config.go index 9bbf83bc714..cd46ebbbfc5 100644 --- a/actor/v7action/v7actionfakes/fake_config.go +++ b/actor/v7action/v7actionfakes/fake_config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeConfig struct { @@ -193,15 +193,16 @@ func (fake *FakeConfig) APIVersion() string { ret, specificReturn := fake.aPIVersionReturnsOnCall[len(fake.aPIVersionArgsForCall)] fake.aPIVersionArgsForCall = append(fake.aPIVersionArgsForCall, struct { }{}) + stub := fake.APIVersionStub + fakeReturns := fake.aPIVersionReturns fake.recordInvocation("APIVersion", []interface{}{}) fake.aPIVersionMutex.Unlock() - if fake.APIVersionStub != nil { - return fake.APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIVersionReturns return fakeReturns.result1 } @@ -245,15 +246,16 @@ func (fake *FakeConfig) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -297,15 +299,16 @@ func (fake *FakeConfig) CurrentUser() (configv3.User, error) { ret, specificReturn := fake.currentUserReturnsOnCall[len(fake.currentUserArgsForCall)] fake.currentUserArgsForCall = append(fake.currentUserArgsForCall, struct { }{}) + stub := fake.CurrentUserStub + fakeReturns := fake.currentUserReturns fake.recordInvocation("CurrentUser", []interface{}{}) fake.currentUserMutex.Unlock() - if fake.CurrentUserStub != nil { - return fake.CurrentUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.currentUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -352,15 +355,16 @@ func (fake *FakeConfig) DialTimeout() time.Duration { ret, specificReturn := fake.dialTimeoutReturnsOnCall[len(fake.dialTimeoutArgsForCall)] fake.dialTimeoutArgsForCall = append(fake.dialTimeoutArgsForCall, struct { }{}) + stub := fake.DialTimeoutStub + fakeReturns := fake.dialTimeoutReturns fake.recordInvocation("DialTimeout", []interface{}{}) fake.dialTimeoutMutex.Unlock() - if fake.DialTimeoutStub != nil { - return fake.DialTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dialTimeoutReturns return fakeReturns.result1 } @@ -404,15 +408,16 @@ func (fake *FakeConfig) IsCFOnK8s() bool { ret, specificReturn := fake.isCFOnK8sReturnsOnCall[len(fake.isCFOnK8sArgsForCall)] fake.isCFOnK8sArgsForCall = append(fake.isCFOnK8sArgsForCall, struct { }{}) + stub := fake.IsCFOnK8sStub + fakeReturns := fake.isCFOnK8sReturns fake.recordInvocation("IsCFOnK8s", []interface{}{}) fake.isCFOnK8sMutex.Unlock() - if fake.IsCFOnK8sStub != nil { - return fake.IsCFOnK8sStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isCFOnK8sReturns return fakeReturns.result1 } @@ -456,15 +461,16 @@ func (fake *FakeConfig) PollingInterval() time.Duration { ret, specificReturn := fake.pollingIntervalReturnsOnCall[len(fake.pollingIntervalArgsForCall)] fake.pollingIntervalArgsForCall = append(fake.pollingIntervalArgsForCall, struct { }{}) + stub := fake.PollingIntervalStub + fakeReturns := fake.pollingIntervalReturns fake.recordInvocation("PollingInterval", []interface{}{}) fake.pollingIntervalMutex.Unlock() - if fake.PollingIntervalStub != nil { - return fake.PollingIntervalStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pollingIntervalReturns return fakeReturns.result1 } @@ -508,15 +514,16 @@ func (fake *FakeConfig) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -560,15 +567,16 @@ func (fake *FakeConfig) SSHOAuthClient() string { ret, specificReturn := fake.sSHOAuthClientReturnsOnCall[len(fake.sSHOAuthClientArgsForCall)] fake.sSHOAuthClientArgsForCall = append(fake.sSHOAuthClientArgsForCall, struct { }{}) + stub := fake.SSHOAuthClientStub + fakeReturns := fake.sSHOAuthClientReturns fake.recordInvocation("SSHOAuthClient", []interface{}{}) fake.sSHOAuthClientMutex.Unlock() - if fake.SSHOAuthClientStub != nil { - return fake.SSHOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.sSHOAuthClientReturns return fakeReturns.result1 } @@ -612,9 +620,10 @@ func (fake *FakeConfig) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -643,9 +652,10 @@ func (fake *FakeConfig) SetKubernetesAuthInfo(arg1 string) { fake.setKubernetesAuthInfoArgsForCall = append(fake.setKubernetesAuthInfoArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetKubernetesAuthInfoStub fake.recordInvocation("SetKubernetesAuthInfo", []interface{}{arg1}) fake.setKubernetesAuthInfoMutex.Unlock() - if fake.SetKubernetesAuthInfoStub != nil { + if stub != nil { fake.SetKubernetesAuthInfoStub(arg1) } } @@ -674,9 +684,10 @@ func (fake *FakeConfig) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } @@ -705,9 +716,10 @@ func (fake *FakeConfig) SetTargetInformation(arg1 configv3.TargetInformationArgs fake.setTargetInformationArgsForCall = append(fake.setTargetInformationArgsForCall, struct { arg1 configv3.TargetInformationArgs }{arg1}) + stub := fake.SetTargetInformationStub fake.recordInvocation("SetTargetInformation", []interface{}{arg1}) fake.setTargetInformationMutex.Unlock() - if fake.SetTargetInformationStub != nil { + if stub != nil { fake.SetTargetInformationStub(arg1) } } @@ -738,9 +750,10 @@ func (fake *FakeConfig) SetTokenInformation(arg1 string, arg2 string, arg3 strin arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.SetTokenInformationStub fake.recordInvocation("SetTokenInformation", []interface{}{arg1, arg2, arg3}) fake.setTokenInformationMutex.Unlock() - if fake.SetTokenInformationStub != nil { + if stub != nil { fake.SetTokenInformationStub(arg1, arg2, arg3) } } @@ -770,9 +783,10 @@ func (fake *FakeConfig) SetUAAClientCredentials(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetUAAClientCredentialsStub fake.recordInvocation("SetUAAClientCredentials", []interface{}{arg1, arg2}) fake.setUAAClientCredentialsMutex.Unlock() - if fake.SetUAAClientCredentialsStub != nil { + if stub != nil { fake.SetUAAClientCredentialsStub(arg1, arg2) } } @@ -801,9 +815,10 @@ func (fake *FakeConfig) SetUAAGrantType(arg1 string) { fake.setUAAGrantTypeArgsForCall = append(fake.setUAAGrantTypeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAGrantTypeStub fake.recordInvocation("SetUAAGrantType", []interface{}{arg1}) fake.setUAAGrantTypeMutex.Unlock() - if fake.SetUAAGrantTypeStub != nil { + if stub != nil { fake.SetUAAGrantTypeStub(arg1) } } @@ -832,15 +847,16 @@ func (fake *FakeConfig) SkipSSLValidation() bool { ret, specificReturn := fake.skipSSLValidationReturnsOnCall[len(fake.skipSSLValidationArgsForCall)] fake.skipSSLValidationArgsForCall = append(fake.skipSSLValidationArgsForCall, struct { }{}) + stub := fake.SkipSSLValidationStub + fakeReturns := fake.skipSSLValidationReturns fake.recordInvocation("SkipSSLValidation", []interface{}{}) fake.skipSSLValidationMutex.Unlock() - if fake.SkipSSLValidationStub != nil { - return fake.SkipSSLValidationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.skipSSLValidationReturns return fakeReturns.result1 } @@ -884,15 +900,16 @@ func (fake *FakeConfig) StagingTimeout() time.Duration { ret, specificReturn := fake.stagingTimeoutReturnsOnCall[len(fake.stagingTimeoutArgsForCall)] fake.stagingTimeoutArgsForCall = append(fake.stagingTimeoutArgsForCall, struct { }{}) + stub := fake.StagingTimeoutStub + fakeReturns := fake.stagingTimeoutReturns fake.recordInvocation("StagingTimeout", []interface{}{}) fake.stagingTimeoutMutex.Unlock() - if fake.StagingTimeoutStub != nil { - return fake.StagingTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stagingTimeoutReturns return fakeReturns.result1 } @@ -936,15 +953,16 @@ func (fake *FakeConfig) StartupTimeout() time.Duration { ret, specificReturn := fake.startupTimeoutReturnsOnCall[len(fake.startupTimeoutArgsForCall)] fake.startupTimeoutArgsForCall = append(fake.startupTimeoutArgsForCall, struct { }{}) + stub := fake.StartupTimeoutStub + fakeReturns := fake.startupTimeoutReturns fake.recordInvocation("StartupTimeout", []interface{}{}) fake.startupTimeoutMutex.Unlock() - if fake.StartupTimeoutStub != nil { - return fake.StartupTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startupTimeoutReturns return fakeReturns.result1 } @@ -988,15 +1006,16 @@ func (fake *FakeConfig) Target() string { ret, specificReturn := fake.targetReturnsOnCall[len(fake.targetArgsForCall)] fake.targetArgsForCall = append(fake.targetArgsForCall, struct { }{}) + stub := fake.TargetStub + fakeReturns := fake.targetReturns fake.recordInvocation("Target", []interface{}{}) fake.targetMutex.Unlock() - if fake.TargetStub != nil { - return fake.TargetStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.targetReturns return fakeReturns.result1 } @@ -1040,15 +1059,16 @@ func (fake *FakeConfig) UAAGrantType() string { ret, specificReturn := fake.uAAGrantTypeReturnsOnCall[len(fake.uAAGrantTypeArgsForCall)] fake.uAAGrantTypeArgsForCall = append(fake.uAAGrantTypeArgsForCall, struct { }{}) + stub := fake.UAAGrantTypeStub + fakeReturns := fake.uAAGrantTypeReturns fake.recordInvocation("UAAGrantType", []interface{}{}) fake.uAAGrantTypeMutex.Unlock() - if fake.UAAGrantTypeStub != nil { - return fake.UAAGrantTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAGrantTypeReturns return fakeReturns.result1 } @@ -1091,9 +1111,10 @@ func (fake *FakeConfig) UnsetOrganizationAndSpaceInformation() { fake.unsetOrganizationAndSpaceInformationMutex.Lock() fake.unsetOrganizationAndSpaceInformationArgsForCall = append(fake.unsetOrganizationAndSpaceInformationArgsForCall, struct { }{}) + stub := fake.UnsetOrganizationAndSpaceInformationStub fake.recordInvocation("UnsetOrganizationAndSpaceInformation", []interface{}{}) fake.unsetOrganizationAndSpaceInformationMutex.Unlock() - if fake.UnsetOrganizationAndSpaceInformationStub != nil { + if stub != nil { fake.UnsetOrganizationAndSpaceInformationStub() } } diff --git a/actor/v7action/v7actionfakes/fake_downloader.go b/actor/v7action/v7actionfakes/fake_downloader.go index f0cb1f7590e..4545618272a 100644 --- a/actor/v7action/v7actionfakes/fake_downloader.go +++ b/actor/v7action/v7actionfakes/fake_downloader.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeDownloader struct { @@ -33,15 +33,16 @@ func (fake *FakeDownloader) Download(arg1 string, arg2 string) (string, error) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.DownloadStub + fakeReturns := fake.downloadReturns fake.recordInvocation("Download", []interface{}{arg1, arg2}) fake.downloadMutex.Unlock() - if fake.DownloadStub != nil { - return fake.DownloadStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.downloadReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go b/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go index f22933d1bb8..7102e140b63 100644 --- a/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go +++ b/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" "k8s.io/client-go/tools/clientcmd/api" ) @@ -30,15 +30,16 @@ func (fake *FakeKubernetesConfigGetter) Get() (*api.Config, error) { ret, specificReturn := fake.getReturnsOnCall[len(fake.getArgsForCall)] fake.getArgsForCall = append(fake.getArgsForCall, struct { }{}) + stub := fake.GetStub + fakeReturns := fake.getReturns fake.recordInvocation("Get", []interface{}{}) fake.getMutex.Unlock() - if fake.GetStub != nil { - return fake.GetStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_manifest_parser.go b/actor/v7action/v7actionfakes/fake_manifest_parser.go index 6f0275be7b1..6d93fd4df35 100644 --- a/actor/v7action/v7actionfakes/fake_manifest_parser.go +++ b/actor/v7action/v7actionfakes/fake_manifest_parser.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeManifestParser struct { @@ -40,15 +40,16 @@ func (fake *FakeManifestParser) AppNames() []string { ret, specificReturn := fake.appNamesReturnsOnCall[len(fake.appNamesArgsForCall)] fake.appNamesArgsForCall = append(fake.appNamesArgsForCall, struct { }{}) + stub := fake.AppNamesStub + fakeReturns := fake.appNamesReturns fake.recordInvocation("AppNames", []interface{}{}) fake.appNamesMutex.Unlock() - if fake.AppNamesStub != nil { - return fake.AppNamesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.appNamesReturns return fakeReturns.result1 } @@ -93,15 +94,16 @@ func (fake *FakeManifestParser) RawAppManifest(arg1 string) ([]byte, error) { fake.rawAppManifestArgsForCall = append(fake.rawAppManifestArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RawAppManifestStub + fakeReturns := fake.rawAppManifestReturns fake.recordInvocation("RawAppManifest", []interface{}{arg1}) fake.rawAppManifestMutex.Unlock() - if fake.RawAppManifestStub != nil { - return fake.RawAppManifestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.rawAppManifestReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_routing_client.go b/actor/v7action/v7actionfakes/fake_routing_client.go index 873d4834a35..d7be3997593 100644 --- a/actor/v7action/v7actionfakes/fake_routing_client.go +++ b/actor/v7action/v7actionfakes/fake_routing_client.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/router" ) type FakeRoutingClient struct { @@ -44,15 +44,16 @@ func (fake *FakeRoutingClient) GetRouterGroupByName(arg1 string) (router.RouterG fake.getRouterGroupByNameArgsForCall = append(fake.getRouterGroupByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetRouterGroupByNameStub + fakeReturns := fake.getRouterGroupByNameReturns fake.recordInvocation("GetRouterGroupByName", []interface{}{arg1}) fake.getRouterGroupByNameMutex.Unlock() - if fake.GetRouterGroupByNameStub != nil { - return fake.GetRouterGroupByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getRouterGroupByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -106,15 +107,16 @@ func (fake *FakeRoutingClient) GetRouterGroups() ([]router.RouterGroup, error) { ret, specificReturn := fake.getRouterGroupsReturnsOnCall[len(fake.getRouterGroupsArgsForCall)] fake.getRouterGroupsArgsForCall = append(fake.getRouterGroupsArgsForCall, struct { }{}) + stub := fake.GetRouterGroupsStub + fakeReturns := fake.getRouterGroupsReturns fake.recordInvocation("GetRouterGroups", []interface{}{}) fake.getRouterGroupsMutex.Unlock() - if fake.GetRouterGroupsStub != nil { - return fake.GetRouterGroupsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getRouterGroupsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_shared_actor.go b/actor/v7action/v7actionfakes/fake_shared_actor.go index 5a2ff877ab6..1601a0e3e99 100644 --- a/actor/v7action/v7actionfakes/fake_shared_actor.go +++ b/actor/v7action/v7actionfakes/fake_shared_actor.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeSharedActor struct { @@ -73,15 +73,16 @@ func (fake *FakeSharedActor) GatherArchiveResources(arg1 string) ([]sharedaction fake.gatherArchiveResourcesArgsForCall = append(fake.gatherArchiveResourcesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GatherArchiveResourcesStub + fakeReturns := fake.gatherArchiveResourcesReturns fake.recordInvocation("GatherArchiveResources", []interface{}{arg1}) fake.gatherArchiveResourcesMutex.Unlock() - if fake.GatherArchiveResourcesStub != nil { - return fake.GatherArchiveResourcesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.gatherArchiveResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -136,15 +137,16 @@ func (fake *FakeSharedActor) GatherDirectoryResources(arg1 string) ([]sharedacti fake.gatherDirectoryResourcesArgsForCall = append(fake.gatherDirectoryResourcesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GatherDirectoryResourcesStub + fakeReturns := fake.gatherDirectoryResourcesReturns fake.recordInvocation("GatherDirectoryResources", []interface{}{arg1}) fake.gatherDirectoryResourcesMutex.Unlock() - if fake.GatherDirectoryResourcesStub != nil { - return fake.GatherDirectoryResourcesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.gatherDirectoryResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -205,15 +207,16 @@ func (fake *FakeSharedActor) ZipArchiveResources(arg1 string, arg2 []sharedactio arg1 string arg2 []sharedaction.Resource }{arg1, arg2Copy}) + stub := fake.ZipArchiveResourcesStub + fakeReturns := fake.zipArchiveResourcesReturns fake.recordInvocation("ZipArchiveResources", []interface{}{arg1, arg2Copy}) fake.zipArchiveResourcesMutex.Unlock() - if fake.ZipArchiveResourcesStub != nil { - return fake.ZipArchiveResourcesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.zipArchiveResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -274,15 +277,16 @@ func (fake *FakeSharedActor) ZipDirectoryResources(arg1 string, arg2 []sharedact arg1 string arg2 []sharedaction.Resource }{arg1, arg2Copy}) + stub := fake.ZipDirectoryResourcesStub + fakeReturns := fake.zipDirectoryResourcesReturns fake.recordInvocation("ZipDirectoryResources", []interface{}{arg1, arg2Copy}) fake.zipDirectoryResourcesMutex.Unlock() - if fake.ZipDirectoryResourcesStub != nil { - return fake.ZipDirectoryResourcesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.zipDirectoryResourcesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_simple_progress_bar.go b/actor/v7action/v7actionfakes/fake_simple_progress_bar.go index 41cf5a49c6c..0e2b05b6486 100644 --- a/actor/v7action/v7actionfakes/fake_simple_progress_bar.go +++ b/actor/v7action/v7actionfakes/fake_simple_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeSimpleProgressBar struct { @@ -38,15 +38,16 @@ func (fake *FakeSimpleProgressBar) Initialize(arg1 string) (io.Reader, int64, er fake.initializeArgsForCall = append(fake.initializeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.InitializeStub + fakeReturns := fake.initializeReturns fake.recordInvocation("Initialize", []interface{}{arg1}) fake.initializeMutex.Unlock() - if fake.InitializeStub != nil { - return fake.InitializeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.initializeReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -102,9 +103,10 @@ func (fake *FakeSimpleProgressBar) Terminate() { fake.terminateMutex.Lock() fake.terminateArgsForCall = append(fake.terminateArgsForCall, struct { }{}) + stub := fake.TerminateStub fake.recordInvocation("Terminate", []interface{}{}) fake.terminateMutex.Unlock() - if fake.TerminateStub != nil { + if stub != nil { fake.TerminateStub() } } diff --git a/actor/v7action/v7actionfakes/fake_sshactor.go b/actor/v7action/v7actionfakes/fake_sshactor.go index c3179aa0a07..f849722dd78 100644 --- a/actor/v7action/v7actionfakes/fake_sshactor.go +++ b/actor/v7action/v7actionfakes/fake_sshactor.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeSSHActor struct { @@ -30,15 +30,16 @@ func (fake *FakeSSHActor) ExecuteSecureShell(arg1 sharedaction.SSHOptions) error fake.executeSecureShellArgsForCall = append(fake.executeSecureShellArgsForCall, struct { arg1 sharedaction.SSHOptions }{arg1}) + stub := fake.ExecuteSecureShellStub + fakeReturns := fake.executeSecureShellReturns fake.recordInvocation("ExecuteSecureShell", []interface{}{arg1}) fake.executeSecureShellMutex.Unlock() - if fake.ExecuteSecureShellStub != nil { - return fake.ExecuteSecureShellStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeSecureShellReturns return fakeReturns.result1 } diff --git a/actor/v7action/v7actionfakes/fake_uaaclient.go b/actor/v7action/v7actionfakes/fake_uaaclient.go index 2924db85154..517b7ec9afa 100644 --- a/actor/v7action/v7actionfakes/fake_uaaclient.go +++ b/actor/v7action/v7actionfakes/fake_uaaclient.go @@ -4,9 +4,9 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" ) type FakeUAAClient struct { @@ -167,15 +167,16 @@ func (fake *FakeUAAClient) Authenticate(arg1 map[string]string, arg2 string, arg arg2 string arg3 constant.GrantType }{arg1, arg2, arg3}) + stub := fake.AuthenticateStub + fakeReturns := fake.authenticateReturns fake.recordInvocation("Authenticate", []interface{}{arg1, arg2, arg3}) fake.authenticateMutex.Unlock() - if fake.AuthenticateStub != nil { - return fake.AuthenticateStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.authenticateReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -235,15 +236,16 @@ func (fake *FakeUAAClient) CreateUser(arg1 string, arg2 string, arg3 string) (ua arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.CreateUserStub + fakeReturns := fake.createUserReturns fake.recordInvocation("CreateUser", []interface{}{arg1, arg2, arg3}) fake.createUserMutex.Unlock() - if fake.CreateUserStub != nil { - return fake.CreateUserStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -298,15 +300,16 @@ func (fake *FakeUAAClient) DeleteUser(arg1 string) (uaa.User, error) { fake.deleteUserArgsForCall = append(fake.deleteUserArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteUserStub + fakeReturns := fake.deleteUserReturns fake.recordInvocation("DeleteUser", []interface{}{arg1}) fake.deleteUserMutex.Unlock() - if fake.DeleteUserStub != nil { - return fake.DeleteUserStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -360,15 +363,16 @@ func (fake *FakeUAAClient) GetAPIVersion() (string, error) { ret, specificReturn := fake.getAPIVersionReturnsOnCall[len(fake.getAPIVersionArgsForCall)] fake.getAPIVersionArgsForCall = append(fake.getAPIVersionArgsForCall, struct { }{}) + stub := fake.GetAPIVersionStub + fakeReturns := fake.getAPIVersionReturns fake.recordInvocation("GetAPIVersion", []interface{}{}) fake.getAPIVersionMutex.Unlock() - if fake.GetAPIVersionStub != nil { - return fake.GetAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAPIVersionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -415,15 +419,16 @@ func (fake *FakeUAAClient) GetLoginPrompts() (map[string][]string, error) { ret, specificReturn := fake.getLoginPromptsReturnsOnCall[len(fake.getLoginPromptsArgsForCall)] fake.getLoginPromptsArgsForCall = append(fake.getLoginPromptsArgsForCall, struct { }{}) + stub := fake.GetLoginPromptsStub + fakeReturns := fake.getLoginPromptsReturns fake.recordInvocation("GetLoginPrompts", []interface{}{}) fake.getLoginPromptsMutex.Unlock() - if fake.GetLoginPromptsStub != nil { - return fake.GetLoginPromptsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getLoginPromptsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -472,15 +477,16 @@ func (fake *FakeUAAClient) GetSSHPasscode(arg1 string, arg2 string) (string, err arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSSHPasscodeStub + fakeReturns := fake.getSSHPasscodeReturns fake.recordInvocation("GetSSHPasscode", []interface{}{arg1, arg2}) fake.getSSHPasscodeMutex.Unlock() - if fake.GetSSHPasscodeStub != nil { - return fake.GetSSHPasscodeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSSHPasscodeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -536,15 +542,16 @@ func (fake *FakeUAAClient) ListUsers(arg1 string, arg2 string) ([]uaa.User, erro arg1 string arg2 string }{arg1, arg2}) + stub := fake.ListUsersStub + fakeReturns := fake.listUsersReturns fake.recordInvocation("ListUsers", []interface{}{arg1, arg2}) fake.listUsersMutex.Unlock() - if fake.ListUsersStub != nil { - return fake.ListUsersStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listUsersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -599,15 +606,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } @@ -662,15 +670,16 @@ func (fake *FakeUAAClient) Revoke(arg1 string) error { fake.revokeArgsForCall = append(fake.revokeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RevokeStub + fakeReturns := fake.revokeReturns fake.recordInvocation("Revoke", []interface{}{arg1}) fake.revokeMutex.Unlock() - if fake.RevokeStub != nil { - return fake.RevokeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.revokeReturns return fakeReturns.result1 } @@ -724,15 +733,16 @@ func (fake *FakeUAAClient) UpdatePassword(arg1 string, arg2 string, arg3 string) arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.UpdatePasswordStub + fakeReturns := fake.updatePasswordReturns fake.recordInvocation("UpdatePassword", []interface{}{arg1, arg2, arg3}) fake.updatePasswordMutex.Unlock() - if fake.UpdatePasswordStub != nil { - return fake.UpdatePasswordStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updatePasswordReturns return fakeReturns.result1 } @@ -784,15 +794,16 @@ func (fake *FakeUAAClient) ValidateClientUser(arg1 string) error { fake.validateClientUserArgsForCall = append(fake.validateClientUserArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ValidateClientUserStub + fakeReturns := fake.validateClientUserReturns fake.recordInvocation("ValidateClientUser", []interface{}{arg1}) fake.validateClientUserMutex.Unlock() - if fake.ValidateClientUserStub != nil { - return fake.ValidateClientUserStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.validateClientUserReturns return fakeReturns.result1 } diff --git a/actor/v7action/v7actionfakes/fake_who_am_ier.go b/actor/v7action/v7actionfakes/fake_who_am_ier.go index 0d1eb42bacc..78dfee83e99 100644 --- a/actor/v7action/v7actionfakes/fake_who_am_ier.go +++ b/actor/v7action/v7actionfakes/fake_who_am_ier.go @@ -4,9 +4,9 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeWhoAmIer struct { @@ -33,15 +33,16 @@ func (fake *FakeWhoAmIer) WhoAmI() (resources.K8sUser, ccv3.Warnings, error) { ret, specificReturn := fake.whoAmIReturnsOnCall[len(fake.whoAmIArgsForCall)] fake.whoAmIArgsForCall = append(fake.whoAmIArgsForCall, struct { }{}) + stub := fake.WhoAmIStub + fakeReturns := fake.whoAmIReturns fake.recordInvocation("WhoAmI", []interface{}{}) fake.whoAmIMutex.Unlock() - if fake.WhoAmIStub != nil { - return fake.WhoAmIStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.whoAmIReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v7action/version_test.go b/actor/v7action/version_test.go index 86226e25ed7..4cab211fa27 100644 --- a/actor/v7action/version_test.go +++ b/actor/v7action/version_test.go @@ -1,8 +1,8 @@ package v7action_test import ( - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/actor_test.go b/actor/v7pushaction/actor_test.go index 32f314564a4..f9c2cb2b3a3 100644 --- a/actor/v7pushaction/actor_test.go +++ b/actor/v7pushaction/actor_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/actualize_test.go b/actor/v7pushaction/actualize_test.go index b1e91a08c43..89f1fbb9344 100644 --- a/actor/v7pushaction/actualize_test.go +++ b/actor/v7pushaction/actualize_test.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_bits_package_for_application.go b/actor/v7pushaction/create_bits_package_for_application.go index bc40f05f58a..b04a0ab919e 100644 --- a/actor/v7pushaction/create_bits_package_for_application.go +++ b/actor/v7pushaction/create_bits_package_for_application.go @@ -3,11 +3,11 @@ package v7pushaction import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7pushaction/create_bits_package_for_application_test.go b/actor/v7pushaction/create_bits_package_for_application_test.go index 40e96523c44..3facaa7dba6 100644 --- a/actor/v7pushaction/create_bits_package_for_application_test.go +++ b/actor/v7pushaction/create_bits_package_for_application_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_deployment_for_push_plan.go b/actor/v7pushaction/create_deployment_for_push_plan.go index 5b23178c3a5..78a9df5619d 100644 --- a/actor/v7pushaction/create_deployment_for_push_plan.go +++ b/actor/v7pushaction/create_deployment_for_push_plan.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) CreateDeploymentForApplication(pushPlan PushPlan, eventStream chan<- *PushEvent, progressBar ProgressBar) (PushPlan, Warnings, error) { diff --git a/actor/v7pushaction/create_deployment_for_push_plan_test.go b/actor/v7pushaction/create_deployment_for_push_plan_test.go index 46031d80dc8..43ff838890e 100644 --- a/actor/v7pushaction/create_deployment_for_push_plan_test.go +++ b/actor/v7pushaction/create_deployment_for_push_plan_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_docker_package_for_application_test.go b/actor/v7pushaction/create_docker_package_for_application_test.go index 29c8674573c..249727424fe 100644 --- a/actor/v7pushaction/create_docker_package_for_application_test.go +++ b/actor/v7pushaction/create_docker_package_for_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v7pushaction/create_droplet_for_application.go b/actor/v7pushaction/create_droplet_for_application.go index 705d8227cc3..e32e79da5db 100644 --- a/actor/v7pushaction/create_droplet_for_application.go +++ b/actor/v7pushaction/create_droplet_for_application.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) const UploadRetries = 3 diff --git a/actor/v7pushaction/create_droplet_for_application_test.go b/actor/v7pushaction/create_droplet_for_application_test.go index c13603276ab..e3c22f027ac 100644 --- a/actor/v7pushaction/create_droplet_for_application_test.go +++ b/actor/v7pushaction/create_droplet_for_application_test.go @@ -4,12 +4,12 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_push_plans.go b/actor/v7pushaction/create_push_plans.go index 7c656d05063..718f142217d 100644 --- a/actor/v7pushaction/create_push_plans.go +++ b/actor/v7pushaction/create_push_plans.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) // CreatePushPlans returns a set of PushPlan objects based off the inputs diff --git a/actor/v7pushaction/create_push_plans_test.go b/actor/v7pushaction/create_push_plans_test.go index 9b8040935a0..6a93e427eaf 100644 --- a/actor/v7pushaction/create_push_plans_test.go +++ b/actor/v7pushaction/create_push_plans_test.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_app_name_override.go b/actor/v7pushaction/handle_app_name_override.go index 329a3129347..9513f391678 100644 --- a/actor/v7pushaction/handle_app_name_override.go +++ b/actor/v7pushaction/handle_app_name_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleAppNameOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_app_name_override_test.go b/actor/v7pushaction/handle_app_name_override_test.go index 8d58871ce30..86a57752165 100644 --- a/actor/v7pushaction/handle_app_name_override_test.go +++ b/actor/v7pushaction/handle_app_name_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_app_path_override.go b/actor/v7pushaction/handle_app_path_override.go index c10ace982d8..f79119c802f 100644 --- a/actor/v7pushaction/handle_app_path_override.go +++ b/actor/v7pushaction/handle_app_path_override.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) // Overrides the path if path is given. Changes empty paths to pwd. Validates paths diff --git a/actor/v7pushaction/handle_app_path_override_test.go b/actor/v7pushaction/handle_app_path_override_test.go index 20f3d8496fb..1fefa74eea7 100644 --- a/actor/v7pushaction/handle_app_path_override_test.go +++ b/actor/v7pushaction/handle_app_path_override_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "runtime" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_buildpacks_override.go b/actor/v7pushaction/handle_buildpacks_override.go index 669d04ab016..dbbbce6ee45 100644 --- a/actor/v7pushaction/handle_buildpacks_override.go +++ b/actor/v7pushaction/handle_buildpacks_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleBuildpacksOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_buildpacks_override_test.go b/actor/v7pushaction/handle_buildpacks_override_test.go index 49c6bc6569d..fc0ac9918a7 100644 --- a/actor/v7pushaction/handle_buildpacks_override_test.go +++ b/actor/v7pushaction/handle_buildpacks_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_cnb_credentials_override.go b/actor/v7pushaction/handle_cnb_credentials_override.go index 8fa212aab4b..f5203729678 100644 --- a/actor/v7pushaction/handle_cnb_credentials_override.go +++ b/actor/v7pushaction/handle_cnb_credentials_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleCNBCredentialsOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_cnb_credentials_override_test.go b/actor/v7pushaction/handle_cnb_credentials_override_test.go index 87a1117de08..3f7d88e4500 100644 --- a/actor/v7pushaction/handle_cnb_credentials_override_test.go +++ b/actor/v7pushaction/handle_cnb_credentials_override_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_default_route_override.go b/actor/v7pushaction/handle_default_route_override.go index fb664ea0c38..97f7dee9954 100644 --- a/actor/v7pushaction/handle_default_route_override.go +++ b/actor/v7pushaction/handle_default_route_override.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDefaultRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_default_route_override_test.go b/actor/v7pushaction/handle_default_route_override_test.go index cc94e9ad9f1..e7b18215014 100644 --- a/actor/v7pushaction/handle_default_route_override_test.go +++ b/actor/v7pushaction/handle_default_route_override_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_disk_override.go b/actor/v7pushaction/handle_disk_override.go index 47adb500fd4..715b1e2023b 100644 --- a/actor/v7pushaction/handle_disk_override.go +++ b/actor/v7pushaction/handle_disk_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDiskOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_disk_override_test.go b/actor/v7pushaction/handle_disk_override_test.go index 3b139bd0728..b04b4d97efa 100644 --- a/actor/v7pushaction/handle_disk_override_test.go +++ b/actor/v7pushaction/handle_disk_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_docker_image_override.go b/actor/v7pushaction/handle_docker_image_override.go index 9190bca816d..e0a17d13f16 100644 --- a/actor/v7pushaction/handle_docker_image_override.go +++ b/actor/v7pushaction/handle_docker_image_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDockerImageOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_docker_image_override_test.go b/actor/v7pushaction/handle_docker_image_override_test.go index 9c7c2310539..ec1e923c44c 100644 --- a/actor/v7pushaction/handle_docker_image_override_test.go +++ b/actor/v7pushaction/handle_docker_image_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_docker_username_override.go b/actor/v7pushaction/handle_docker_username_override.go index b9c31ad3e59..dd5376e27c5 100644 --- a/actor/v7pushaction/handle_docker_username_override.go +++ b/actor/v7pushaction/handle_docker_username_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDockerUsernameOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_docker_username_override_test.go b/actor/v7pushaction/handle_docker_username_override_test.go index 0dd9a1cd388..b974e73649d 100644 --- a/actor/v7pushaction/handle_docker_username_override_test.go +++ b/actor/v7pushaction/handle_docker_username_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_droplet_path_override.go b/actor/v7pushaction/handle_droplet_path_override.go index 8a5e97e8a7d..12943d29d95 100644 --- a/actor/v7pushaction/handle_droplet_path_override.go +++ b/actor/v7pushaction/handle_droplet_path_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDropletPathOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_droplet_path_override_test.go b/actor/v7pushaction/handle_droplet_path_override_test.go index 2c0dfdf5e1c..cab56f09add 100644 --- a/actor/v7pushaction/handle_droplet_path_override_test.go +++ b/actor/v7pushaction/handle_droplet_path_override_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_flag_override_func.go b/actor/v7pushaction/handle_flag_override_func.go index dc382117c9a..e30dd2e6166 100644 --- a/actor/v7pushaction/handle_flag_override_func.go +++ b/actor/v7pushaction/handle_flag_override_func.go @@ -1,5 +1,5 @@ package v7pushaction -import "code.cloudfoundry.org/cli/util/manifestparser" +import "code.cloudfoundry.org/cli/v9/util/manifestparser" type HandleFlagOverrideFunc func(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) diff --git a/actor/v7pushaction/handle_flag_overrides.go b/actor/v7pushaction/handle_flag_overrides.go index 0b140d98b76..810df15c48a 100644 --- a/actor/v7pushaction/handle_flag_overrides.go +++ b/actor/v7pushaction/handle_flag_overrides.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func (actor Actor) HandleFlagOverrides( diff --git a/actor/v7pushaction/handle_flag_overrides_test.go b/actor/v7pushaction/handle_flag_overrides_test.go index a50450b004f..d7c1da26c4d 100644 --- a/actor/v7pushaction/handle_flag_overrides_test.go +++ b/actor/v7pushaction/handle_flag_overrides_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_health_check_endpoint_override.go b/actor/v7pushaction/handle_health_check_endpoint_override.go index ab9659ac7dd..f5a0381858e 100644 --- a/actor/v7pushaction/handle_health_check_endpoint_override.go +++ b/actor/v7pushaction/handle_health_check_endpoint_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleHealthCheckEndpointOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_endpoint_override_test.go b/actor/v7pushaction/handle_health_check_endpoint_override_test.go index c3cbac2ed78..08b0bfea5c9 100644 --- a/actor/v7pushaction/handle_health_check_endpoint_override_test.go +++ b/actor/v7pushaction/handle_health_check_endpoint_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_health_check_timeout_override.go b/actor/v7pushaction/handle_health_check_timeout_override.go index b4c6f977182..6f4acd54a73 100644 --- a/actor/v7pushaction/handle_health_check_timeout_override.go +++ b/actor/v7pushaction/handle_health_check_timeout_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleHealthCheckTimeoutOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_timeout_override_test.go b/actor/v7pushaction/handle_health_check_timeout_override_test.go index 18fe4c52eaa..9d53e7b9734 100644 --- a/actor/v7pushaction/handle_health_check_timeout_override_test.go +++ b/actor/v7pushaction/handle_health_check_timeout_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_health_check_type_override.go b/actor/v7pushaction/handle_health_check_type_override.go index e9f0d4091c8..b4b9d7a6795 100644 --- a/actor/v7pushaction/handle_health_check_type_override.go +++ b/actor/v7pushaction/handle_health_check_type_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleHealthCheckTypeOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_type_override_test.go b/actor/v7pushaction/handle_health_check_type_override_test.go index 695f06b6f86..f86e56b0bb8 100644 --- a/actor/v7pushaction/handle_health_check_type_override_test.go +++ b/actor/v7pushaction/handle_health_check_type_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_instances_override.go b/actor/v7pushaction/handle_instances_override.go index 018ab02e8a4..144e7fd62ff 100644 --- a/actor/v7pushaction/handle_instances_override.go +++ b/actor/v7pushaction/handle_instances_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleInstancesOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_instances_override_test.go b/actor/v7pushaction/handle_instances_override_test.go index 4b662ce7cfe..5b445c1fa3c 100644 --- a/actor/v7pushaction/handle_instances_override_test.go +++ b/actor/v7pushaction/handle_instances_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_lifecycle_override.go b/actor/v7pushaction/handle_lifecycle_override.go index 005aa659029..5906fcf93ac 100644 --- a/actor/v7pushaction/handle_lifecycle_override.go +++ b/actor/v7pushaction/handle_lifecycle_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleLifecycleOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_log_rate_limit_override.go b/actor/v7pushaction/handle_log_rate_limit_override.go index 9e80cbfc805..1d329843b27 100644 --- a/actor/v7pushaction/handle_log_rate_limit_override.go +++ b/actor/v7pushaction/handle_log_rate_limit_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleLogRateLimitOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_log_rate_limit_override_test.go b/actor/v7pushaction/handle_log_rate_limit_override_test.go index f261703e514..34b968b2c1c 100644 --- a/actor/v7pushaction/handle_log_rate_limit_override_test.go +++ b/actor/v7pushaction/handle_log_rate_limit_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_memory_override.go b/actor/v7pushaction/handle_memory_override.go index 67c12f758be..5c9507a60ee 100644 --- a/actor/v7pushaction/handle_memory_override.go +++ b/actor/v7pushaction/handle_memory_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleMemoryOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_memory_override_test.go b/actor/v7pushaction/handle_memory_override_test.go index d301981543c..29a2a7515cc 100644 --- a/actor/v7pushaction/handle_memory_override_test.go +++ b/actor/v7pushaction/handle_memory_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_no_route_override.go b/actor/v7pushaction/handle_no_route_override.go index 10d5c170cda..2d823f4bcb6 100644 --- a/actor/v7pushaction/handle_no_route_override.go +++ b/actor/v7pushaction/handle_no_route_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleNoRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_no_route_override_test.go b/actor/v7pushaction/handle_no_route_override_test.go index 36b547901c0..e381a126f9f 100644 --- a/actor/v7pushaction/handle_no_route_override_test.go +++ b/actor/v7pushaction/handle_no_route_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_random_route_override.go b/actor/v7pushaction/handle_random_route_override.go index ba18805c21e..4d0306643c2 100644 --- a/actor/v7pushaction/handle_random_route_override.go +++ b/actor/v7pushaction/handle_random_route_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleRandomRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_random_route_override_test.go b/actor/v7pushaction/handle_random_route_override_test.go index 566ee226f9a..40081a54767 100644 --- a/actor/v7pushaction/handle_random_route_override_test.go +++ b/actor/v7pushaction/handle_random_route_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_stack_override.go b/actor/v7pushaction/handle_stack_override.go index 3087e67ccee..095f73ec509 100644 --- a/actor/v7pushaction/handle_stack_override.go +++ b/actor/v7pushaction/handle_stack_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleStackOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_stack_override_test.go b/actor/v7pushaction/handle_stack_override_test.go index a7dd434f7be..0e76dd387b0 100644 --- a/actor/v7pushaction/handle_stack_override_test.go +++ b/actor/v7pushaction/handle_stack_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_start_command_override.go b/actor/v7pushaction/handle_start_command_override.go index 45dbe8838b4..a818326b66f 100644 --- a/actor/v7pushaction/handle_start_command_override.go +++ b/actor/v7pushaction/handle_start_command_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleStartCommandOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_start_command_override_test.go b/actor/v7pushaction/handle_start_command_override_test.go index 93df0fa065c..5295e9d0758 100644 --- a/actor/v7pushaction/handle_start_command_override_test.go +++ b/actor/v7pushaction/handle_start_command_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_strategy_override.go b/actor/v7pushaction/handle_strategy_override.go index 7501a024278..93be4198352 100644 --- a/actor/v7pushaction/handle_strategy_override.go +++ b/actor/v7pushaction/handle_strategy_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleStrategyOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_strategy_override_test.go b/actor/v7pushaction/handle_strategy_override_test.go index 476636d234c..8c16b97b732 100644 --- a/actor/v7pushaction/handle_strategy_override_test.go +++ b/actor/v7pushaction/handle_strategy_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_task_override.go b/actor/v7pushaction/handle_task_override.go index 6d369d8b828..d39e0641419 100644 --- a/actor/v7pushaction/handle_task_override.go +++ b/actor/v7pushaction/handle_task_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleTaskOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_task_override_test.go b/actor/v7pushaction/handle_task_override_test.go index 88700852f05..e7f9eb5cdbb 100644 --- a/actor/v7pushaction/handle_task_override_test.go +++ b/actor/v7pushaction/handle_task_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/push_plan.go b/actor/v7pushaction/push_plan.go index dc4a181e2b2..a1a108dcee9 100644 --- a/actor/v7pushaction/push_plan.go +++ b/actor/v7pushaction/push_plan.go @@ -3,11 +3,11 @@ package v7pushaction import ( "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" "github.com/cloudfoundry/bosh-cli/director/template" ) diff --git a/actor/v7pushaction/resource_match.go b/actor/v7pushaction/resource_match.go index dcfb1ebafd2..cf630bfc3bc 100644 --- a/actor/v7pushaction/resource_match.go +++ b/actor/v7pushaction/resource_match.go @@ -1,6 +1,6 @@ package v7pushaction -import "code.cloudfoundry.org/cli/actor/sharedaction" +import "code.cloudfoundry.org/cli/v9/actor/sharedaction" // MatchResources returns back a list of matched and unmatched resources for the provided resources. func (actor Actor) MatchResources(resources []sharedaction.V3Resource) ([]sharedaction.V3Resource, []sharedaction.V3Resource, Warnings, error) { diff --git a/actor/v7pushaction/resource_match_test.go b/actor/v7pushaction/resource_match_test.go index e35c7618298..6b491e635ba 100644 --- a/actor/v7pushaction/resource_match_test.go +++ b/actor/v7pushaction/resource_match_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/restart_application_test.go b/actor/v7pushaction/restart_application_test.go index 217ebbbc324..b2c10da093e 100644 --- a/actor/v7pushaction/restart_application_test.go +++ b/actor/v7pushaction/restart_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/sequence.go b/actor/v7pushaction/sequence.go index 1f9aa741a7f..1943fb3fdbf 100644 --- a/actor/v7pushaction/sequence.go +++ b/actor/v7pushaction/sequence.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) func ShouldCreateBitsPackage(plan PushPlan) bool { diff --git a/actor/v7pushaction/sequence_test.go b/actor/v7pushaction/sequence_test.go index 5274516b04c..9fb488f116c 100644 --- a/actor/v7pushaction/sequence_test.go +++ b/actor/v7pushaction/sequence_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/set_default_bits_path_for_push_plan_test.go b/actor/v7pushaction/set_default_bits_path_for_push_plan_test.go index 03ca77503c1..5d56d970399 100644 --- a/actor/v7pushaction/set_default_bits_path_for_push_plan_test.go +++ b/actor/v7pushaction/set_default_bits_path_for_push_plan_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/set_droplet_for_application_test.go b/actor/v7pushaction/set_droplet_for_application_test.go index 9b543b34cb8..f5631cd155f 100644 --- a/actor/v7pushaction/set_droplet_for_application_test.go +++ b/actor/v7pushaction/set_droplet_for_application_test.go @@ -3,10 +3,10 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_all_resources_for_push_plan.go b/actor/v7pushaction/setup_all_resources_for_push_plan.go index e58b9ed5461..1e955687bc1 100644 --- a/actor/v7pushaction/setup_all_resources_for_push_plan.go +++ b/actor/v7pushaction/setup_all_resources_for_push_plan.go @@ -4,8 +4,8 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) func (actor Actor) SetupAllResourcesForPushPlan(pushPlan PushPlan, overrides FlagOverrides) (PushPlan, error) { diff --git a/actor/v7pushaction/setup_all_resources_for_push_plan_test.go b/actor/v7pushaction/setup_all_resources_for_push_plan_test.go index cb991961c19..014d75bebd9 100644 --- a/actor/v7pushaction/setup_all_resources_for_push_plan_test.go +++ b/actor/v7pushaction/setup_all_resources_for_push_plan_test.go @@ -4,11 +4,11 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/setup_deployment_information_for_push_plan.go b/actor/v7pushaction/setup_deployment_information_for_push_plan.go index 11e4dd26d8e..08642a849ba 100644 --- a/actor/v7pushaction/setup_deployment_information_for_push_plan.go +++ b/actor/v7pushaction/setup_deployment_information_for_push_plan.go @@ -1,6 +1,6 @@ package v7pushaction -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" func SetupDeploymentInformationForPushPlan(pushPlan PushPlan, overrides FlagOverrides) (PushPlan, error) { pushPlan.Strategy = overrides.Strategy diff --git a/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go b/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go index 14515c9f446..b62694d9f9d 100644 --- a/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go +++ b/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go b/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go index f06eeb6d76c..939a72b1ebf 100644 --- a/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go +++ b/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/setup_no_start_for_push_plan_test.go b/actor/v7pushaction/setup_no_start_for_push_plan_test.go index fa24192cc6d..7dba50c2497 100644 --- a/actor/v7pushaction/setup_no_start_for_push_plan_test.go +++ b/actor/v7pushaction/setup_no_start_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/setup_no_wait_for_push_plan_test.go b/actor/v7pushaction/setup_no_wait_for_push_plan_test.go index 3e89800bb1c..378fa3784dd 100644 --- a/actor/v7pushaction/setup_no_wait_for_push_plan_test.go +++ b/actor/v7pushaction/setup_no_wait_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/setup_task_app_for_push_plan_test.go b/actor/v7pushaction/setup_task_app_for_push_plan_test.go index 17a1bd3ab69..b6d3a58778e 100644 --- a/actor/v7pushaction/setup_task_app_for_push_plan_test.go +++ b/actor/v7pushaction/setup_task_app_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/shared_actor.go b/actor/v7pushaction/shared_actor.go index cd4efca31b5..f48f2d9dcb4 100644 --- a/actor/v7pushaction/shared_actor.go +++ b/actor/v7pushaction/shared_actor.go @@ -3,7 +3,7 @@ package v7pushaction import ( "io" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.ReadCloser diff --git a/actor/v7pushaction/stage_package_for_application_test.go b/actor/v7pushaction/stage_package_for_application_test.go index cfe6a90051e..3e610b95ac3 100644 --- a/actor/v7pushaction/stage_package_for_application_test.go +++ b/actor/v7pushaction/stage_package_for_application_test.go @@ -3,10 +3,10 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/stop_application.go b/actor/v7pushaction/stop_application.go index b6865a2f16c..e4c6eabfc92 100644 --- a/actor/v7pushaction/stop_application.go +++ b/actor/v7pushaction/stop_application.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7pushaction/stop_application_test.go b/actor/v7pushaction/stop_application_test.go index 04287023c20..9d8af0113f6 100644 --- a/actor/v7pushaction/stop_application_test.go +++ b/actor/v7pushaction/stop_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/v7_actor.go b/actor/v7pushaction/v7_actor.go index 91356c9df46..0dbe0659f31 100644 --- a/actor/v7pushaction/v7_actor.go +++ b/actor/v7pushaction/v7_actor.go @@ -3,9 +3,9 @@ package v7pushaction import ( "io" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V7Actor diff --git a/actor/v7pushaction/v7pushaction_suite_test.go b/actor/v7pushaction/v7pushaction_suite_test.go index 2a68dddff26..9147fd72092 100644 --- a/actor/v7pushaction/v7pushaction_suite_test.go +++ b/actor/v7pushaction/v7pushaction_suite_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go b/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go index 9b0a3aa81cd..2e6a43ae7e0 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" ) type FakeProgressBar struct { @@ -32,15 +32,16 @@ func (fake *FakeProgressBar) NewProgressBarWrapper(arg1 io.Reader, arg2 int64) i arg1 io.Reader arg2 int64 }{arg1, arg2}) + stub := fake.NewProgressBarWrapperStub + fakeReturns := fake.newProgressBarWrapperReturns fake.recordInvocation("NewProgressBarWrapper", []interface{}{arg1, arg2}) fake.newProgressBarWrapperMutex.Unlock() - if fake.NewProgressBarWrapperStub != nil { - return fake.NewProgressBarWrapperStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newProgressBarWrapperReturns return fakeReturns.result1 } diff --git a/actor/v7pushaction/v7pushactionfakes/fake_read_closer.go b/actor/v7pushaction/v7pushactionfakes/fake_read_closer.go index 22f42a76ee4..2adfd1e23bc 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_read_closer.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_read_closer.go @@ -39,15 +39,16 @@ func (fake *FakeReadCloser) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -97,15 +98,16 @@ func (fake *FakeReadCloser) Read(arg1 []byte) (int, error) { fake.readArgsForCall = append(fake.readArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1Copy}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go b/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go index 63ba72df441..0ab156444a0 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" ) type FakeSharedActor struct { @@ -89,15 +89,16 @@ func (fake *FakeSharedActor) GatherArchiveResources(arg1 string) ([]sharedaction fake.gatherArchiveResourcesArgsForCall = append(fake.gatherArchiveResourcesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GatherArchiveResourcesStub + fakeReturns := fake.gatherArchiveResourcesReturns fake.recordInvocation("GatherArchiveResources", []interface{}{arg1}) fake.gatherArchiveResourcesMutex.Unlock() - if fake.GatherArchiveResourcesStub != nil { - return fake.GatherArchiveResourcesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.gatherArchiveResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -152,15 +153,16 @@ func (fake *FakeSharedActor) GatherDirectoryResources(arg1 string) ([]sharedacti fake.gatherDirectoryResourcesArgsForCall = append(fake.gatherDirectoryResourcesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GatherDirectoryResourcesStub + fakeReturns := fake.gatherDirectoryResourcesReturns fake.recordInvocation("GatherDirectoryResources", []interface{}{arg1}) fake.gatherDirectoryResourcesMutex.Unlock() - if fake.GatherDirectoryResourcesStub != nil { - return fake.GatherDirectoryResourcesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.gatherDirectoryResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -215,15 +217,16 @@ func (fake *FakeSharedActor) ReadArchive(arg1 string) (io.ReadCloser, int64, err fake.readArchiveArgsForCall = append(fake.readArchiveArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadArchiveStub + fakeReturns := fake.readArchiveReturns fake.recordInvocation("ReadArchive", []interface{}{arg1}) fake.readArchiveMutex.Unlock() - if fake.ReadArchiveStub != nil { - return fake.ReadArchiveStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.readArchiveReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -287,15 +290,16 @@ func (fake *FakeSharedActor) ZipArchiveResources(arg1 string, arg2 []sharedactio arg1 string arg2 []sharedaction.Resource }{arg1, arg2Copy}) + stub := fake.ZipArchiveResourcesStub + fakeReturns := fake.zipArchiveResourcesReturns fake.recordInvocation("ZipArchiveResources", []interface{}{arg1, arg2Copy}) fake.zipArchiveResourcesMutex.Unlock() - if fake.ZipArchiveResourcesStub != nil { - return fake.ZipArchiveResourcesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.zipArchiveResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -356,15 +360,16 @@ func (fake *FakeSharedActor) ZipDirectoryResources(arg1 string, arg2 []sharedact arg1 string arg2 []sharedaction.Resource }{arg1, arg2Copy}) + stub := fake.ZipDirectoryResourcesStub + fakeReturns := fake.zipDirectoryResourcesReturns fake.recordInvocation("ZipDirectoryResources", []interface{}{arg1, arg2Copy}) fake.zipDirectoryResourcesMutex.Unlock() - if fake.ZipDirectoryResourcesStub != nil { - return fake.ZipDirectoryResourcesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.zipDirectoryResourcesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go index 76d8d4d185d..36bf8cf8369 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go @@ -5,10 +5,10 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeV7Actor struct { diff --git a/actor/versioncheck/minimum_version_check_test.go b/actor/versioncheck/minimum_version_check_test.go index 89015dbe129..3369b1cbd83 100644 --- a/actor/versioncheck/minimum_version_check_test.go +++ b/actor/versioncheck/minimum_version_check_test.go @@ -1,7 +1,7 @@ package versioncheck_test import ( - . "code.cloudfoundry.org/cli/actor/versioncheck" + . "code.cloudfoundry.org/cli/v9/actor/versioncheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go b/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go new file mode 100644 index 00000000000..f591fe76641 --- /dev/null +++ b/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go @@ -0,0 +1,55 @@ +package cfnetv1_test + +import ( + "bytes" + "log" + "testing" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +func TestCFNetV1(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "CF Networking V1 Client Suite") +} + +var server *Server + +var _ = SynchronizedBeforeSuite(func() []byte { + return []byte{} +}, func(data []byte) { + server = NewTLSServer() + + // Suppresses ginkgo server logs + server.HTTPTestServer.Config.ErrorLog = log.New(&bytes.Buffer{}, "", 0) +}) + +var _ = SynchronizedAfterSuite(func() { + server.Close() +}, func() {}) + +var _ = BeforeEach(func() { + server.Reset() +}) + +func NewTestClient(passed ...Config) *Client { + var config Config + if len(passed) > 0 { + config = passed[0] + } else { + config = Config{} + } + config.AppName = "CF Networking V1 Test" + config.AppVersion = "Unknown" + config.SkipSSLValidation = true + + if config.URL == "" { + config.URL = server.URL() + } + + return NewClient(config) +} diff --git a/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go b/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go new file mode 100644 index 00000000000..5ada76a17d7 --- /dev/null +++ b/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go @@ -0,0 +1,188 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetv1fakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" +) + +type FakeConnectionWrapper struct { + MakeStub func(*cfnetworking.Request, *cfnetworking.Response) error + makeMutex sync.RWMutex + makeArgsForCall []struct { + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + } + makeReturns struct { + result1 error + } + makeReturnsOnCall map[int]struct { + result1 error + } + WrapStub func(cfnetworking.Connection) cfnetworking.Connection + wrapMutex sync.RWMutex + wrapArgsForCall []struct { + arg1 cfnetworking.Connection + } + wrapReturns struct { + result1 cfnetworking.Connection + } + wrapReturnsOnCall map[int]struct { + result1 cfnetworking.Connection + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeConnectionWrapper) Make(arg1 *cfnetworking.Request, arg2 *cfnetworking.Response) error { + fake.makeMutex.Lock() + ret, specificReturn := fake.makeReturnsOnCall[len(fake.makeArgsForCall)] + fake.makeArgsForCall = append(fake.makeArgsForCall, struct { + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns + fake.recordInvocation("Make", []interface{}{arg1, arg2}) + fake.makeMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeConnectionWrapper) MakeCallCount() int { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + return len(fake.makeArgsForCall) +} + +func (fake *FakeConnectionWrapper) MakeCalls(stub func(*cfnetworking.Request, *cfnetworking.Response) error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() + fake.MakeStub = stub +} + +func (fake *FakeConnectionWrapper) MakeArgsForCall(i int) (*cfnetworking.Request, *cfnetworking.Response) { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + argsForCall := fake.makeArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeConnectionWrapper) MakeReturns(result1 error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() + fake.MakeStub = nil + fake.makeReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeConnectionWrapper) MakeReturnsOnCall(i int, result1 error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() + fake.MakeStub = nil + if fake.makeReturnsOnCall == nil { + fake.makeReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.makeReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeConnectionWrapper) Wrap(arg1 cfnetworking.Connection) cfnetworking.Connection { + fake.wrapMutex.Lock() + ret, specificReturn := fake.wrapReturnsOnCall[len(fake.wrapArgsForCall)] + fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { + arg1 cfnetworking.Connection + }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns + fake.recordInvocation("Wrap", []interface{}{arg1}) + fake.wrapMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeConnectionWrapper) WrapCallCount() int { + fake.wrapMutex.RLock() + defer fake.wrapMutex.RUnlock() + return len(fake.wrapArgsForCall) +} + +func (fake *FakeConnectionWrapper) WrapCalls(stub func(cfnetworking.Connection) cfnetworking.Connection) { + fake.wrapMutex.Lock() + defer fake.wrapMutex.Unlock() + fake.WrapStub = stub +} + +func (fake *FakeConnectionWrapper) WrapArgsForCall(i int) cfnetworking.Connection { + fake.wrapMutex.RLock() + defer fake.wrapMutex.RUnlock() + argsForCall := fake.wrapArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeConnectionWrapper) WrapReturns(result1 cfnetworking.Connection) { + fake.wrapMutex.Lock() + defer fake.wrapMutex.Unlock() + fake.WrapStub = nil + fake.wrapReturns = struct { + result1 cfnetworking.Connection + }{result1} +} + +func (fake *FakeConnectionWrapper) WrapReturnsOnCall(i int, result1 cfnetworking.Connection) { + fake.wrapMutex.Lock() + defer fake.wrapMutex.Unlock() + fake.WrapStub = nil + if fake.wrapReturnsOnCall == nil { + fake.wrapReturnsOnCall = make(map[int]struct { + result1 cfnetworking.Connection + }) + } + fake.wrapReturnsOnCall[i] = struct { + result1 cfnetworking.Connection + }{result1} +} + +func (fake *FakeConnectionWrapper) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + fake.wrapMutex.RLock() + defer fake.wrapMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeConnectionWrapper) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ cfnetv1.ConnectionWrapper = new(FakeConnectionWrapper) diff --git a/api/cfnetworking/cfnetv1/cfvnetv1.go b/api/cfnetworking/cfnetv1/cfvnetv1.go new file mode 100644 index 00000000000..c80661d5e30 --- /dev/null +++ b/api/cfnetworking/cfnetv1/cfvnetv1.go @@ -0,0 +1,3 @@ +package cfnetv1 + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/api/cfnetworking/cfnetv1/client.go b/api/cfnetworking/cfnetv1/client.go new file mode 100644 index 00000000000..1c301716184 --- /dev/null +++ b/api/cfnetworking/cfnetv1/client.go @@ -0,0 +1,136 @@ +// Package cfnetv1 represents a CF Networking V1 client. +// +// These sets of packages are still under development/pre-pre-pre...alpha. Use +// at your own risk! Functionality and design may change without warning. +// +// For more information on the CF Networking API see +// https://github.com/cloudfoundry-incubator/cf-networking-release/blob/develop/docs/API.md +// +// Method Naming Conventions +// +// The client takes a '' +// approach to method names. If the and +// are similar, they do not need to be repeated. If a GUID is required for the +// , the pluralization is removed from said endpoint in the +// method name. +// +// For Example: +// Method Name: GetApplication +// Endpoint: /v2/applications/:guid +// Action Name: Get +// Top Level Endpoint: applications +// Return Value: Application +// +// Method Name: GetServiceInstances +// Endpoint: /v2/service_instances +// Action Name: Get +// Top Level Endpoint: service_instances +// Return Value: []ServiceInstance +// +// Method Name: GetSpaceServiceInstances +// Endpoint: /v2/spaces/:guid/service_instances +// Action Name: Get +// Top Level Endpoint: spaces +// Return Value: []ServiceInstance +// +// Use the following table to determine which HTTP Command equates to which +// Action Name: +// HTTP Command -> Action Name +// POST -> Create +// GET -> Get +// PUT -> Update +// DELETE -> Delete +// +// Method Locations +// +// Methods exist in the same file as their return type, regardless of which +// endpoint they use. +// +// Error Handling +// +// All error handling that requires parsing the error_code/code returned back +// from the Cloud Controller should be placed in the errorWrapper. Everything +// else can be handled in the individual operations. All parsed cloud +// controller errors should exist in errors.go, all generic HTTP errors should +// exist in the cloudcontroller's errors.go. Errors related to the individaul +// operation should exist at the top of that operation's file. +// +// No inline-relations-depth And summary Endpoints +// +// This package will not use ever use 'inline-relations-depth' or the +// '/summary' endpoints for any operations. These requests can be extremely +// taxing on the Cloud Controller and are avoided at all costs. Additionally, +// the objects returned back from these requests can become extremely +// inconsistant across versions and are problematic to deal with in general. +package cfnetv1 + +import ( + "fmt" + "runtime" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1/internal" + + "github.com/tedsuo/rata" +) + +// Client is a client that can be used to talk to a CF Networking API. +type Client struct { + connection cfnetworking.Connection + router *rata.RequestGenerator + url string + userAgent string +} + +// Config allows the Client to be configured +type Config struct { + // AppName is the name of the application/process using the client. + AppName string + + // AppVersion is the version of the application/process using the client. + AppVersion string + + // DialTimeout is the DNS timeout used to make all requests to the Cloud + // Controller. + DialTimeout time.Duration + + // SkipSSLValidation controls whether a client verifies the server's + // certificate chain and host name. If SkipSSLValidation is true, TLS accepts + // any certificate presented by the server and any host name in that + // certificate for *all* client requests going forward. + // + // In this mode, TLS is susceptible to man-in-the-middle attacks. This should + // be used only for testing. + SkipSSLValidation bool + + // URL is a fully qualified URL to the CF Networking API. + URL string + + // Wrappers that apply to the client connection. + Wrappers []ConnectionWrapper +} + +// NewClient returns a new CF Networking client. +func NewClient(config Config) *Client { + userAgent := fmt.Sprintf("%s/%s (%s; %s %s)", config.AppName, config.AppVersion, runtime.Version(), runtime.GOARCH, runtime.GOOS) + + connection := cfnetworking.NewConnection(cfnetworking.Config{ + DialTimeout: config.DialTimeout, + SkipSSLValidation: config.SkipSSLValidation, + }) + + wrappedConnection := cfnetworking.NewErrorWrapper().Wrap(connection) + for _, wrapper := range config.Wrappers { + wrappedConnection = wrapper.Wrap(wrappedConnection) + } + + client := &Client{ + connection: wrappedConnection, + router: rata.NewRequestGenerator(config.URL, internal.Routes), + url: config.URL, + userAgent: userAgent, + } + + return client +} diff --git a/api/cfnetworking/cfnetv1/connection_wrapper.go b/api/cfnetworking/cfnetv1/connection_wrapper.go new file mode 100644 index 00000000000..fc2367015fe --- /dev/null +++ b/api/cfnetworking/cfnetv1/connection_wrapper.go @@ -0,0 +1,17 @@ +package cfnetv1 + +import "code.cloudfoundry.org/cli/v9/api/cfnetworking" + +// ConnectionWrapper can wrap a given connection allowing the wrapper to modify +// all requests going in and out of the given connection. +// +//counterfeiter:generate . ConnectionWrapper +type ConnectionWrapper interface { + cfnetworking.Connection + Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection +} + +// WrapConnection wraps the current Client connection in the wrapper. +func (client *Client) WrapConnection(wrapper ConnectionWrapper) { + client.connection = wrapper.Wrap(client.connection) +} diff --git a/api/cfnetworking/cfnetv1/internal/routes.go b/api/cfnetworking/cfnetv1/internal/routes.go new file mode 100644 index 00000000000..69cf937ca4f --- /dev/null +++ b/api/cfnetworking/cfnetv1/internal/routes.go @@ -0,0 +1,21 @@ +package internal + +import ( + "net/http" + + "github.com/tedsuo/rata" +) + +const ( + CreatePolicies = "PostPolicies" + DeletePolicies = "DeletePolicies" + ListPolicies = "ListPolicies" +) + +// Routes is a list of routes used by the rata library to construct request +// URLs. +var Routes = rata.Routes{ + {Path: "/policies", Method: http.MethodPost, Name: CreatePolicies}, + {Path: "/policies/delete", Method: http.MethodPost, Name: DeletePolicies}, + {Path: "/policies", Method: http.MethodGet, Name: ListPolicies}, +} diff --git a/api/cfnetworking/cfnetv1/policy.go b/api/cfnetworking/cfnetv1/policy.go new file mode 100644 index 00000000000..113cb8d6ea8 --- /dev/null +++ b/api/cfnetworking/cfnetv1/policy.go @@ -0,0 +1,104 @@ +package cfnetv1 + +import ( + "bytes" + "encoding/json" + "strings" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1/internal" +) + +type PolicyProtocol string + +const ( + PolicyProtocolTCP PolicyProtocol = "tcp" + PolicyProtocolUDP PolicyProtocol = "udp" +) + +type PolicyList struct { + TotalPolicies int `json:"total_policies,omitempty"` + Policies []Policy `json:"policies"` +} + +type Policy struct { + Source PolicySource `json:"source"` + Destination PolicyDestination `json:"destination"` +} + +type PolicySource struct { + ID string `json:"id"` +} + +type PolicyDestination struct { + ID string `json:"id"` + Protocol PolicyProtocol `json:"protocol"` + Ports Ports `json:"ports"` +} + +// CreatePolicies will create the network policy with the given parameters. +func (client *Client) CreatePolicies(policies []Policy) error { + rawJSON, err := json.Marshal(PolicyList{Policies: policies}) + if err != nil { + return err + } + + request, err := client.newHTTPRequest(requestOptions{ + RequestName: internal.CreatePolicies, + Body: bytes.NewReader(rawJSON), + }) + if err != nil { + return err + } + + return client.connection.Make(request, &cfnetworking.Response{}) +} + +// ListPolicies will list the policies with the app guids in either the source or destination. +func (client *Client) ListPolicies(appGUIDs ...string) ([]Policy, error) { + var request *cfnetworking.Request + var err error + if len(appGUIDs) == 0 { + request, err = client.newHTTPRequest(requestOptions{ + RequestName: internal.ListPolicies, + }) + } else { + request, err = client.newHTTPRequest(requestOptions{ + RequestName: internal.ListPolicies, + Query: map[string][]string{ + "id": {strings.Join(appGUIDs, ",")}, + }, + }) + } + if err != nil { + return []Policy{}, err + } + + policies := PolicyList{} + response := &cfnetworking.Response{} + + err = client.connection.Make(request, response) + if err != nil { + return []Policy{}, err + } + + err = json.Unmarshal(response.RawResponse, &policies) + if err != nil { + return []Policy{}, err + } + + return policies.Policies, nil +} + +// RemovePolicies will remove the network policy with the given parameters. +func (client *Client) RemovePolicies(policies []Policy) error { + rawJSON, err := json.Marshal(PolicyList{Policies: policies}) + if err != nil { + return err + } + request, err := client.newHTTPRequest(requestOptions{ + RequestName: internal.DeletePolicies, + Body: bytes.NewReader(rawJSON), + }) + return client.connection.Make(request, &cfnetworking.Response{}) +} diff --git a/api/cfnetworking/cfnetv1/policy_test.go b/api/cfnetworking/cfnetv1/policy_test.go new file mode 100644 index 00000000000..6ccebded829 --- /dev/null +++ b/api/cfnetworking/cfnetv1/policy_test.go @@ -0,0 +1,339 @@ +package cfnetv1_test + +import ( + "net/http" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +var _ = Describe("Policy", func() { + var client *Client + BeforeEach(func() { + client = NewTestClient() + }) + + Describe("CreatePolicies", func() { + Context("when the stack is found", func() { + BeforeEach(func() { + expectedBody := `{ + "policies": [ + { + "source": { + "id": "source-id-1" + }, + "destination": { + "id": "destination-id-1", + "protocol": "tcp", + "ports": { + "start": 1234, + "end": 1235 + } + } + }, + { + "source": { + "id": "source-id-2" + }, + "destination": { + "id": "destination-id-2", + "protocol": "udp", + "ports": { + "start": 1234, + "end": 1235 + } + } + } + ] + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies"), + VerifyJSON(expectedBody), + RespondWith(http.StatusOK, ""), + ), + ) + }) + + It("passes the body correctly", func() { + err := client.CreatePolicies([]Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: PolicyProtocolTCP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: PolicyProtocolUDP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + }) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) + + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ + "error": "Oh Noes" + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) + + It("returns the error and warnings", func() { + err := client.CreatePolicies(nil) + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) + + Describe("ListPolicies", func() { + var expectedPolicies []Policy + Context("when the policies are found", func() { + BeforeEach(func() { + response := `{ + "policies": [ + { + "source": { + "id": "source-id-1" + }, + "destination": { + "id": "destination-id-1", + "protocol": "tcp", + "ports": { + "start": 1234, + "end": 1235 + } + } + }, + { + "source": { + "id": "source-id-2" + }, + "destination": { + "id": "destination-id-2", + "protocol": "tcp", + "ports": { + "start": 4321, + "end": 5321 + } + } + } + ] + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/policies"), + RespondWith(http.StatusOK, response), + ), + ) + expectedPolicies = []Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: "tcp", + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: "tcp", + Ports: Ports{ + Start: 4321, + End: 5321, + }, + }, + }, + } + }) + + It("returns the policies correctly", func() { + policies, err := client.ListPolicies() + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + + Context("when an app guid is passed", func() { + It("makes the query correctly", func() { + policies, err := client.ListPolicies("source-id-1") + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) + + requests := server.ReceivedRequests() + Expect(requests).To(HaveLen(1)) + Expect(requests[0].RequestURI).To(Equal("/policies?id=source-id-1")) + }) + }) + + Context("when multiple app guid are passed", func() { + It("makes the query correctly", func() { + policies, err := client.ListPolicies("source-id-1", "source-id-2") + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) + + requests := server.ReceivedRequests() + Expect(requests).To(HaveLen(1)) + Expect(requests[0].RequestURI).To(Equal("/policies?id=source-id-1%2Csource-id-2")) + }) + }) + + }) + + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ + "error": "Oh Noes" + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/policies"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) + + It("returns the error", func() { + _, err := client.ListPolicies() + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) + + Describe("RemovePolicies", func() { + Context("when the policy is found", func() { + BeforeEach(func() { + expectedBody := `{ + "policies": [ + { + "source": { + "id": "source-id-1" + }, + "destination": { + "id": "destination-id-1", + "protocol": "tcp", + "ports": { + "start": 1234, + "end": 1235 + } + } + }, + { + "source": { + "id": "source-id-2" + }, + "destination": { + "id": "destination-id-2", + "protocol": "udp", + "ports": { + "start": 1234, + "end": 1235 + } + } + } + ] + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies/delete"), + VerifyJSON(expectedBody), + RespondWith(http.StatusOK, ""), + ), + ) + }) + + It("passes the body correctly", func() { + err := client.RemovePolicies([]Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: PolicyProtocolTCP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: PolicyProtocolUDP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + }) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) + + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ + "error": "Oh Noes" + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies/delete"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) + + It("returns the error", func() { + err := client.RemovePolicies(nil) + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) +}) diff --git a/api/cfnetworking/cfnetv1/ports.go b/api/cfnetworking/cfnetv1/ports.go new file mode 100644 index 00000000000..d684f64418b --- /dev/null +++ b/api/cfnetworking/cfnetv1/ports.go @@ -0,0 +1,6 @@ +package cfnetv1 + +type Ports struct { + Start int `json:"start"` + End int `json:"end"` +} diff --git a/api/cfnetworking/cfnetv1/request.go b/api/cfnetworking/cfnetv1/request.go new file mode 100644 index 00000000000..8511e5e683c --- /dev/null +++ b/api/cfnetworking/cfnetv1/request.go @@ -0,0 +1,70 @@ +package cfnetv1 + +import ( + "fmt" + "io" + "net/http" + "net/url" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +// Params represents URI parameters for a request. +type Params map[string]string + +// requestOptions contains all the options to create an HTTP request. +type requestOptions struct { + // URIParams are the list URI route parameters + URIParams Params + + // Query is a list of HTTP query parameters + Query url.Values + + // RequestName is the name of the request (see routes) + RequestName string + + // URI is the URI of the request. + URI string + // Method is the HTTP method of the request. + Method string + + // Body is the request body + Body io.ReadSeeker +} + +// newHTTPRequest returns a constructed HTTP.Request with some defaults. +// Defaults are applied when Request fields are not filled in. +func (client *Client) newHTTPRequest(passedRequest requestOptions) (*cfnetworking.Request, error) { + var request *http.Request + var err error + if passedRequest.URI != "" { + request, err = http.NewRequest( + passedRequest.Method, + fmt.Sprintf("%s%s", client.url, passedRequest.URI), + passedRequest.Body, + ) + } else { + request, err = client.router.CreateRequest( + passedRequest.RequestName, + map[string]string(passedRequest.URIParams), + passedRequest.Body, + ) + if err == nil { + request.URL.RawQuery = passedRequest.Query.Encode() + } + } + if err != nil { + return nil, err + } + + request.Header = http.Header{} + request.Header.Set("Accept", "application/json") + request.Header.Set("User-Agent", client.userAgent) + + if passedRequest.Body != nil { + request.Header.Set("Content-Type", "application/json") + } + + // Make sure the body is the same as the one in the request + return cfnetworking.NewRequest(request, passedRequest.Body), nil +} diff --git a/api/cfnetworking/cfnetworking.go b/api/cfnetworking/cfnetworking.go new file mode 100644 index 00000000000..93b0cacabd5 --- /dev/null +++ b/api/cfnetworking/cfnetworking.go @@ -0,0 +1,6 @@ +// CF networking API. Copied from code.cloudfoundry.org/cfnetworking-cli-api +// to reduce recursive dependencies and allow proper go module management. + +package cfnetworking + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/api/cfnetworking/cfnetworking_suite_test.go b/api/cfnetworking/cfnetworking_suite_test.go new file mode 100644 index 00000000000..b434160e526 --- /dev/null +++ b/api/cfnetworking/cfnetworking_suite_test.go @@ -0,0 +1,35 @@ +package cfnetworking_test + +import ( + "bytes" + "log" + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +func TestUaa(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "CF Networking Suite") +} + +var server *Server + +var _ = SynchronizedBeforeSuite(func() []byte { + return []byte{} +}, func(data []byte) { + server = NewTLSServer() + + // Suppresses ginkgo server logs + server.HTTPTestServer.Config.ErrorLog = log.New(&bytes.Buffer{}, "", 0) +}) + +var _ = SynchronizedAfterSuite(func() { + server.Close() +}, func() {}) + +var _ = BeforeEach(func() { + server.Reset() +}) diff --git a/api/cfnetworking/cfnetworkingfakes/fake_connection.go b/api/cfnetworking/cfnetworkingfakes/fake_connection.go new file mode 100644 index 00000000000..157903f772c --- /dev/null +++ b/api/cfnetworking/cfnetworkingfakes/fake_connection.go @@ -0,0 +1,113 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetworkingfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +type FakeConnection struct { + MakeStub func(*cfnetworking.Request, *cfnetworking.Response) error + makeMutex sync.RWMutex + makeArgsForCall []struct { + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + } + makeReturns struct { + result1 error + } + makeReturnsOnCall map[int]struct { + result1 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeConnection) Make(arg1 *cfnetworking.Request, arg2 *cfnetworking.Response) error { + fake.makeMutex.Lock() + ret, specificReturn := fake.makeReturnsOnCall[len(fake.makeArgsForCall)] + fake.makeArgsForCall = append(fake.makeArgsForCall, struct { + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns + fake.recordInvocation("Make", []interface{}{arg1, arg2}) + fake.makeMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeConnection) MakeCallCount() int { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + return len(fake.makeArgsForCall) +} + +func (fake *FakeConnection) MakeCalls(stub func(*cfnetworking.Request, *cfnetworking.Response) error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() + fake.MakeStub = stub +} + +func (fake *FakeConnection) MakeArgsForCall(i int) (*cfnetworking.Request, *cfnetworking.Response) { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + argsForCall := fake.makeArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeConnection) MakeReturns(result1 error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() + fake.MakeStub = nil + fake.makeReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeConnection) MakeReturnsOnCall(i int, result1 error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() + fake.MakeStub = nil + if fake.makeReturnsOnCall == nil { + fake.makeReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.makeReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeConnection) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeConnection) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ cfnetworking.Connection = new(FakeConnection) diff --git a/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go b/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go new file mode 100644 index 00000000000..1e759ee28c1 --- /dev/null +++ b/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go @@ -0,0 +1,202 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetworkingfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +type FakeReadSeeker struct { + ReadStub func([]byte) (int, error) + readMutex sync.RWMutex + readArgsForCall []struct { + arg1 []byte + } + readReturns struct { + result1 int + result2 error + } + readReturnsOnCall map[int]struct { + result1 int + result2 error + } + SeekStub func(int64, int) (int64, error) + seekMutex sync.RWMutex + seekArgsForCall []struct { + arg1 int64 + arg2 int + } + seekReturns struct { + result1 int64 + result2 error + } + seekReturnsOnCall map[int]struct { + result1 int64 + result2 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeReadSeeker) Read(arg1 []byte) (int, error) { + var arg1Copy []byte + if arg1 != nil { + arg1Copy = make([]byte, len(arg1)) + copy(arg1Copy, arg1) + } + fake.readMutex.Lock() + ret, specificReturn := fake.readReturnsOnCall[len(fake.readArgsForCall)] + fake.readArgsForCall = append(fake.readArgsForCall, struct { + arg1 []byte + }{arg1Copy}) + stub := fake.ReadStub + fakeReturns := fake.readReturns + fake.recordInvocation("Read", []interface{}{arg1Copy}) + fake.readMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeReadSeeker) ReadCallCount() int { + fake.readMutex.RLock() + defer fake.readMutex.RUnlock() + return len(fake.readArgsForCall) +} + +func (fake *FakeReadSeeker) ReadCalls(stub func([]byte) (int, error)) { + fake.readMutex.Lock() + defer fake.readMutex.Unlock() + fake.ReadStub = stub +} + +func (fake *FakeReadSeeker) ReadArgsForCall(i int) []byte { + fake.readMutex.RLock() + defer fake.readMutex.RUnlock() + argsForCall := fake.readArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeReadSeeker) ReadReturns(result1 int, result2 error) { + fake.readMutex.Lock() + defer fake.readMutex.Unlock() + fake.ReadStub = nil + fake.readReturns = struct { + result1 int + result2 error + }{result1, result2} +} + +func (fake *FakeReadSeeker) ReadReturnsOnCall(i int, result1 int, result2 error) { + fake.readMutex.Lock() + defer fake.readMutex.Unlock() + fake.ReadStub = nil + if fake.readReturnsOnCall == nil { + fake.readReturnsOnCall = make(map[int]struct { + result1 int + result2 error + }) + } + fake.readReturnsOnCall[i] = struct { + result1 int + result2 error + }{result1, result2} +} + +func (fake *FakeReadSeeker) Seek(arg1 int64, arg2 int) (int64, error) { + fake.seekMutex.Lock() + ret, specificReturn := fake.seekReturnsOnCall[len(fake.seekArgsForCall)] + fake.seekArgsForCall = append(fake.seekArgsForCall, struct { + arg1 int64 + arg2 int + }{arg1, arg2}) + stub := fake.SeekStub + fakeReturns := fake.seekReturns + fake.recordInvocation("Seek", []interface{}{arg1, arg2}) + fake.seekMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeReadSeeker) SeekCallCount() int { + fake.seekMutex.RLock() + defer fake.seekMutex.RUnlock() + return len(fake.seekArgsForCall) +} + +func (fake *FakeReadSeeker) SeekCalls(stub func(int64, int) (int64, error)) { + fake.seekMutex.Lock() + defer fake.seekMutex.Unlock() + fake.SeekStub = stub +} + +func (fake *FakeReadSeeker) SeekArgsForCall(i int) (int64, int) { + fake.seekMutex.RLock() + defer fake.seekMutex.RUnlock() + argsForCall := fake.seekArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeReadSeeker) SeekReturns(result1 int64, result2 error) { + fake.seekMutex.Lock() + defer fake.seekMutex.Unlock() + fake.SeekStub = nil + fake.seekReturns = struct { + result1 int64 + result2 error + }{result1, result2} +} + +func (fake *FakeReadSeeker) SeekReturnsOnCall(i int, result1 int64, result2 error) { + fake.seekMutex.Lock() + defer fake.seekMutex.Unlock() + fake.SeekStub = nil + if fake.seekReturnsOnCall == nil { + fake.seekReturnsOnCall = make(map[int]struct { + result1 int64 + result2 error + }) + } + fake.seekReturnsOnCall[i] = struct { + result1 int64 + result2 error + }{result1, result2} +} + +func (fake *FakeReadSeeker) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.readMutex.RLock() + defer fake.readMutex.RUnlock() + fake.seekMutex.RLock() + defer fake.seekMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeReadSeeker) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ cfnetworking.ReadSeeker = new(FakeReadSeeker) diff --git a/api/cfnetworking/connection.go b/api/cfnetworking/connection.go new file mode 100644 index 00000000000..96958130dcf --- /dev/null +++ b/api/cfnetworking/connection.go @@ -0,0 +1,8 @@ +package cfnetworking + +// Connection creates and executes http requests +// +//counterfeiter:generate . Connection +type Connection interface { + Make(request *Request, passedResponse *Response) error +} diff --git a/api/cfnetworking/errors.go b/api/cfnetworking/errors.go new file mode 100644 index 00000000000..7abd7877c64 --- /dev/null +++ b/api/cfnetworking/errors.go @@ -0,0 +1,64 @@ +package cfnetworking + +import ( + "encoding/json" + "net/http" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" +) + +// errorWrapper is the wrapper that converts responses with 4xx and 5xx status +// codes to an error. +type errorWrapper struct { + connection Connection +} + +func NewErrorWrapper() *errorWrapper { + return new(errorWrapper) +} + +// Wrap wraps a Cloud Controller connection in this error handling wrapper. +func (e *errorWrapper) Wrap(innerconnection Connection) Connection { + e.connection = innerconnection + return e +} + +// Make converts RawHTTPStatusError, which represents responses with 4xx and +// 5xx status codes, to specific errors. +func (e *errorWrapper) Make(request *Request, passedResponse *Response) error { + err := e.connection.Make(request, passedResponse) + + if rawHTTPStatusErr, ok := err.(networkerror.RawHTTPStatusError); ok { + return convert(rawHTTPStatusErr) + } + return err +} + +func convert(rawHTTPStatusErr networkerror.RawHTTPStatusError) error { + // Try to unmarshal the raw error into a CC error. If unmarshaling fails, + // return the raw error. + var errorResponse networkerror.ErrorResponse + err := json.Unmarshal(rawHTTPStatusErr.RawResponse, &errorResponse) + if err != nil { + return rawHTTPStatusErr + } + + switch rawHTTPStatusErr.StatusCode { + case http.StatusBadRequest: // 400 + return networkerror.BadRequestError(errorResponse) + case http.StatusUnauthorized: // 401 + return networkerror.UnauthorizedError(errorResponse) + case http.StatusForbidden: // 403 + return networkerror.ForbiddenError(errorResponse) + case http.StatusNotAcceptable: // 406 + return networkerror.NotAcceptableError(errorResponse) + case http.StatusConflict: // 409 + return networkerror.ConflictError(errorResponse) + default: + return networkerror.UnexpectedResponseError{ + ErrorResponse: errorResponse, + RequestIDs: rawHTTPStatusErr.RequestIDs, + ResponseCode: rawHTTPStatusErr.StatusCode, + } + } +} diff --git a/api/cfnetworking/errors_test.go b/api/cfnetworking/errors_test.go new file mode 100644 index 00000000000..1edf8d4f04f --- /dev/null +++ b/api/cfnetworking/errors_test.go @@ -0,0 +1,36 @@ +package cfnetworking_test + +import ( + "fmt" + "net/http" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("Error Wrapper", func() { + const errorMessage = "I am an error" + + DescribeTable("Make", + func(statusCode int, expectedError error) { + fakeConnection := new(cfnetworkingfakes.FakeConnection) + fakeConnection.MakeReturns(networkerror.RawHTTPStatusError{ + StatusCode: statusCode, + RawResponse: []byte(fmt.Sprintf(`{"error":"%s"}`, errorMessage)), + }) + + errorWrapper := NewErrorWrapper().Wrap(fakeConnection) + err := errorWrapper.Make(nil, nil) + Expect(err).To(MatchError(expectedError)) + }, + Entry("400 -> BadRequestError", http.StatusBadRequest, networkerror.BadRequestError{Message: errorMessage}), + Entry("401 -> UnauthorizedError", http.StatusUnauthorized, networkerror.UnauthorizedError{Message: errorMessage}), + Entry("403 -> ForbiddenError", http.StatusForbidden, networkerror.ForbiddenError{Message: errorMessage}), + Entry("406 -> NotAcceptable", http.StatusNotAcceptable, networkerror.NotAcceptableError{Message: errorMessage}), + Entry("409 -> ConflictError", http.StatusConflict, networkerror.ConflictError{Message: errorMessage}), + ) +}) diff --git a/api/cfnetworking/networkerror/bad_request_error.go b/api/cfnetworking/networkerror/bad_request_error.go new file mode 100644 index 00000000000..16db7bd925c --- /dev/null +++ b/api/cfnetworking/networkerror/bad_request_error.go @@ -0,0 +1,9 @@ +package networkerror + +type BadRequestError struct { + Message string `json:"error"` +} + +func (e BadRequestError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/conflict_error.go b/api/cfnetworking/networkerror/conflict_error.go new file mode 100644 index 00000000000..807ac313642 --- /dev/null +++ b/api/cfnetworking/networkerror/conflict_error.go @@ -0,0 +1,9 @@ +package networkerror + +type ConflictError struct { + Message string `json:"error"` +} + +func (e ConflictError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/error_response.go b/api/cfnetworking/networkerror/error_response.go new file mode 100644 index 00000000000..a3ff4659f9a --- /dev/null +++ b/api/cfnetworking/networkerror/error_response.go @@ -0,0 +1,9 @@ +package networkerror + +type ErrorResponse struct { + Message string `json:"error"` +} + +func (e ErrorResponse) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/forbidden_error.go b/api/cfnetworking/networkerror/forbidden_error.go new file mode 100644 index 00000000000..d780a34cb8f --- /dev/null +++ b/api/cfnetworking/networkerror/forbidden_error.go @@ -0,0 +1,9 @@ +package networkerror + +type ForbiddenError struct { + Message string `json:"error"` +} + +func (e ForbiddenError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/invalid_auth_token_error.go b/api/cfnetworking/networkerror/invalid_auth_token_error.go new file mode 100644 index 00000000000..3e3178c39ad --- /dev/null +++ b/api/cfnetworking/networkerror/invalid_auth_token_error.go @@ -0,0 +1,11 @@ +package networkerror + +// InvalidAuthTokenError is returned when the client has an invalid +// authorization header. +type InvalidAuthTokenError struct { + Message string +} + +func (e InvalidAuthTokenError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/not_acceptable_error.go b/api/cfnetworking/networkerror/not_acceptable_error.go new file mode 100644 index 00000000000..002a73df304 --- /dev/null +++ b/api/cfnetworking/networkerror/not_acceptable_error.go @@ -0,0 +1,9 @@ +package networkerror + +type NotAcceptableError struct { + Message string `json:"error"` +} + +func (e NotAcceptableError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/not_found_error.go b/api/cfnetworking/networkerror/not_found_error.go new file mode 100644 index 00000000000..a69d3030854 --- /dev/null +++ b/api/cfnetworking/networkerror/not_found_error.go @@ -0,0 +1,10 @@ +package networkerror + +// NotFoundError wraps a generic 404 error. +type NotFoundError struct { + Message string +} + +func (e NotFoundError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/raw_http_status_error.go b/api/cfnetworking/networkerror/raw_http_status_error.go new file mode 100644 index 00000000000..fea62dcd7fd --- /dev/null +++ b/api/cfnetworking/networkerror/raw_http_status_error.go @@ -0,0 +1,14 @@ +package networkerror + +import "fmt" + +// RawHTTPStatusError represents any response with a 4xx or 5xx status code. +type RawHTTPStatusError struct { + StatusCode int + RawResponse []byte + RequestIDs []string +} + +func (r RawHTTPStatusError) Error() string { + return fmt.Sprintf("Error Code: %d\nRaw Response: %s", r.StatusCode, r.RawResponse) +} diff --git a/api/cfnetworking/networkerror/request_error.go b/api/cfnetworking/networkerror/request_error.go new file mode 100644 index 00000000000..0a4c17a6f72 --- /dev/null +++ b/api/cfnetworking/networkerror/request_error.go @@ -0,0 +1,11 @@ +package networkerror + +// RequestError represents a generic error encountered while performing the +// HTTP request. This generic error occurs before an HTTP response is obtained. +type RequestError struct { + Err error +} + +func (e RequestError) Error() string { + return e.Err.Error() +} diff --git a/api/cfnetworking/networkerror/ssl_validation_hostname_error.go b/api/cfnetworking/networkerror/ssl_validation_hostname_error.go new file mode 100644 index 00000000000..a583abcff0e --- /dev/null +++ b/api/cfnetworking/networkerror/ssl_validation_hostname_error.go @@ -0,0 +1,13 @@ +package networkerror + +import "fmt" + +// SSLValidationHostnameError replaces x509.HostnameError when the server has +// SSL certificate that does not match the hostname. +type SSLValidationHostnameError struct { + Message string +} + +func (e SSLValidationHostnameError) Error() string { + return fmt.Sprintf("Hostname does not match SSL Certificate (%s)", e.Message) +} diff --git a/api/cfnetworking/networkerror/unauthorized_error.go b/api/cfnetworking/networkerror/unauthorized_error.go new file mode 100644 index 00000000000..513c6de40cb --- /dev/null +++ b/api/cfnetworking/networkerror/unauthorized_error.go @@ -0,0 +1,9 @@ +package networkerror + +type UnauthorizedError struct { + Message string `json:"error"` +} + +func (e UnauthorizedError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/unexpected_response_error.go b/api/cfnetworking/networkerror/unexpected_response_error.go new file mode 100644 index 00000000000..e337d7a7954 --- /dev/null +++ b/api/cfnetworking/networkerror/unexpected_response_error.go @@ -0,0 +1,20 @@ +package networkerror + +import "fmt" + +// UnexpectedResponseError is returned when the client gets an error that has +// not been accounted for. +type UnexpectedResponseError struct { + ErrorResponse + + RequestIDs []string + ResponseCode int +} + +func (e UnexpectedResponseError) Error() string { + message := fmt.Sprintf("Unexpected Response\nResponse code: %d", e.ResponseCode) + for _, id := range e.RequestIDs { + message = fmt.Sprintf("%s\nRequest ID: %s", message, id) + } + return fmt.Sprintf("%s\nDescription: %s", message, e.Message) +} diff --git a/api/cfnetworking/networkerror/unverified_server_error.go b/api/cfnetworking/networkerror/unverified_server_error.go new file mode 100644 index 00000000000..97b7992e614 --- /dev/null +++ b/api/cfnetworking/networkerror/unverified_server_error.go @@ -0,0 +1,11 @@ +package networkerror + +// UnverifiedServerError replaces x509.UnknownAuthorityError when the server +// has SSL but the client is unable to verify its certificate +type UnverifiedServerError struct { + URL string +} + +func (UnverifiedServerError) Error() string { + return "x509: certificate signed by unknown authority" +} diff --git a/api/cfnetworking/networking_connection.go b/api/cfnetworking/networking_connection.go new file mode 100644 index 00000000000..2db049fb4bb --- /dev/null +++ b/api/cfnetworking/networking_connection.go @@ -0,0 +1,127 @@ +package cfnetworking + +import ( + "bytes" + "crypto/tls" + "crypto/x509" + "encoding/json" + "errors" + "io" + "net" + "net/http" + "net/url" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" +) + +// NetworkingConnection represents a connection to the Cloud Controller +// server. +type NetworkingConnection struct { + HTTPClient *http.Client + UserAgent string +} + +// Config is for configuring a NetworkingConnection. +type Config struct { + DialTimeout time.Duration + SkipSSLValidation bool +} + +// NewConnection returns a new NetworkingConnection with provided +// configuration. +func NewConnection(config Config) *NetworkingConnection { + tr := &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: config.SkipSSLValidation, + }, + Proxy: http.ProxyFromEnvironment, + DialContext: (&net.Dialer{ + KeepAlive: 30 * time.Second, + Timeout: config.DialTimeout, + }).DialContext, + } + + return &NetworkingConnection{ + HTTPClient: &http.Client{Transport: tr}, + } +} + +// Make performs the request and parses the response. +func (connection *NetworkingConnection) Make(request *Request, passedResponse *Response) error { + // In case this function is called from a retry, passedResponse may already + // be populated with a previous response. We reset in case there's an HTTP + // error, and we don't repopulate it in populateResponse. + passedResponse.reset() + + response, err := connection.HTTPClient.Do(request.Request) + if err != nil { + return connection.processRequestErrors(request.Request, err) + } + + return connection.populateResponse(response, passedResponse) +} + +func (*NetworkingConnection) processRequestErrors(request *http.Request, err error) error { + switch err.(type) { + case *url.Error: + if errors.As(err, &x509.UnknownAuthorityError{}) { + return networkerror.UnverifiedServerError{ + URL: request.URL.String(), + } + } + hostnameError := x509.HostnameError{} + if errors.As(err, &hostnameError) { + return networkerror.SSLValidationHostnameError{ + Message: hostnameError.Error(), + } + } + return networkerror.RequestError{Err: err} + default: + return err + } +} + +func (connection *NetworkingConnection) populateResponse(response *http.Response, passedResponse *Response) error { + passedResponse.HTTPResponse = response + + if resourceLocationURL := response.Header.Get("Location"); resourceLocationURL != "" { + passedResponse.ResourceLocationURL = resourceLocationURL + } + + rawBytes, err := io.ReadAll(response.Body) + defer response.Body.Close() + if err != nil { + return err + } + + passedResponse.RawResponse = rawBytes + + err = connection.handleStatusCodes(response, passedResponse) + if err != nil { + return err + } + + if passedResponse.Result != nil { + decoder := json.NewDecoder(bytes.NewBuffer(passedResponse.RawResponse)) + decoder.UseNumber() + err = decoder.Decode(passedResponse.Result) + if err != nil { + return err + } + } + + return nil +} + +func (*NetworkingConnection) handleStatusCodes(response *http.Response, passedResponse *Response) error { + if response.StatusCode >= 400 { + return networkerror.RawHTTPStatusError{ + StatusCode: response.StatusCode, + RawResponse: passedResponse.RawResponse, + RequestIDs: response.Header["X-Vcap-Request-Id"], + } + } + + return nil +} diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go new file mode 100644 index 00000000000..d40abb6e28f --- /dev/null +++ b/api/cfnetworking/networking_connection_test.go @@ -0,0 +1,251 @@ +package cfnetworking_test + +import ( + "fmt" + "net/http" + "runtime" + "strings" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +type DummyResponse struct { + Val1 string `json:"val1"` + Val2 int `json:"val2"` + Val3 interface{} `json:"val3,omitempty"` +} + +var _ = Describe("CF Networking Connection", func() { + var connection *NetworkingConnection + + BeforeEach(func() { + connection = NewConnection(Config{SkipSSLValidation: true}) + }) + + Describe("Make", func() { + Describe("Data Unmarshalling", func() { + var request *Request + + BeforeEach(func() { + response := `{ + "val1":"2.59.0", + "val2":2, + "val3":1111111111111111111 + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo", ""), + RespondWith(http.StatusOK, response), + ), + ) + + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request = &Request{Request: req} + }) + + When("passed a response with a result set", func() { + It("unmarshals the data into a struct", func() { + var body DummyResponse + response := Response{ + Result: &body, + } + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(body.Val1).To(Equal("2.59.0")) + Expect(body.Val2).To(Equal(2)) + }) + + It("keeps numbers unmarshalled to interfaces as interfaces", func() { + var body DummyResponse + response := Response{ + Result: &body, + } + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + Expect(fmt.Sprint(body.Val3)).To(Equal("1111111111111111111")) + }) + }) + + When("passed an empty response", func() { + It("skips the unmarshalling step", func() { + var response Response + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + Expect(response.Result).To(BeNil()) + }) + }) + }) + + Describe("HTTP Response", func() { + var request *Request + + BeforeEach(func() { + response := `{}` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo", ""), + RespondWith(http.StatusOK, response), + ), + ) + + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request = &Request{Request: req} + }) + + It("returns the status", func() { + response := Response{} + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(response.HTTPResponse.Status).To(Equal("200 OK")) + }) + }) + + Describe("Response Headers", func() { + Describe("Location", func() { + BeforeEach(func() { + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + RespondWith(http.StatusAccepted, "{}", http.Header{"Location": {"/v2/some-location"}}), + ), + ) + }) + + It("returns the location in the ResourceLocationURL", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(server.ReceivedRequests()).To(HaveLen(1)) + Expect(response.ResourceLocationURL).To(Equal("/v2/some-location")) + }) + }) + }) + + Describe("Errors", func() { + When("the server does not exist", func() { + BeforeEach(func() { + connection = NewConnection(Config{}) + }) + + It("returns a RequestError", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", "http://garbledyguk.com"), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(HaveOccurred()) + + requestErr, ok := err.(networkerror.RequestError) + Expect(ok).To(BeTrue()) + Expect(requestErr.Error()).To(MatchRegexp(".*http://garbledyguk.com/v2/foo.*[nN]o such host")) + }) + }) + + When("the server does not have a verified certificate", func() { + Context("skipSSLValidation is false", func() { + BeforeEach(func() { + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + ), + ) + + connection = NewConnection(Config{}) + }) + + It("returns a UnverifiedServerError", func() { + req, err := http.NewRequest(http.MethodGet, server.URL(), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.UnverifiedServerError{URL: server.URL()})) + }) + }) + }) + + When("the server's certificate does not match the hostname", func() { + Context("skipSSLValidation is false", func() { + BeforeEach(func() { + if runtime.GOOS == "windows" || runtime.GOOS == "darwin" { + Skip("ssl validation has a different order on windows/darwin, will not be returned properly") + } + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/"), + ), + ) + + connection = NewConnection(Config{}) + }) + + // loopback.cli.fun is a custom DNS record setup to point to 127.0.0.1 + It("returns a SSLValidationHostnameError", func() { + altHostURL := strings.Replace(server.URL(), "127.0.0.1", "loopback.cli.fun", -1) + req, err := http.NewRequest(http.MethodGet, altHostURL, nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.SSLValidationHostnameError{ + Message: "x509: certificate is valid for example.com, not loopback.cli.fun", + })) + }) + }) + }) + + Describe("RawHTTPStatusError", func() { + var networkResponse string + BeforeEach(func() { + networkResponse = `{ + "code": 90004, + "description": "The service binding could not be found: some-guid", + "error_code": "CF-ServiceBindingNotFound" + }` + + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + RespondWith(http.StatusNotFound, networkResponse, http.Header{"X-Vcap-Request-Id": {"6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95", "6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95::7445d9db-c31e-410d-8dc5-9f79ec3fc26f"}}), + ), + ) + }) + + It("returns a CCRawResponse", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.RawHTTPStatusError{ + StatusCode: http.StatusNotFound, + RawResponse: []byte(networkResponse), + RequestIDs: []string{"6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95", "6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95::7445d9db-c31e-410d-8dc5-9f79ec3fc26f"}, + })) + + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) + }) + }) +}) diff --git a/api/cfnetworking/request.go b/api/cfnetworking/request.go new file mode 100644 index 00000000000..8a81ca53897 --- /dev/null +++ b/api/cfnetworking/request.go @@ -0,0 +1,34 @@ +package cfnetworking + +import ( + "io" + "net/http" +) + +//counterfeiter:generate . ReadSeeker +type ReadSeeker interface { + io.ReadSeeker +} + +// Request represents the request of the cloud controller. +type Request struct { + *http.Request + + body io.ReadSeeker +} + +func (r *Request) ResetBody() error { + if r.body == nil { + return nil + } + + _, err := r.body.Seek(0, 0) + return err +} + +func NewRequest(request *http.Request, body io.ReadSeeker) *Request { + return &Request{ + Request: request, + body: body, + } +} diff --git a/api/cfnetworking/response.go b/api/cfnetworking/response.go new file mode 100644 index 00000000000..8d4de87ccac --- /dev/null +++ b/api/cfnetworking/response.go @@ -0,0 +1,29 @@ +package cfnetworking + +import "net/http" + +// Response represents a Cloud Controller response object. +type Response struct { + // Result represents the resource entity type that is expected in the + // response JSON. + Result interface{} + + // RawResponse represents the response body. + RawResponse []byte + + // Warnings represents warnings parsed from the custom warnings headers of a + // Cloud Controller response. + Warnings []string + + // HTTPResponse represents the HTTP response object. + HTTPResponse *http.Response + + // ResourceLocationURL represents the Location header value + ResourceLocationURL string +} + +func (r *Response) reset() { + r.RawResponse = []byte{} + r.Warnings = []string{} + r.HTTPResponse = nil +} diff --git a/api/cfnetworking/wrapper/request_logger.go b/api/cfnetworking/wrapper/request_logger.go new file mode 100644 index 00000000000..410fcc80ce2 --- /dev/null +++ b/api/cfnetworking/wrapper/request_logger.go @@ -0,0 +1,156 @@ +package wrapper + +import ( + "fmt" + "io" + "net/http" + "sort" + "strings" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +// RequestLoggerOutput is the interface for displaying logs +// +//counterfeiter:generate . RequestLoggerOutput +type RequestLoggerOutput interface { + DisplayHeader(name string, value string) error + DisplayHost(name string) error + DisplayJSONBody(body []byte) error + DisplayMessage(msg string) error + DisplayRequestHeader(method string, uri string, httpProtocol string) error + DisplayResponseHeader(httpProtocol string, status string) error + DisplayType(name string, requestDate time.Time) error + HandleInternalError(err error) + Start() error + Stop() error +} + +// RequestLogger is the wrapper that logs requests to and responses from the +// Cloud Controller server +type RequestLogger struct { + connection cfnetworking.Connection + output RequestLoggerOutput +} + +// NewRequestLogger returns a pointer to a RequestLogger wrapper +func NewRequestLogger(output RequestLoggerOutput) *RequestLogger { + return &RequestLogger{ + output: output, + } +} + +// Wrap sets the connection on the RequestLogger and returns itself +func (logger *RequestLogger) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { + logger.connection = innerconnection + return logger +} + +// Make records the request and the response to UI +func (logger *RequestLogger) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + err := logger.displayRequest(request) + if err != nil { + logger.output.HandleInternalError(err) + } + + err = logger.connection.Make(request, passedResponse) + + if passedResponse.HTTPResponse != nil { + displayErr := logger.displayResponse(passedResponse) + if displayErr != nil { + logger.output.HandleInternalError(displayErr) + } + } + + return err +} + +func (logger *RequestLogger) displayRequest(request *cfnetworking.Request) error { + err := logger.output.Start() + if err != nil { + return err + } + defer logger.output.Stop() + + err = logger.output.DisplayType("REQUEST", time.Now()) + if err != nil { + return err + } + err = logger.output.DisplayRequestHeader(request.Method, request.URL.RequestURI(), request.Proto) + if err != nil { + return err + } + err = logger.output.DisplayHost(request.URL.Host) + if err != nil { + return err + } + err = logger.displaySortedHeaders(request.Header) + if err != nil { + return err + } + + contentType := request.Header.Get("Content-Type") + if request.Body != nil { + if strings.Contains(contentType, "json") { + rawRequestBody, err := io.ReadAll(request.Body) + if err != nil { + return err + } + + defer request.ResetBody() + + return logger.output.DisplayJSONBody(rawRequestBody) + } else if contentType != "" { + return logger.output.DisplayMessage(fmt.Sprintf("[%s Content Hidden]", strings.Split(contentType, ";")[0])) + } + } + return nil +} + +func (logger *RequestLogger) displayResponse(passedResponse *cfnetworking.Response) error { + err := logger.output.Start() + if err != nil { + return err + } + defer logger.output.Stop() + + err = logger.output.DisplayType("RESPONSE", time.Now()) + if err != nil { + return err + } + err = logger.output.DisplayResponseHeader(passedResponse.HTTPResponse.Proto, passedResponse.HTTPResponse.Status) + if err != nil { + return err + } + err = logger.displaySortedHeaders(passedResponse.HTTPResponse.Header) + if err != nil { + return err + } + return logger.output.DisplayJSONBody(passedResponse.RawResponse) +} + +func (logger *RequestLogger) displaySortedHeaders(headers http.Header) error { + keys := make([]string, 0) + for key := range headers { + keys = append(keys, key) + } + sort.Strings(keys) + + for _, key := range keys { + for _, value := range headers[key] { + err := logger.output.DisplayHeader(key, redactHeaders(key, value)) + if err != nil { + return err + } + } + } + return nil +} + +func redactHeaders(key string, value string) string { + if key == "Authorization" { + return "[PRIVATE DATA HIDDEN]" + } + return value +} diff --git a/api/cfnetworking/wrapper/request_logger_test.go b/api/cfnetworking/wrapper/request_logger_test.go new file mode 100644 index 00000000000..aa2a21d48f7 --- /dev/null +++ b/api/cfnetworking/wrapper/request_logger_test.go @@ -0,0 +1,328 @@ +package wrapper_test + +import ( + "bytes" + "errors" + "io" + "net/http" + "net/url" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/wrapperfakes" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("Request Logger", func() { + var ( + fakeConnection *cfnetworkingfakes.FakeConnection + fakeOutput *wrapperfakes.FakeRequestLoggerOutput + + wrapper cfnetworking.Connection + + request *cfnetworking.Request + response *cfnetworking.Response + executeErr error + ) + + BeforeEach(func() { + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeOutput = new(wrapperfakes.FakeRequestLoggerOutput) + + wrapper = NewRequestLogger(fakeOutput).Wrap(fakeConnection) + + body := bytes.NewReader([]byte("foo")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", body) + Expect(err).NotTo(HaveOccurred()) + + req.URL.RawQuery = url.Values{ + "query1": {"a"}, + "query2": {"b"}, + }.Encode() + + headers := http.Header{} + headers.Add("Aghi", "bar") + headers.Add("Abc", "json") + headers.Add("Adef", "application/json") + req.Header = headers + + response = &cfnetworking.Response{ + RawResponse: []byte("some-response-body"), + HTTPResponse: &http.Response{}, + } + request = cfnetworking.NewRequest(req, body) + }) + + JustBeforeEach(func() { + executeErr = wrapper.Make(request, response) + }) + + Describe("Make", func() { + It("outputs the request", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayTypeCallCount()).To(BeNumerically(">=", 1)) + name, date := fakeOutput.DisplayTypeArgsForCall(0) + Expect(name).To(Equal("REQUEST")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayRequestHeaderCallCount()).To(Equal(1)) + method, uri, protocol := fakeOutput.DisplayRequestHeaderArgsForCall(0) + Expect(method).To(Equal(http.MethodGet)) + Expect(uri).To(MatchRegexp("/banana\\?(?:query1=a&query2=b|query2=b&query1=a)")) + Expect(protocol).To(Equal("HTTP/1.1")) + + Expect(fakeOutput.DisplayHostCallCount()).To(Equal(1)) + host := fakeOutput.DisplayHostArgsForCall(0) + Expect(host).To(Equal("foo.bar.com")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 3)) + name, value := fakeOutput.DisplayHeaderArgsForCall(0) + Expect(name).To(Equal("Abc")) + Expect(value).To(Equal("json")) + name, value = fakeOutput.DisplayHeaderArgsForCall(1) + Expect(name).To(Equal("Adef")) + Expect(value).To(Equal("application/json")) + name, value = fakeOutput.DisplayHeaderArgsForCall(2) + Expect(name).To(Equal("Aghi")) + Expect(value).To(Equal("bar")) + + Expect(fakeOutput.DisplayMessageCallCount()).To(Equal(0)) + }) + + Context("when an authorization header is in the request", func() { + BeforeEach(func() { + request.Header = http.Header{"Authorization": []string{"should not be shown"}} + }) + + It("redacts the contents of the authorization header", func() { + Expect(executeErr).NotTo(HaveOccurred()) + Expect(fakeOutput.DisplayHeaderCallCount()).To(Equal(1)) + key, value := fakeOutput.DisplayHeaderArgsForCall(0) + Expect(key).To(Equal("Authorization")) + Expect(value).To(Equal("[PRIVATE DATA HIDDEN]")) + }) + }) + + Context("when passed a body", func() { + Context("when the request's Content-Type is application/json", func() { + BeforeEach(func() { + request.Header.Set("Content-Type", "application/json") + }) + + It("outputs the body", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("foo"))) + + bytes, err := io.ReadAll(request.Body) + Expect(err).NotTo(HaveOccurred()) + Expect(bytes).To(Equal([]byte("foo"))) + }) + }) + + Context("when request's Content-Type is anything else", func() { + BeforeEach(func() { + request.Header.Set("Content-Type", "banana;rama") + }) + + It("does not display the body", func() { + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(Equal(1)) // Once for response body only + Expect(fakeOutput.DisplayMessageCallCount()).To(Equal(1)) + Expect(fakeOutput.DisplayMessageArgsForCall(0)).To(Equal("[banana Content Hidden]")) + }) + }) + }) + + Context("when an error occures while trying to log the request", func() { + var expectedErr error + + BeforeEach(func() { + expectedErr = errors.New("this should never block the request") + + calledOnce := false + fakeOutput.StartStub = func() error { + if !calledOnce { + calledOnce = true + return expectedErr + } + return nil + } + }) + + It("should display the error and continue on", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(1)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + }) + }) + + Context("when the request is successful", func() { + BeforeEach(func() { + response = &cfnetworking.Response{ + RawResponse: []byte("some-response-body"), + HTTPResponse: &http.Response{ + Proto: "HTTP/1.1", + Status: "200 OK", + Header: http.Header{ + "BBBBB": {"second"}, + "AAAAA": {"first"}, + "CCCCC": {"third"}, + }, + }, + } + }) + + It("outputs the response", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayTypeCallCount()).To(Equal(2)) + name, date := fakeOutput.DisplayTypeArgsForCall(1) + Expect(name).To(Equal("RESPONSE")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(1)) + protocol, status := fakeOutput.DisplayResponseHeaderArgsForCall(0) + Expect(protocol).To(Equal("HTTP/1.1")) + Expect(status).To(Equal("200 OK")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 6)) + name, value := fakeOutput.DisplayHeaderArgsForCall(3) + Expect(name).To(Equal("AAAAA")) + Expect(value).To(Equal("first")) + name, value = fakeOutput.DisplayHeaderArgsForCall(4) + Expect(name).To(Equal("BBBBB")) + Expect(value).To(Equal("second")) + name, value = fakeOutput.DisplayHeaderArgsForCall(5) + Expect(name).To(Equal("CCCCC")) + Expect(value).To(Equal("third")) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("some-response-body"))) + }) + }) + + Context("when the request is unsuccessful", func() { + var expectedErr error + + BeforeEach(func() { + expectedErr = errors.New("banana") + fakeConnection.MakeReturns(expectedErr) + }) + + Context("when the http response is not set", func() { + BeforeEach(func() { + response = &cfnetworking.Response{} + }) + + It("outputs nothing", func() { + Expect(executeErr).To(MatchError(expectedErr)) + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(0)) + }) + }) + + Context("when the http response is set", func() { + BeforeEach(func() { + response = &cfnetworking.Response{ + RawResponse: []byte("some-error-body"), + HTTPResponse: &http.Response{ + Proto: "HTTP/1.1", + Status: "200 OK", + Header: http.Header{ + "BBBBB": {"second"}, + "AAAAA": {"first"}, + "CCCCC": {"third"}, + }, + }, + } + }) + + It("outputs the response", func() { + Expect(executeErr).To(MatchError(expectedErr)) + + Expect(fakeOutput.DisplayTypeCallCount()).To(Equal(2)) + name, date := fakeOutput.DisplayTypeArgsForCall(1) + Expect(name).To(Equal("RESPONSE")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(1)) + protocol, status := fakeOutput.DisplayResponseHeaderArgsForCall(0) + Expect(protocol).To(Equal("HTTP/1.1")) + Expect(status).To(Equal("200 OK")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 6)) + name, value := fakeOutput.DisplayHeaderArgsForCall(3) + Expect(name).To(Equal("AAAAA")) + Expect(value).To(Equal("first")) + name, value = fakeOutput.DisplayHeaderArgsForCall(4) + Expect(name).To(Equal("BBBBB")) + Expect(value).To(Equal("second")) + name, value = fakeOutput.DisplayHeaderArgsForCall(5) + Expect(name).To(Equal("CCCCC")) + Expect(value).To(Equal("third")) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("some-error-body"))) + }) + }) + }) + + Context("when an error occures while trying to log the response", func() { + var ( + originalErr error + expectedErr error + ) + + BeforeEach(func() { + originalErr = errors.New("this error should not be overwritten") + fakeConnection.MakeReturns(originalErr) + + expectedErr = errors.New("this should never block the request") + + calledOnce := false + fakeOutput.StartStub = func() error { + if !calledOnce { + calledOnce = true + return nil + } + return expectedErr + } + }) + + It("should display the error and continue on", func() { + Expect(executeErr).To(MatchError(originalErr)) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(1)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + }) + }) + + It("starts and stops the output", func() { + Expect(fakeOutput.StartCallCount()).To(Equal(2)) + Expect(fakeOutput.StopCallCount()).To(Equal(2)) + }) + + Context("when displaying the logs have an error", func() { + var expectedErr error + BeforeEach(func() { + expectedErr = errors.New("Display error on request") + fakeOutput.StartReturns(expectedErr) + }) + + It("calls handle internal error", func() { + Expect(executeErr).ToNot(HaveOccurred()) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(2)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(1)).To(MatchError(expectedErr)) + }) + }) + }) +}) diff --git a/api/cfnetworking/wrapper/retry_request.go b/api/cfnetworking/wrapper/retry_request.go new file mode 100644 index 00000000000..600a79825d5 --- /dev/null +++ b/api/cfnetworking/wrapper/retry_request.go @@ -0,0 +1,54 @@ +package wrapper + +import ( + "net/http" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +// RetryRequest is a wrapper that retries failed requests if they contain a 5XX +// status code. +type RetryRequest struct { + maxRetries int + connection cfnetworking.Connection +} + +// NewRetryRequest returns a pointer to a RetryRequest wrapper. +func NewRetryRequest(maxRetries int) *RetryRequest { + return &RetryRequest{ + maxRetries: maxRetries, + } +} + +// Wrap sets the connection in the RetryRequest and returns itself. +func (retry *RetryRequest) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { + retry.connection = innerconnection + return retry +} + +// Make retries the request if it comes back with certain status codes. +func (retry *RetryRequest) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + var err error + + for i := 0; i < retry.maxRetries+1; i += 1 { + err = retry.connection.Make(request, passedResponse) + if err == nil { + return nil + } + + if passedResponse.HTTPResponse != nil && + (passedResponse.HTTPResponse.StatusCode == http.StatusBadGateway || + passedResponse.HTTPResponse.StatusCode == http.StatusServiceUnavailable || + passedResponse.HTTPResponse.StatusCode == http.StatusGatewayTimeout || + (passedResponse.HTTPResponse.StatusCode >= 400 && passedResponse.HTTPResponse.StatusCode < 500)) { + break + } + + // Reset the request body prior to the next retry + resetErr := request.ResetBody() + if resetErr != nil { + return resetErr + } + } + return err +} diff --git a/api/cfnetworking/wrapper/retry_request_test.go b/api/cfnetworking/wrapper/retry_request_test.go new file mode 100644 index 00000000000..b98b833c3c4 --- /dev/null +++ b/api/cfnetworking/wrapper/retry_request_test.go @@ -0,0 +1,110 @@ +package wrapper_test + +import ( + "errors" + "io" + "net/http" + "strings" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("Retry Request", func() { + DescribeTable("number of retries", + func(requestMethod string, responseStatusCode int, expectedNumberOfRetries int) { + rawRequestBody := "banana pants" + body := strings.NewReader(rawRequestBody) + + req, err := http.NewRequest(requestMethod, "https://foo.bar.com/banana", body) + Expect(err).NotTo(HaveOccurred()) + request := cfnetworking.NewRequest(req, body) + + response := &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: responseStatusCode, + }, + } + + fakeConnection := new(cfnetworkingfakes.FakeConnection) + expectedErr := networkerror.RawHTTPStatusError{ + StatusCode: responseStatusCode, + } + fakeConnection.MakeStub = func(req *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + defer req.Body.Close() + body, readBodyErr := io.ReadAll(request.Body) + Expect(readBodyErr).ToNot(HaveOccurred()) + Expect(string(body)).To(Equal(rawRequestBody)) + return expectedErr + } + + wrapper := NewRetryRequest(2).Wrap(fakeConnection) + err = wrapper.Make(request, response) + Expect(err).To(MatchError(expectedErr)) + Expect(fakeConnection.MakeCallCount()).To(Equal(expectedNumberOfRetries)) + }, + + Entry("maxRetries for Non-Post (500) Internal Server Error", http.MethodGet, http.StatusInternalServerError, 3), + Entry("1 for Post (502) Bad Gateway", http.MethodGet, http.StatusBadGateway, 1), + Entry("1 for Post (503) Service Unavailable", http.MethodGet, http.StatusServiceUnavailable, 1), + Entry("1 for Post (504) Gateway Timeout", http.MethodGet, http.StatusGatewayTimeout, 1), + + Entry("1 for 4XX Errors", http.MethodGet, http.StatusNotFound, 1), + ) + + It("does not retry on success", func() { + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", nil) + Expect(err).NotTo(HaveOccurred()) + request := cfnetworking.NewRequest(req, nil) + response := &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: http.StatusOK, + }, + } + + fakeConnection := new(cfnetworkingfakes.FakeConnection) + wrapper := NewRetryRequest(2).Wrap(fakeConnection) + + err = wrapper.Make(request, response) + Expect(err).ToNot(HaveOccurred()) + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + }) + + Context("when seeking errors", func() { + var ( + request *cfnetworking.Request + response *cfnetworking.Response + + fakeConnection *cfnetworkingfakes.FakeConnection + wrapper cfnetworking.Connection + ) + + BeforeEach(func() { + fakeReadSeeker := new(cfnetworkingfakes.FakeReadSeeker) + fakeReadSeeker.SeekReturns(0, errors.New("oh noes")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", fakeReadSeeker) + Expect(err).NotTo(HaveOccurred()) + request = cfnetworking.NewRequest(req, fakeReadSeeker) + + response = &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: http.StatusInternalServerError, + }, + } + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeConnection.MakeReturns(errors.New("some error")) + wrapper = NewRetryRequest(3).Wrap(fakeConnection) + }) + + It("sets the err on SeekError", func() { + err := wrapper.Make(request, response) + Expect(err).To(MatchError("oh noes")) + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + }) + }) +}) diff --git a/api/cfnetworking/wrapper/uaa_authentication.go b/api/cfnetworking/wrapper/uaa_authentication.go new file mode 100644 index 00000000000..7562c3e659d --- /dev/null +++ b/api/cfnetworking/wrapper/uaa_authentication.go @@ -0,0 +1,81 @@ +package wrapper + +import ( + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + "code.cloudfoundry.org/cli/v9/api/uaa" +) + +// UAAClient is the interface for getting a valid access token +// +//counterfeiter:generate . UAAClient +type UAAClient interface { + RefreshAccessToken(refreshToken string) (uaa.RefreshedTokens, error) +} + +// TokenCache is where the UAA token information is stored. +// +//counterfeiter:generate . TokenCache +type TokenCache interface { + AccessToken() string + RefreshToken() string + SetAccessToken(token string) + SetRefreshToken(token string) +} + +// UAAAuthentication wraps connections and adds authentication headers to all +// requests +type UAAAuthentication struct { + connection cfnetworking.Connection + client UAAClient + cache TokenCache +} + +// NewUAAAuthentication returns a pointer to a UAAAuthentication wrapper with +// the client and a token cache. +func NewUAAAuthentication(client UAAClient, cache TokenCache) *UAAAuthentication { + return &UAAAuthentication{ + client: client, + cache: cache, + } +} + +// Wrap sets the connection on the UAAAuthentication and returns itself +func (t *UAAAuthentication) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { + t.connection = innerconnection + return t +} + +// SetClient sets the UAA client that the wrapper will use. +func (t *UAAAuthentication) SetClient(client UAAClient) { + t.client = client +} + +// Make adds authentication headers to the passed in request and then calls the +// wrapped connection's Make. If the client is not set on the wrapper, it will +// not add any header or handle any authentication errors. +func (t *UAAAuthentication) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + request.Header.Set("Authorization", t.cache.AccessToken()) + + requestErr := t.connection.Make(request, passedResponse) + if _, ok := requestErr.(networkerror.InvalidAuthTokenError); ok { + tokens, err := t.client.RefreshAccessToken(t.cache.RefreshToken()) + if err != nil { + return err + } + + t.cache.SetAccessToken(tokens.AuthorizationToken()) + t.cache.SetRefreshToken(tokens.RefreshToken) + + if request.Body != nil { + err = request.ResetBody() + if err != nil { + return err + } + } + request.Header.Set("Authorization", t.cache.AccessToken()) + requestErr = t.connection.Make(request, passedResponse) + } + + return requestErr +} diff --git a/api/cfnetworking/wrapper/uaa_authentication_test.go b/api/cfnetworking/wrapper/uaa_authentication_test.go new file mode 100644 index 00000000000..fc26022c7dc --- /dev/null +++ b/api/cfnetworking/wrapper/uaa_authentication_test.go @@ -0,0 +1,174 @@ +package wrapper_test + +import ( + "errors" + "io" + "net/http" + "strings" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("UAA Authentication", func() { + var ( + fakeConnection *cfnetworkingfakes.FakeConnection + fakeClient *wrapperfakes.FakeUAAClient + inMemoryCache *util.InMemoryCache + + wrapper cfnetworking.Connection + request *cfnetworking.Request + inner *UAAAuthentication + ) + + BeforeEach(func() { + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeClient = new(wrapperfakes.FakeUAAClient) + inMemoryCache = util.NewInMemoryTokenCache() + inMemoryCache.SetAccessToken("a-ok") + + inner = NewUAAAuthentication(fakeClient, inMemoryCache) + wrapper = inner.Wrap(fakeConnection) + + request = &cfnetworking.Request{ + Request: &http.Request{ + Header: http.Header{}, + }, + } + }) + + Describe("Make", func() { + It("adds authentication headers", func() { + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + authenticatedRequest, _ := fakeConnection.MakeArgsForCall(0) + headers := authenticatedRequest.Header + Expect(headers["Authorization"]).To(ConsistOf([]string{"a-ok"})) + }) + + Context("when the token is valid", func() { + Context("when the request already has headers", func() { + It("preserves existing headers", func() { + request.Header.Add("Existing", "header") + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + authenticatedRequest, _ := fakeConnection.MakeArgsForCall(0) + headers := authenticatedRequest.Header + Expect(headers["Existing"]).To(ConsistOf([]string{"header"})) + }) + }) + + Context("when the wrapped connection returns nil", func() { + It("returns nil", func() { + fakeConnection.MakeReturns(nil) + + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + }) + }) + + Context("when the wrapped connection returns an error", func() { + It("returns the error", func() { + innerError := errors.New("inner error") + fakeConnection.MakeReturns(innerError) + + err := wrapper.Make(request, nil) + Expect(err).To(Equal(innerError)) + }) + }) + }) + + Context("when the token is invalid", func() { + var ( + expectedBody string + request *cfnetworking.Request + executeErr error + ) + + BeforeEach(func() { + expectedBody = "this body content should be preserved" + body := strings.NewReader(expectedBody) + request = cfnetworking.NewRequest(&http.Request{ + Header: http.Header{}, + Body: io.NopCloser(body), + }, body) + + makeCount := 0 + fakeConnection.MakeStub = func(request *cfnetworking.Request, response *cfnetworking.Response) error { + body, err := io.ReadAll(request.Body) + Expect(err).NotTo(HaveOccurred()) + Expect(string(body)).To(Equal(expectedBody)) + + if makeCount == 0 { + makeCount += 1 + return networkerror.InvalidAuthTokenError{} + } else { + return nil + } + } + + inMemoryCache.SetAccessToken("what") + + fakeClient.RefreshAccessTokenReturns( + uaa.RefreshedTokens{ + AccessToken: "foobar-2", + RefreshToken: "bananananananana", + Type: "bearer", + }, + nil, + ) + }) + + JustBeforeEach(func() { + executeErr = wrapper.Make(request, nil) + }) + + It("should refresh the token", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(fakeClient.RefreshAccessTokenCallCount()).To(Equal(1)) + }) + + It("should resend the request", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(fakeConnection.MakeCallCount()).To(Equal(2)) + + requestArg, _ := fakeConnection.MakeArgsForCall(1) + Expect(requestArg.Header.Get("Authorization")).To(Equal("bearer foobar-2")) + }) + + It("should save the refresh token", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(inMemoryCache.RefreshToken()).To(Equal("bananananananana")) + }) + + Context("when the reseting the request body fails", func() { + BeforeEach(func() { + fakeConnection.MakeReturnsOnCall(0, networkerror.InvalidAuthTokenError{}) + + fakeReadSeeker := new(cfnetworkingfakes.FakeReadSeeker) + fakeReadSeeker.SeekReturns(0, errors.New("oh noes")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", fakeReadSeeker) + Expect(err).NotTo(HaveOccurred()) + request = cfnetworking.NewRequest(req, fakeReadSeeker) + }) + + It("returns error on seek", func() { + Expect(executeErr).To(MatchError("oh noes")) + }) + }) + }) + }) +}) diff --git a/api/cfnetworking/wrapper/util/in_memory_cache.go b/api/cfnetworking/wrapper/util/in_memory_cache.go new file mode 100644 index 00000000000..7e1f291fef5 --- /dev/null +++ b/api/cfnetworking/wrapper/util/in_memory_cache.go @@ -0,0 +1,26 @@ +package util + +type InMemoryCache struct { + accessToken string + refreshToken string +} + +func (c *InMemoryCache) AccessToken() string { + return c.accessToken +} + +func (c *InMemoryCache) RefreshToken() string { + return c.refreshToken +} + +func (c *InMemoryCache) SetAccessToken(token string) { + c.accessToken = token +} + +func (c *InMemoryCache) SetRefreshToken(token string) { + c.refreshToken = token +} + +func NewInMemoryTokenCache() *InMemoryCache { + return new(InMemoryCache) +} diff --git a/api/cfnetworking/wrapper/wrapper.go b/api/cfnetworking/wrapper/wrapper.go new file mode 100644 index 00000000000..c9964d98277 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapper.go @@ -0,0 +1,3 @@ +package wrapper + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/api/cfnetworking/wrapper/wrapper_suite_test.go b/api/cfnetworking/wrapper/wrapper_suite_test.go new file mode 100644 index 00000000000..36bb7436be4 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapper_suite_test.go @@ -0,0 +1,35 @@ +package wrapper_test + +import ( + "bytes" + "log" + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +func TestWrapper(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Wrapper Suite") +} + +var server *Server + +var _ = SynchronizedBeforeSuite(func() []byte { + return []byte{} +}, func(data []byte) { + server = NewTLSServer() + + // Suppresses ginkgo server logs + server.HTTPTestServer.Config.ErrorLog = log.New(&bytes.Buffer{}, "", 0) +}) + +var _ = SynchronizedAfterSuite(func() { + server.Close() +}, func() {}) + +var _ = BeforeEach(func() { + server.Reset() +}) diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go b/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go new file mode 100644 index 00000000000..837896b75f2 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go @@ -0,0 +1,740 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" +) + +type FakeRequestLoggerOutput struct { + DisplayHeaderStub func(string, string) error + displayHeaderMutex sync.RWMutex + displayHeaderArgsForCall []struct { + arg1 string + arg2 string + } + displayHeaderReturns struct { + result1 error + } + displayHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayHostStub func(string) error + displayHostMutex sync.RWMutex + displayHostArgsForCall []struct { + arg1 string + } + displayHostReturns struct { + result1 error + } + displayHostReturnsOnCall map[int]struct { + result1 error + } + DisplayJSONBodyStub func([]byte) error + displayJSONBodyMutex sync.RWMutex + displayJSONBodyArgsForCall []struct { + arg1 []byte + } + displayJSONBodyReturns struct { + result1 error + } + displayJSONBodyReturnsOnCall map[int]struct { + result1 error + } + DisplayMessageStub func(string) error + displayMessageMutex sync.RWMutex + displayMessageArgsForCall []struct { + arg1 string + } + displayMessageReturns struct { + result1 error + } + displayMessageReturnsOnCall map[int]struct { + result1 error + } + DisplayRequestHeaderStub func(string, string, string) error + displayRequestHeaderMutex sync.RWMutex + displayRequestHeaderArgsForCall []struct { + arg1 string + arg2 string + arg3 string + } + displayRequestHeaderReturns struct { + result1 error + } + displayRequestHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayResponseHeaderStub func(string, string) error + displayResponseHeaderMutex sync.RWMutex + displayResponseHeaderArgsForCall []struct { + arg1 string + arg2 string + } + displayResponseHeaderReturns struct { + result1 error + } + displayResponseHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayTypeStub func(string, time.Time) error + displayTypeMutex sync.RWMutex + displayTypeArgsForCall []struct { + arg1 string + arg2 time.Time + } + displayTypeReturns struct { + result1 error + } + displayTypeReturnsOnCall map[int]struct { + result1 error + } + HandleInternalErrorStub func(error) + handleInternalErrorMutex sync.RWMutex + handleInternalErrorArgsForCall []struct { + arg1 error + } + StartStub func() error + startMutex sync.RWMutex + startArgsForCall []struct { + } + startReturns struct { + result1 error + } + startReturnsOnCall map[int]struct { + result1 error + } + StopStub func() error + stopMutex sync.RWMutex + stopArgsForCall []struct { + } + stopReturns struct { + result1 error + } + stopReturnsOnCall map[int]struct { + result1 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) error { + fake.displayHeaderMutex.Lock() + ret, specificReturn := fake.displayHeaderReturnsOnCall[len(fake.displayHeaderArgsForCall)] + fake.displayHeaderArgsForCall = append(fake.displayHeaderArgsForCall, struct { + arg1 string + arg2 string + }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns + fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) + fake.displayHeaderMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderCallCount() int { + fake.displayHeaderMutex.RLock() + defer fake.displayHeaderMutex.RUnlock() + return len(fake.displayHeaderArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderCalls(stub func(string, string) error) { + fake.displayHeaderMutex.Lock() + defer fake.displayHeaderMutex.Unlock() + fake.DisplayHeaderStub = stub +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderArgsForCall(i int) (string, string) { + fake.displayHeaderMutex.RLock() + defer fake.displayHeaderMutex.RUnlock() + argsForCall := fake.displayHeaderArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderReturns(result1 error) { + fake.displayHeaderMutex.Lock() + defer fake.displayHeaderMutex.Unlock() + fake.DisplayHeaderStub = nil + fake.displayHeaderReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderReturnsOnCall(i int, result1 error) { + fake.displayHeaderMutex.Lock() + defer fake.displayHeaderMutex.Unlock() + fake.DisplayHeaderStub = nil + if fake.displayHeaderReturnsOnCall == nil { + fake.displayHeaderReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { + fake.displayHostMutex.Lock() + ret, specificReturn := fake.displayHostReturnsOnCall[len(fake.displayHostArgsForCall)] + fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns + fake.recordInvocation("DisplayHost", []interface{}{arg1}) + fake.displayHostMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayHostCallCount() int { + fake.displayHostMutex.RLock() + defer fake.displayHostMutex.RUnlock() + return len(fake.displayHostArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayHostCalls(stub func(string) error) { + fake.displayHostMutex.Lock() + defer fake.displayHostMutex.Unlock() + fake.DisplayHostStub = stub +} + +func (fake *FakeRequestLoggerOutput) DisplayHostArgsForCall(i int) string { + fake.displayHostMutex.RLock() + defer fake.displayHostMutex.RUnlock() + argsForCall := fake.displayHostArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeRequestLoggerOutput) DisplayHostReturns(result1 error) { + fake.displayHostMutex.Lock() + defer fake.displayHostMutex.Unlock() + fake.DisplayHostStub = nil + fake.displayHostReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayHostReturnsOnCall(i int, result1 error) { + fake.displayHostMutex.Lock() + defer fake.displayHostMutex.Unlock() + fake.DisplayHostStub = nil + if fake.displayHostReturnsOnCall == nil { + fake.displayHostReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayHostReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { + var arg1Copy []byte + if arg1 != nil { + arg1Copy = make([]byte, len(arg1)) + copy(arg1Copy, arg1) + } + fake.displayJSONBodyMutex.Lock() + ret, specificReturn := fake.displayJSONBodyReturnsOnCall[len(fake.displayJSONBodyArgsForCall)] + fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { + arg1 []byte + }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns + fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) + fake.displayJSONBodyMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyCallCount() int { + fake.displayJSONBodyMutex.RLock() + defer fake.displayJSONBodyMutex.RUnlock() + return len(fake.displayJSONBodyArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyCalls(stub func([]byte) error) { + fake.displayJSONBodyMutex.Lock() + defer fake.displayJSONBodyMutex.Unlock() + fake.DisplayJSONBodyStub = stub +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyArgsForCall(i int) []byte { + fake.displayJSONBodyMutex.RLock() + defer fake.displayJSONBodyMutex.RUnlock() + argsForCall := fake.displayJSONBodyArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyReturns(result1 error) { + fake.displayJSONBodyMutex.Lock() + defer fake.displayJSONBodyMutex.Unlock() + fake.DisplayJSONBodyStub = nil + fake.displayJSONBodyReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyReturnsOnCall(i int, result1 error) { + fake.displayJSONBodyMutex.Lock() + defer fake.displayJSONBodyMutex.Unlock() + fake.DisplayJSONBodyStub = nil + if fake.displayJSONBodyReturnsOnCall == nil { + fake.displayJSONBodyReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayJSONBodyReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayMessage(arg1 string) error { + fake.displayMessageMutex.Lock() + ret, specificReturn := fake.displayMessageReturnsOnCall[len(fake.displayMessageArgsForCall)] + fake.displayMessageArgsForCall = append(fake.displayMessageArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.DisplayMessageStub + fakeReturns := fake.displayMessageReturns + fake.recordInvocation("DisplayMessage", []interface{}{arg1}) + fake.displayMessageMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageCallCount() int { + fake.displayMessageMutex.RLock() + defer fake.displayMessageMutex.RUnlock() + return len(fake.displayMessageArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageCalls(stub func(string) error) { + fake.displayMessageMutex.Lock() + defer fake.displayMessageMutex.Unlock() + fake.DisplayMessageStub = stub +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageArgsForCall(i int) string { + fake.displayMessageMutex.RLock() + defer fake.displayMessageMutex.RUnlock() + argsForCall := fake.displayMessageArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageReturns(result1 error) { + fake.displayMessageMutex.Lock() + defer fake.displayMessageMutex.Unlock() + fake.DisplayMessageStub = nil + fake.displayMessageReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageReturnsOnCall(i int, result1 error) { + fake.displayMessageMutex.Lock() + defer fake.displayMessageMutex.Unlock() + fake.DisplayMessageStub = nil + if fake.displayMessageReturnsOnCall == nil { + fake.displayMessageReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayMessageReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 string, arg3 string) error { + fake.displayRequestHeaderMutex.Lock() + ret, specificReturn := fake.displayRequestHeaderReturnsOnCall[len(fake.displayRequestHeaderArgsForCall)] + fake.displayRequestHeaderArgsForCall = append(fake.displayRequestHeaderArgsForCall, struct { + arg1 string + arg2 string + arg3 string + }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns + fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) + fake.displayRequestHeaderMutex.Unlock() + if stub != nil { + return stub(arg1, arg2, arg3) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderCallCount() int { + fake.displayRequestHeaderMutex.RLock() + defer fake.displayRequestHeaderMutex.RUnlock() + return len(fake.displayRequestHeaderArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderCalls(stub func(string, string, string) error) { + fake.displayRequestHeaderMutex.Lock() + defer fake.displayRequestHeaderMutex.Unlock() + fake.DisplayRequestHeaderStub = stub +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderArgsForCall(i int) (string, string, string) { + fake.displayRequestHeaderMutex.RLock() + defer fake.displayRequestHeaderMutex.RUnlock() + argsForCall := fake.displayRequestHeaderArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3 +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderReturns(result1 error) { + fake.displayRequestHeaderMutex.Lock() + defer fake.displayRequestHeaderMutex.Unlock() + fake.DisplayRequestHeaderStub = nil + fake.displayRequestHeaderReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderReturnsOnCall(i int, result1 error) { + fake.displayRequestHeaderMutex.Lock() + defer fake.displayRequestHeaderMutex.Unlock() + fake.DisplayRequestHeaderStub = nil + if fake.displayRequestHeaderReturnsOnCall == nil { + fake.displayRequestHeaderReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayRequestHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 string) error { + fake.displayResponseHeaderMutex.Lock() + ret, specificReturn := fake.displayResponseHeaderReturnsOnCall[len(fake.displayResponseHeaderArgsForCall)] + fake.displayResponseHeaderArgsForCall = append(fake.displayResponseHeaderArgsForCall, struct { + arg1 string + arg2 string + }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns + fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) + fake.displayResponseHeaderMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderCallCount() int { + fake.displayResponseHeaderMutex.RLock() + defer fake.displayResponseHeaderMutex.RUnlock() + return len(fake.displayResponseHeaderArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderCalls(stub func(string, string) error) { + fake.displayResponseHeaderMutex.Lock() + defer fake.displayResponseHeaderMutex.Unlock() + fake.DisplayResponseHeaderStub = stub +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderArgsForCall(i int) (string, string) { + fake.displayResponseHeaderMutex.RLock() + defer fake.displayResponseHeaderMutex.RUnlock() + argsForCall := fake.displayResponseHeaderArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderReturns(result1 error) { + fake.displayResponseHeaderMutex.Lock() + defer fake.displayResponseHeaderMutex.Unlock() + fake.DisplayResponseHeaderStub = nil + fake.displayResponseHeaderReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderReturnsOnCall(i int, result1 error) { + fake.displayResponseHeaderMutex.Lock() + defer fake.displayResponseHeaderMutex.Unlock() + fake.DisplayResponseHeaderStub = nil + if fake.displayResponseHeaderReturnsOnCall == nil { + fake.displayResponseHeaderReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayResponseHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) error { + fake.displayTypeMutex.Lock() + ret, specificReturn := fake.displayTypeReturnsOnCall[len(fake.displayTypeArgsForCall)] + fake.displayTypeArgsForCall = append(fake.displayTypeArgsForCall, struct { + arg1 string + arg2 time.Time + }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns + fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) + fake.displayTypeMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeCallCount() int { + fake.displayTypeMutex.RLock() + defer fake.displayTypeMutex.RUnlock() + return len(fake.displayTypeArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeCalls(stub func(string, time.Time) error) { + fake.displayTypeMutex.Lock() + defer fake.displayTypeMutex.Unlock() + fake.DisplayTypeStub = stub +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeArgsForCall(i int) (string, time.Time) { + fake.displayTypeMutex.RLock() + defer fake.displayTypeMutex.RUnlock() + argsForCall := fake.displayTypeArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeReturns(result1 error) { + fake.displayTypeMutex.Lock() + defer fake.displayTypeMutex.Unlock() + fake.DisplayTypeStub = nil + fake.displayTypeReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeReturnsOnCall(i int, result1 error) { + fake.displayTypeMutex.Lock() + defer fake.displayTypeMutex.Unlock() + fake.DisplayTypeStub = nil + if fake.displayTypeReturnsOnCall == nil { + fake.displayTypeReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayTypeReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { + fake.handleInternalErrorMutex.Lock() + fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { + arg1 error + }{arg1}) + stub := fake.HandleInternalErrorStub + fake.recordInvocation("HandleInternalError", []interface{}{arg1}) + fake.handleInternalErrorMutex.Unlock() + if stub != nil { + fake.HandleInternalErrorStub(arg1) + } +} + +func (fake *FakeRequestLoggerOutput) HandleInternalErrorCallCount() int { + fake.handleInternalErrorMutex.RLock() + defer fake.handleInternalErrorMutex.RUnlock() + return len(fake.handleInternalErrorArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) HandleInternalErrorCalls(stub func(error)) { + fake.handleInternalErrorMutex.Lock() + defer fake.handleInternalErrorMutex.Unlock() + fake.HandleInternalErrorStub = stub +} + +func (fake *FakeRequestLoggerOutput) HandleInternalErrorArgsForCall(i int) error { + fake.handleInternalErrorMutex.RLock() + defer fake.handleInternalErrorMutex.RUnlock() + argsForCall := fake.handleInternalErrorArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeRequestLoggerOutput) Start() error { + fake.startMutex.Lock() + ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] + fake.startArgsForCall = append(fake.startArgsForCall, struct { + }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns + fake.recordInvocation("Start", []interface{}{}) + fake.startMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) StartCallCount() int { + fake.startMutex.RLock() + defer fake.startMutex.RUnlock() + return len(fake.startArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) StartCalls(stub func() error) { + fake.startMutex.Lock() + defer fake.startMutex.Unlock() + fake.StartStub = stub +} + +func (fake *FakeRequestLoggerOutput) StartReturns(result1 error) { + fake.startMutex.Lock() + defer fake.startMutex.Unlock() + fake.StartStub = nil + fake.startReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) StartReturnsOnCall(i int, result1 error) { + fake.startMutex.Lock() + defer fake.startMutex.Unlock() + fake.StartStub = nil + if fake.startReturnsOnCall == nil { + fake.startReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.startReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) Stop() error { + fake.stopMutex.Lock() + ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] + fake.stopArgsForCall = append(fake.stopArgsForCall, struct { + }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns + fake.recordInvocation("Stop", []interface{}{}) + fake.stopMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) StopCallCount() int { + fake.stopMutex.RLock() + defer fake.stopMutex.RUnlock() + return len(fake.stopArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) StopCalls(stub func() error) { + fake.stopMutex.Lock() + defer fake.stopMutex.Unlock() + fake.StopStub = stub +} + +func (fake *FakeRequestLoggerOutput) StopReturns(result1 error) { + fake.stopMutex.Lock() + defer fake.stopMutex.Unlock() + fake.StopStub = nil + fake.stopReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) StopReturnsOnCall(i int, result1 error) { + fake.stopMutex.Lock() + defer fake.stopMutex.Unlock() + fake.StopStub = nil + if fake.stopReturnsOnCall == nil { + fake.stopReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.stopReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.displayHeaderMutex.RLock() + defer fake.displayHeaderMutex.RUnlock() + fake.displayHostMutex.RLock() + defer fake.displayHostMutex.RUnlock() + fake.displayJSONBodyMutex.RLock() + defer fake.displayJSONBodyMutex.RUnlock() + fake.displayMessageMutex.RLock() + defer fake.displayMessageMutex.RUnlock() + fake.displayRequestHeaderMutex.RLock() + defer fake.displayRequestHeaderMutex.RUnlock() + fake.displayResponseHeaderMutex.RLock() + defer fake.displayResponseHeaderMutex.RUnlock() + fake.displayTypeMutex.RLock() + defer fake.displayTypeMutex.RUnlock() + fake.handleInternalErrorMutex.RLock() + defer fake.handleInternalErrorMutex.RUnlock() + fake.startMutex.RLock() + defer fake.startMutex.RUnlock() + fake.stopMutex.RLock() + defer fake.stopMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeRequestLoggerOutput) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ wrapper.RequestLoggerOutput = new(FakeRequestLoggerOutput) diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go b/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go new file mode 100644 index 00000000000..8742715ee4a --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go @@ -0,0 +1,245 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" +) + +type FakeTokenCache struct { + AccessTokenStub func() string + accessTokenMutex sync.RWMutex + accessTokenArgsForCall []struct { + } + accessTokenReturns struct { + result1 string + } + accessTokenReturnsOnCall map[int]struct { + result1 string + } + RefreshTokenStub func() string + refreshTokenMutex sync.RWMutex + refreshTokenArgsForCall []struct { + } + refreshTokenReturns struct { + result1 string + } + refreshTokenReturnsOnCall map[int]struct { + result1 string + } + SetAccessTokenStub func(string) + setAccessTokenMutex sync.RWMutex + setAccessTokenArgsForCall []struct { + arg1 string + } + SetRefreshTokenStub func(string) + setRefreshTokenMutex sync.RWMutex + setRefreshTokenArgsForCall []struct { + arg1 string + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeTokenCache) AccessToken() string { + fake.accessTokenMutex.Lock() + ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] + fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { + }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns + fake.recordInvocation("AccessToken", []interface{}{}) + fake.accessTokenMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeTokenCache) AccessTokenCallCount() int { + fake.accessTokenMutex.RLock() + defer fake.accessTokenMutex.RUnlock() + return len(fake.accessTokenArgsForCall) +} + +func (fake *FakeTokenCache) AccessTokenCalls(stub func() string) { + fake.accessTokenMutex.Lock() + defer fake.accessTokenMutex.Unlock() + fake.AccessTokenStub = stub +} + +func (fake *FakeTokenCache) AccessTokenReturns(result1 string) { + fake.accessTokenMutex.Lock() + defer fake.accessTokenMutex.Unlock() + fake.AccessTokenStub = nil + fake.accessTokenReturns = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) AccessTokenReturnsOnCall(i int, result1 string) { + fake.accessTokenMutex.Lock() + defer fake.accessTokenMutex.Unlock() + fake.AccessTokenStub = nil + if fake.accessTokenReturnsOnCall == nil { + fake.accessTokenReturnsOnCall = make(map[int]struct { + result1 string + }) + } + fake.accessTokenReturnsOnCall[i] = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) RefreshToken() string { + fake.refreshTokenMutex.Lock() + ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] + fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { + }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns + fake.recordInvocation("RefreshToken", []interface{}{}) + fake.refreshTokenMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeTokenCache) RefreshTokenCallCount() int { + fake.refreshTokenMutex.RLock() + defer fake.refreshTokenMutex.RUnlock() + return len(fake.refreshTokenArgsForCall) +} + +func (fake *FakeTokenCache) RefreshTokenCalls(stub func() string) { + fake.refreshTokenMutex.Lock() + defer fake.refreshTokenMutex.Unlock() + fake.RefreshTokenStub = stub +} + +func (fake *FakeTokenCache) RefreshTokenReturns(result1 string) { + fake.refreshTokenMutex.Lock() + defer fake.refreshTokenMutex.Unlock() + fake.RefreshTokenStub = nil + fake.refreshTokenReturns = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) RefreshTokenReturnsOnCall(i int, result1 string) { + fake.refreshTokenMutex.Lock() + defer fake.refreshTokenMutex.Unlock() + fake.RefreshTokenStub = nil + if fake.refreshTokenReturnsOnCall == nil { + fake.refreshTokenReturnsOnCall = make(map[int]struct { + result1 string + }) + } + fake.refreshTokenReturnsOnCall[i] = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) SetAccessToken(arg1 string) { + fake.setAccessTokenMutex.Lock() + fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.SetAccessTokenStub + fake.recordInvocation("SetAccessToken", []interface{}{arg1}) + fake.setAccessTokenMutex.Unlock() + if stub != nil { + fake.SetAccessTokenStub(arg1) + } +} + +func (fake *FakeTokenCache) SetAccessTokenCallCount() int { + fake.setAccessTokenMutex.RLock() + defer fake.setAccessTokenMutex.RUnlock() + return len(fake.setAccessTokenArgsForCall) +} + +func (fake *FakeTokenCache) SetAccessTokenCalls(stub func(string)) { + fake.setAccessTokenMutex.Lock() + defer fake.setAccessTokenMutex.Unlock() + fake.SetAccessTokenStub = stub +} + +func (fake *FakeTokenCache) SetAccessTokenArgsForCall(i int) string { + fake.setAccessTokenMutex.RLock() + defer fake.setAccessTokenMutex.RUnlock() + argsForCall := fake.setAccessTokenArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { + fake.setRefreshTokenMutex.Lock() + fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.SetRefreshTokenStub + fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) + fake.setRefreshTokenMutex.Unlock() + if stub != nil { + fake.SetRefreshTokenStub(arg1) + } +} + +func (fake *FakeTokenCache) SetRefreshTokenCallCount() int { + fake.setRefreshTokenMutex.RLock() + defer fake.setRefreshTokenMutex.RUnlock() + return len(fake.setRefreshTokenArgsForCall) +} + +func (fake *FakeTokenCache) SetRefreshTokenCalls(stub func(string)) { + fake.setRefreshTokenMutex.Lock() + defer fake.setRefreshTokenMutex.Unlock() + fake.SetRefreshTokenStub = stub +} + +func (fake *FakeTokenCache) SetRefreshTokenArgsForCall(i int) string { + fake.setRefreshTokenMutex.RLock() + defer fake.setRefreshTokenMutex.RUnlock() + argsForCall := fake.setRefreshTokenArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeTokenCache) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.accessTokenMutex.RLock() + defer fake.accessTokenMutex.RUnlock() + fake.refreshTokenMutex.RLock() + defer fake.refreshTokenMutex.RUnlock() + fake.setAccessTokenMutex.RLock() + defer fake.setAccessTokenMutex.RUnlock() + fake.setRefreshTokenMutex.RLock() + defer fake.setRefreshTokenMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeTokenCache) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ wrapper.TokenCache = new(FakeTokenCache) diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go b/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go new file mode 100644 index 00000000000..92d8ad16214 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go @@ -0,0 +1,117 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" +) + +type FakeUAAClient struct { + RefreshAccessTokenStub func(string) (uaa.RefreshedTokens, error) + refreshAccessTokenMutex sync.RWMutex + refreshAccessTokenArgsForCall []struct { + arg1 string + } + refreshAccessTokenReturns struct { + result1 uaa.RefreshedTokens + result2 error + } + refreshAccessTokenReturnsOnCall map[int]struct { + result1 uaa.RefreshedTokens + result2 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, error) { + fake.refreshAccessTokenMutex.Lock() + ret, specificReturn := fake.refreshAccessTokenReturnsOnCall[len(fake.refreshAccessTokenArgsForCall)] + fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns + fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) + fake.refreshAccessTokenMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeUAAClient) RefreshAccessTokenCallCount() int { + fake.refreshAccessTokenMutex.RLock() + defer fake.refreshAccessTokenMutex.RUnlock() + return len(fake.refreshAccessTokenArgsForCall) +} + +func (fake *FakeUAAClient) RefreshAccessTokenCalls(stub func(string) (uaa.RefreshedTokens, error)) { + fake.refreshAccessTokenMutex.Lock() + defer fake.refreshAccessTokenMutex.Unlock() + fake.RefreshAccessTokenStub = stub +} + +func (fake *FakeUAAClient) RefreshAccessTokenArgsForCall(i int) string { + fake.refreshAccessTokenMutex.RLock() + defer fake.refreshAccessTokenMutex.RUnlock() + argsForCall := fake.refreshAccessTokenArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeUAAClient) RefreshAccessTokenReturns(result1 uaa.RefreshedTokens, result2 error) { + fake.refreshAccessTokenMutex.Lock() + defer fake.refreshAccessTokenMutex.Unlock() + fake.RefreshAccessTokenStub = nil + fake.refreshAccessTokenReturns = struct { + result1 uaa.RefreshedTokens + result2 error + }{result1, result2} +} + +func (fake *FakeUAAClient) RefreshAccessTokenReturnsOnCall(i int, result1 uaa.RefreshedTokens, result2 error) { + fake.refreshAccessTokenMutex.Lock() + defer fake.refreshAccessTokenMutex.Unlock() + fake.RefreshAccessTokenStub = nil + if fake.refreshAccessTokenReturnsOnCall == nil { + fake.refreshAccessTokenReturnsOnCall = make(map[int]struct { + result1 uaa.RefreshedTokens + result2 error + }) + } + fake.refreshAccessTokenReturnsOnCall[i] = struct { + result1 uaa.RefreshedTokens + result2 error + }{result1, result2} +} + +func (fake *FakeUAAClient) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.refreshAccessTokenMutex.RLock() + defer fake.refreshAccessTokenMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeUAAClient) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ wrapper.UAAClient = new(FakeUAAClient) diff --git a/api/cloudcontroller/ccerror/multi_error_test.go b/api/cloudcontroller/ccerror/multi_error_test.go index 8b78993bda4..84ca9f78ebe 100644 --- a/api/cloudcontroller/ccerror/multi_error_test.go +++ b/api/cloudcontroller/ccerror/multi_error_test.go @@ -3,7 +3,7 @@ package ccerror_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go b/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go index 1bcfe10cc7a..788f3d7ff8c 100644 --- a/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go +++ b/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go b/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go index 161c2c0bf9e..1f2d458c1d9 100644 --- a/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go +++ b/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/user_not_found.go b/api/cloudcontroller/ccerror/user_not_found.go index 1ed3c3ee6c7..ec85756f3d3 100644 --- a/api/cloudcontroller/ccerror/user_not_found.go +++ b/api/cloudcontroller/ccerror/user_not_found.go @@ -3,7 +3,7 @@ package ccerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // UserNotFoundError is returned when a role does not exist. diff --git a/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go b/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go index 024d896fe13..02922b27eea 100644 --- a/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go +++ b/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccerror/v3_job_failed_error.go b/api/cloudcontroller/ccerror/v3_job_failed_error.go index aac4025f081..9ad08dc93b2 100644 --- a/api/cloudcontroller/ccerror/v3_job_failed_error.go +++ b/api/cloudcontroller/ccerror/v3_job_failed_error.go @@ -3,7 +3,7 @@ package ccerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // V3JobFailedError represents a failed Cloud Controller Job. It wraps the error diff --git a/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go b/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go index 0a265e85f33..1d1e504f638 100644 --- a/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go +++ b/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go @@ -3,7 +3,7 @@ package ccerror_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/application.go b/api/cloudcontroller/ccv3/application.go index e2530a9b736..c56b91c872a 100644 --- a/api/cloudcontroller/ccv3/application.go +++ b/api/cloudcontroller/ccv3/application.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateApplication creates an application with the given settings. diff --git a/api/cloudcontroller/ccv3/application_feature.go b/api/cloudcontroller/ccv3/application_feature.go index ee07cc6cf56..caf9cdb83da 100644 --- a/api/cloudcontroller/ccv3/application_feature.go +++ b/api/cloudcontroller/ccv3/application_feature.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) type SSHEnabled struct { diff --git a/api/cloudcontroller/ccv3/application_feature_test.go b/api/cloudcontroller/ccv3/application_feature_test.go index 2b0567169ec..92e2e995e4d 100644 --- a/api/cloudcontroller/ccv3/application_feature_test.go +++ b/api/cloudcontroller/ccv3/application_feature_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/application_test.go b/api/cloudcontroller/ccv3/application_test.go index 46002b20b09..82dd9324569 100644 --- a/api/cloudcontroller/ccv3/application_test.go +++ b/api/cloudcontroller/ccv3/application_test.go @@ -4,13 +4,13 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/build.go b/api/cloudcontroller/ccv3/build.go index 2c671892184..8ece50c8c46 100644 --- a/api/cloudcontroller/ccv3/build.go +++ b/api/cloudcontroller/ccv3/build.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateBuild creates the given build, requires Package GUID to be set on the diff --git a/api/cloudcontroller/ccv3/build_test.go b/api/cloudcontroller/ccv3/build_test.go index c1f9cd0a70d..ffb30f84890 100644 --- a/api/cloudcontroller/ccv3/build_test.go +++ b/api/cloudcontroller/ccv3/build_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/buildpack.go b/api/cloudcontroller/ccv3/buildpack.go index 7846d58952e..7e1514bdf20 100644 --- a/api/cloudcontroller/ccv3/buildpack.go +++ b/api/cloudcontroller/ccv3/buildpack.go @@ -3,9 +3,9 @@ package ccv3 import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/api/cloudcontroller/uploads" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateBuildpack creates a buildpack with the given settings, Type and the diff --git a/api/cloudcontroller/ccv3/buildpack_test.go b/api/cloudcontroller/ccv3/buildpack_test.go index 9ef09c56dc9..3db0d301f2a 100644 --- a/api/cloudcontroller/ccv3/buildpack_test.go +++ b/api/cloudcontroller/ccv3/buildpack_test.go @@ -8,16 +8,16 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/ccv3_suite_test.go b/api/cloudcontroller/ccv3/ccv3_suite_test.go index c6db76ee3cd..d500b5fd6a1 100644 --- a/api/cloudcontroller/ccv3/ccv3_suite_test.go +++ b/api/cloudcontroller/ccv3/ccv3_suite_test.go @@ -5,8 +5,8 @@ import ( "log" "testing" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go index 5c41fa00cda..0324ac5ef03 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" ) type FakeClock struct { @@ -28,15 +28,16 @@ func (fake *FakeClock) Now() time.Time { ret, specificReturn := fake.nowReturnsOnCall[len(fake.nowArgsForCall)] fake.nowArgsForCall = append(fake.nowArgsForCall, struct { }{}) + stub := fake.NowStub + fakeReturns := fake.nowReturns fake.recordInvocation("Now", []interface{}{}) fake.nowMutex.Unlock() - if fake.NowStub != nil { - return fake.NowStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.nowReturns return fakeReturns.result1 } diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go index 46d95f6f2f3..e8cf670369e 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go @@ -4,8 +4,8 @@ package ccv3fakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" ) type FakeConnectionWrapper struct { @@ -43,15 +43,16 @@ func (fake *FakeConnectionWrapper) Make(arg1 *cloudcontroller.Request, arg2 *clo arg1 *cloudcontroller.Request arg2 *cloudcontroller.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } @@ -103,15 +104,16 @@ func (fake *FakeConnectionWrapper) Wrap(arg1 cloudcontroller.Connection) cloudco fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 cloudcontroller.Connection }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go index 09e6ccf14ce..395fb77fea9 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go @@ -35,15 +35,16 @@ func (fake *FakeReader) Read(arg1 []byte) (int, error) { fake.readArgsForCall = append(fake.readArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1Copy}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go index 528b7ba15b2..1f387b5c54f 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go @@ -6,8 +6,8 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) type FakeRequester struct { @@ -140,9 +140,10 @@ func (fake *FakeRequester) InitializeConnection(arg1 ccv3.TargetSettings) { fake.initializeConnectionArgsForCall = append(fake.initializeConnectionArgsForCall, struct { arg1 ccv3.TargetSettings }{arg1}) + stub := fake.InitializeConnectionStub fake.recordInvocation("InitializeConnection", []interface{}{arg1}) fake.initializeConnectionMutex.Unlock() - if fake.InitializeConnectionStub != nil { + if stub != nil { fake.InitializeConnectionStub(arg1) } } @@ -171,9 +172,10 @@ func (fake *FakeRequester) InitializeRouter(arg1 string) { fake.initializeRouterArgsForCall = append(fake.initializeRouterArgsForCall, struct { arg1 string }{arg1}) + stub := fake.InitializeRouterStub fake.recordInvocation("InitializeRouter", []interface{}{arg1}) fake.initializeRouterMutex.Unlock() - if fake.InitializeRouterStub != nil { + if stub != nil { fake.InitializeRouterStub(arg1) } } @@ -203,15 +205,16 @@ func (fake *FakeRequester) MakeListRequest(arg1 ccv3.RequestParams) (ccv3.Includ fake.makeListRequestArgsForCall = append(fake.makeListRequestArgsForCall, struct { arg1 ccv3.RequestParams }{arg1}) + stub := fake.MakeListRequestStub + fakeReturns := fake.makeListRequestReturns fake.recordInvocation("MakeListRequest", []interface{}{arg1}) fake.makeListRequestMutex.Unlock() - if fake.MakeListRequestStub != nil { - return fake.MakeListRequestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeListRequestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -269,15 +272,16 @@ func (fake *FakeRequester) MakeRequest(arg1 ccv3.RequestParams) (ccv3.JobURL, cc fake.makeRequestArgsForCall = append(fake.makeRequestArgsForCall, struct { arg1 ccv3.RequestParams }{arg1}) + stub := fake.MakeRequestStub + fakeReturns := fake.makeRequestReturns fake.recordInvocation("MakeRequest", []interface{}{arg1}) fake.makeRequestMutex.Unlock() - if fake.MakeRequestStub != nil { - return fake.MakeRequestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -337,15 +341,16 @@ func (fake *FakeRequester) MakeRequestReceiveRaw(arg1 string, arg2 internal.Para arg2 internal.Params arg3 string }{arg1, arg2, arg3}) + stub := fake.MakeRequestReceiveRawStub + fakeReturns := fake.makeRequestReceiveRawReturns fake.recordInvocation("MakeRequestReceiveRaw", []interface{}{arg1, arg2, arg3}) fake.makeRequestReceiveRawMutex.Unlock() - if fake.MakeRequestReceiveRawStub != nil { - return fake.MakeRequestReceiveRawStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestReceiveRawReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -412,15 +417,16 @@ func (fake *FakeRequester) MakeRequestSendRaw(arg1 string, arg2 internal.Params, arg4 string arg5 interface{} }{arg1, arg2, arg3Copy, arg4, arg5}) + stub := fake.MakeRequestSendRawStub + fakeReturns := fake.makeRequestSendRawReturns fake.recordInvocation("MakeRequestSendRaw", []interface{}{arg1, arg2, arg3Copy, arg4, arg5}) fake.makeRequestSendRawMutex.Unlock() - if fake.MakeRequestSendRawStub != nil { - return fake.MakeRequestSendRawStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestSendRawReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -486,15 +492,16 @@ func (fake *FakeRequester) MakeRequestSendReceiveRaw(arg1 string, arg2 string, a arg3 http.Header arg4 []byte }{arg1, arg2, arg3, arg4Copy}) + stub := fake.MakeRequestSendReceiveRawStub + fakeReturns := fake.makeRequestSendReceiveRawReturns fake.recordInvocation("MakeRequestSendReceiveRaw", []interface{}{arg1, arg2, arg3, arg4Copy}) fake.makeRequestSendReceiveRawMutex.Unlock() - if fake.MakeRequestSendReceiveRawStub != nil { - return fake.MakeRequestSendReceiveRawStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestSendReceiveRawReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -558,15 +565,16 @@ func (fake *FakeRequester) MakeRequestUploadAsync(arg1 string, arg2 internal.Par arg6 interface{} arg7 <-chan error }{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) + stub := fake.MakeRequestUploadAsyncStub + fakeReturns := fake.makeRequestUploadAsyncReturns fake.recordInvocation("MakeRequestUploadAsync", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) fake.makeRequestUploadAsyncMutex.Unlock() - if fake.MakeRequestUploadAsyncStub != nil { - return fake.MakeRequestUploadAsyncStub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestUploadAsyncReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -623,9 +631,10 @@ func (fake *FakeRequester) WrapConnection(arg1 ccv3.ConnectionWrapper) { fake.wrapConnectionArgsForCall = append(fake.wrapConnectionArgsForCall, struct { arg1 ccv3.ConnectionWrapper }{arg1}) + stub := fake.WrapConnectionStub fake.recordInvocation("WrapConnection", []interface{}{arg1}) fake.wrapConnectionMutex.Unlock() - if fake.WrapConnectionStub != nil { + if stub != nil { fake.WrapConnectionStub(arg1) } } diff --git a/api/cloudcontroller/ccv3/client.go b/api/cloudcontroller/ccv3/client.go index ffb7ef5d933..bbccb6c171b 100644 --- a/api/cloudcontroller/ccv3/client.go +++ b/api/cloudcontroller/ccv3/client.go @@ -77,7 +77,7 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) // Warnings are a collection of warnings that the Cloud Controller can return diff --git a/api/cloudcontroller/ccv3/client_test.go b/api/cloudcontroller/ccv3/client_test.go index 116faa9accb..9669cf6884e 100644 --- a/api/cloudcontroller/ccv3/client_test.go +++ b/api/cloudcontroller/ccv3/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/connection_wrapper.go b/api/cloudcontroller/ccv3/connection_wrapper.go index 376891caddc..4af2406970a 100644 --- a/api/cloudcontroller/ccv3/connection_wrapper.go +++ b/api/cloudcontroller/ccv3/connection_wrapper.go @@ -1,6 +1,6 @@ package ccv3 -import "code.cloudfoundry.org/cli/api/cloudcontroller" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ConnectionWrapper diff --git a/api/cloudcontroller/ccv3/deployment.go b/api/cloudcontroller/ccv3/deployment.go index 3d72e47f482..d08a7a44044 100644 --- a/api/cloudcontroller/ccv3/deployment.go +++ b/api/cloudcontroller/ccv3/deployment.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) ContinueDeployment(deploymentGUID string) (Warnings, error) { diff --git a/api/cloudcontroller/ccv3/deployment_test.go b/api/cloudcontroller/ccv3/deployment_test.go index ad2099583b1..68372938ac8 100644 --- a/api/cloudcontroller/ccv3/deployment_test.go +++ b/api/cloudcontroller/ccv3/deployment_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/domain.go b/api/cloudcontroller/ccv3/domain.go index 6b0aae2141c..f39c589a896 100644 --- a/api/cloudcontroller/ccv3/domain.go +++ b/api/cloudcontroller/ccv3/domain.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) type SharedOrgs struct { diff --git a/api/cloudcontroller/ccv3/domain_test.go b/api/cloudcontroller/ccv3/domain_test.go index df3dbf5b599..cce17cf4039 100644 --- a/api/cloudcontroller/ccv3/domain_test.go +++ b/api/cloudcontroller/ccv3/domain_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/droplet.go b/api/cloudcontroller/ccv3/droplet.go index 7d9bfe5e703..fc2a1009eff 100644 --- a/api/cloudcontroller/ccv3/droplet.go +++ b/api/cloudcontroller/ccv3/droplet.go @@ -3,10 +3,10 @@ package ccv3 import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/api/cloudcontroller/uploads" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v9/resources" ) type DropletCreateRequest struct { diff --git a/api/cloudcontroller/ccv3/droplet_test.go b/api/cloudcontroller/ccv3/droplet_test.go index 2e8f9eed293..f5c127a080c 100644 --- a/api/cloudcontroller/ccv3/droplet_test.go +++ b/api/cloudcontroller/ccv3/droplet_test.go @@ -7,15 +7,15 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/environment.go b/api/cloudcontroller/ccv3/environment.go index 45af18d5bbe..b705b3ef243 100644 --- a/api/cloudcontroller/ccv3/environment.go +++ b/api/cloudcontroller/ccv3/environment.go @@ -1,7 +1,7 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) // Environment variables that will be provided to an app at runtime. It will @@ -13,11 +13,11 @@ type Environment struct { Application map[string]interface{} `json:"application_env_json"` // EnvironmentVariables are user provided environment variables. EnvironmentVariables map[string]interface{} `json:"environment_variables"` - //Running is the set of default environment variables available to running - //apps. + // Running is the set of default environment variables available to running + // apps. Running map[string]interface{} `json:"running_env_json"` - //Staging is the set of default environment variables available during - //staging. + // Staging is the set of default environment variables available during + // staging. Staging map[string]interface{} `json:"staging_env_json"` // System contains information about bound services for the application. AKA // VCAP_SERVICES. diff --git a/api/cloudcontroller/ccv3/environment_test.go b/api/cloudcontroller/ccv3/environment_test.go index 14b8462218d..bb915cdd3f1 100644 --- a/api/cloudcontroller/ccv3/environment_test.go +++ b/api/cloudcontroller/ccv3/environment_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/environment_variables.go b/api/cloudcontroller/ccv3/environment_variables.go index 22c50d8f97c..ebf5b3455d5 100644 --- a/api/cloudcontroller/ccv3/environment_variables.go +++ b/api/cloudcontroller/ccv3/environment_variables.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // EnvironmentVariables represents the environment variables that can be set on diff --git a/api/cloudcontroller/ccv3/environment_variables_test.go b/api/cloudcontroller/ccv3/environment_variables_test.go index f2ce0794bd5..b923d6d7e8f 100644 --- a/api/cloudcontroller/ccv3/environment_variables_test.go +++ b/api/cloudcontroller/ccv3/environment_variables_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/errors.go b/api/cloudcontroller/ccv3/errors.go index e819b980a40..f018e89b68c 100644 --- a/api/cloudcontroller/ccv3/errors.go +++ b/api/cloudcontroller/ccv3/errors.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) const ( @@ -146,7 +146,7 @@ func handleNotFound(errorResponse ccerror.V3Error, request *cloudcontroller.Requ } func handleUnprocessableEntity(errorResponse ccerror.V3Error) error { - //idea to make route already exist error flexible for all relevant error cases + // idea to make route already exist error flexible for all relevant error cases errorString := errorResponse.Detail err := ccerror.UnprocessableEntityError{Message: errorResponse.Detail} appNameTakenRegexp := regexp.MustCompile(`App with the name '.*' already exists\.`) diff --git a/api/cloudcontroller/ccv3/errors_test.go b/api/cloudcontroller/ccv3/errors_test.go index a5c92c32180..21538706b40 100644 --- a/api/cloudcontroller/ccv3/errors_test.go +++ b/api/cloudcontroller/ccv3/errors_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/event.go b/api/cloudcontroller/ccv3/event.go index 3a918eed1d8..cf0a13a9b76 100644 --- a/api/cloudcontroller/ccv3/event.go +++ b/api/cloudcontroller/ccv3/event.go @@ -3,8 +3,8 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) type Event struct { diff --git a/api/cloudcontroller/ccv3/event_test.go b/api/cloudcontroller/ccv3/event_test.go index 542a60fd4cd..86a4cbd7b44 100644 --- a/api/cloudcontroller/ccv3/event_test.go +++ b/api/cloudcontroller/ccv3/event_test.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/feature_flag.go b/api/cloudcontroller/ccv3/feature_flag.go index 80f775acc8e..790e3206c38 100644 --- a/api/cloudcontroller/ccv3/feature_flag.go +++ b/api/cloudcontroller/ccv3/feature_flag.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetFeatureFlag(flagName string) (resources.FeatureFlag, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/feature_flag_test.go b/api/cloudcontroller/ccv3/feature_flag_test.go index ceeb15cf222..6227cf5876b 100644 --- a/api/cloudcontroller/ccv3/feature_flag_test.go +++ b/api/cloudcontroller/ccv3/feature_flag_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/included_resources.go b/api/cloudcontroller/ccv3/included_resources.go index 24f3b5a0c01..6827248eae1 100644 --- a/api/cloudcontroller/ccv3/included_resources.go +++ b/api/cloudcontroller/ccv3/included_resources.go @@ -1,6 +1,6 @@ package ccv3 -import "code.cloudfoundry.org/cli/resources" +import "code.cloudfoundry.org/cli/v9/resources" type IncludedResources struct { Users []resources.User `json:"users,omitempty"` diff --git a/api/cloudcontroller/ccv3/info.go b/api/cloudcontroller/ccv3/info.go index 564834a8ed1..07acc168eeb 100644 --- a/api/cloudcontroller/ccv3/info.go +++ b/api/cloudcontroller/ccv3/info.go @@ -3,9 +3,9 @@ package ccv3 import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" ) type InfoLinks struct { diff --git a/api/cloudcontroller/ccv3/info_test.go b/api/cloudcontroller/ccv3/info_test.go index 542909b391b..b3e0ef9b9fd 100644 --- a/api/cloudcontroller/ccv3/info_test.go +++ b/api/cloudcontroller/ccv3/info_test.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/internal/routing_test.go b/api/cloudcontroller/ccv3/internal/routing_test.go index 59b52b3f74a..ff3f68f5f19 100644 --- a/api/cloudcontroller/ccv3/internal/routing_test.go +++ b/api/cloudcontroller/ccv3/internal/routing_test.go @@ -3,7 +3,7 @@ package internal_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/isolation_segment.go b/api/cloudcontroller/ccv3/isolation_segment.go index 16dbd4ec174..b7f56aa97a6 100644 --- a/api/cloudcontroller/ccv3/isolation_segment.go +++ b/api/cloudcontroller/ccv3/isolation_segment.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateIsolationSegment will create an Isolation Segment on the Cloud diff --git a/api/cloudcontroller/ccv3/isolation_segment_test.go b/api/cloudcontroller/ccv3/isolation_segment_test.go index a52e3d1344c..f7dd7117e08 100644 --- a/api/cloudcontroller/ccv3/isolation_segment_test.go +++ b/api/cloudcontroller/ccv3/isolation_segment_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/job.go b/api/cloudcontroller/ccv3/job.go index a0704a80841..7f0cc31cf29 100644 --- a/api/cloudcontroller/ccv3/job.go +++ b/api/cloudcontroller/ccv3/job.go @@ -3,8 +3,8 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Job represents a Cloud Controller Job. diff --git a/api/cloudcontroller/ccv3/job_test.go b/api/cloudcontroller/ccv3/job_test.go index d4bacafa8ab..71424bc5a11 100644 --- a/api/cloudcontroller/ccv3/job_test.go +++ b/api/cloudcontroller/ccv3/job_test.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/job_url.go b/api/cloudcontroller/ccv3/job_url.go index f49a965789f..8d65440769d 100644 --- a/api/cloudcontroller/ccv3/job_url.go +++ b/api/cloudcontroller/ccv3/job_url.go @@ -1,7 +1,7 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) // JobURL is the URL to a given Job. diff --git a/api/cloudcontroller/ccv3/job_url_test.go b/api/cloudcontroller/ccv3/job_url_test.go index 3c6d3bd6219..9be3cd80bed 100644 --- a/api/cloudcontroller/ccv3/job_url_test.go +++ b/api/cloudcontroller/ccv3/job_url_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/manifest.go b/api/cloudcontroller/ccv3/manifest.go index fba84e1c40a..5dc76894042 100644 --- a/api/cloudcontroller/ccv3/manifest.go +++ b/api/cloudcontroller/ccv3/manifest.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // GetApplicationManifest returns a (YAML) manifest for an application and its diff --git a/api/cloudcontroller/ccv3/manifest_test.go b/api/cloudcontroller/ccv3/manifest_test.go index 4038a805562..1f4a353588a 100644 --- a/api/cloudcontroller/ccv3/manifest_test.go +++ b/api/cloudcontroller/ccv3/manifest_test.go @@ -4,13 +4,13 @@ import ( "errors" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/metadata.go b/api/cloudcontroller/ccv3/metadata.go index a909e49f182..7d0306df25e 100644 --- a/api/cloudcontroller/ccv3/metadata.go +++ b/api/cloudcontroller/ccv3/metadata.go @@ -3,8 +3,8 @@ package ccv3 import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) UpdateResourceMetadata(resource string, resourceGUID string, metadata resources.Metadata) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/metadata_test.go b/api/cloudcontroller/ccv3/metadata_test.go index 763ec58bb52..5232f73d929 100644 --- a/api/cloudcontroller/ccv3/metadata_test.go +++ b/api/cloudcontroller/ccv3/metadata_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/organization.go b/api/cloudcontroller/ccv3/organization.go index b75cad50e9a..e9cf539ccc0 100644 --- a/api/cloudcontroller/ccv3/organization.go +++ b/api/cloudcontroller/ccv3/organization.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateOrganization(orgName string) (resources.Organization, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/organization_quota.go b/api/cloudcontroller/ccv3/organization_quota.go index 8812493a565..e5de9f942eb 100644 --- a/api/cloudcontroller/ccv3/organization_quota.go +++ b/api/cloudcontroller/ccv3/organization_quota.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) ApplyOrganizationQuota(quotaGuid, orgGuid string) (resources.RelationshipList, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/organization_quota_test.go b/api/cloudcontroller/ccv3/organization_quota_test.go index a8b810fae95..36d2d88578e 100644 --- a/api/cloudcontroller/ccv3/organization_quota_test.go +++ b/api/cloudcontroller/ccv3/organization_quota_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/organization_test.go b/api/cloudcontroller/ccv3/organization_test.go index 1b7800dffce..d379c27592c 100644 --- a/api/cloudcontroller/ccv3/organization_test.go +++ b/api/cloudcontroller/ccv3/organization_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/package.go b/api/cloudcontroller/ccv3/package.go index 0dcdfcaaaf2..3deb0fbbe77 100644 --- a/api/cloudcontroller/ccv3/package.go +++ b/api/cloudcontroller/ccv3/package.go @@ -8,11 +8,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.Reader diff --git a/api/cloudcontroller/ccv3/package_test.go b/api/cloudcontroller/ccv3/package_test.go index 5cc627d2903..633dc206241 100644 --- a/api/cloudcontroller/ccv3/package_test.go +++ b/api/cloudcontroller/ccv3/package_test.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/api/cloudcontroller/ccv3/paginate.go b/api/cloudcontroller/ccv3/paginate.go index a31fe0ec5b3..c352d061432 100644 --- a/api/cloudcontroller/ccv3/paginate.go +++ b/api/cloudcontroller/ccv3/paginate.go @@ -3,7 +3,7 @@ package ccv3 import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) func (requester RealRequester) paginate(request *cloudcontroller.Request, obj interface{}, appendToExternalList func(interface{}) error, specificPage bool) (IncludedResources, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/paginated_resources_test.go b/api/cloudcontroller/ccv3/paginated_resources_test.go index debe0ad1626..b5f95377af5 100644 --- a/api/cloudcontroller/ccv3/paginated_resources_test.go +++ b/api/cloudcontroller/ccv3/paginated_resources_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - . "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/process.go b/api/cloudcontroller/ccv3/process.go index d03f2885fb9..caa6ac6495e 100644 --- a/api/cloudcontroller/ccv3/process.go +++ b/api/cloudcontroller/ccv3/process.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateApplicationProcessScale updates process instances count, memory or disk diff --git a/api/cloudcontroller/ccv3/process_instance.go b/api/cloudcontroller/ccv3/process_instance.go index da5764a6f15..11fa1b56b1a 100644 --- a/api/cloudcontroller/ccv3/process_instance.go +++ b/api/cloudcontroller/ccv3/process_instance.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/types" ) // ProcessInstance represents a single process instance for a particular diff --git a/api/cloudcontroller/ccv3/process_instance_test.go b/api/cloudcontroller/ccv3/process_instance_test.go index 911d5d402a1..7834a257720 100644 --- a/api/cloudcontroller/ccv3/process_instance_test.go +++ b/api/cloudcontroller/ccv3/process_instance_test.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/process_test.go b/api/cloudcontroller/ccv3/process_test.go index fc584e4f372..b41d9fea80e 100644 --- a/api/cloudcontroller/ccv3/process_test.go +++ b/api/cloudcontroller/ccv3/process_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/query_test.go b/api/cloudcontroller/ccv3/query_test.go index e614d4c8195..761aa4c9184 100644 --- a/api/cloudcontroller/ccv3/query_test.go +++ b/api/cloudcontroller/ccv3/query_test.go @@ -3,7 +3,7 @@ package ccv3_test import ( "net/url" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/relationship.go b/api/cloudcontroller/ccv3/relationship.go index e4ed3b81eff..129b33103ff 100644 --- a/api/cloudcontroller/ccv3/relationship.go +++ b/api/cloudcontroller/ccv3/relationship.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // DeleteIsolationSegmentOrganization will delete the relationship between diff --git a/api/cloudcontroller/ccv3/relationship_list.go b/api/cloudcontroller/ccv3/relationship_list.go index a60adef2505..28d185e371a 100644 --- a/api/cloudcontroller/ccv3/relationship_list.go +++ b/api/cloudcontroller/ccv3/relationship_list.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // EntitleIsolationSegmentToOrganizations will create a link between the diff --git a/api/cloudcontroller/ccv3/relationship_list_test.go b/api/cloudcontroller/ccv3/relationship_list_test.go index 06fbfc4c4fb..91401af3e7a 100644 --- a/api/cloudcontroller/ccv3/relationship_list_test.go +++ b/api/cloudcontroller/ccv3/relationship_list_test.go @@ -3,9 +3,9 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/relationship_test.go b/api/cloudcontroller/ccv3/relationship_test.go index 88fcd4e3de1..34323f4ba37 100644 --- a/api/cloudcontroller/ccv3/relationship_test.go +++ b/api/cloudcontroller/ccv3/relationship_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/request.go b/api/cloudcontroller/ccv3/request.go index 65b988ac784..1624a1950ee 100644 --- a/api/cloudcontroller/ccv3/request.go +++ b/api/cloudcontroller/ccv3/request.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) // requestOptions contains all the options to create an HTTP request. diff --git a/api/cloudcontroller/ccv3/requester.go b/api/cloudcontroller/ccv3/requester.go index f0982fc6293..4b14853d2d3 100644 --- a/api/cloudcontroller/ccv3/requester.go +++ b/api/cloudcontroller/ccv3/requester.go @@ -8,8 +8,8 @@ import ( "net/http" "runtime" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Requester diff --git a/api/cloudcontroller/ccv3/requester_test.go b/api/cloudcontroller/ccv3/requester_test.go index 6b078ece01b..221b2c17edf 100644 --- a/api/cloudcontroller/ccv3/requester_test.go +++ b/api/cloudcontroller/ccv3/requester_test.go @@ -8,13 +8,13 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/resource.go b/api/cloudcontroller/ccv3/resource.go index cb8d778c37f..a2122458f64 100644 --- a/api/cloudcontroller/ccv3/resource.go +++ b/api/cloudcontroller/ccv3/resource.go @@ -5,8 +5,8 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) type Checksum struct { diff --git a/api/cloudcontroller/ccv3/resource_test.go b/api/cloudcontroller/ccv3/resource_test.go index 0b47d31fb0a..f94b9e0e3a3 100644 --- a/api/cloudcontroller/ccv3/resource_test.go +++ b/api/cloudcontroller/ccv3/resource_test.go @@ -5,8 +5,8 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/revisions.go b/api/cloudcontroller/ccv3/revisions.go index d50fca2630b..f72abbb6baf 100644 --- a/api/cloudcontroller/ccv3/revisions.go +++ b/api/cloudcontroller/ccv3/revisions.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetApplicationRevisions(appGUID string, query ...Query) ([]resources.Revision, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/revisions_test.go b/api/cloudcontroller/ccv3/revisions_test.go index afeb59fbb7e..ecbf4c1697e 100644 --- a/api/cloudcontroller/ccv3/revisions_test.go +++ b/api/cloudcontroller/ccv3/revisions_test.go @@ -3,12 +3,12 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/role.go b/api/cloudcontroller/ccv3/role.go index 7e12f96dc8b..5f3b1559c51 100644 --- a/api/cloudcontroller/ccv3/role.go +++ b/api/cloudcontroller/ccv3/role.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateRole(roleSpec resources.Role) (resources.Role, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/role_test.go b/api/cloudcontroller/ccv3/role_test.go index 50a226da1b8..7d0d6894581 100644 --- a/api/cloudcontroller/ccv3/role_test.go +++ b/api/cloudcontroller/ccv3/role_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/route.go b/api/cloudcontroller/ccv3/route.go index afff0af5e9a..651ce0bd2c8 100644 --- a/api/cloudcontroller/ccv3/route.go +++ b/api/cloudcontroller/ccv3/route.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client Client) CreateRoute(route resources.Route) (resources.Route, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/route_binding.go b/api/cloudcontroller/ccv3/route_binding.go index 643479d628d..cda98197594 100644 --- a/api/cloudcontroller/ccv3/route_binding.go +++ b/api/cloudcontroller/ccv3/route_binding.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateRouteBinding(binding resources.RouteBinding) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/route_binding_test.go b/api/cloudcontroller/ccv3/route_binding_test.go index 6321d4faad2..c0dbee113b6 100644 --- a/api/cloudcontroller/ccv3/route_binding_test.go +++ b/api/cloudcontroller/ccv3/route_binding_test.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/route_test.go b/api/cloudcontroller/ccv3/route_test.go index c1597c71db9..0bdff6563bb 100644 --- a/api/cloudcontroller/ccv3/route_test.go +++ b/api/cloudcontroller/ccv3/route_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/security_group.go b/api/cloudcontroller/ccv3/security_group.go index 1880769ceff..656234a1b6a 100644 --- a/api/cloudcontroller/ccv3/security_group.go +++ b/api/cloudcontroller/ccv3/security_group.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateSecurityGroup(securityGroup resources.SecurityGroup) (resources.SecurityGroup, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/security_group_test.go b/api/cloudcontroller/ccv3/security_group_test.go index b2a1e915aea..5849af528c4 100644 --- a/api/cloudcontroller/ccv3/security_group_test.go +++ b/api/cloudcontroller/ccv3/security_group_test.go @@ -3,11 +3,11 @@ package ccv3_test import ( "errors" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/service_broker.go b/api/cloudcontroller/ccv3/service_broker.go index c61b0d9fa23..c6b35eb9b7d 100644 --- a/api/cloudcontroller/ccv3/service_broker.go +++ b/api/cloudcontroller/ccv3/service_broker.go @@ -3,8 +3,8 @@ package ccv3 import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateServiceBroker registers a new service broker. diff --git a/api/cloudcontroller/ccv3/service_broker_test.go b/api/cloudcontroller/ccv3/service_broker_test.go index ab4ea030bdd..276784cf91c 100644 --- a/api/cloudcontroller/ccv3/service_broker_test.go +++ b/api/cloudcontroller/ccv3/service_broker_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_credential_binding.go b/api/cloudcontroller/ccv3/service_credential_binding.go index 8d3910273c8..bd621b79c53 100644 --- a/api/cloudcontroller/ccv3/service_credential_binding.go +++ b/api/cloudcontroller/ccv3/service_credential_binding.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) func (client *Client) CreateServiceCredentialBinding(binding resources.ServiceCredentialBinding) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_credential_binding_test.go b/api/cloudcontroller/ccv3/service_credential_binding_test.go index f78261ad690..919903e4d33 100644 --- a/api/cloudcontroller/ccv3/service_credential_binding_test.go +++ b/api/cloudcontroller/ccv3/service_credential_binding_test.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/service_instance.go b/api/cloudcontroller/ccv3/service_instance.go index 5ab9c84b643..d988543d099 100644 --- a/api/cloudcontroller/ccv3/service_instance.go +++ b/api/cloudcontroller/ccv3/service_instance.go @@ -1,12 +1,12 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) type SpaceWithOrganization struct { diff --git a/api/cloudcontroller/ccv3/service_instance_test.go b/api/cloudcontroller/ccv3/service_instance_test.go index f4ee3c427cd..fcd8dc6dd8d 100644 --- a/api/cloudcontroller/ccv3/service_instance_test.go +++ b/api/cloudcontroller/ccv3/service_instance_test.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/service_offering.go b/api/cloudcontroller/ccv3/service_offering.go index c5ce0cba2ea..91fc64a8988 100644 --- a/api/cloudcontroller/ccv3/service_offering.go +++ b/api/cloudcontroller/ccv3/service_offering.go @@ -1,10 +1,10 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) // GetServiceOffering lists service offering with optional filters. diff --git a/api/cloudcontroller/ccv3/service_offering_test.go b/api/cloudcontroller/ccv3/service_offering_test.go index 03383e390f5..4f7bc137ce0 100644 --- a/api/cloudcontroller/ccv3/service_offering_test.go +++ b/api/cloudcontroller/ccv3/service_offering_test.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_plan.go b/api/cloudcontroller/ccv3/service_plan.go index e61a462e6dd..23e3aef0c4c 100644 --- a/api/cloudcontroller/ccv3/service_plan.go +++ b/api/cloudcontroller/ccv3/service_plan.go @@ -1,11 +1,11 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) func (client *Client) GetServicePlanByGUID(guid string) (resources.ServicePlan, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_plan_test.go b/api/cloudcontroller/ccv3/service_plan_test.go index 492e9f35bba..87f7b86c87e 100644 --- a/api/cloudcontroller/ccv3/service_plan_test.go +++ b/api/cloudcontroller/ccv3/service_plan_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_plan_visibility.go b/api/cloudcontroller/ccv3/service_plan_visibility.go index 89fb79b21f7..5e37c2ac2d7 100644 --- a/api/cloudcontroller/ccv3/service_plan_visibility.go +++ b/api/cloudcontroller/ccv3/service_plan_visibility.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetServicePlanVisibility(servicePlanGUID string) (resources.ServicePlanVisibility, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_plan_visibility_test.go b/api/cloudcontroller/ccv3/service_plan_visibility_test.go index d5d0c7a136d..94215662f9a 100644 --- a/api/cloudcontroller/ccv3/service_plan_visibility_test.go +++ b/api/cloudcontroller/ccv3/service_plan_visibility_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/sidecar.go b/api/cloudcontroller/ccv3/sidecar.go index f9e59c92a25..d988c939804 100644 --- a/api/cloudcontroller/ccv3/sidecar.go +++ b/api/cloudcontroller/ccv3/sidecar.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetProcessSidecars(processGuid string) ([]resources.Sidecar, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/sidecar_test.go b/api/cloudcontroller/ccv3/sidecar_test.go index 744bb8db77e..07d07210738 100644 --- a/api/cloudcontroller/ccv3/sidecar_test.go +++ b/api/cloudcontroller/ccv3/sidecar_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/space.go b/api/cloudcontroller/ccv3/space.go index cad31730bcb..8d808e88bb5 100644 --- a/api/cloudcontroller/ccv3/space.go +++ b/api/cloudcontroller/ccv3/space.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateSpace(space resources.Space) (resources.Space, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_feature.go b/api/cloudcontroller/ccv3/space_feature.go index 462295bc4e3..15ec1566563 100644 --- a/api/cloudcontroller/ccv3/space_feature.go +++ b/api/cloudcontroller/ccv3/space_feature.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetSpaceFeature(spaceGUID string, featureName string) (bool, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_feature_test.go b/api/cloudcontroller/ccv3/space_feature_test.go index d3aea454d72..72723c69d3a 100644 --- a/api/cloudcontroller/ccv3/space_feature_test.go +++ b/api/cloudcontroller/ccv3/space_feature_test.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/space_quota.go b/api/cloudcontroller/ccv3/space_quota.go index b8fb01a176f..2b74988f08e 100644 --- a/api/cloudcontroller/ccv3/space_quota.go +++ b/api/cloudcontroller/ccv3/space_quota.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client Client) ApplySpaceQuota(quotaGUID string, spaceGUID string) (resources.RelationshipList, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_quota_test.go b/api/cloudcontroller/ccv3/space_quota_test.go index 64d3cb9e312..e9c4cc1a8dd 100644 --- a/api/cloudcontroller/ccv3/space_quota_test.go +++ b/api/cloudcontroller/ccv3/space_quota_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/space_test.go b/api/cloudcontroller/ccv3/space_test.go index 11b247018d0..b3bfde4b319 100644 --- a/api/cloudcontroller/ccv3/space_test.go +++ b/api/cloudcontroller/ccv3/space_test.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/stack.go b/api/cloudcontroller/ccv3/stack.go index e1704a3c39a..d403f44030c 100644 --- a/api/cloudcontroller/ccv3/stack.go +++ b/api/cloudcontroller/ccv3/stack.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // GetStacks lists stacks with optional filters. diff --git a/api/cloudcontroller/ccv3/stack_test.go b/api/cloudcontroller/ccv3/stack_test.go index 8ad2225db6e..0485525646b 100644 --- a/api/cloudcontroller/ccv3/stack_test.go +++ b/api/cloudcontroller/ccv3/stack_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/target_test.go b/api/cloudcontroller/ccv3/target_test.go index f7be61b25a2..8869ee754dc 100644 --- a/api/cloudcontroller/ccv3/target_test.go +++ b/api/cloudcontroller/ccv3/target_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/task.go b/api/cloudcontroller/ccv3/task.go index 91c99814eaa..6a4ae31119d 100644 --- a/api/cloudcontroller/ccv3/task.go +++ b/api/cloudcontroller/ccv3/task.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateApplication resources.Task runs a command in the Application environment diff --git a/api/cloudcontroller/ccv3/task_test.go b/api/cloudcontroller/ccv3/task_test.go index bfa411ddf28..2b9a549d5ad 100644 --- a/api/cloudcontroller/ccv3/task_test.go +++ b/api/cloudcontroller/ccv3/task_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/user.go b/api/cloudcontroller/ccv3/user.go index 7b2aa8edb20..43fb166b6fd 100644 --- a/api/cloudcontroller/ccv3/user.go +++ b/api/cloudcontroller/ccv3/user.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateUser creates a new Cloud Controller User from the provided UAA user diff --git a/api/cloudcontroller/ccv3/user_test.go b/api/cloudcontroller/ccv3/user_test.go index 2b42fb39251..2ede31ad3c2 100644 --- a/api/cloudcontroller/ccv3/user_test.go +++ b/api/cloudcontroller/ccv3/user_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/v2_formatted_resource.go b/api/cloudcontroller/ccv3/v2_formatted_resource.go index 2107a905a9d..3dfd55c5d1d 100644 --- a/api/cloudcontroller/ccv3/v2_formatted_resource.go +++ b/api/cloudcontroller/ccv3/v2_formatted_resource.go @@ -5,7 +5,7 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) // V2FormattedResource represents a Cloud Controller Resource that still has the same shape as the V2 Resource. diff --git a/api/cloudcontroller/ccv3/v2_formatted_resource_test.go b/api/cloudcontroller/ccv3/v2_formatted_resource_test.go index 6f4083b5041..7500f97cf69 100644 --- a/api/cloudcontroller/ccv3/v2_formatted_resource_test.go +++ b/api/cloudcontroller/ccv3/v2_formatted_resource_test.go @@ -3,7 +3,7 @@ package ccv3_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/cloud_controller_connection.go b/api/cloudcontroller/cloud_controller_connection.go index b5601a86ccd..8bea7e11825 100644 --- a/api/cloudcontroller/cloud_controller_connection.go +++ b/api/cloudcontroller/cloud_controller_connection.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/util" ) // Config is for configuring a CloudControllerConnection. diff --git a/api/cloudcontroller/cloud_controller_connection_test.go b/api/cloudcontroller/cloud_controller_connection_test.go index b32124f5ce7..e54c011f9c5 100644 --- a/api/cloudcontroller/cloud_controller_connection_test.go +++ b/api/cloudcontroller/cloud_controller_connection_test.go @@ -6,8 +6,8 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go b/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go index 068ea8e1a50..58d44d9b11e 100644 --- a/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go +++ b/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go @@ -4,7 +4,7 @@ package cloudcontrollerfakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) type FakeConnection struct { @@ -31,15 +31,16 @@ func (fake *FakeConnection) Make(arg1 *cloudcontroller.Request, arg2 *cloudcontr arg1 *cloudcontroller.Request arg2 *cloudcontroller.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } diff --git a/api/cloudcontroller/pipebomb.go b/api/cloudcontroller/pipebomb.go index 29ac6b0fe17..20c15bbc99c 100644 --- a/api/cloudcontroller/pipebomb.go +++ b/api/cloudcontroller/pipebomb.go @@ -3,7 +3,7 @@ package cloudcontroller import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) // Pipebomb is a wrapper around an io.Pipe's io.ReadCloser that turns it into a diff --git a/api/cloudcontroller/uploads/upload.go b/api/cloudcontroller/uploads/upload.go index fa69b97a9ad..e622c554f22 100644 --- a/api/cloudcontroller/uploads/upload.go +++ b/api/cloudcontroller/uploads/upload.go @@ -6,7 +6,7 @@ import ( "mime/multipart" "path/filepath" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) func CalculateRequestSize(fileSize int64, path string, fieldName string) (int64, error) { diff --git a/api/cloudcontroller/wrapper/custom_wrapper.go b/api/cloudcontroller/wrapper/custom_wrapper.go index dc6b38af746..d54743fd73d 100644 --- a/api/cloudcontroller/wrapper/custom_wrapper.go +++ b/api/cloudcontroller/wrapper/custom_wrapper.go @@ -1,6 +1,6 @@ package wrapper -import "code.cloudfoundry.org/cli/api/cloudcontroller" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller" // CustomWrapper is a wrapper that can execute arbitrary code via the // CustomMake function on every request that passes through Make. diff --git a/api/cloudcontroller/wrapper/kubernetes_authentication.go b/api/cloudcontroller/wrapper/kubernetes_authentication.go index 622bd580ccf..1043c3be597 100644 --- a/api/cloudcontroller/wrapper/kubernetes_authentication.go +++ b/api/cloudcontroller/wrapper/kubernetes_authentication.go @@ -3,10 +3,10 @@ package wrapper import ( "net/http" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/shared" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/shared" + "code.cloudfoundry.org/cli/v9/command" ) type KubernetesAuthentication struct { diff --git a/api/cloudcontroller/wrapper/kubernetes_authentication_test.go b/api/cloudcontroller/wrapper/kubernetes_authentication_test.go index 443f21bdbd7..790c5854369 100644 --- a/api/cloudcontroller/wrapper/kubernetes_authentication_test.go +++ b/api/cloudcontroller/wrapper/kubernetes_authentication_test.go @@ -11,12 +11,12 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/integration/helpers" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" diff --git a/api/cloudcontroller/wrapper/request_logger.go b/api/cloudcontroller/wrapper/request_logger.go index abebb85108c..18c6f19d274 100644 --- a/api/cloudcontroller/wrapper/request_logger.go +++ b/api/cloudcontroller/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/cloudcontroller/wrapper/request_logger_test.go b/api/cloudcontroller/wrapper/request_logger_test.go index f105321c9a9..30a69f711d8 100644 --- a/api/cloudcontroller/wrapper/request_logger_test.go +++ b/api/cloudcontroller/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/retry_request.go b/api/cloudcontroller/wrapper/retry_request.go index cf9e7f6cd6b..4f9359af882 100644 --- a/api/cloudcontroller/wrapper/retry_request.go +++ b/api/cloudcontroller/wrapper/retry_request.go @@ -3,8 +3,8 @@ package wrapper import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/cloudcontroller/wrapper/retry_request_test.go b/api/cloudcontroller/wrapper/retry_request_test.go index 118d285ae2a..0f0b2a2dad7 100644 --- a/api/cloudcontroller/wrapper/retry_request_test.go +++ b/api/cloudcontroller/wrapper/retry_request_test.go @@ -6,10 +6,10 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/uaa_authentication.go b/api/cloudcontroller/wrapper/uaa_authentication.go index d11ae162857..e6a7aaf72b2 100644 --- a/api/cloudcontroller/wrapper/uaa_authentication.go +++ b/api/cloudcontroller/wrapper/uaa_authentication.go @@ -6,8 +6,8 @@ import ( "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/cloudcontroller/wrapper/uaa_authentication_test.go b/api/cloudcontroller/wrapper/uaa_authentication_test.go index 6302c91d3c9..025fddb600e 100644 --- a/api/cloudcontroller/wrapper/uaa_authentication_test.go +++ b/api/cloudcontroller/wrapper/uaa_authentication_test.go @@ -7,18 +7,18 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper/wrapperfakes" - "code.cloudfoundry.org/cli/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go index 1ef43d68900..9b508745ce7 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" ) type FakeRequestLoggerOutput struct { @@ -127,15 +127,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) err arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHeaderReturns return fakeReturns.result1 } @@ -187,15 +188,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHostReturns return fakeReturns.result1 } @@ -252,15 +254,16 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONBodyReturns return fakeReturns.result1 } @@ -312,15 +315,16 @@ func (fake *FakeRequestLoggerOutput) DisplayMessage(arg1 string) error { fake.displayMessageArgsForCall = append(fake.displayMessageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayMessageStub + fakeReturns := fake.displayMessageReturns fake.recordInvocation("DisplayMessage", []interface{}{arg1}) fake.displayMessageMutex.Unlock() - if fake.DisplayMessageStub != nil { - return fake.DisplayMessageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayMessageReturns return fakeReturns.result1 } @@ -374,15 +378,16 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayRequestHeaderReturns return fakeReturns.result1 } @@ -435,15 +440,16 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayResponseHeaderReturns return fakeReturns.result1 } @@ -496,15 +502,16 @@ func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) er arg1 string arg2 time.Time }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayTypeReturns return fakeReturns.result1 } @@ -555,9 +562,10 @@ func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.HandleInternalErrorStub fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { + if stub != nil { fake.HandleInternalErrorStub(arg1) } } @@ -586,15 +594,16 @@ func (fake *FakeRequestLoggerOutput) Start() error { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -638,15 +647,16 @@ func (fake *FakeRequestLoggerOutput) Stop() error { ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] fake.stopArgsForCall = append(fake.stopArgsForCall, struct { }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stopReturns return fakeReturns.result1 } diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go index fc1158cfa33..6d0de701fcb 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" ) type FakeTokenCache struct { @@ -47,15 +47,16 @@ func (fake *FakeTokenCache) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeTokenCache) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -151,9 +153,10 @@ func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -182,9 +185,10 @@ func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go index b328b1d7c81..4e7bf73d99e 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeUAAClient struct { @@ -32,15 +32,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/logcache/log_cache_client.go b/api/logcache/log_cache_client.go index a6166346f53..2f737393e8e 100644 --- a/api/logcache/log_cache_client.go +++ b/api/logcache/log_cache_client.go @@ -10,10 +10,10 @@ import ( logcache "code.cloudfoundry.org/go-log-cache/v2" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/shared" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/shared" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/util" ) type RequestLoggerOutput interface { @@ -34,31 +34,31 @@ type DebugPrinter struct { func (p DebugPrinter) PrintError(err error) { for _, output := range p.outputs { - _ = output.Start() //nolint - _ = output.DisplayType("ERROR", time.Now()) //nolint - _ = output.DisplayDump(err.Error()) //nolint - _ = output.Stop() //nolint + _ = output.Start() // nolint + _ = output.DisplayType("ERROR", time.Now()) // nolint + _ = output.DisplayDump(err.Error()) // nolint + _ = output.Stop() // nolint } } func (p DebugPrinter) PrintRequest(req *http.Request) { for _, output := range p.outputs { - _ = output.Start() //nolint - _ = output.DisplayType("REQUEST", time.Now()) //nolint - _ = output.DisplayRequestHeader(req.Method, req.URL.RequestURI(), req.Proto) //nolint - _ = output.DisplayHost(req.URL.Host) //nolint - _ = output.DisplayDump(headersString(req.Header)) //nolint - _ = output.Stop() //nolint + _ = output.Start() // nolint + _ = output.DisplayType("REQUEST", time.Now()) // nolint + _ = output.DisplayRequestHeader(req.Method, req.URL.RequestURI(), req.Proto) // nolint + _ = output.DisplayHost(req.URL.Host) // nolint + _ = output.DisplayDump(headersString(req.Header)) // nolint + _ = output.Stop() // nolint } } func (p DebugPrinter) PrintResponse(resp *http.Response) { for _, output := range p.outputs { - _ = output.Start() //nolint - _ = output.DisplayType("RESPONSE", time.Now()) //nolint - _ = output.DisplayResponseHeader(resp.Proto, resp.Status) //nolint - _ = output.DisplayDump(headersString(resp.Header)) //nolint - _ = output.Stop() //nolint + _ = output.Start() // nolint + _ = output.DisplayType("RESPONSE", time.Now()) // nolint + _ = output.DisplayResponseHeader(resp.Proto, resp.Status) // nolint + _ = output.DisplayDump(headersString(resp.Header)) // nolint + _ = output.Stop() // nolint } } @@ -124,7 +124,7 @@ func NewClient(logCacheEndpoint string, config command.Config, ui command.UI, k8 } } - var client logcache.HTTPClient //nolint + var client logcache.HTTPClient // nolint client = &userAgentHTTPClient{ c: &http.Client{Transport: tr}, userAgent: fmt.Sprintf("%s/%s (%s; %s %s)", config.BinaryName(), config.BinaryVersion(), runtime.Version(), runtime.GOARCH, runtime.GOOS), diff --git a/api/plugin/client_test.go b/api/plugin/client_test.go index 4a3275201ee..0e7fc8ab038 100644 --- a/api/plugin/client_test.go +++ b/api/plugin/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/download_plugin_test.go b/api/plugin/download_plugin_test.go index 5261eba3b6d..bb981753f25 100644 --- a/api/plugin/download_plugin_test.go +++ b/api/plugin/download_plugin_test.go @@ -6,9 +6,9 @@ import ( "net/url" "os" - . "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/plugin_connection.go b/api/plugin/plugin_connection.go index 465be1bacd3..522d2afc85b 100644 --- a/api/plugin/plugin_connection.go +++ b/api/plugin/plugin_connection.go @@ -11,8 +11,8 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/util" ) // PluginConnection represents a connection to a plugin repo. diff --git a/api/plugin/plugin_connection_test.go b/api/plugin/plugin_connection_test.go index ac1a8b36f56..1a344ef00aa 100644 --- a/api/plugin/plugin_connection_test.go +++ b/api/plugin/plugin_connection_test.go @@ -7,9 +7,9 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/plugin_repository_test.go b/api/plugin/plugin_repository_test.go index d929b9a2a9d..d44cbd5210e 100644 --- a/api/plugin/plugin_repository_test.go +++ b/api/plugin/plugin_repository_test.go @@ -5,8 +5,8 @@ import ( "net/http" "net/url" - . "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" + . "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/plugin_suite_test.go b/api/plugin/plugin_suite_test.go index fb573421058..48e4973c9cc 100644 --- a/api/plugin/plugin_suite_test.go +++ b/api/plugin/plugin_suite_test.go @@ -5,7 +5,7 @@ import ( "log" "testing" - . "code.cloudfoundry.org/cli/api/plugin" + . "code.cloudfoundry.org/cli/v9/api/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/pluginfakes/fake_connection.go b/api/plugin/pluginfakes/fake_connection.go index 7c0c8374cf4..57cd4630692 100644 --- a/api/plugin/pluginfakes/fake_connection.go +++ b/api/plugin/pluginfakes/fake_connection.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) type FakeConnection struct { @@ -34,15 +34,16 @@ func (fake *FakeConnection) Make(arg1 *http.Request, arg2 *plugin.Response, arg3 arg2 *plugin.Response arg3 plugin.ProxyReader }{arg1, arg2, arg3}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2, arg3}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } diff --git a/api/plugin/pluginfakes/fake_connection_wrapper.go b/api/plugin/pluginfakes/fake_connection_wrapper.go index 02121dbbc4d..f2838fcadf1 100644 --- a/api/plugin/pluginfakes/fake_connection_wrapper.go +++ b/api/plugin/pluginfakes/fake_connection_wrapper.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) type FakeConnectionWrapper struct { @@ -45,15 +45,16 @@ func (fake *FakeConnectionWrapper) Make(arg1 *http.Request, arg2 *plugin.Respons arg2 *plugin.Response arg3 plugin.ProxyReader }{arg1, arg2, arg3}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2, arg3}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } @@ -105,15 +106,16 @@ func (fake *FakeConnectionWrapper) Wrap(arg1 plugin.Connection) plugin.Connectio fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 plugin.Connection }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/plugin/pluginfakes/fake_proxy_reader.go b/api/plugin/pluginfakes/fake_proxy_reader.go index bb9729e831c..b6027c8dfc8 100644 --- a/api/plugin/pluginfakes/fake_proxy_reader.go +++ b/api/plugin/pluginfakes/fake_proxy_reader.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) type FakeProxyReader struct { @@ -37,9 +37,10 @@ func (fake *FakeProxyReader) Finish() { fake.finishMutex.Lock() fake.finishArgsForCall = append(fake.finishArgsForCall, struct { }{}) + stub := fake.FinishStub fake.recordInvocation("Finish", []interface{}{}) fake.finishMutex.Unlock() - if fake.FinishStub != nil { + if stub != nil { fake.FinishStub() } } @@ -61,9 +62,10 @@ func (fake *FakeProxyReader) Start(arg1 int64) { fake.startArgsForCall = append(fake.startArgsForCall, struct { arg1 int64 }{arg1}) + stub := fake.StartStub fake.recordInvocation("Start", []interface{}{arg1}) fake.startMutex.Unlock() - if fake.StartStub != nil { + if stub != nil { fake.StartStub(arg1) } } @@ -93,15 +95,16 @@ func (fake *FakeProxyReader) Wrap(arg1 io.Reader) io.ReadCloser { fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 io.Reader }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/plugin/wrapper/request_logger.go b/api/plugin/wrapper/request_logger.go index 8903969fd09..d10ee4b825c 100644 --- a/api/plugin/wrapper/request_logger.go +++ b/api/plugin/wrapper/request_logger.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/plugin/wrapper/request_logger_test.go b/api/plugin/wrapper/request_logger_test.go index 2b6a5fe1e4e..22af66bd806 100644 --- a/api/plugin/wrapper/request_logger_test.go +++ b/api/plugin/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - . "code.cloudfoundry.org/cli/api/plugin/wrapper" - "code.cloudfoundry.org/cli/api/plugin/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v9/api/plugin/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/plugin/wrapper/retry_request.go b/api/plugin/wrapper/retry_request.go index 0af18b74dba..6d3adb388ef 100644 --- a/api/plugin/wrapper/retry_request.go +++ b/api/plugin/wrapper/retry_request.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/plugin/wrapper/retry_request_test.go b/api/plugin/wrapper/retry_request_test.go index 151c32b5a03..a4816a94477 100644 --- a/api/plugin/wrapper/retry_request_test.go +++ b/api/plugin/wrapper/retry_request_test.go @@ -6,10 +6,10 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - . "code.cloudfoundry.org/cli/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go b/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go index 5f0b28bfaaa..b5e812a9db5 100644 --- a/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v9/api/plugin/wrapper" ) type FakeRequestLoggerOutput struct { @@ -126,15 +126,16 @@ func (fake *FakeRequestLoggerOutput) DisplayDump(arg1 string) error { fake.displayDumpArgsForCall = append(fake.displayDumpArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayDumpStub + fakeReturns := fake.displayDumpReturns fake.recordInvocation("DisplayDump", []interface{}{arg1}) fake.displayDumpMutex.Unlock() - if fake.DisplayDumpStub != nil { - return fake.DisplayDumpStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayDumpReturns return fakeReturns.result1 } @@ -187,15 +188,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) err arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHeaderReturns return fakeReturns.result1 } @@ -247,15 +249,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHostReturns return fakeReturns.result1 } @@ -312,15 +315,16 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONBodyReturns return fakeReturns.result1 } @@ -374,15 +378,16 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayRequestHeaderReturns return fakeReturns.result1 } @@ -435,15 +440,16 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayResponseHeaderReturns return fakeReturns.result1 } @@ -496,15 +502,16 @@ func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) er arg1 string arg2 time.Time }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayTypeReturns return fakeReturns.result1 } @@ -555,9 +562,10 @@ func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.HandleInternalErrorStub fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { + if stub != nil { fake.HandleInternalErrorStub(arg1) } } @@ -586,15 +594,16 @@ func (fake *FakeRequestLoggerOutput) Start() error { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -638,15 +647,16 @@ func (fake *FakeRequestLoggerOutput) Stop() error { ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] fake.stopArgsForCall = append(fake.stopArgsForCall, struct { }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stopReturns return fakeReturns.result1 } diff --git a/api/router/client.go b/api/router/client.go index b6ceeefe46f..5bd642e4e47 100644 --- a/api/router/client.go +++ b/api/router/client.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime" - "code.cloudfoundry.org/cli/api/router/internal" + "code.cloudfoundry.org/cli/v9/api/router/internal" "github.com/tedsuo/rata" ) diff --git a/api/router/router_connection.go b/api/router/router_connection.go index c5e8ebbc4bd..2157d6d6210 100644 --- a/api/router/router_connection.go +++ b/api/router/router_connection.go @@ -10,9 +10,9 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/util" ) // ConnectionConfig is for configuring the RouterConnection diff --git a/api/router/router_group.go b/api/router/router_group.go index de67d5cf6f2..3e3137951cb 100644 --- a/api/router/router_group.go +++ b/api/router/router_group.go @@ -3,8 +3,8 @@ package router import ( "net/url" - "code.cloudfoundry.org/cli/api/router/internal" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router/internal" + "code.cloudfoundry.org/cli/v9/api/router/routererror" ) // RouterGroup represents a router group. diff --git a/api/router/router_group_test.go b/api/router/router_group_test.go index 461d183cf54..7121d020579 100644 --- a/api/router/router_group_test.go +++ b/api/router/router_group_test.go @@ -3,9 +3,9 @@ package router_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/api/router/wrapper" + . "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/router/router_suite_test.go b/api/router/router_suite_test.go index 483f3bbb725..8a4908b3139 100644 --- a/api/router/router_suite_test.go +++ b/api/router/router_suite_test.go @@ -6,7 +6,7 @@ import ( "net/url" "testing" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v9/api/router" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/router/routerfakes/fake_connection.go b/api/router/routerfakes/fake_connection.go index 5185d53c75f..e4eb68757ef 100644 --- a/api/router/routerfakes/fake_connection.go +++ b/api/router/routerfakes/fake_connection.go @@ -4,7 +4,7 @@ package routerfakes import ( "sync" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v9/api/router" ) type FakeConnection struct { @@ -31,15 +31,16 @@ func (fake *FakeConnection) Make(arg1 *router.Request, arg2 *router.Response) er arg1 *router.Request arg2 *router.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } diff --git a/api/router/routerfakes/fake_connection_wrapper.go b/api/router/routerfakes/fake_connection_wrapper.go index d890a183eb8..8d6eccb3984 100644 --- a/api/router/routerfakes/fake_connection_wrapper.go +++ b/api/router/routerfakes/fake_connection_wrapper.go @@ -4,7 +4,7 @@ package routerfakes import ( "sync" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v9/api/router" ) type FakeConnectionWrapper struct { @@ -42,15 +42,16 @@ func (fake *FakeConnectionWrapper) Make(arg1 *router.Request, arg2 *router.Respo arg1 *router.Request arg2 *router.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } @@ -102,15 +103,16 @@ func (fake *FakeConnectionWrapper) Wrap(arg1 router.Connection) router.Connectio fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 router.Connection }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/router/wrapper/error_wrapper.go b/api/router/wrapper/error_wrapper.go index 07579b90951..c3f4b6f13cc 100644 --- a/api/router/wrapper/error_wrapper.go +++ b/api/router/wrapper/error_wrapper.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" ) const expiredTokenMessage = "Token is expired" diff --git a/api/router/wrapper/error_wrapper_test.go b/api/router/wrapper/error_wrapper_test.go index e5b57115d18..e09a7eaec2c 100644 --- a/api/router/wrapper/error_wrapper_test.go +++ b/api/router/wrapper/error_wrapper_test.go @@ -3,10 +3,10 @@ package wrapper_test import ( "net/http" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/api/router/routerfakes" - . "code.cloudfoundry.org/cli/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v9/api/router/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/router/wrapper/request_logger.go b/api/router/wrapper/request_logger.go index 9f7b4206ea9..e7111683559 100644 --- a/api/router/wrapper/request_logger.go +++ b/api/router/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v9/api/router" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/router/wrapper/request_logger_test.go b/api/router/wrapper/request_logger_test.go index ac025e02d7c..e666e0ccc23 100644 --- a/api/router/wrapper/request_logger_test.go +++ b/api/router/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routerfakes" - . "code.cloudfoundry.org/cli/api/router/wrapper" - "code.cloudfoundry.org/cli/api/router/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v9/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/router/wrapper/uaa_authentication.go b/api/router/wrapper/uaa_authentication.go index 6fca8a07d8b..14d52b2bebd 100644 --- a/api/router/wrapper/uaa_authentication.go +++ b/api/router/wrapper/uaa_authentication.go @@ -1,9 +1,9 @@ package wrapper import ( - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/router/wrapper/uaa_authentication_test.go b/api/router/wrapper/uaa_authentication_test.go index 73320125a9d..86a73d46b7d 100644 --- a/api/router/wrapper/uaa_authentication_test.go +++ b/api/router/wrapper/uaa_authentication_test.go @@ -6,13 +6,13 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/api/router/routerfakes" - . "code.cloudfoundry.org/cli/api/router/wrapper" - "code.cloudfoundry.org/cli/api/router/wrapper/wrapperfakes" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v9/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/router/wrapper/wrapperfakes/fake_request_logger_output.go b/api/router/wrapper/wrapperfakes/fake_request_logger_output.go index 665f9441df8..e8fe80457b8 100644 --- a/api/router/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/router/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router/wrapper" ) type FakeRequestLoggerOutput struct { @@ -127,15 +127,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) err arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHeaderReturns return fakeReturns.result1 } @@ -187,15 +188,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHostReturns return fakeReturns.result1 } @@ -252,15 +254,16 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONBodyReturns return fakeReturns.result1 } @@ -312,15 +315,16 @@ func (fake *FakeRequestLoggerOutput) DisplayMessage(arg1 string) error { fake.displayMessageArgsForCall = append(fake.displayMessageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayMessageStub + fakeReturns := fake.displayMessageReturns fake.recordInvocation("DisplayMessage", []interface{}{arg1}) fake.displayMessageMutex.Unlock() - if fake.DisplayMessageStub != nil { - return fake.DisplayMessageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayMessageReturns return fakeReturns.result1 } @@ -374,15 +378,16 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayRequestHeaderReturns return fakeReturns.result1 } @@ -435,15 +440,16 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayResponseHeaderReturns return fakeReturns.result1 } @@ -496,15 +502,16 @@ func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) er arg1 string arg2 time.Time }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayTypeReturns return fakeReturns.result1 } @@ -555,9 +562,10 @@ func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.HandleInternalErrorStub fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { + if stub != nil { fake.HandleInternalErrorStub(arg1) } } @@ -586,15 +594,16 @@ func (fake *FakeRequestLoggerOutput) Start() error { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -638,15 +647,16 @@ func (fake *FakeRequestLoggerOutput) Stop() error { ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] fake.stopArgsForCall = append(fake.stopArgsForCall, struct { }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stopReturns return fakeReturns.result1 } diff --git a/api/router/wrapper/wrapperfakes/fake_token_cache.go b/api/router/wrapper/wrapperfakes/fake_token_cache.go index 780d388a0bd..5f97569a257 100644 --- a/api/router/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/router/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router/wrapper" ) type FakeTokenCache struct { @@ -47,15 +47,16 @@ func (fake *FakeTokenCache) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeTokenCache) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -151,9 +153,10 @@ func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -182,9 +185,10 @@ func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } diff --git a/api/router/wrapper/wrapperfakes/fake_uaaclient.go b/api/router/wrapper/wrapperfakes/fake_uaaclient.go index e534f49ba47..d5761ef0434 100644 --- a/api/router/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/router/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/router/wrapper" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeUAAClient struct { @@ -32,15 +32,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/shared/sharedfakes/fake_round_tripper.go b/api/shared/sharedfakes/fake_round_tripper.go index 02f1ff17922..e8c0e9dd4f4 100644 --- a/api/shared/sharedfakes/fake_round_tripper.go +++ b/api/shared/sharedfakes/fake_round_tripper.go @@ -30,15 +30,16 @@ func (fake *FakeRoundTripper) RoundTrip(arg1 *http.Request) (*http.Response, err fake.roundTripArgsForCall = append(fake.roundTripArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.RoundTripStub + fakeReturns := fake.roundTripReturns fake.recordInvocation("RoundTrip", []interface{}{arg1}) fake.roundTripMutex.Unlock() - if fake.RoundTripStub != nil { - return fake.RoundTripStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.roundTripReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/shared/wrap_for_cf_on_k8s.go b/api/shared/wrap_for_cf_on_k8s.go index d5734d6ffd5..74dbb3d51f2 100644 --- a/api/shared/wrap_for_cf_on_k8s.go +++ b/api/shared/wrap_for_cf_on_k8s.go @@ -15,8 +15,8 @@ import ( "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/transport" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" // imported for the side effects _ "k8s.io/client-go/plugin/pkg/client/auth/azure" diff --git a/api/shared/wrap_for_cf_on_k8s_test.go b/api/shared/wrap_for_cf_on_k8s_test.go index f79b6050919..3e18922d87e 100644 --- a/api/shared/wrap_for_cf_on_k8s_test.go +++ b/api/shared/wrap_for_cf_on_k8s_test.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/shared" - "code.cloudfoundry.org/cli/api/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/shared" + "code.cloudfoundry.org/cli/v9/api/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/integration/helpers" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" diff --git a/api/uaa/auth.go b/api/uaa/auth.go index f12da64f163..c571773c978 100644 --- a/api/uaa/auth.go +++ b/api/uaa/auth.go @@ -8,8 +8,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // AuthResponse contains the access token and refresh token which are granted diff --git a/api/uaa/auth_test.go b/api/uaa/auth_test.go index b7002c3b79b..275ade094d8 100644 --- a/api/uaa/auth_test.go +++ b/api/uaa/auth_test.go @@ -6,9 +6,9 @@ import ( "net/http" "net/url" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/client.go b/api/uaa/client.go index a8ccd54e4f9..5702b968d47 100644 --- a/api/uaa/client.go +++ b/api/uaa/client.go @@ -9,7 +9,7 @@ import ( "fmt" "runtime" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // Client is the UAA client diff --git a/api/uaa/client_test.go b/api/uaa/client_test.go index fa683776043..a77f6260245 100644 --- a/api/uaa/client_test.go +++ b/api/uaa/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/error_converter_test.go b/api/uaa/error_converter_test.go index a3fb6596904..0e5ad2a21bf 100644 --- a/api/uaa/error_converter_test.go +++ b/api/uaa/error_converter_test.go @@ -3,8 +3,8 @@ package uaa_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/info_test.go b/api/uaa/info_test.go index 2657447a38f..0aedb853e7c 100644 --- a/api/uaa/info_test.go +++ b/api/uaa/info_test.go @@ -1,7 +1,7 @@ package uaa_test import ( - . "code.cloudfoundry.org/cli/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/internal/routing_test.go b/api/uaa/internal/routing_test.go index e808296c04a..f4bd968bd68 100644 --- a/api/uaa/internal/routing_test.go +++ b/api/uaa/internal/routing_test.go @@ -3,7 +3,7 @@ package internal_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/uaa/internal" + . "code.cloudfoundry.org/cli/v9/api/uaa/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go b/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go index d905db448bd..b447e8e75a7 100644 --- a/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go +++ b/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go @@ -4,7 +4,7 @@ package noaabridgefakes import ( "sync" - "code.cloudfoundry.org/cli/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v9/api/uaa/noaabridge" ) type FakeTokenCache struct { @@ -37,15 +37,16 @@ func (fake *FakeTokenCache) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -89,9 +90,10 @@ func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -120,9 +122,10 @@ func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } diff --git a/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go b/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go index 21ec9048164..33f852090a4 100644 --- a/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go +++ b/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package noaabridgefakes import ( "sync" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/noaabridge" ) type FakeUAAClient struct { @@ -32,15 +32,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/uaa/noaabridge/token_refresher.go b/api/uaa/noaabridge/token_refresher.go index 1c5278618ba..68e558458b3 100644 --- a/api/uaa/noaabridge/token_refresher.go +++ b/api/uaa/noaabridge/token_refresher.go @@ -2,7 +2,7 @@ // TokenRefresher interface for noaa/consumer. package noaabridge -import "code.cloudfoundry.org/cli/api/uaa" +import "code.cloudfoundry.org/cli/v9/api/uaa" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/uaa/noaabridge/token_refresher_test.go b/api/uaa/noaabridge/token_refresher_test.go index b7bdf5fcee2..31008cf9d65 100644 --- a/api/uaa/noaabridge/token_refresher_test.go +++ b/api/uaa/noaabridge/token_refresher_test.go @@ -3,9 +3,9 @@ package noaabridge_test import ( "errors" - "code.cloudfoundry.org/cli/api/uaa" - . "code.cloudfoundry.org/cli/api/uaa/noaabridge" - "code.cloudfoundry.org/cli/api/uaa/noaabridge/noaabridgefakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v9/api/uaa/noaabridge/noaabridgefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/prompts_test.go b/api/uaa/prompts_test.go index 117a12586e6..ff5795da32f 100644 --- a/api/uaa/prompts_test.go +++ b/api/uaa/prompts_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/api/uaa" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/refresh_token.go b/api/uaa/refresh_token.go index fba19e211ea..8da8d7cfb1d 100644 --- a/api/uaa/refresh_token.go +++ b/api/uaa/refresh_token.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // RefreshedTokens represents the UAA refresh token response. diff --git a/api/uaa/refresh_token_test.go b/api/uaa/refresh_token_test.go index 92359d38b37..228f5e58415 100644 --- a/api/uaa/refresh_token_test.go +++ b/api/uaa/refresh_token_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/request.go b/api/uaa/request.go index a49df595b4d..69604b380e0 100644 --- a/api/uaa/request.go +++ b/api/uaa/request.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // RequestOptions contains all the options to create an HTTP Request. diff --git a/api/uaa/resources.go b/api/uaa/resources.go index 5a674db8c6c..1f91e875eca 100644 --- a/api/uaa/resources.go +++ b/api/uaa/resources.go @@ -1,7 +1,7 @@ package uaa import ( - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // SetupResources configures the client to use the specified settings and diescopers the UAA and Authentication resources diff --git a/api/uaa/resources_test.go b/api/uaa/resources_test.go index 23543858ad1..9c70704523b 100644 --- a/api/uaa/resources_test.go +++ b/api/uaa/resources_test.go @@ -1,8 +1,8 @@ package uaa_test import ( - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/ssh.go b/api/uaa/ssh.go index 01cff5eeaa9..28b38a0d204 100644 --- a/api/uaa/ssh.go +++ b/api/uaa/ssh.go @@ -3,7 +3,7 @@ package uaa import ( "net/url" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) func (client *Client) GetSSHPasscode(accessToken string, sshOAuthClient string) (string, error) { diff --git a/api/uaa/ssh_test.go b/api/uaa/ssh_test.go index 94ff8071092..44d862ce27d 100644 --- a/api/uaa/ssh_test.go +++ b/api/uaa/ssh_test.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/uaa_connection.go b/api/uaa/uaa_connection.go index 69c6be93fd2..9b6ea9f9189 100644 --- a/api/uaa/uaa_connection.go +++ b/api/uaa/uaa_connection.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/util" ) // UAAConnection represents the connection to UAA diff --git a/api/uaa/uaa_connection_test.go b/api/uaa/uaa_connection_test.go index 25009795a4f..7fa729eb268 100644 --- a/api/uaa/uaa_connection_test.go +++ b/api/uaa/uaa_connection_test.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/uaa_suite_test.go b/api/uaa/uaa_suite_test.go index a8d48f49752..2421117b304 100644 --- a/api/uaa/uaa_suite_test.go +++ b/api/uaa/uaa_suite_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/uaafakes/fake_config.go b/api/uaa/uaafakes/fake_config.go index 02dc7f5e992..806b3033689 100644 --- a/api/uaa/uaafakes/fake_config.go +++ b/api/uaa/uaafakes/fake_config.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeConfig struct { @@ -103,15 +103,16 @@ func (fake *FakeConfig) BinaryName() string { ret, specificReturn := fake.binaryNameReturnsOnCall[len(fake.binaryNameArgsForCall)] fake.binaryNameArgsForCall = append(fake.binaryNameArgsForCall, struct { }{}) + stub := fake.BinaryNameStub + fakeReturns := fake.binaryNameReturns fake.recordInvocation("BinaryName", []interface{}{}) fake.binaryNameMutex.Unlock() - if fake.BinaryNameStub != nil { - return fake.BinaryNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.binaryNameReturns return fakeReturns.result1 } @@ -155,15 +156,16 @@ func (fake *FakeConfig) BinaryVersion() string { ret, specificReturn := fake.binaryVersionReturnsOnCall[len(fake.binaryVersionArgsForCall)] fake.binaryVersionArgsForCall = append(fake.binaryVersionArgsForCall, struct { }{}) + stub := fake.BinaryVersionStub + fakeReturns := fake.binaryVersionReturns fake.recordInvocation("BinaryVersion", []interface{}{}) fake.binaryVersionMutex.Unlock() - if fake.BinaryVersionStub != nil { - return fake.BinaryVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.binaryVersionReturns return fakeReturns.result1 } @@ -207,15 +209,16 @@ func (fake *FakeConfig) DialTimeout() time.Duration { ret, specificReturn := fake.dialTimeoutReturnsOnCall[len(fake.dialTimeoutArgsForCall)] fake.dialTimeoutArgsForCall = append(fake.dialTimeoutArgsForCall, struct { }{}) + stub := fake.DialTimeoutStub + fakeReturns := fake.dialTimeoutReturns fake.recordInvocation("DialTimeout", []interface{}{}) fake.dialTimeoutMutex.Unlock() - if fake.DialTimeoutStub != nil { - return fake.DialTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dialTimeoutReturns return fakeReturns.result1 } @@ -259,9 +262,10 @@ func (fake *FakeConfig) SetUAAEndpoint(arg1 string) { fake.setUAAEndpointArgsForCall = append(fake.setUAAEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAEndpointStub fake.recordInvocation("SetUAAEndpoint", []interface{}{arg1}) fake.setUAAEndpointMutex.Unlock() - if fake.SetUAAEndpointStub != nil { + if stub != nil { fake.SetUAAEndpointStub(arg1) } } @@ -290,15 +294,16 @@ func (fake *FakeConfig) SkipSSLValidation() bool { ret, specificReturn := fake.skipSSLValidationReturnsOnCall[len(fake.skipSSLValidationArgsForCall)] fake.skipSSLValidationArgsForCall = append(fake.skipSSLValidationArgsForCall, struct { }{}) + stub := fake.SkipSSLValidationStub + fakeReturns := fake.skipSSLValidationReturns fake.recordInvocation("SkipSSLValidation", []interface{}{}) fake.skipSSLValidationMutex.Unlock() - if fake.SkipSSLValidationStub != nil { - return fake.SkipSSLValidationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.skipSSLValidationReturns return fakeReturns.result1 } @@ -342,15 +347,16 @@ func (fake *FakeConfig) UAADisableKeepAlives() bool { ret, specificReturn := fake.uAADisableKeepAlivesReturnsOnCall[len(fake.uAADisableKeepAlivesArgsForCall)] fake.uAADisableKeepAlivesArgsForCall = append(fake.uAADisableKeepAlivesArgsForCall, struct { }{}) + stub := fake.UAADisableKeepAlivesStub + fakeReturns := fake.uAADisableKeepAlivesReturns fake.recordInvocation("UAADisableKeepAlives", []interface{}{}) fake.uAADisableKeepAlivesMutex.Unlock() - if fake.UAADisableKeepAlivesStub != nil { - return fake.UAADisableKeepAlivesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAADisableKeepAlivesReturns return fakeReturns.result1 } @@ -394,15 +400,16 @@ func (fake *FakeConfig) UAAGrantType() string { ret, specificReturn := fake.uAAGrantTypeReturnsOnCall[len(fake.uAAGrantTypeArgsForCall)] fake.uAAGrantTypeArgsForCall = append(fake.uAAGrantTypeArgsForCall, struct { }{}) + stub := fake.UAAGrantTypeStub + fakeReturns := fake.uAAGrantTypeReturns fake.recordInvocation("UAAGrantType", []interface{}{}) fake.uAAGrantTypeMutex.Unlock() - if fake.UAAGrantTypeStub != nil { - return fake.UAAGrantTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAGrantTypeReturns return fakeReturns.result1 } @@ -446,15 +453,16 @@ func (fake *FakeConfig) UAAOAuthClient() string { ret, specificReturn := fake.uAAOAuthClientReturnsOnCall[len(fake.uAAOAuthClientArgsForCall)] fake.uAAOAuthClientArgsForCall = append(fake.uAAOAuthClientArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientStub + fakeReturns := fake.uAAOAuthClientReturns fake.recordInvocation("UAAOAuthClient", []interface{}{}) fake.uAAOAuthClientMutex.Unlock() - if fake.UAAOAuthClientStub != nil { - return fake.UAAOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientReturns return fakeReturns.result1 } @@ -498,15 +506,16 @@ func (fake *FakeConfig) UAAOAuthClientSecret() string { ret, specificReturn := fake.uAAOAuthClientSecretReturnsOnCall[len(fake.uAAOAuthClientSecretArgsForCall)] fake.uAAOAuthClientSecretArgsForCall = append(fake.uAAOAuthClientSecretArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientSecretStub + fakeReturns := fake.uAAOAuthClientSecretReturns fake.recordInvocation("UAAOAuthClientSecret", []interface{}{}) fake.uAAOAuthClientSecretMutex.Unlock() - if fake.UAAOAuthClientSecretStub != nil { - return fake.UAAOAuthClientSecretStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientSecretReturns return fakeReturns.result1 } diff --git a/api/uaa/uaafakes/fake_connection.go b/api/uaa/uaafakes/fake_connection.go index b9013ee19d7..a6b251de882 100644 --- a/api/uaa/uaafakes/fake_connection.go +++ b/api/uaa/uaafakes/fake_connection.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeConnection struct { @@ -32,15 +32,16 @@ func (fake *FakeConnection) Make(arg1 *http.Request, arg2 *uaa.Response) error { arg1 *http.Request arg2 *uaa.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } diff --git a/api/uaa/uaafakes/fake_connection_wrapper.go b/api/uaa/uaafakes/fake_connection_wrapper.go index 98ef73893ff..b909fb89678 100644 --- a/api/uaa/uaafakes/fake_connection_wrapper.go +++ b/api/uaa/uaafakes/fake_connection_wrapper.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeConnectionWrapper struct { @@ -43,15 +43,16 @@ func (fake *FakeConnectionWrapper) Make(arg1 *http.Request, arg2 *uaa.Response) arg1 *http.Request arg2 *uaa.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } @@ -103,15 +104,16 @@ func (fake *FakeConnectionWrapper) Wrap(arg1 uaa.Connection) uaa.Connection { fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 uaa.Connection }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/uaa/user.go b/api/uaa/user.go index 0ca5fa9d39e..452be20c2f8 100644 --- a/api/uaa/user.go +++ b/api/uaa/user.go @@ -7,8 +7,8 @@ import ( "net/http" "net/url" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // User represents an UAA user account. diff --git a/api/uaa/user_test.go b/api/uaa/user_test.go index e86ade3a0cc..e6e296ecb00 100644 --- a/api/uaa/user_test.go +++ b/api/uaa/user_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/version_test.go b/api/uaa/version_test.go index 780bd814ca5..f9e2530df09 100644 --- a/api/uaa/version_test.go +++ b/api/uaa/version_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/api/uaa" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/request_logger.go b/api/uaa/wrapper/request_logger.go index 8e034252114..6eb0983f9c2 100644 --- a/api/uaa/wrapper/request_logger.go +++ b/api/uaa/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/uaa/wrapper/request_logger_test.go b/api/uaa/wrapper/request_logger_test.go index b7b0f036faa..de97d93ce34 100644 --- a/api/uaa/wrapper/request_logger_test.go +++ b/api/uaa/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/api/uaa/wrapper" - "code.cloudfoundry.org/cli/api/uaa/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/retry_request.go b/api/uaa/wrapper/retry_request.go index fa5c1103533..da029667574 100644 --- a/api/uaa/wrapper/retry_request.go +++ b/api/uaa/wrapper/retry_request.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/uaa/wrapper/retry_request_test.go b/api/uaa/wrapper/retry_request_test.go index 7c0270dec97..1a2b603ffad 100644 --- a/api/uaa/wrapper/retry_request_test.go +++ b/api/uaa/wrapper/retry_request_test.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/uaa_authentication.go b/api/uaa/wrapper/uaa_authentication.go index 96bc7e64d03..505bc6a192e 100644 --- a/api/uaa/wrapper/uaa_authentication.go +++ b/api/uaa/wrapper/uaa_authentication.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/uaa/wrapper/uaa_authentication_test.go b/api/uaa/wrapper/uaa_authentication_test.go index 055dac1f799..d07621c9526 100644 --- a/api/uaa/wrapper/uaa_authentication_test.go +++ b/api/uaa/wrapper/uaa_authentication_test.go @@ -8,11 +8,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/api/uaa/wrapper" - "code.cloudfoundry.org/cli/api/uaa/wrapper/util" - "code.cloudfoundry.org/cli/api/uaa/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go b/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go index 4d6ba759ad9..11498a4ecf3 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" ) type FakeRequestLoggerOutput struct { @@ -131,15 +131,16 @@ func (fake *FakeRequestLoggerOutput) DisplayBody(arg1 []byte) error { fake.displayBodyArgsForCall = append(fake.displayBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayBodyStub + fakeReturns := fake.displayBodyReturns fake.recordInvocation("DisplayBody", []interface{}{arg1Copy}) fake.displayBodyMutex.Unlock() - if fake.DisplayBodyStub != nil { - return fake.DisplayBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayBodyReturns return fakeReturns.result1 } @@ -192,15 +193,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) err arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHeaderReturns return fakeReturns.result1 } @@ -252,15 +254,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHostReturns return fakeReturns.result1 } @@ -317,15 +320,16 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONBodyReturns return fakeReturns.result1 } @@ -379,15 +383,16 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayRequestHeaderReturns return fakeReturns.result1 } @@ -440,15 +445,16 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayResponseHeaderReturns return fakeReturns.result1 } @@ -501,15 +507,16 @@ func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) er arg1 string arg2 time.Time }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayTypeReturns return fakeReturns.result1 } @@ -560,9 +567,10 @@ func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.HandleInternalErrorStub fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { + if stub != nil { fake.HandleInternalErrorStub(arg1) } } @@ -591,15 +599,16 @@ func (fake *FakeRequestLoggerOutput) Start() error { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -643,15 +652,16 @@ func (fake *FakeRequestLoggerOutput) Stop() error { ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] fake.stopArgsForCall = append(fake.stopArgsForCall, struct { }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stopReturns return fakeReturns.result1 } diff --git a/api/uaa/wrapper/wrapperfakes/fake_token_cache.go b/api/uaa/wrapper/wrapperfakes/fake_token_cache.go index b1516a14ad4..e7120ceaa93 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/uaa/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" ) type FakeTokenCache struct { @@ -47,15 +47,16 @@ func (fake *FakeTokenCache) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeTokenCache) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -151,9 +153,10 @@ func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -182,9 +185,10 @@ func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } diff --git a/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go b/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go index 57836aafcd7..47a9d7184b3 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" ) type FakeUAAClient struct { @@ -32,15 +32,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/actors_suite_test.go b/cf/actors/actors_suite_test.go index d40c9f87f64..a3faab044ed 100644 --- a/cf/actors/actors_suite_test.go +++ b/cf/actors/actors_suite_test.go @@ -1,8 +1,8 @@ package actors_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/actorsfakes/fake_push_actor.go b/cf/actors/actorsfakes/fake_push_actor.go index caa013a6867..d3bd0655e73 100644 --- a/cf/actors/actorsfakes/fake_push_actor.go +++ b/cf/actors/actorsfakes/fake_push_actor.go @@ -5,9 +5,9 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakePushActor struct { @@ -96,15 +96,16 @@ func (fake *FakePushActor) GatherFiles(arg1 []models.AppFileFields, arg2 string, arg3 string arg4 bool }{arg1Copy, arg2, arg3, arg4}) + stub := fake.GatherFilesStub + fakeReturns := fake.gatherFilesReturns fake.recordInvocation("GatherFiles", []interface{}{arg1Copy, arg2, arg3, arg4}) fake.gatherFilesMutex.Unlock() - if fake.GatherFilesStub != nil { - return fake.GatherFilesStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.gatherFilesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -164,15 +165,16 @@ func (fake *FakePushActor) MapManifestRoute(arg1 string, arg2 models.Application arg2 models.Application arg3 models.AppParams }{arg1, arg2, arg3}) + stub := fake.MapManifestRouteStub + fakeReturns := fake.mapManifestRouteReturns fake.recordInvocation("MapManifestRoute", []interface{}{arg1, arg2, arg3}) fake.mapManifestRouteMutex.Unlock() - if fake.MapManifestRouteStub != nil { - return fake.MapManifestRouteStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.mapManifestRouteReturns return fakeReturns.result1 } @@ -225,15 +227,16 @@ func (fake *FakePushActor) ProcessPath(arg1 string, arg2 func(string) error) err arg1 string arg2 func(string) error }{arg1, arg2}) + stub := fake.ProcessPathStub + fakeReturns := fake.processPathReturns fake.recordInvocation("ProcessPath", []interface{}{arg1, arg2}) fake.processPathMutex.Unlock() - if fake.ProcessPathStub != nil { - return fake.ProcessPathStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.processPathReturns return fakeReturns.result1 } @@ -292,15 +295,16 @@ func (fake *FakePushActor) UploadApp(arg1 string, arg2 *os.File, arg3 []resource arg2 *os.File arg3 []resources.AppFileResource }{arg1, arg2, arg3Copy}) + stub := fake.UploadAppStub + fakeReturns := fake.uploadAppReturns fake.recordInvocation("UploadApp", []interface{}{arg1, arg2, arg3Copy}) fake.uploadAppMutex.Unlock() - if fake.UploadAppStub != nil { - return fake.UploadAppStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.uploadAppReturns return fakeReturns.result1 } @@ -357,15 +361,16 @@ func (fake *FakePushActor) ValidateAppParams(arg1 []models.AppParams) []error { fake.validateAppParamsArgsForCall = append(fake.validateAppParamsArgsForCall, struct { arg1 []models.AppParams }{arg1Copy}) + stub := fake.ValidateAppParamsStub + fakeReturns := fake.validateAppParamsReturns fake.recordInvocation("ValidateAppParams", []interface{}{arg1Copy}) fake.validateAppParamsMutex.Unlock() - if fake.ValidateAppParamsStub != nil { - return fake.ValidateAppParamsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.validateAppParamsReturns return fakeReturns.result1 } diff --git a/cf/actors/actorsfakes/fake_route_actor.go b/cf/actors/actorsfakes/fake_route_actor.go index 795612f4250..942d898d070 100644 --- a/cf/actors/actorsfakes/fake_route_actor.go +++ b/cf/actors/actorsfakes/fake_route_actor.go @@ -4,8 +4,8 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRouteActor struct { @@ -129,15 +129,16 @@ func (fake *FakeRouteActor) BindRoute(arg1 models.Application, arg2 models.Route arg1 models.Application arg2 models.Route }{arg1, arg2}) + stub := fake.BindRouteStub + fakeReturns := fake.bindRouteReturns fake.recordInvocation("BindRoute", []interface{}{arg1, arg2}) fake.bindRouteMutex.Unlock() - if fake.BindRouteStub != nil { - return fake.BindRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindRouteReturns return fakeReturns.result1 } @@ -189,15 +190,16 @@ func (fake *FakeRouteActor) CreateRandomTCPRoute(arg1 models.DomainFields) (mode fake.createRandomTCPRouteArgsForCall = append(fake.createRandomTCPRouteArgsForCall, struct { arg1 models.DomainFields }{arg1}) + stub := fake.CreateRandomTCPRouteStub + fakeReturns := fake.createRandomTCPRouteReturns fake.recordInvocation("CreateRandomTCPRoute", []interface{}{arg1}) fake.createRandomTCPRouteMutex.Unlock() - if fake.CreateRandomTCPRouteStub != nil { - return fake.CreateRandomTCPRouteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createRandomTCPRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -254,15 +256,16 @@ func (fake *FakeRouteActor) FindAndBindRoute(arg1 string, arg2 models.Applicatio arg2 models.Application arg3 models.AppParams }{arg1, arg2, arg3}) + stub := fake.FindAndBindRouteStub + fakeReturns := fake.findAndBindRouteReturns fake.recordInvocation("FindAndBindRoute", []interface{}{arg1, arg2, arg3}) fake.findAndBindRouteMutex.Unlock() - if fake.FindAndBindRouteStub != nil { - return fake.FindAndBindRouteStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.findAndBindRouteReturns return fakeReturns.result1 } @@ -314,15 +317,16 @@ func (fake *FakeRouteActor) FindDomain(arg1 string) (string, models.DomainFields fake.findDomainArgsForCall = append(fake.findDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindDomainStub + fakeReturns := fake.findDomainReturns fake.recordInvocation("FindDomain", []interface{}{arg1}) fake.findDomainMutex.Unlock() - if fake.FindDomainStub != nil { - return fake.FindDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.findDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -384,15 +388,16 @@ func (fake *FakeRouteActor) FindOrCreateRoute(arg1 string, arg2 models.DomainFie arg4 int arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.FindOrCreateRouteStub + fakeReturns := fake.findOrCreateRouteReturns fake.recordInvocation("FindOrCreateRoute", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.findOrCreateRouteMutex.Unlock() - if fake.FindOrCreateRouteStub != nil { - return fake.FindOrCreateRouteStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findOrCreateRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -447,15 +452,16 @@ func (fake *FakeRouteActor) FindPath(arg1 string) (string, string) { fake.findPathArgsForCall = append(fake.findPathArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindPathStub + fakeReturns := fake.findPathReturns fake.recordInvocation("FindPath", []interface{}{arg1}) fake.findPathMutex.Unlock() - if fake.FindPathStub != nil { - return fake.FindPathStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findPathReturns return fakeReturns.result1, fakeReturns.result2 } @@ -510,15 +516,16 @@ func (fake *FakeRouteActor) FindPort(arg1 string) (string, int, error) { fake.findPortArgsForCall = append(fake.findPortArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindPortStub + fakeReturns := fake.findPortReturns fake.recordInvocation("FindPort", []interface{}{arg1}) fake.findPortMutex.Unlock() - if fake.FindPortStub != nil { - return fake.FindPortStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.findPortReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -576,15 +583,16 @@ func (fake *FakeRouteActor) UnbindAll(arg1 models.Application) error { fake.unbindAllArgsForCall = append(fake.unbindAllArgsForCall, struct { arg1 models.Application }{arg1}) + stub := fake.UnbindAllStub + fakeReturns := fake.unbindAllReturns fake.recordInvocation("UnbindAll", []interface{}{arg1}) fake.unbindAllMutex.Unlock() - if fake.UnbindAllStub != nil { - return fake.UnbindAllStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindAllReturns return fakeReturns.result1 } diff --git a/cf/actors/actorsfakes/fake_service_actor.go b/cf/actors/actorsfakes/fake_service_actor.go index 292c15a4dae..c65986a2ab4 100644 --- a/cf/actors/actorsfakes/fake_service_actor.go +++ b/cf/actors/actorsfakes/fake_service_actor.go @@ -4,8 +4,8 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceActor struct { @@ -36,15 +36,16 @@ func (fake *FakeServiceActor) FilterBrokers(arg1 string, arg2 string, arg3 strin arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.FilterBrokersStub + fakeReturns := fake.filterBrokersReturns fake.recordInvocation("FilterBrokers", []interface{}{arg1, arg2, arg3}) fake.filterBrokersMutex.Unlock() - if fake.FilterBrokersStub != nil { - return fake.FilterBrokersStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.filterBrokersReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/actorsfakes/fake_service_plan_actor.go b/cf/actors/actorsfakes/fake_service_plan_actor.go index 35cd597e588..97983167bbc 100644 --- a/cf/actors/actorsfakes/fake_service_plan_actor.go +++ b/cf/actors/actorsfakes/fake_service_plan_actor.go @@ -4,7 +4,7 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors" ) type FakeServicePlanActor struct { @@ -85,15 +85,16 @@ func (fake *FakeServicePlanActor) FindServiceAccess(arg1 string, arg2 string) (a arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindServiceAccessStub + fakeReturns := fake.findServiceAccessReturns fake.recordInvocation("FindServiceAccess", []interface{}{arg1, arg2}) fake.findServiceAccessMutex.Unlock() - if fake.FindServiceAccessStub != nil { - return fake.FindServiceAccessStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServiceAccessReturns return fakeReturns.result1, fakeReturns.result2 } @@ -149,15 +150,16 @@ func (fake *FakeServicePlanActor) UpdateAllPlansForService(arg1 string, arg2 boo arg1 string arg2 bool }{arg1, arg2}) + stub := fake.UpdateAllPlansForServiceStub + fakeReturns := fake.updateAllPlansForServiceReturns fake.recordInvocation("UpdateAllPlansForService", []interface{}{arg1, arg2}) fake.updateAllPlansForServiceMutex.Unlock() - if fake.UpdateAllPlansForServiceStub != nil { - return fake.UpdateAllPlansForServiceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateAllPlansForServiceReturns return fakeReturns.result1 } @@ -211,15 +213,16 @@ func (fake *FakeServicePlanActor) UpdateOrgForService(arg1 string, arg2 string, arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.UpdateOrgForServiceStub + fakeReturns := fake.updateOrgForServiceReturns fake.recordInvocation("UpdateOrgForService", []interface{}{arg1, arg2, arg3}) fake.updateOrgForServiceMutex.Unlock() - if fake.UpdateOrgForServiceStub != nil { - return fake.UpdateOrgForServiceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateOrgForServiceReturns return fakeReturns.result1 } @@ -274,15 +277,16 @@ func (fake *FakeServicePlanActor) UpdatePlanAndOrgForService(arg1 string, arg2 s arg3 string arg4 bool }{arg1, arg2, arg3, arg4}) + stub := fake.UpdatePlanAndOrgForServiceStub + fakeReturns := fake.updatePlanAndOrgForServiceReturns fake.recordInvocation("UpdatePlanAndOrgForService", []interface{}{arg1, arg2, arg3, arg4}) fake.updatePlanAndOrgForServiceMutex.Unlock() - if fake.UpdatePlanAndOrgForServiceStub != nil { - return fake.UpdatePlanAndOrgForServiceStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.updatePlanAndOrgForServiceReturns return fakeReturns.result1 } @@ -336,15 +340,16 @@ func (fake *FakeServicePlanActor) UpdateSinglePlanForService(arg1 string, arg2 s arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.UpdateSinglePlanForServiceStub + fakeReturns := fake.updateSinglePlanForServiceReturns fake.recordInvocation("UpdateSinglePlanForService", []interface{}{arg1, arg2, arg3}) fake.updateSinglePlanForServiceMutex.Unlock() - if fake.UpdateSinglePlanForServiceStub != nil { - return fake.UpdateSinglePlanForServiceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateSinglePlanForServiceReturns return fakeReturns.result1 } diff --git a/cf/actors/brokerbuilder/broker_builder.go b/cf/actors/brokerbuilder/broker_builder.go index e46d9501f5c..811677d2f41 100644 --- a/cf/actors/brokerbuilder/broker_builder.go +++ b/cf/actors/brokerbuilder/broker_builder.go @@ -1,9 +1,9 @@ package brokerbuilder import ( - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BrokerBuilder diff --git a/cf/actors/brokerbuilder/broker_builder_test.go b/cf/actors/brokerbuilder/broker_builder_test.go index 8d009927325..12759124097 100644 --- a/cf/actors/brokerbuilder/broker_builder_test.go +++ b/cf/actors/brokerbuilder/broker_builder_test.go @@ -3,11 +3,11 @@ package brokerbuilder_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go b/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go index 8afcd08a52a..5206b7fb99d 100644 --- a/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go +++ b/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go @@ -4,8 +4,8 @@ package brokerbuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeBrokerBuilder struct { @@ -89,15 +89,16 @@ func (fake *FakeBrokerBuilder) AttachBrokersToServices(arg1 []models.ServiceOffe fake.attachBrokersToServicesArgsForCall = append(fake.attachBrokersToServicesArgsForCall, struct { arg1 []models.ServiceOffering }{arg1Copy}) + stub := fake.AttachBrokersToServicesStub + fakeReturns := fake.attachBrokersToServicesReturns fake.recordInvocation("AttachBrokersToServices", []interface{}{arg1Copy}) fake.attachBrokersToServicesMutex.Unlock() - if fake.AttachBrokersToServicesStub != nil { - return fake.AttachBrokersToServicesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.attachBrokersToServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -158,15 +159,16 @@ func (fake *FakeBrokerBuilder) AttachSpecificBrokerToServices(arg1 string, arg2 arg1 string arg2 []models.ServiceOffering }{arg1, arg2Copy}) + stub := fake.AttachSpecificBrokerToServicesStub + fakeReturns := fake.attachSpecificBrokerToServicesReturns fake.recordInvocation("AttachSpecificBrokerToServices", []interface{}{arg1, arg2Copy}) fake.attachSpecificBrokerToServicesMutex.Unlock() - if fake.AttachSpecificBrokerToServicesStub != nil { - return fake.AttachSpecificBrokerToServicesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.attachSpecificBrokerToServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -220,15 +222,16 @@ func (fake *FakeBrokerBuilder) GetAllServiceBrokers() ([]models.ServiceBroker, e ret, specificReturn := fake.getAllServiceBrokersReturnsOnCall[len(fake.getAllServiceBrokersArgsForCall)] fake.getAllServiceBrokersArgsForCall = append(fake.getAllServiceBrokersArgsForCall, struct { }{}) + stub := fake.GetAllServiceBrokersStub + fakeReturns := fake.getAllServiceBrokersReturns fake.recordInvocation("GetAllServiceBrokers", []interface{}{}) fake.getAllServiceBrokersMutex.Unlock() - if fake.GetAllServiceBrokersStub != nil { - return fake.GetAllServiceBrokersStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAllServiceBrokersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -276,15 +279,16 @@ func (fake *FakeBrokerBuilder) GetBrokerWithAllServices(arg1 string) (models.Ser fake.getBrokerWithAllServicesArgsForCall = append(fake.getBrokerWithAllServicesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetBrokerWithAllServicesStub + fakeReturns := fake.getBrokerWithAllServicesReturns fake.recordInvocation("GetBrokerWithAllServices", []interface{}{arg1}) fake.getBrokerWithAllServicesMutex.Unlock() - if fake.GetBrokerWithAllServicesStub != nil { - return fake.GetBrokerWithAllServicesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getBrokerWithAllServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -339,15 +343,16 @@ func (fake *FakeBrokerBuilder) GetBrokerWithSpecifiedService(arg1 string) (model fake.getBrokerWithSpecifiedServiceArgsForCall = append(fake.getBrokerWithSpecifiedServiceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetBrokerWithSpecifiedServiceStub + fakeReturns := fake.getBrokerWithSpecifiedServiceReturns fake.recordInvocation("GetBrokerWithSpecifiedService", []interface{}{arg1}) fake.getBrokerWithSpecifiedServiceMutex.Unlock() - if fake.GetBrokerWithSpecifiedServiceStub != nil { - return fake.GetBrokerWithSpecifiedServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getBrokerWithSpecifiedServiceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/planbuilder/plan_builder.go b/cf/actors/planbuilder/plan_builder.go index 871f450a4ed..5c1a74a815d 100644 --- a/cf/actors/planbuilder/plan_builder.go +++ b/cf/actors/planbuilder/plan_builder.go @@ -1,9 +1,9 @@ package planbuilder import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PlanBuilder diff --git a/cf/actors/planbuilder/plan_builder_test.go b/cf/actors/planbuilder/plan_builder_test.go index f49c1b6a1fa..5edf5d12e5e 100644 --- a/cf/actors/planbuilder/plan_builder_test.go +++ b/cf/actors/planbuilder/plan_builder_test.go @@ -3,10 +3,10 @@ package planbuilder_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go b/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go index 73e44142c00..a04732f1855 100644 --- a/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go +++ b/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go @@ -4,8 +4,8 @@ package planbuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakePlanBuilder struct { @@ -118,15 +118,16 @@ func (fake *FakePlanBuilder) AttachOrgToPlans(arg1 []models.ServicePlanFields, a arg1 []models.ServicePlanFields arg2 string }{arg1Copy, arg2}) + stub := fake.AttachOrgToPlansStub + fakeReturns := fake.attachOrgToPlansReturns fake.recordInvocation("AttachOrgToPlans", []interface{}{arg1Copy, arg2}) fake.attachOrgToPlansMutex.Unlock() - if fake.AttachOrgToPlansStub != nil { - return fake.AttachOrgToPlansStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.attachOrgToPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -186,15 +187,16 @@ func (fake *FakePlanBuilder) AttachOrgsToPlans(arg1 []models.ServicePlanFields) fake.attachOrgsToPlansArgsForCall = append(fake.attachOrgsToPlansArgsForCall, struct { arg1 []models.ServicePlanFields }{arg1Copy}) + stub := fake.AttachOrgsToPlansStub + fakeReturns := fake.attachOrgsToPlansReturns fake.recordInvocation("AttachOrgsToPlans", []interface{}{arg1Copy}) fake.attachOrgsToPlansMutex.Unlock() - if fake.AttachOrgsToPlansStub != nil { - return fake.AttachOrgsToPlansStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.attachOrgsToPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -254,15 +256,16 @@ func (fake *FakePlanBuilder) GetPlansForManyServicesWithOrgs(arg1 []string) ([]m fake.getPlansForManyServicesWithOrgsArgsForCall = append(fake.getPlansForManyServicesWithOrgsArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.GetPlansForManyServicesWithOrgsStub + fakeReturns := fake.getPlansForManyServicesWithOrgsReturns fake.recordInvocation("GetPlansForManyServicesWithOrgs", []interface{}{arg1Copy}) fake.getPlansForManyServicesWithOrgsMutex.Unlock() - if fake.GetPlansForManyServicesWithOrgsStub != nil { - return fake.GetPlansForManyServicesWithOrgsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansForManyServicesWithOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -317,15 +320,16 @@ func (fake *FakePlanBuilder) GetPlansForService(arg1 string) ([]models.ServicePl fake.getPlansForServiceArgsForCall = append(fake.getPlansForServiceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPlansForServiceStub + fakeReturns := fake.getPlansForServiceReturns fake.recordInvocation("GetPlansForService", []interface{}{arg1}) fake.getPlansForServiceMutex.Unlock() - if fake.GetPlansForServiceStub != nil { - return fake.GetPlansForServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansForServiceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -381,15 +385,16 @@ func (fake *FakePlanBuilder) GetPlansForServiceForOrg(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetPlansForServiceForOrgStub + fakeReturns := fake.getPlansForServiceForOrgReturns fake.recordInvocation("GetPlansForServiceForOrg", []interface{}{arg1, arg2}) fake.getPlansForServiceForOrgMutex.Unlock() - if fake.GetPlansForServiceForOrgStub != nil { - return fake.GetPlansForServiceForOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansForServiceForOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -444,15 +449,16 @@ func (fake *FakePlanBuilder) GetPlansForServiceWithOrgs(arg1 string) ([]models.S fake.getPlansForServiceWithOrgsArgsForCall = append(fake.getPlansForServiceWithOrgsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPlansForServiceWithOrgsStub + fakeReturns := fake.getPlansForServiceWithOrgsReturns fake.recordInvocation("GetPlansForServiceWithOrgs", []interface{}{arg1}) fake.getPlansForServiceWithOrgsMutex.Unlock() - if fake.GetPlansForServiceWithOrgsStub != nil { - return fake.GetPlansForServiceWithOrgsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansForServiceWithOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -507,15 +513,16 @@ func (fake *FakePlanBuilder) GetPlansVisibleToOrg(arg1 string) ([]models.Service fake.getPlansVisibleToOrgArgsForCall = append(fake.getPlansVisibleToOrgArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPlansVisibleToOrgStub + fakeReturns := fake.getPlansVisibleToOrgReturns fake.recordInvocation("GetPlansVisibleToOrg", []interface{}{arg1}) fake.getPlansVisibleToOrgMutex.Unlock() - if fake.GetPlansVisibleToOrgStub != nil { - return fake.GetPlansVisibleToOrgStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansVisibleToOrgReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/plugininstaller/plugin_downloader.go b/cf/actors/plugininstaller/plugin_downloader.go index b431d11d445..a3574deafe7 100644 --- a/cf/actors/plugininstaller/plugin_downloader.go +++ b/cf/actors/plugininstaller/plugin_downloader.go @@ -7,9 +7,9 @@ import ( "runtime" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/downloader" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/downloader" ) type PluginDownloader struct { diff --git a/cf/actors/plugininstaller/plugin_installer.go b/cf/actors/plugininstaller/plugin_installer.go index d7b8724f178..f895240cb93 100644 --- a/cf/actors/plugininstaller/plugin_installer.go +++ b/cf/actors/plugininstaller/plugin_installer.go @@ -1,11 +1,11 @@ package plugininstaller import ( - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/downloader" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/downloader" + "code.cloudfoundry.org/cli/v9/util" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginInstaller diff --git a/cf/actors/plugininstaller/plugin_installer_with_repo.go b/cf/actors/plugininstaller/plugin_installer_with_repo.go index 50845ff4a27..2b7c56cabaf 100644 --- a/cf/actors/plugininstaller/plugin_installer_with_repo.go +++ b/cf/actors/plugininstaller/plugin_installer_with_repo.go @@ -5,11 +5,11 @@ import ( "strings" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/util" ) type pluginInstallerWithRepo struct { diff --git a/cf/actors/plugininstaller/plugin_installer_without_repo.go b/cf/actors/plugininstaller/plugin_installer_without_repo.go index 7cf0bf97038..76c82dfb15c 100644 --- a/cf/actors/plugininstaller/plugin_installer_without_repo.go +++ b/cf/actors/plugininstaller/plugin_installer_without_repo.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type pluginInstallerWithoutRepo struct { diff --git a/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go b/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go index fd496df7119..4b9f14b5939 100644 --- a/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go +++ b/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go @@ -4,7 +4,7 @@ package plugininstallerfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/plugininstaller" + "code.cloudfoundry.org/cli/v9/cf/actors/plugininstaller" ) type FakePluginInstaller struct { @@ -29,15 +29,16 @@ func (fake *FakePluginInstaller) Install(arg1 string) string { fake.installArgsForCall = append(fake.installArgsForCall, struct { arg1 string }{arg1}) + stub := fake.InstallStub + fakeReturns := fake.installReturns fake.recordInvocation("Install", []interface{}{arg1}) fake.installMutex.Unlock() - if fake.InstallStub != nil { - return fake.InstallStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.installReturns return fakeReturns.result1 } diff --git a/cf/actors/pluginrepo/plugin_repo.go b/cf/actors/pluginrepo/plugin_repo.go index e7ac7ef6be9..ef5bbb5a634 100644 --- a/cf/actors/pluginrepo/plugin_repo.go +++ b/cf/actors/pluginrepo/plugin_repo.go @@ -8,9 +8,9 @@ import ( "strings" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginRepo diff --git a/cf/actors/pluginrepo/plugin_repo_suite_test.go b/cf/actors/pluginrepo/plugin_repo_suite_test.go index cbb56b8b877..817e4f82a7d 100644 --- a/cf/actors/pluginrepo/plugin_repo_suite_test.go +++ b/cf/actors/pluginrepo/plugin_repo_suite_test.go @@ -1,8 +1,8 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/pluginrepo/plugin_repo_test.go b/cf/actors/pluginrepo/plugin_repo_test.go index 3247dd2800c..b57933c25b9 100644 --- a/cf/actors/pluginrepo/plugin_repo_test.go +++ b/cf/actors/pluginrepo/plugin_repo_test.go @@ -5,9 +5,9 @@ import ( "net/http" "net/http/httptest" - . "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go b/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go index 8971d8783c6..00ca3866243 100644 --- a/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go +++ b/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go @@ -5,8 +5,8 @@ import ( "sync" "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakePluginRepo struct { diff --git a/cf/actors/push.go b/cf/actors/push.go index 182e2b2f308..0f1613ae635 100644 --- a/cf/actors/push.go +++ b/cf/actors/push.go @@ -7,11 +7,11 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/appfiles" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/actors/push_test.go b/cf/actors/push_test.go index 205850e52cd..cc80cf293cc 100644 --- a/cf/actors/push_test.go +++ b/cf/actors/push_test.go @@ -8,13 +8,13 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/applicationbits/applicationbitsfakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/appfiles/appfilesfakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits/applicationbitsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/appfiles/appfilesfakes" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/routes.go b/cf/actors/routes.go index 0b360480504..bd9d93561c2 100644 --- a/cf/actors/routes.go +++ b/cf/actors/routes.go @@ -5,12 +5,12 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/util/randomword" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/util/randomword" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteActor @@ -58,7 +58,7 @@ func (routeActor routeActor) CreateRandomTCPRoute(domain models.DomainFields) (m func (routeActor routeActor) FindOrCreateRoute(hostname string, domain models.DomainFields, path string, port int, useRandomPort bool) (models.Route, error) { var route models.Route var err error - //if tcp route use random port should skip route lookup + // if tcp route use random port should skip route lookup if useRandomPort && domain.RouterGroupType == tcp { err = new(errors.ModelNotFoundError) } else { diff --git a/cf/actors/routes_test.go b/cf/actors/routes_test.go index 95176a5042e..b0d9e98a269 100644 --- a/cf/actors/routes_test.go +++ b/cf/actors/routes_test.go @@ -3,12 +3,12 @@ package actors_test import ( "errors" - . "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/apifakes" - cferrors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/errors/errorsfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" + . "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + cferrors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/errors/errorsfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/servicebuilder/service_builder.go b/cf/actors/servicebuilder/service_builder.go index c91f07a7b18..6e19d49702c 100644 --- a/cf/actors/servicebuilder/service_builder.go +++ b/cf/actors/servicebuilder/service_builder.go @@ -3,9 +3,9 @@ package servicebuilder import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBuilder diff --git a/cf/actors/servicebuilder/service_builder_test.go b/cf/actors/servicebuilder/service_builder_test.go index 380fcbb9b7d..b696c8236ec 100644 --- a/cf/actors/servicebuilder/service_builder_test.go +++ b/cf/actors/servicebuilder/service_builder_test.go @@ -3,11 +3,11 @@ package servicebuilder_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go b/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go index 2a05297cc3b..86af0573236 100644 --- a/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go +++ b/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go @@ -4,8 +4,8 @@ package servicebuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceBuilder struct { @@ -203,15 +203,16 @@ func (fake *FakeServiceBuilder) GetAllServices() ([]models.ServiceOffering, erro ret, specificReturn := fake.getAllServicesReturnsOnCall[len(fake.getAllServicesArgsForCall)] fake.getAllServicesArgsForCall = append(fake.getAllServicesArgsForCall, struct { }{}) + stub := fake.GetAllServicesStub + fakeReturns := fake.getAllServicesReturns fake.recordInvocation("GetAllServices", []interface{}{}) fake.getAllServicesMutex.Unlock() - if fake.GetAllServicesStub != nil { - return fake.GetAllServicesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAllServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -258,15 +259,16 @@ func (fake *FakeServiceBuilder) GetAllServicesWithPlans() ([]models.ServiceOffer ret, specificReturn := fake.getAllServicesWithPlansReturnsOnCall[len(fake.getAllServicesWithPlansArgsForCall)] fake.getAllServicesWithPlansArgsForCall = append(fake.getAllServicesWithPlansArgsForCall, struct { }{}) + stub := fake.GetAllServicesWithPlansStub + fakeReturns := fake.getAllServicesWithPlansReturns fake.recordInvocation("GetAllServicesWithPlans", []interface{}{}) fake.getAllServicesWithPlansMutex.Unlock() - if fake.GetAllServicesWithPlansStub != nil { - return fake.GetAllServicesWithPlansStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAllServicesWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -315,15 +317,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameForOrg(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceByNameForOrgStub + fakeReturns := fake.getServiceByNameForOrgReturns fake.recordInvocation("GetServiceByNameForOrg", []interface{}{arg1, arg2}) fake.getServiceByNameForOrgMutex.Unlock() - if fake.GetServiceByNameForOrgStub != nil { - return fake.GetServiceByNameForOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameForOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -379,15 +382,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameForSpace(arg1 string, arg2 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceByNameForSpaceStub + fakeReturns := fake.getServiceByNameForSpaceReturns fake.recordInvocation("GetServiceByNameForSpace", []interface{}{arg1, arg2}) fake.getServiceByNameForSpaceMutex.Unlock() - if fake.GetServiceByNameForSpaceStub != nil { - return fake.GetServiceByNameForSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameForSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -443,15 +447,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameForSpaceWithPlans(arg1 string, a arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceByNameForSpaceWithPlansStub + fakeReturns := fake.getServiceByNameForSpaceWithPlansReturns fake.recordInvocation("GetServiceByNameForSpaceWithPlans", []interface{}{arg1, arg2}) fake.getServiceByNameForSpaceWithPlansMutex.Unlock() - if fake.GetServiceByNameForSpaceWithPlansStub != nil { - return fake.GetServiceByNameForSpaceWithPlansStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameForSpaceWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -506,15 +511,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameWithPlans(arg1 string) (models.S fake.getServiceByNameWithPlansArgsForCall = append(fake.getServiceByNameWithPlansArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceByNameWithPlansStub + fakeReturns := fake.getServiceByNameWithPlansReturns fake.recordInvocation("GetServiceByNameWithPlans", []interface{}{arg1}) fake.getServiceByNameWithPlansMutex.Unlock() - if fake.GetServiceByNameWithPlansStub != nil { - return fake.GetServiceByNameWithPlansStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -569,15 +575,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameWithPlansWithOrgNames(arg1 strin fake.getServiceByNameWithPlansWithOrgNamesArgsForCall = append(fake.getServiceByNameWithPlansWithOrgNamesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceByNameWithPlansWithOrgNamesStub + fakeReturns := fake.getServiceByNameWithPlansWithOrgNamesReturns fake.recordInvocation("GetServiceByNameWithPlansWithOrgNames", []interface{}{arg1}) fake.getServiceByNameWithPlansWithOrgNamesMutex.Unlock() - if fake.GetServiceByNameWithPlansWithOrgNamesStub != nil { - return fake.GetServiceByNameWithPlansWithOrgNamesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameWithPlansWithOrgNamesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -633,15 +640,16 @@ func (fake *FakeServiceBuilder) GetServiceVisibleToOrg(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceVisibleToOrgStub + fakeReturns := fake.getServiceVisibleToOrgReturns fake.recordInvocation("GetServiceVisibleToOrg", []interface{}{arg1, arg2}) fake.getServiceVisibleToOrgMutex.Unlock() - if fake.GetServiceVisibleToOrgStub != nil { - return fake.GetServiceVisibleToOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceVisibleToOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -697,15 +705,16 @@ func (fake *FakeServiceBuilder) GetServicesByNameForSpaceWithPlans(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServicesByNameForSpaceWithPlansStub + fakeReturns := fake.getServicesByNameForSpaceWithPlansReturns fake.recordInvocation("GetServicesByNameForSpaceWithPlans", []interface{}{arg1, arg2}) fake.getServicesByNameForSpaceWithPlansMutex.Unlock() - if fake.GetServicesByNameForSpaceWithPlansStub != nil { - return fake.GetServicesByNameForSpaceWithPlansStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesByNameForSpaceWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -760,15 +769,16 @@ func (fake *FakeServiceBuilder) GetServicesForBroker(arg1 string) ([]models.Serv fake.getServicesForBrokerArgsForCall = append(fake.getServicesForBrokerArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicesForBrokerStub + fakeReturns := fake.getServicesForBrokerReturns fake.recordInvocation("GetServicesForBroker", []interface{}{arg1}) fake.getServicesForBrokerMutex.Unlock() - if fake.GetServicesForBrokerStub != nil { - return fake.GetServicesForBrokerStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesForBrokerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -828,15 +838,16 @@ func (fake *FakeServiceBuilder) GetServicesForManyBrokers(arg1 []string) ([]mode fake.getServicesForManyBrokersArgsForCall = append(fake.getServicesForManyBrokersArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.GetServicesForManyBrokersStub + fakeReturns := fake.getServicesForManyBrokersReturns fake.recordInvocation("GetServicesForManyBrokers", []interface{}{arg1Copy}) fake.getServicesForManyBrokersMutex.Unlock() - if fake.GetServicesForManyBrokersStub != nil { - return fake.GetServicesForManyBrokersStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesForManyBrokersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -891,15 +902,16 @@ func (fake *FakeServiceBuilder) GetServicesForSpace(arg1 string) ([]models.Servi fake.getServicesForSpaceArgsForCall = append(fake.getServicesForSpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicesForSpaceStub + fakeReturns := fake.getServicesForSpaceReturns fake.recordInvocation("GetServicesForSpace", []interface{}{arg1}) fake.getServicesForSpaceMutex.Unlock() - if fake.GetServicesForSpaceStub != nil { - return fake.GetServicesForSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesForSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -954,15 +966,16 @@ func (fake *FakeServiceBuilder) GetServicesForSpaceWithPlans(arg1 string) ([]mod fake.getServicesForSpaceWithPlansArgsForCall = append(fake.getServicesForSpaceWithPlansArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicesForSpaceWithPlansStub + fakeReturns := fake.getServicesForSpaceWithPlansReturns fake.recordInvocation("GetServicesForSpaceWithPlans", []interface{}{arg1}) fake.getServicesForSpaceWithPlansMutex.Unlock() - if fake.GetServicesForSpaceWithPlansStub != nil { - return fake.GetServicesForSpaceWithPlansStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesForSpaceWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1017,15 +1030,16 @@ func (fake *FakeServiceBuilder) GetServicesVisibleToOrg(arg1 string) ([]models.S fake.getServicesVisibleToOrgArgsForCall = append(fake.getServicesVisibleToOrgArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicesVisibleToOrgStub + fakeReturns := fake.getServicesVisibleToOrgReturns fake.recordInvocation("GetServicesVisibleToOrg", []interface{}{arg1}) fake.getServicesVisibleToOrgMutex.Unlock() - if fake.GetServicesVisibleToOrgStub != nil { - return fake.GetServicesVisibleToOrgStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesVisibleToOrgReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/services.go b/cf/actors/services.go index c776e317a30..ebb42fa00e2 100644 --- a/cf/actors/services.go +++ b/cf/actors/services.go @@ -1,10 +1,10 @@ package actors import ( - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceActor diff --git a/cf/actors/services_plans.go b/cf/actors/services_plans.go index 47bc690aff9..4d644042a2f 100644 --- a/cf/actors/services_plans.go +++ b/cf/actors/services_plans.go @@ -3,12 +3,12 @@ package actors import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanActor diff --git a/cf/actors/services_plans_test.go b/cf/actors/services_plans_test.go index ebd27048be2..9579320d1e3 100644 --- a/cf/actors/services_plans_test.go +++ b/cf/actors/services_plans_test.go @@ -1,14 +1,14 @@ package actors_test import ( - "code.cloudfoundry.org/cli/cf/errors" - - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/errors" + + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/services_test.go b/cf/actors/services_test.go index 16e5891b340..b075d0266dc 100644 --- a/cf/actors/services_test.go +++ b/cf/actors/services_test.go @@ -1,12 +1,12 @@ package actors_test import ( - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder/brokerbuilderfakes" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder/brokerbuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/userprint/plugin.go b/cf/actors/userprint/plugin.go index a5e4f2aab66..46443b2a1b8 100644 --- a/cf/actors/userprint/plugin.go +++ b/cf/actors/userprint/plugin.go @@ -1,8 +1,8 @@ package userprint import ( - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type pluginPrinter struct { diff --git a/cf/actors/userprint/ui.go b/cf/actors/userprint/ui.go index e75ad01ea08..168cd0adf88 100644 --- a/cf/actors/userprint/ui.go +++ b/cf/actors/userprint/ui.go @@ -1,9 +1,9 @@ package userprint import ( - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SpaceUsersUIPrinter struct { diff --git a/cf/actors/userprint/userprintfakes/fake_user_printer.go b/cf/actors/userprint/userprintfakes/fake_user_printer.go index 006670f0b36..9f039fb8649 100644 --- a/cf/actors/userprint/userprintfakes/fake_user_printer.go +++ b/cf/actors/userprint/userprintfakes/fake_user_printer.go @@ -4,7 +4,7 @@ package userprintfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/userprint" + "code.cloudfoundry.org/cli/v9/cf/actors/userprint" ) type FakeUserPrinter struct { @@ -24,9 +24,10 @@ func (fake *FakeUserPrinter) PrintUsers(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.PrintUsersStub fake.recordInvocation("PrintUsers", []interface{}{arg1, arg2}) fake.printUsersMutex.Unlock() - if fake.PrintUsersStub != nil { + if stub != nil { fake.PrintUsersStub(arg1, arg2) } } diff --git a/cf/api/api_suite_test.go b/cf/api/api_suite_test.go index 063a28603b2..9e333fbb6fe 100644 --- a/cf/api/api_suite_test.go +++ b/cf/api/api_suite_test.go @@ -1,8 +1,8 @@ package api_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/apifakes/fake_app_summary_repository.go b/cf/api/apifakes/fake_app_summary_repository.go index 57f5838b1a1..20e96c8201c 100644 --- a/cf/api/apifakes/fake_app_summary_repository.go +++ b/cf/api/apifakes/fake_app_summary_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeAppSummaryRepository struct { @@ -43,15 +43,16 @@ func (fake *FakeAppSummaryRepository) GetSummariesInCurrentSpace() ([]models.App ret, specificReturn := fake.getSummariesInCurrentSpaceReturnsOnCall[len(fake.getSummariesInCurrentSpaceArgsForCall)] fake.getSummariesInCurrentSpaceArgsForCall = append(fake.getSummariesInCurrentSpaceArgsForCall, struct { }{}) + stub := fake.GetSummariesInCurrentSpaceStub + fakeReturns := fake.getSummariesInCurrentSpaceReturns fake.recordInvocation("GetSummariesInCurrentSpace", []interface{}{}) fake.getSummariesInCurrentSpaceMutex.Unlock() - if fake.GetSummariesInCurrentSpaceStub != nil { - return fake.GetSummariesInCurrentSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSummariesInCurrentSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -99,15 +100,16 @@ func (fake *FakeAppSummaryRepository) GetSummary(arg1 string) (models.Applicatio fake.getSummaryArgsForCall = append(fake.getSummaryArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSummaryStub + fakeReturns := fake.getSummaryReturns fake.recordInvocation("GetSummary", []interface{}{arg1}) fake.getSummaryMutex.Unlock() - if fake.GetSummaryStub != nil { - return fake.GetSummaryStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSummaryReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_buildpack_bits_repository.go b/cf/api/apifakes/fake_buildpack_bits_repository.go index abe72109754..0af7815bbf8 100644 --- a/cf/api/apifakes/fake_buildpack_bits_repository.go +++ b/cf/api/apifakes/fake_buildpack_bits_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeBuildpackBitsRepository struct { @@ -48,15 +48,16 @@ func (fake *FakeBuildpackBitsRepository) CreateBuildpackZipFile(arg1 string) (*o fake.createBuildpackZipFileArgsForCall = append(fake.createBuildpackZipFileArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateBuildpackZipFileStub + fakeReturns := fake.createBuildpackZipFileReturns fake.recordInvocation("CreateBuildpackZipFile", []interface{}{arg1}) fake.createBuildpackZipFileMutex.Unlock() - if fake.CreateBuildpackZipFileStub != nil { - return fake.CreateBuildpackZipFileStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBuildpackZipFileReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -116,15 +117,16 @@ func (fake *FakeBuildpackBitsRepository) UploadBuildpack(arg1 models.Buildpack, arg2 *os.File arg3 string }{arg1, arg2, arg3}) + stub := fake.UploadBuildpackStub + fakeReturns := fake.uploadBuildpackReturns fake.recordInvocation("UploadBuildpack", []interface{}{arg1, arg2, arg3}) fake.uploadBuildpackMutex.Unlock() - if fake.UploadBuildpackStub != nil { - return fake.UploadBuildpackStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.uploadBuildpackReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_buildpack_repository.go b/cf/api/apifakes/fake_buildpack_repository.go index 305e43965bb..44e15ddd74c 100644 --- a/cf/api/apifakes/fake_buildpack_repository.go +++ b/cf/api/apifakes/fake_buildpack_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeBuildpackRepository struct { @@ -113,15 +113,16 @@ func (fake *FakeBuildpackRepository) Create(arg1 string, arg2 *int, arg3 *bool, arg3 *bool arg4 *bool }{arg1, arg2, arg3, arg4}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3, arg4}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -176,15 +177,16 @@ func (fake *FakeBuildpackRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -236,15 +238,16 @@ func (fake *FakeBuildpackRepository) FindByName(arg1 string) (models.Buildpack, fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -300,15 +303,16 @@ func (fake *FakeBuildpackRepository) FindByNameAndStack(arg1 string, arg2 string arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByNameAndStackStub + fakeReturns := fake.findByNameAndStackReturns fake.recordInvocation("FindByNameAndStack", []interface{}{arg1, arg2}) fake.findByNameAndStackMutex.Unlock() - if fake.FindByNameAndStackStub != nil { - return fake.FindByNameAndStackStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameAndStackReturns return fakeReturns.result1, fakeReturns.result2 } @@ -363,15 +367,16 @@ func (fake *FakeBuildpackRepository) FindByNameWithNilStack(arg1 string) (models fake.findByNameWithNilStackArgsForCall = append(fake.findByNameWithNilStackArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameWithNilStackStub + fakeReturns := fake.findByNameWithNilStackReturns fake.recordInvocation("FindByNameWithNilStack", []interface{}{arg1}) fake.findByNameWithNilStackMutex.Unlock() - if fake.FindByNameWithNilStackStub != nil { - return fake.FindByNameWithNilStackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameWithNilStackReturns return fakeReturns.result1, fakeReturns.result2 } @@ -426,15 +431,16 @@ func (fake *FakeBuildpackRepository) ListBuildpacks(arg1 func(models.Buildpack) fake.listBuildpacksArgsForCall = append(fake.listBuildpacksArgsForCall, struct { arg1 func(models.Buildpack) bool }{arg1}) + stub := fake.ListBuildpacksStub + fakeReturns := fake.listBuildpacksReturns fake.recordInvocation("ListBuildpacks", []interface{}{arg1}) fake.listBuildpacksMutex.Unlock() - if fake.ListBuildpacksStub != nil { - return fake.ListBuildpacksStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listBuildpacksReturns return fakeReturns.result1 } @@ -486,15 +492,16 @@ func (fake *FakeBuildpackRepository) Update(arg1 models.Buildpack) (models.Build fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.Buildpack }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_client_repository.go b/cf/api/apifakes/fake_client_repository.go index f470961a958..8939e3c1672 100644 --- a/cf/api/apifakes/fake_client_repository.go +++ b/cf/api/apifakes/fake_client_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api" ) type FakeClientRepository struct { @@ -31,15 +31,16 @@ func (fake *FakeClientRepository) ClientExists(arg1 string) (bool, error) { fake.clientExistsArgsForCall = append(fake.clientExistsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ClientExistsStub + fakeReturns := fake.clientExistsReturns fake.recordInvocation("ClientExists", []interface{}{arg1}) fake.clientExistsMutex.Unlock() - if fake.ClientExistsStub != nil { - return fake.ClientExistsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.clientExistsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_curl_repository.go b/cf/api/apifakes/fake_curl_repository.go index 5be62978a63..51aa040acbb 100644 --- a/cf/api/apifakes/fake_curl_repository.go +++ b/cf/api/apifakes/fake_curl_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api" ) type FakeCurlRepository struct { @@ -41,15 +41,16 @@ func (fake *FakeCurlRepository) Request(arg1 string, arg2 string, arg3 string, a arg4 string arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.RequestStub + fakeReturns := fake.requestReturns fake.recordInvocation("Request", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.requestMutex.Unlock() - if fake.RequestStub != nil { - return fake.RequestStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.requestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/cf/api/apifakes/fake_domain_repository.go b/cf/api/apifakes/fake_domain_repository.go index d87faffe6d5..13dd9efbf70 100644 --- a/cf/api/apifakes/fake_domain_repository.go +++ b/cf/api/apifakes/fake_domain_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeDomainRepository struct { @@ -134,15 +134,16 @@ func (fake *FakeDomainRepository) Create(arg1 string, arg2 string) (models.Domai arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -198,15 +199,16 @@ func (fake *FakeDomainRepository) CreateSharedDomain(arg1 string, arg2 string) e arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateSharedDomainStub + fakeReturns := fake.createSharedDomainReturns fake.recordInvocation("CreateSharedDomain", []interface{}{arg1, arg2}) fake.createSharedDomainMutex.Unlock() - if fake.CreateSharedDomainStub != nil { - return fake.CreateSharedDomainStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.createSharedDomainReturns return fakeReturns.result1 } @@ -258,15 +260,16 @@ func (fake *FakeDomainRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -318,15 +321,16 @@ func (fake *FakeDomainRepository) DeleteSharedDomain(arg1 string) error { fake.deleteSharedDomainArgsForCall = append(fake.deleteSharedDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteSharedDomainStub + fakeReturns := fake.deleteSharedDomainReturns fake.recordInvocation("DeleteSharedDomain", []interface{}{arg1}) fake.deleteSharedDomainMutex.Unlock() - if fake.DeleteSharedDomainStub != nil { - return fake.DeleteSharedDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteSharedDomainReturns return fakeReturns.result1 } @@ -379,15 +383,16 @@ func (fake *FakeDomainRepository) FindByNameInOrg(arg1 string, arg2 string) (mod arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByNameInOrgStub + fakeReturns := fake.findByNameInOrgReturns fake.recordInvocation("FindByNameInOrg", []interface{}{arg1, arg2}) fake.findByNameInOrgMutex.Unlock() - if fake.FindByNameInOrgStub != nil { - return fake.FindByNameInOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameInOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -442,15 +447,16 @@ func (fake *FakeDomainRepository) FindPrivateByName(arg1 string) (models.DomainF fake.findPrivateByNameArgsForCall = append(fake.findPrivateByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindPrivateByNameStub + fakeReturns := fake.findPrivateByNameReturns fake.recordInvocation("FindPrivateByName", []interface{}{arg1}) fake.findPrivateByNameMutex.Unlock() - if fake.FindPrivateByNameStub != nil { - return fake.FindPrivateByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findPrivateByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -505,15 +511,16 @@ func (fake *FakeDomainRepository) FindSharedByName(arg1 string) (models.DomainFi fake.findSharedByNameArgsForCall = append(fake.findSharedByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindSharedByNameStub + fakeReturns := fake.findSharedByNameReturns fake.recordInvocation("FindSharedByName", []interface{}{arg1}) fake.findSharedByNameMutex.Unlock() - if fake.FindSharedByNameStub != nil { - return fake.FindSharedByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findSharedByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -569,15 +576,16 @@ func (fake *FakeDomainRepository) FirstOrDefault(arg1 string, arg2 *string) (mod arg1 string arg2 *string }{arg1, arg2}) + stub := fake.FirstOrDefaultStub + fakeReturns := fake.firstOrDefaultReturns fake.recordInvocation("FirstOrDefault", []interface{}{arg1, arg2}) fake.firstOrDefaultMutex.Unlock() - if fake.FirstOrDefaultStub != nil { - return fake.FirstOrDefaultStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.firstOrDefaultReturns return fakeReturns.result1, fakeReturns.result2 } @@ -633,15 +641,16 @@ func (fake *FakeDomainRepository) ListDomainsForOrg(arg1 string, arg2 func(model arg1 string arg2 func(models.DomainFields) bool }{arg1, arg2}) + stub := fake.ListDomainsForOrgStub + fakeReturns := fake.listDomainsForOrgReturns fake.recordInvocation("ListDomainsForOrg", []interface{}{arg1, arg2}) fake.listDomainsForOrgMutex.Unlock() - if fake.ListDomainsForOrgStub != nil { - return fake.ListDomainsForOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.listDomainsForOrgReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_route_repository.go b/cf/api/apifakes/fake_route_repository.go index 1400d7ee04a..db9a1a07f08 100644 --- a/cf/api/apifakes/fake_route_repository.go +++ b/cf/api/apifakes/fake_route_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRouteRepository struct { @@ -143,15 +143,16 @@ func (fake *FakeRouteRepository) Bind(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.BindStub + fakeReturns := fake.bindReturns fake.recordInvocation("Bind", []interface{}{arg1, arg2}) fake.bindMutex.Unlock() - if fake.BindStub != nil { - return fake.BindStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindReturns return fakeReturns.result1 } @@ -205,15 +206,16 @@ func (fake *FakeRouteRepository) CheckIfExists(arg1 string, arg2 models.DomainFi arg2 models.DomainFields arg3 string }{arg1, arg2, arg3}) + stub := fake.CheckIfExistsStub + fakeReturns := fake.checkIfExistsReturns fake.recordInvocation("CheckIfExists", []interface{}{arg1, arg2, arg3}) fake.checkIfExistsMutex.Unlock() - if fake.CheckIfExistsStub != nil { - return fake.CheckIfExistsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.checkIfExistsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -272,15 +274,16 @@ func (fake *FakeRouteRepository) Create(arg1 string, arg2 models.DomainFields, a arg4 int arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -340,15 +343,16 @@ func (fake *FakeRouteRepository) CreateInSpace(arg1 string, arg2 string, arg3 st arg5 int arg6 bool }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.CreateInSpaceStub + fakeReturns := fake.createInSpaceReturns fake.recordInvocation("CreateInSpace", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) fake.createInSpaceMutex.Unlock() - if fake.CreateInSpaceStub != nil { - return fake.CreateInSpaceStub(arg1, arg2, arg3, arg4, arg5, arg6) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createInSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -403,15 +407,16 @@ func (fake *FakeRouteRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -466,15 +471,16 @@ func (fake *FakeRouteRepository) Find(arg1 string, arg2 models.DomainFields, arg arg3 string arg4 int }{arg1, arg2, arg3, arg4}) + stub := fake.FindStub + fakeReturns := fake.findReturns fake.recordInvocation("Find", []interface{}{arg1, arg2, arg3, arg4}) fake.findMutex.Unlock() - if fake.FindStub != nil { - return fake.FindStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findReturns return fakeReturns.result1, fakeReturns.result2 } @@ -529,15 +535,16 @@ func (fake *FakeRouteRepository) ListAllRoutes(arg1 func(models.Route) bool) err fake.listAllRoutesArgsForCall = append(fake.listAllRoutesArgsForCall, struct { arg1 func(models.Route) bool }{arg1}) + stub := fake.ListAllRoutesStub + fakeReturns := fake.listAllRoutesReturns fake.recordInvocation("ListAllRoutes", []interface{}{arg1}) fake.listAllRoutesMutex.Unlock() - if fake.ListAllRoutesStub != nil { - return fake.ListAllRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listAllRoutesReturns return fakeReturns.result1 } @@ -589,15 +596,16 @@ func (fake *FakeRouteRepository) ListRoutes(arg1 func(models.Route) bool) error fake.listRoutesArgsForCall = append(fake.listRoutesArgsForCall, struct { arg1 func(models.Route) bool }{arg1}) + stub := fake.ListRoutesStub + fakeReturns := fake.listRoutesReturns fake.recordInvocation("ListRoutes", []interface{}{arg1}) fake.listRoutesMutex.Unlock() - if fake.ListRoutesStub != nil { - return fake.ListRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listRoutesReturns return fakeReturns.result1 } @@ -650,15 +658,16 @@ func (fake *FakeRouteRepository) Unbind(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnbindStub + fakeReturns := fake.unbindReturns fake.recordInvocation("Unbind", []interface{}{arg1, arg2}) fake.unbindMutex.Unlock() - if fake.UnbindStub != nil { - return fake.UnbindStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_route_service_binding_repository.go b/cf/api/apifakes/fake_route_service_binding_repository.go index 2c93527c84a..e928d90ce6e 100644 --- a/cf/api/apifakes/fake_route_service_binding_repository.go +++ b/cf/api/apifakes/fake_route_service_binding_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api" ) type FakeRouteServiceBindingRepository struct { @@ -48,15 +48,16 @@ func (fake *FakeRouteServiceBindingRepository) Bind(arg1 string, arg2 string, ar arg3 bool arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.BindStub + fakeReturns := fake.bindReturns fake.recordInvocation("Bind", []interface{}{arg1, arg2, arg3, arg4}) fake.bindMutex.Unlock() - if fake.BindStub != nil { - return fake.BindStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindReturns return fakeReturns.result1 } @@ -110,15 +111,16 @@ func (fake *FakeRouteServiceBindingRepository) Unbind(arg1 string, arg2 string, arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.UnbindStub + fakeReturns := fake.unbindReturns fake.recordInvocation("Unbind", []interface{}{arg1, arg2, arg3}) fake.unbindMutex.Unlock() - if fake.UnbindStub != nil { - return fake.UnbindStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_routing_apirepository.go b/cf/api/apifakes/fake_routing_apirepository.go index e821850e54c..91436a2e630 100644 --- a/cf/api/apifakes/fake_routing_apirepository.go +++ b/cf/api/apifakes/fake_routing_apirepository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRoutingAPIRepository struct { @@ -30,15 +30,16 @@ func (fake *FakeRoutingAPIRepository) ListRouterGroups(arg1 func(models.RouterGr fake.listRouterGroupsArgsForCall = append(fake.listRouterGroupsArgsForCall, struct { arg1 func(models.RouterGroup) bool }{arg1}) + stub := fake.ListRouterGroupsStub + fakeReturns := fake.listRouterGroupsReturns fake.recordInvocation("ListRouterGroups", []interface{}{arg1}) fake.listRouterGroupsMutex.Unlock() - if fake.ListRouterGroupsStub != nil { - return fake.ListRouterGroupsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listRouterGroupsReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_auth_token_repository.go b/cf/api/apifakes/fake_service_auth_token_repository.go index d68f7817ff0..2ef40db396d 100644 --- a/cf/api/apifakes/fake_service_auth_token_repository.go +++ b/cf/api/apifakes/fake_service_auth_token_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceAuthTokenRepository struct { @@ -78,15 +78,16 @@ func (fake *FakeServiceAuthTokenRepository) Create(arg1 models.ServiceAuthTokenF fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.ServiceAuthTokenFields }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -138,15 +139,16 @@ func (fake *FakeServiceAuthTokenRepository) Delete(arg1 models.ServiceAuthTokenF fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 models.ServiceAuthTokenFields }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -197,15 +199,16 @@ func (fake *FakeServiceAuthTokenRepository) FindAll() ([]models.ServiceAuthToken ret, specificReturn := fake.findAllReturnsOnCall[len(fake.findAllArgsForCall)] fake.findAllArgsForCall = append(fake.findAllArgsForCall, struct { }{}) + stub := fake.FindAllStub + fakeReturns := fake.findAllReturns fake.recordInvocation("FindAll", []interface{}{}) fake.findAllMutex.Unlock() - if fake.FindAllStub != nil { - return fake.FindAllStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllReturns return fakeReturns.result1, fakeReturns.result2 } @@ -254,15 +257,16 @@ func (fake *FakeServiceAuthTokenRepository) FindByLabelAndProvider(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByLabelAndProviderStub + fakeReturns := fake.findByLabelAndProviderReturns fake.recordInvocation("FindByLabelAndProvider", []interface{}{arg1, arg2}) fake.findByLabelAndProviderMutex.Unlock() - if fake.FindByLabelAndProviderStub != nil { - return fake.FindByLabelAndProviderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByLabelAndProviderReturns return fakeReturns.result1, fakeReturns.result2 } @@ -317,15 +321,16 @@ func (fake *FakeServiceAuthTokenRepository) Update(arg1 models.ServiceAuthTokenF fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.ServiceAuthTokenFields }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_binding_repository.go b/cf/api/apifakes/fake_service_binding_repository.go index 265da6a06a8..ec97c3b0fa2 100644 --- a/cf/api/apifakes/fake_service_binding_repository.go +++ b/cf/api/apifakes/fake_service_binding_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceBindingRepository struct { @@ -61,15 +61,16 @@ func (fake *FakeServiceBindingRepository) Create(arg1 string, arg2 string, arg3 arg2 string arg3 map[string]interface{} }{arg1, arg2, arg3}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -122,15 +123,16 @@ func (fake *FakeServiceBindingRepository) Delete(arg1 models.ServiceInstance, ar arg1 models.ServiceInstance arg2 string }{arg1, arg2}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1, arg2}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -185,15 +187,16 @@ func (fake *FakeServiceBindingRepository) ListAllForService(arg1 string) ([]mode fake.listAllForServiceArgsForCall = append(fake.listAllForServiceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ListAllForServiceStub + fakeReturns := fake.listAllForServiceReturns fake.recordInvocation("ListAllForService", []interface{}{arg1}) fake.listAllForServiceMutex.Unlock() - if fake.ListAllForServiceStub != nil { - return fake.ListAllForServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listAllForServiceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_service_broker_repository.go b/cf/api/apifakes/fake_service_broker_repository.go index 90f1206df36..a0c0a37c199 100644 --- a/cf/api/apifakes/fake_service_broker_repository.go +++ b/cf/api/apifakes/fake_service_broker_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceBrokerRepository struct { @@ -109,15 +109,16 @@ func (fake *FakeServiceBrokerRepository) Create(arg1 string, arg2 string, arg3 s arg4 string arg5 string }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -169,15 +170,16 @@ func (fake *FakeServiceBrokerRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -229,15 +231,16 @@ func (fake *FakeServiceBrokerRepository) FindByGUID(arg1 string) (models.Service fake.findByGUIDArgsForCall = append(fake.findByGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByGUIDStub + fakeReturns := fake.findByGUIDReturns fake.recordInvocation("FindByGUID", []interface{}{arg1}) fake.findByGUIDMutex.Unlock() - if fake.FindByGUIDStub != nil { - return fake.FindByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -292,15 +295,16 @@ func (fake *FakeServiceBrokerRepository) FindByName(arg1 string) (models.Service fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -355,15 +359,16 @@ func (fake *FakeServiceBrokerRepository) ListServiceBrokers(arg1 func(models.Ser fake.listServiceBrokersArgsForCall = append(fake.listServiceBrokersArgsForCall, struct { arg1 func(models.ServiceBroker) bool }{arg1}) + stub := fake.ListServiceBrokersStub + fakeReturns := fake.listServiceBrokersReturns fake.recordInvocation("ListServiceBrokers", []interface{}{arg1}) fake.listServiceBrokersMutex.Unlock() - if fake.ListServiceBrokersStub != nil { - return fake.ListServiceBrokersStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listServiceBrokersReturns return fakeReturns.result1 } @@ -416,15 +421,16 @@ func (fake *FakeServiceBrokerRepository) Rename(arg1 string, arg2 string) error arg1 string arg2 string }{arg1, arg2}) + stub := fake.RenameStub + fakeReturns := fake.renameReturns fake.recordInvocation("Rename", []interface{}{arg1, arg2}) fake.renameMutex.Unlock() - if fake.RenameStub != nil { - return fake.RenameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.renameReturns return fakeReturns.result1 } @@ -476,15 +482,16 @@ func (fake *FakeServiceBrokerRepository) Update(arg1 models.ServiceBroker) error fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.ServiceBroker }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_key_repository.go b/cf/api/apifakes/fake_service_key_repository.go index d919c306d8a..61fcfebfbf2 100644 --- a/cf/api/apifakes/fake_service_key_repository.go +++ b/cf/api/apifakes/fake_service_key_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceKeyRepository struct { @@ -72,15 +72,16 @@ func (fake *FakeServiceKeyRepository) CreateServiceKey(arg1 string, arg2 string, arg2 string arg3 map[string]interface{} }{arg1, arg2, arg3}) + stub := fake.CreateServiceKeyStub + fakeReturns := fake.createServiceKeyReturns fake.recordInvocation("CreateServiceKey", []interface{}{arg1, arg2, arg3}) fake.createServiceKeyMutex.Unlock() - if fake.CreateServiceKeyStub != nil { - return fake.CreateServiceKeyStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.createServiceKeyReturns return fakeReturns.result1 } @@ -132,15 +133,16 @@ func (fake *FakeServiceKeyRepository) DeleteServiceKey(arg1 string) error { fake.deleteServiceKeyArgsForCall = append(fake.deleteServiceKeyArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteServiceKeyStub + fakeReturns := fake.deleteServiceKeyReturns fake.recordInvocation("DeleteServiceKey", []interface{}{arg1}) fake.deleteServiceKeyMutex.Unlock() - if fake.DeleteServiceKeyStub != nil { - return fake.DeleteServiceKeyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteServiceKeyReturns return fakeReturns.result1 } @@ -193,15 +195,16 @@ func (fake *FakeServiceKeyRepository) GetServiceKey(arg1 string, arg2 string) (m arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceKeyStub + fakeReturns := fake.getServiceKeyReturns fake.recordInvocation("GetServiceKey", []interface{}{arg1, arg2}) fake.getServiceKeyMutex.Unlock() - if fake.GetServiceKeyStub != nil { - return fake.GetServiceKeyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceKeyReturns return fakeReturns.result1, fakeReturns.result2 } @@ -256,15 +259,16 @@ func (fake *FakeServiceKeyRepository) ListServiceKeys(arg1 string) ([]models.Ser fake.listServiceKeysArgsForCall = append(fake.listServiceKeysArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ListServiceKeysStub + fakeReturns := fake.listServiceKeysReturns fake.recordInvocation("ListServiceKeys", []interface{}{arg1}) fake.listServiceKeysMutex.Unlock() - if fake.ListServiceKeysStub != nil { - return fake.ListServiceKeysStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listServiceKeysReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_service_plan_repository.go b/cf/api/apifakes/fake_service_plan_repository.go index e650477f616..430740598fb 100644 --- a/cf/api/apifakes/fake_service_plan_repository.go +++ b/cf/api/apifakes/fake_service_plan_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServicePlanRepository struct { @@ -63,15 +63,16 @@ func (fake *FakeServicePlanRepository) ListPlansFromManyServices(arg1 []string) fake.listPlansFromManyServicesArgsForCall = append(fake.listPlansFromManyServicesArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.ListPlansFromManyServicesStub + fakeReturns := fake.listPlansFromManyServicesReturns fake.recordInvocation("ListPlansFromManyServices", []interface{}{arg1Copy}) fake.listPlansFromManyServicesMutex.Unlock() - if fake.ListPlansFromManyServicesStub != nil { - return fake.ListPlansFromManyServicesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listPlansFromManyServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -126,15 +127,16 @@ func (fake *FakeServicePlanRepository) Search(arg1 map[string]string) ([]models. fake.searchArgsForCall = append(fake.searchArgsForCall, struct { arg1 map[string]string }{arg1}) + stub := fake.SearchStub + fakeReturns := fake.searchReturns fake.recordInvocation("Search", []interface{}{arg1}) fake.searchMutex.Unlock() - if fake.SearchStub != nil { - return fake.SearchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.searchReturns return fakeReturns.result1, fakeReturns.result2 } @@ -191,15 +193,16 @@ func (fake *FakeServicePlanRepository) Update(arg1 models.ServicePlanFields, arg arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1, arg2, arg3}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_plan_visibility_repository.go b/cf/api/apifakes/fake_service_plan_visibility_repository.go index dcf0e32cba8..66cb2fa8daf 100644 --- a/cf/api/apifakes/fake_service_plan_visibility_repository.go +++ b/cf/api/apifakes/fake_service_plan_visibility_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServicePlanVisibilityRepository struct { @@ -68,15 +68,16 @@ func (fake *FakeServicePlanVisibilityRepository) Create(arg1 string, arg2 string arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -128,15 +129,16 @@ func (fake *FakeServicePlanVisibilityRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -187,15 +189,16 @@ func (fake *FakeServicePlanVisibilityRepository) List() ([]models.ServicePlanVis ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] fake.listArgsForCall = append(fake.listArgsForCall, struct { }{}) + stub := fake.ListStub + fakeReturns := fake.listReturns fake.recordInvocation("List", []interface{}{}) fake.listMutex.Unlock() - if fake.ListStub != nil { - return fake.ListStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listReturns return fakeReturns.result1, fakeReturns.result2 } @@ -243,15 +246,16 @@ func (fake *FakeServicePlanVisibilityRepository) Search(arg1 map[string]string) fake.searchArgsForCall = append(fake.searchArgsForCall, struct { arg1 map[string]string }{arg1}) + stub := fake.SearchStub + fakeReturns := fake.searchReturns fake.recordInvocation("Search", []interface{}{arg1}) fake.searchMutex.Unlock() - if fake.SearchStub != nil { - return fake.SearchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.searchReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_service_repository.go b/cf/api/apifakes/fake_service_repository.go index 752834cfad2..c1a9a3df126 100644 --- a/cf/api/apifakes/fake_service_repository.go +++ b/cf/api/apifakes/fake_service_repository.go @@ -4,9 +4,9 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceRepository struct { @@ -259,15 +259,16 @@ func (fake *FakeServiceRepository) CreateServiceInstance(arg1 string, arg2 strin arg3 map[string]interface{} arg4 []string }{arg1, arg2, arg3, arg4Copy}) + stub := fake.CreateServiceInstanceStub + fakeReturns := fake.createServiceInstanceReturns fake.recordInvocation("CreateServiceInstance", []interface{}{arg1, arg2, arg3, arg4Copy}) fake.createServiceInstanceMutex.Unlock() - if fake.CreateServiceInstanceStub != nil { - return fake.CreateServiceInstanceStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.createServiceInstanceReturns return fakeReturns.result1 } @@ -319,15 +320,16 @@ func (fake *FakeServiceRepository) DeleteService(arg1 models.ServiceInstance) er fake.deleteServiceArgsForCall = append(fake.deleteServiceArgsForCall, struct { arg1 models.ServiceInstance }{arg1}) + stub := fake.DeleteServiceStub + fakeReturns := fake.deleteServiceReturns fake.recordInvocation("DeleteService", []interface{}{arg1}) fake.deleteServiceMutex.Unlock() - if fake.DeleteServiceStub != nil { - return fake.DeleteServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteServiceReturns return fakeReturns.result1 } @@ -379,15 +381,16 @@ func (fake *FakeServiceRepository) FindInstanceByName(arg1 string) (models.Servi fake.findInstanceByNameArgsForCall = append(fake.findInstanceByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindInstanceByNameStub + fakeReturns := fake.findInstanceByNameReturns fake.recordInvocation("FindInstanceByName", []interface{}{arg1}) fake.findInstanceByNameMutex.Unlock() - if fake.FindInstanceByNameStub != nil { - return fake.FindInstanceByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findInstanceByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -443,15 +446,16 @@ func (fake *FakeServiceRepository) FindServiceOfferingByLabelAndProvider(arg1 st arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindServiceOfferingByLabelAndProviderStub + fakeReturns := fake.findServiceOfferingByLabelAndProviderReturns fake.recordInvocation("FindServiceOfferingByLabelAndProvider", []interface{}{arg1, arg2}) fake.findServiceOfferingByLabelAndProviderMutex.Unlock() - if fake.FindServiceOfferingByLabelAndProviderStub != nil { - return fake.FindServiceOfferingByLabelAndProviderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServiceOfferingByLabelAndProviderReturns return fakeReturns.result1, fakeReturns.result2 } @@ -506,15 +510,16 @@ func (fake *FakeServiceRepository) FindServiceOfferingsByLabel(arg1 string) (mod fake.findServiceOfferingsByLabelArgsForCall = append(fake.findServiceOfferingsByLabelArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindServiceOfferingsByLabelStub + fakeReturns := fake.findServiceOfferingsByLabelReturns fake.recordInvocation("FindServiceOfferingsByLabel", []interface{}{arg1}) fake.findServiceOfferingsByLabelMutex.Unlock() - if fake.FindServiceOfferingsByLabelStub != nil { - return fake.FindServiceOfferingsByLabelStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServiceOfferingsByLabelReturns return fakeReturns.result1, fakeReturns.result2 } @@ -570,15 +575,16 @@ func (fake *FakeServiceRepository) FindServiceOfferingsForSpaceByLabel(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindServiceOfferingsForSpaceByLabelStub + fakeReturns := fake.findServiceOfferingsForSpaceByLabelReturns fake.recordInvocation("FindServiceOfferingsForSpaceByLabel", []interface{}{arg1, arg2}) fake.findServiceOfferingsForSpaceByLabelMutex.Unlock() - if fake.FindServiceOfferingsForSpaceByLabelStub != nil { - return fake.FindServiceOfferingsForSpaceByLabelStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServiceOfferingsForSpaceByLabelReturns return fakeReturns.result1, fakeReturns.result2 } @@ -633,15 +639,16 @@ func (fake *FakeServiceRepository) FindServicePlanByDescription(arg1 resources.S fake.findServicePlanByDescriptionArgsForCall = append(fake.findServicePlanByDescriptionArgsForCall, struct { arg1 resources.ServicePlanDescription }{arg1}) + stub := fake.FindServicePlanByDescriptionStub + fakeReturns := fake.findServicePlanByDescriptionReturns fake.recordInvocation("FindServicePlanByDescription", []interface{}{arg1}) fake.findServicePlanByDescriptionMutex.Unlock() - if fake.FindServicePlanByDescriptionStub != nil { - return fake.FindServicePlanByDescriptionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServicePlanByDescriptionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -695,15 +702,16 @@ func (fake *FakeServiceRepository) GetAllServiceOfferings() (models.ServiceOffer ret, specificReturn := fake.getAllServiceOfferingsReturnsOnCall[len(fake.getAllServiceOfferingsArgsForCall)] fake.getAllServiceOfferingsArgsForCall = append(fake.getAllServiceOfferingsArgsForCall, struct { }{}) + stub := fake.GetAllServiceOfferingsStub + fakeReturns := fake.getAllServiceOfferingsReturns fake.recordInvocation("GetAllServiceOfferings", []interface{}{}) fake.getAllServiceOfferingsMutex.Unlock() - if fake.GetAllServiceOfferingsStub != nil { - return fake.GetAllServiceOfferingsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAllServiceOfferingsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -751,15 +759,16 @@ func (fake *FakeServiceRepository) GetServiceInstanceCountForServicePlan(arg1 st fake.getServiceInstanceCountForServicePlanArgsForCall = append(fake.getServiceInstanceCountForServicePlanArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstanceCountForServicePlanStub + fakeReturns := fake.getServiceInstanceCountForServicePlanReturns fake.recordInvocation("GetServiceInstanceCountForServicePlan", []interface{}{arg1}) fake.getServiceInstanceCountForServicePlanMutex.Unlock() - if fake.GetServiceInstanceCountForServicePlanStub != nil { - return fake.GetServiceInstanceCountForServicePlanStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceInstanceCountForServicePlanReturns return fakeReturns.result1, fakeReturns.result2 } @@ -814,15 +823,16 @@ func (fake *FakeServiceRepository) GetServiceOfferingByGUID(arg1 string) (models fake.getServiceOfferingByGUIDArgsForCall = append(fake.getServiceOfferingByGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceOfferingByGUIDStub + fakeReturns := fake.getServiceOfferingByGUIDReturns fake.recordInvocation("GetServiceOfferingByGUID", []interface{}{arg1}) fake.getServiceOfferingByGUIDMutex.Unlock() - if fake.GetServiceOfferingByGUIDStub != nil { - return fake.GetServiceOfferingByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceOfferingByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -877,15 +887,16 @@ func (fake *FakeServiceRepository) GetServiceOfferingsForSpace(arg1 string) (mod fake.getServiceOfferingsForSpaceArgsForCall = append(fake.getServiceOfferingsForSpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceOfferingsForSpaceStub + fakeReturns := fake.getServiceOfferingsForSpaceReturns fake.recordInvocation("GetServiceOfferingsForSpace", []interface{}{arg1}) fake.getServiceOfferingsForSpaceMutex.Unlock() - if fake.GetServiceOfferingsForSpaceStub != nil { - return fake.GetServiceOfferingsForSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceOfferingsForSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -940,15 +951,16 @@ func (fake *FakeServiceRepository) ListServicesFromBroker(arg1 string) ([]models fake.listServicesFromBrokerArgsForCall = append(fake.listServicesFromBrokerArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ListServicesFromBrokerStub + fakeReturns := fake.listServicesFromBrokerReturns fake.recordInvocation("ListServicesFromBroker", []interface{}{arg1}) fake.listServicesFromBrokerMutex.Unlock() - if fake.ListServicesFromBrokerStub != nil { - return fake.ListServicesFromBrokerStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listServicesFromBrokerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1008,15 +1020,16 @@ func (fake *FakeServiceRepository) ListServicesFromManyBrokers(arg1 []string) ([ fake.listServicesFromManyBrokersArgsForCall = append(fake.listServicesFromManyBrokersArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.ListServicesFromManyBrokersStub + fakeReturns := fake.listServicesFromManyBrokersReturns fake.recordInvocation("ListServicesFromManyBrokers", []interface{}{arg1Copy}) fake.listServicesFromManyBrokersMutex.Unlock() - if fake.ListServicesFromManyBrokersStub != nil { - return fake.ListServicesFromManyBrokersStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listServicesFromManyBrokersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1072,15 +1085,16 @@ func (fake *FakeServiceRepository) MigrateServicePlanFromV1ToV2(arg1 string, arg arg1 string arg2 string }{arg1, arg2}) + stub := fake.MigrateServicePlanFromV1ToV2Stub + fakeReturns := fake.migrateServicePlanFromV1ToV2Returns fake.recordInvocation("MigrateServicePlanFromV1ToV2", []interface{}{arg1, arg2}) fake.migrateServicePlanFromV1ToV2Mutex.Unlock() - if fake.MigrateServicePlanFromV1ToV2Stub != nil { - return fake.MigrateServicePlanFromV1ToV2Stub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.migrateServicePlanFromV1ToV2Returns return fakeReturns.result1, fakeReturns.result2 } @@ -1135,15 +1149,16 @@ func (fake *FakeServiceRepository) PurgeServiceInstance(arg1 models.ServiceInsta fake.purgeServiceInstanceArgsForCall = append(fake.purgeServiceInstanceArgsForCall, struct { arg1 models.ServiceInstance }{arg1}) + stub := fake.PurgeServiceInstanceStub + fakeReturns := fake.purgeServiceInstanceReturns fake.recordInvocation("PurgeServiceInstance", []interface{}{arg1}) fake.purgeServiceInstanceMutex.Unlock() - if fake.PurgeServiceInstanceStub != nil { - return fake.PurgeServiceInstanceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.purgeServiceInstanceReturns return fakeReturns.result1 } @@ -1195,15 +1210,16 @@ func (fake *FakeServiceRepository) PurgeServiceOffering(arg1 models.ServiceOffer fake.purgeServiceOfferingArgsForCall = append(fake.purgeServiceOfferingArgsForCall, struct { arg1 models.ServiceOffering }{arg1}) + stub := fake.PurgeServiceOfferingStub + fakeReturns := fake.purgeServiceOfferingReturns fake.recordInvocation("PurgeServiceOffering", []interface{}{arg1}) fake.purgeServiceOfferingMutex.Unlock() - if fake.PurgeServiceOfferingStub != nil { - return fake.PurgeServiceOfferingStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.purgeServiceOfferingReturns return fakeReturns.result1 } @@ -1256,15 +1272,16 @@ func (fake *FakeServiceRepository) RenameService(arg1 models.ServiceInstance, ar arg1 models.ServiceInstance arg2 string }{arg1, arg2}) + stub := fake.RenameServiceStub + fakeReturns := fake.renameServiceReturns fake.recordInvocation("RenameService", []interface{}{arg1, arg2}) fake.renameServiceMutex.Unlock() - if fake.RenameServiceStub != nil { - return fake.RenameServiceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.renameServiceReturns return fakeReturns.result1 } @@ -1319,15 +1336,16 @@ func (fake *FakeServiceRepository) UpdateServiceInstance(arg1 string, arg2 strin arg3 map[string]interface{} arg4 *[]string }{arg1, arg2, arg3, arg4}) + stub := fake.UpdateServiceInstanceStub + fakeReturns := fake.updateServiceInstanceReturns fake.recordInvocation("UpdateServiceInstance", []interface{}{arg1, arg2, arg3, arg4}) fake.updateServiceInstanceMutex.Unlock() - if fake.UpdateServiceInstanceStub != nil { - return fake.UpdateServiceInstanceStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateServiceInstanceReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_summary_repository.go b/cf/api/apifakes/fake_service_summary_repository.go index f2ca2905245..f267206391a 100644 --- a/cf/api/apifakes/fake_service_summary_repository.go +++ b/cf/api/apifakes/fake_service_summary_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceSummaryRepository struct { @@ -30,15 +30,16 @@ func (fake *FakeServiceSummaryRepository) GetSummariesInCurrentSpace() ([]models ret, specificReturn := fake.getSummariesInCurrentSpaceReturnsOnCall[len(fake.getSummariesInCurrentSpaceArgsForCall)] fake.getSummariesInCurrentSpaceArgsForCall = append(fake.getSummariesInCurrentSpaceArgsForCall, struct { }{}) + stub := fake.GetSummariesInCurrentSpaceStub + fakeReturns := fake.getSummariesInCurrentSpaceReturns fake.recordInvocation("GetSummariesInCurrentSpace", []interface{}{}) fake.getSummariesInCurrentSpaceMutex.Unlock() - if fake.GetSummariesInCurrentSpaceStub != nil { - return fake.GetSummariesInCurrentSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSummariesInCurrentSpaceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_user_provided_service_instance_repository.go b/cf/api/apifakes/fake_user_provided_service_instance_repository.go index 175e18d2bfc..8fb46194d1d 100644 --- a/cf/api/apifakes/fake_user_provided_service_instance_repository.go +++ b/cf/api/apifakes/fake_user_provided_service_instance_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeUserProvidedServiceInstanceRepository struct { @@ -66,15 +66,16 @@ func (fake *FakeUserProvidedServiceInstanceRepository) Create(arg1 string, arg2 arg4 map[string]interface{} arg5 []string }{arg1, arg2, arg3, arg4, arg5Copy}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3, arg4, arg5Copy}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -125,15 +126,16 @@ func (fake *FakeUserProvidedServiceInstanceRepository) GetSummaries() (models.Us ret, specificReturn := fake.getSummariesReturnsOnCall[len(fake.getSummariesArgsForCall)] fake.getSummariesArgsForCall = append(fake.getSummariesArgsForCall, struct { }{}) + stub := fake.GetSummariesStub + fakeReturns := fake.getSummariesReturns fake.recordInvocation("GetSummaries", []interface{}{}) fake.getSummariesMutex.Unlock() - if fake.GetSummariesStub != nil { - return fake.GetSummariesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSummariesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -181,15 +183,16 @@ func (fake *FakeUserProvidedServiceInstanceRepository) Update(arg1 models.Servic fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.ServiceInstanceFields }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_user_repository.go b/cf/api/apifakes/fake_user_repository.go index 04fa96b9652..e23e1418422 100644 --- a/cf/api/apifakes/fake_user_repository.go +++ b/cf/api/apifakes/fake_user_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeUserRepository struct { @@ -203,15 +203,16 @@ func (fake *FakeUserRepository) Create(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -263,15 +264,16 @@ func (fake *FakeUserRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -323,15 +325,16 @@ func (fake *FakeUserRepository) FindAllByUsername(arg1 string) ([]models.UserFie fake.findAllByUsernameArgsForCall = append(fake.findAllByUsernameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindAllByUsernameStub + fakeReturns := fake.findAllByUsernameReturns fake.recordInvocation("FindAllByUsername", []interface{}{arg1}) fake.findAllByUsernameMutex.Unlock() - if fake.FindAllByUsernameStub != nil { - return fake.FindAllByUsernameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllByUsernameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -386,15 +389,16 @@ func (fake *FakeUserRepository) FindByUsername(arg1 string) (models.UserFields, fake.findByUsernameArgsForCall = append(fake.findByUsernameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByUsernameStub + fakeReturns := fake.findByUsernameReturns fake.recordInvocation("FindByUsername", []interface{}{arg1}) fake.findByUsernameMutex.Unlock() - if fake.FindByUsernameStub != nil { - return fake.FindByUsernameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByUsernameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -450,15 +454,16 @@ func (fake *FakeUserRepository) ListUsersInOrgForRoleWithNoUAA(arg1 string, arg2 arg1 string arg2 models.Role }{arg1, arg2}) + stub := fake.ListUsersInOrgForRoleWithNoUAAStub + fakeReturns := fake.listUsersInOrgForRoleWithNoUAAReturns fake.recordInvocation("ListUsersInOrgForRoleWithNoUAA", []interface{}{arg1, arg2}) fake.listUsersInOrgForRoleWithNoUAAMutex.Unlock() - if fake.ListUsersInOrgForRoleWithNoUAAStub != nil { - return fake.ListUsersInOrgForRoleWithNoUAAStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listUsersInOrgForRoleWithNoUAAReturns return fakeReturns.result1, fakeReturns.result2 } @@ -514,15 +519,16 @@ func (fake *FakeUserRepository) ListUsersInSpaceForRoleWithNoUAA(arg1 string, ar arg1 string arg2 models.Role }{arg1, arg2}) + stub := fake.ListUsersInSpaceForRoleWithNoUAAStub + fakeReturns := fake.listUsersInSpaceForRoleWithNoUAAReturns fake.recordInvocation("ListUsersInSpaceForRoleWithNoUAA", []interface{}{arg1, arg2}) fake.listUsersInSpaceForRoleWithNoUAAMutex.Unlock() - if fake.ListUsersInSpaceForRoleWithNoUAAStub != nil { - return fake.ListUsersInSpaceForRoleWithNoUAAStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listUsersInSpaceForRoleWithNoUAAReturns return fakeReturns.result1, fakeReturns.result2 } @@ -579,15 +585,16 @@ func (fake *FakeUserRepository) SetOrgRoleByGUID(arg1 string, arg2 string, arg3 arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.SetOrgRoleByGUIDStub + fakeReturns := fake.setOrgRoleByGUIDReturns fake.recordInvocation("SetOrgRoleByGUID", []interface{}{arg1, arg2, arg3}) fake.setOrgRoleByGUIDMutex.Unlock() - if fake.SetOrgRoleByGUIDStub != nil { - return fake.SetOrgRoleByGUIDStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.setOrgRoleByGUIDReturns return fakeReturns.result1 } @@ -641,15 +648,16 @@ func (fake *FakeUserRepository) SetOrgRoleByUsername(arg1 string, arg2 string, a arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.SetOrgRoleByUsernameStub + fakeReturns := fake.setOrgRoleByUsernameReturns fake.recordInvocation("SetOrgRoleByUsername", []interface{}{arg1, arg2, arg3}) fake.setOrgRoleByUsernameMutex.Unlock() - if fake.SetOrgRoleByUsernameStub != nil { - return fake.SetOrgRoleByUsernameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.setOrgRoleByUsernameReturns return fakeReturns.result1 } @@ -704,15 +712,16 @@ func (fake *FakeUserRepository) SetSpaceRoleByGUID(arg1 string, arg2 string, arg arg3 string arg4 models.Role }{arg1, arg2, arg3, arg4}) + stub := fake.SetSpaceRoleByGUIDStub + fakeReturns := fake.setSpaceRoleByGUIDReturns fake.recordInvocation("SetSpaceRoleByGUID", []interface{}{arg1, arg2, arg3, arg4}) fake.setSpaceRoleByGUIDMutex.Unlock() - if fake.SetSpaceRoleByGUIDStub != nil { - return fake.SetSpaceRoleByGUIDStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.setSpaceRoleByGUIDReturns return fakeReturns.result1 } @@ -767,15 +776,16 @@ func (fake *FakeUserRepository) SetSpaceRoleByUsername(arg1 string, arg2 string, arg3 string arg4 models.Role }{arg1, arg2, arg3, arg4}) + stub := fake.SetSpaceRoleByUsernameStub + fakeReturns := fake.setSpaceRoleByUsernameReturns fake.recordInvocation("SetSpaceRoleByUsername", []interface{}{arg1, arg2, arg3, arg4}) fake.setSpaceRoleByUsernameMutex.Unlock() - if fake.SetSpaceRoleByUsernameStub != nil { - return fake.SetSpaceRoleByUsernameStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.setSpaceRoleByUsernameReturns return fakeReturns.result1 } @@ -829,15 +839,16 @@ func (fake *FakeUserRepository) UnsetOrgRoleByGUID(arg1 string, arg2 string, arg arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.UnsetOrgRoleByGUIDStub + fakeReturns := fake.unsetOrgRoleByGUIDReturns fake.recordInvocation("UnsetOrgRoleByGUID", []interface{}{arg1, arg2, arg3}) fake.unsetOrgRoleByGUIDMutex.Unlock() - if fake.UnsetOrgRoleByGUIDStub != nil { - return fake.UnsetOrgRoleByGUIDStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsetOrgRoleByGUIDReturns return fakeReturns.result1 } @@ -891,15 +902,16 @@ func (fake *FakeUserRepository) UnsetOrgRoleByUsername(arg1 string, arg2 string, arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.UnsetOrgRoleByUsernameStub + fakeReturns := fake.unsetOrgRoleByUsernameReturns fake.recordInvocation("UnsetOrgRoleByUsername", []interface{}{arg1, arg2, arg3}) fake.unsetOrgRoleByUsernameMutex.Unlock() - if fake.UnsetOrgRoleByUsernameStub != nil { - return fake.UnsetOrgRoleByUsernameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsetOrgRoleByUsernameReturns return fakeReturns.result1 } @@ -953,15 +965,16 @@ func (fake *FakeUserRepository) UnsetSpaceRoleByGUID(arg1 string, arg2 string, a arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.UnsetSpaceRoleByGUIDStub + fakeReturns := fake.unsetSpaceRoleByGUIDReturns fake.recordInvocation("UnsetSpaceRoleByGUID", []interface{}{arg1, arg2, arg3}) fake.unsetSpaceRoleByGUIDMutex.Unlock() - if fake.UnsetSpaceRoleByGUIDStub != nil { - return fake.UnsetSpaceRoleByGUIDStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsetSpaceRoleByGUIDReturns return fakeReturns.result1 } @@ -1015,15 +1028,16 @@ func (fake *FakeUserRepository) UnsetSpaceRoleByUsername(arg1 string, arg2 strin arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.UnsetSpaceRoleByUsernameStub + fakeReturns := fake.unsetSpaceRoleByUsernameReturns fake.recordInvocation("UnsetSpaceRoleByUsername", []interface{}{arg1, arg2, arg3}) fake.unsetSpaceRoleByUsernameMutex.Unlock() - if fake.UnsetSpaceRoleByUsernameStub != nil { - return fake.UnsetSpaceRoleByUsernameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsetSpaceRoleByUsernameReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/old_fake_app_summary_repo.go b/cf/api/apifakes/old_fake_app_summary_repo.go index 25c6de49828..29e285cf75b 100644 --- a/cf/api/apifakes/old_fake_app_summary_repo.go +++ b/cf/api/apifakes/old_fake_app_summary_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeAppSummaryRepo struct { diff --git a/cf/api/apifakes/old_fake_auth_token_repo.go b/cf/api/apifakes/old_fake_auth_token_repo.go index 4fb3576bad4..31fb1e1e80b 100644 --- a/cf/api/apifakes/old_fake_auth_token_repo.go +++ b/cf/api/apifakes/old_fake_auth_token_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type OldFakeAuthTokenRepo struct { CreatedServiceAuthTokenFields models.ServiceAuthTokenFields diff --git a/cf/api/apifakes/old_fake_buildpack_bits_repo.go b/cf/api/apifakes/old_fake_buildpack_bits_repo.go index b82b3a0e6d6..d220f07437d 100644 --- a/cf/api/apifakes/old_fake_buildpack_bits_repo.go +++ b/cf/api/apifakes/old_fake_buildpack_bits_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeBuildpackBitsRepository struct { diff --git a/cf/api/apifakes/old_fake_buildpack_repo.go b/cf/api/apifakes/old_fake_buildpack_repo.go index 1b361d6e7f6..ba133f9d4e9 100644 --- a/cf/api/apifakes/old_fake_buildpack_repo.go +++ b/cf/api/apifakes/old_fake_buildpack_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeBuildpackRepository struct { diff --git a/cf/api/apifakes/old_fake_cc_request.go b/cf/api/apifakes/old_fake_cc_request.go index 0b64b79c80d..c01fcec4d6e 100644 --- a/cf/api/apifakes/old_fake_cc_request.go +++ b/cf/api/apifakes/old_fake_cc_request.go @@ -3,7 +3,7 @@ package apifakes import ( "net/http" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" ) func NewCloudControllerTestRequest(request testnet.TestRequest) testnet.TestRequest { diff --git a/cf/api/apifakes/old_fake_password_repo.go b/cf/api/apifakes/old_fake_password_repo.go index 53798334cdf..46e88170110 100644 --- a/cf/api/apifakes/old_fake_password_repo.go +++ b/cf/api/apifakes/old_fake_password_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/cf/errors" +import "code.cloudfoundry.org/cli/v9/cf/errors" type OldFakePasswordRepo struct { Score string diff --git a/cf/api/apifakes/old_fake_service_key_repo.go b/cf/api/apifakes/old_fake_service_key_repo.go index fcc19904e9e..368e413b9ad 100644 --- a/cf/api/apifakes/old_fake_service_key_repo.go +++ b/cf/api/apifakes/old_fake_service_key_repo.go @@ -1,7 +1,7 @@ package apifakes import ( - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeServiceKeyRepo struct { diff --git a/cf/api/apifakes/old_fake_service_plan_repo.go b/cf/api/apifakes/old_fake_service_plan_repo.go index 832b2f0c3c4..68af1099697 100644 --- a/cf/api/apifakes/old_fake_service_plan_repo.go +++ b/cf/api/apifakes/old_fake_service_plan_repo.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeServicePlanRepo struct { @@ -44,7 +44,7 @@ func (fake *OldFakeServicePlanRepo) Search(queryParams map[string]string) ([]mod } if queryParams == nil { - //return everything + // return everything var returnPlans []models.ServicePlanFields for _, value := range fake.SearchReturns { returnPlans = append(returnPlans, value...) diff --git a/cf/api/apifakes/old_fake_service_summary_repo.go b/cf/api/apifakes/old_fake_service_summary_repo.go index fed622ff3cb..9e36413672a 100644 --- a/cf/api/apifakes/old_fake_service_summary_repo.go +++ b/cf/api/apifakes/old_fake_service_summary_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type OldFakeServiceSummaryRepo struct { GetSummariesInCurrentSpaceInstances []models.ServiceInstance diff --git a/cf/api/app_summary.go b/cf/api/app_summary.go index 15a9b2387ad..a2080c7f4f8 100644 --- a/cf/api/app_summary.go +++ b/cf/api/app_summary.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type ApplicationSummaries struct { diff --git a/cf/api/app_summary_test.go b/cf/api/app_summary_test.go index 36f0b0e0d76..9913c472e29 100644 --- a/cf/api/app_summary_test.go +++ b/cf/api/app_summary_test.go @@ -5,14 +5,14 @@ import ( "net/http/httptest" "time" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appevents/app_events.go b/cf/api/appevents/app_events.go index a1bc966c830..4679e23ca19 100644 --- a/cf/api/appevents/app_events.go +++ b/cf/api/appevents/app_events.go @@ -3,10 +3,10 @@ package appevents import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/appevents/app_events_suite_test.go b/cf/api/appevents/app_events_suite_test.go index 72faadddf92..4556e17b792 100644 --- a/cf/api/appevents/app_events_suite_test.go +++ b/cf/api/appevents/app_events_suite_test.go @@ -1,8 +1,8 @@ package appevents_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appevents/app_events_test.go b/cf/api/appevents/app_events_test.go index 3edf21f9783..e56fc872d1c 100644 --- a/cf/api/appevents/app_events_test.go +++ b/cf/api/appevents/app_events_test.go @@ -6,14 +6,14 @@ import ( "time" - . "code.cloudfoundry.org/cli/cf/api/appevents" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + . "code.cloudfoundry.org/cli/v9/cf/api/appevents" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appevents/appeventsfakes/fake_app_events_repository.go b/cf/api/appevents/appeventsfakes/fake_app_events_repository.go index 601be0df596..54e9bb68ed4 100644 --- a/cf/api/appevents/appeventsfakes/fake_app_events_repository.go +++ b/cf/api/appevents/appeventsfakes/fake_app_events_repository.go @@ -4,8 +4,8 @@ package appeventsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appevents" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/appevents" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeAppEventsRepository struct { diff --git a/cf/api/appevents/appeventsfakes/fake_repository.go b/cf/api/appevents/appeventsfakes/fake_repository.go index 1c62f9dde9d..2b26fc412da 100644 --- a/cf/api/appevents/appeventsfakes/fake_repository.go +++ b/cf/api/appevents/appeventsfakes/fake_repository.go @@ -4,8 +4,8 @@ package appeventsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appevents" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/appevents" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRepository struct { @@ -34,15 +34,16 @@ func (fake *FakeRepository) RecentEvents(arg1 string, arg2 int64) ([]models.Even arg1 string arg2 int64 }{arg1, arg2}) + stub := fake.RecentEventsStub + fakeReturns := fake.recentEventsReturns fake.recordInvocation("RecentEvents", []interface{}{arg1, arg2}) fake.recentEventsMutex.Unlock() - if fake.RecentEventsStub != nil { - return fake.RecentEventsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.recentEventsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/appfiles/app_files.go b/cf/api/appfiles/app_files.go index 473b27e1226..8fec307cd9e 100644 --- a/cf/api/appfiles/app_files.go +++ b/cf/api/appfiles/app_files.go @@ -3,8 +3,8 @@ package appfiles import ( "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/appfiles/app_files_suite_test.go b/cf/api/appfiles/app_files_suite_test.go index f1e204e4e19..b6a499efb37 100644 --- a/cf/api/appfiles/app_files_suite_test.go +++ b/cf/api/appfiles/app_files_suite_test.go @@ -1,8 +1,8 @@ package appfiles_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appfiles/app_files_test.go b/cf/api/appfiles/app_files_test.go index 62f6484f2e0..9d0fc8d41de 100644 --- a/cf/api/appfiles/app_files_test.go +++ b/cf/api/appfiles/app_files_test.go @@ -6,15 +6,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api/appfiles" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go b/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go index f3d46847d71..a9c97cbdf9d 100644 --- a/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go +++ b/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/api/appfiles" ) type FakeAppFilesRepository struct { diff --git a/cf/api/appfiles/appfilesfakes/fake_repository.go b/cf/api/appfiles/appfilesfakes/fake_repository.go index 38b0d22db35..2a121098bef 100644 --- a/cf/api/appfiles/appfilesfakes/fake_repository.go +++ b/cf/api/appfiles/appfilesfakes/fake_repository.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/api/appfiles" ) type FakeRepository struct { @@ -35,15 +35,16 @@ func (fake *FakeRepository) ListFiles(arg1 string, arg2 int, arg3 string) (strin arg2 int arg3 string }{arg1, arg2, arg3}) + stub := fake.ListFilesStub + fakeReturns := fake.listFilesReturns fake.recordInvocation("ListFiles", []interface{}{arg1, arg2, arg3}) fake.listFilesMutex.Unlock() - if fake.ListFilesStub != nil { - return fake.ListFilesStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listFilesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/appinstances/app_instances.go b/cf/api/appinstances/app_instances.go index 6a3ea086002..8f2e882924c 100644 --- a/cf/api/appinstances/app_instances.go +++ b/cf/api/appinstances/app_instances.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type InstancesAPIResponse map[string]InstanceAPIResponse diff --git a/cf/api/appinstances/app_instances_suite_test.go b/cf/api/appinstances/app_instances_suite_test.go index dc833a081ce..96cb3946510 100644 --- a/cf/api/appinstances/app_instances_suite_test.go +++ b/cf/api/appinstances/app_instances_suite_test.go @@ -1,8 +1,8 @@ package appinstances_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appinstances/app_instances_test.go b/cf/api/appinstances/app_instances_test.go index 625a905edaf..d4adffa3c88 100644 --- a/cf/api/appinstances/app_instances_test.go +++ b/cf/api/appinstances/app_instances_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go b/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go index efd79f324e4..948ecf088e6 100644 --- a/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go +++ b/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go @@ -4,8 +4,8 @@ package appinstancesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeAppInstancesRepository struct { diff --git a/cf/api/appinstances/appinstancesfakes/fake_repository.go b/cf/api/appinstances/appinstancesfakes/fake_repository.go index 74baf569a43..8122dd12193 100644 --- a/cf/api/appinstances/appinstancesfakes/fake_repository.go +++ b/cf/api/appinstances/appinstancesfakes/fake_repository.go @@ -4,8 +4,8 @@ package appinstancesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRepository struct { @@ -45,15 +45,16 @@ func (fake *FakeRepository) DeleteInstance(arg1 string, arg2 int) error { arg1 string arg2 int }{arg1, arg2}) + stub := fake.DeleteInstanceStub + fakeReturns := fake.deleteInstanceReturns fake.recordInvocation("DeleteInstance", []interface{}{arg1, arg2}) fake.deleteInstanceMutex.Unlock() - if fake.DeleteInstanceStub != nil { - return fake.DeleteInstanceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteInstanceReturns return fakeReturns.result1 } @@ -105,15 +106,16 @@ func (fake *FakeRepository) GetInstances(arg1 string) ([]models.AppInstanceField fake.getInstancesArgsForCall = append(fake.getInstancesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetInstancesStub + fakeReturns := fake.getInstancesReturns fake.recordInvocation("GetInstances", []interface{}{arg1}) fake.getInstancesMutex.Unlock() - if fake.GetInstancesStub != nil { - return fake.GetInstancesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getInstancesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/applicationbits/application_bits.go b/cf/api/applicationbits/application_bits.go index 1b16ae9d3cd..c8468c7c4ad 100644 --- a/cf/api/applicationbits/application_bits.go +++ b/cf/api/applicationbits/application_bits.go @@ -10,10 +10,10 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/api/applicationbits/application_bits_suite_test.go b/cf/api/applicationbits/application_bits_suite_test.go index 80506752f90..8056aca8a67 100644 --- a/cf/api/applicationbits/application_bits_suite_test.go +++ b/cf/api/applicationbits/application_bits_suite_test.go @@ -1,8 +1,8 @@ package applicationbits_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/applicationbits/application_bits_test.go b/cf/api/applicationbits/application_bits_test.go index 0ee4183737d..e71596519a7 100644 --- a/cf/api/applicationbits/application_bits_test.go +++ b/cf/api/applicationbits/application_bits_test.go @@ -13,16 +13,16 @@ import ( "strings" "time" - testapi "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + testapi "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go b/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go index 9c69ac9fdc9..60ae07faafb 100644 --- a/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go +++ b/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/api/resources" ) type FakeApplicationBitsRepository struct { diff --git a/cf/api/applicationbits/applicationbitsfakes/fake_repository.go b/cf/api/applicationbits/applicationbitsfakes/fake_repository.go index fd56c911702..18fb3284c8c 100644 --- a/cf/api/applicationbits/applicationbitsfakes/fake_repository.go +++ b/cf/api/applicationbits/applicationbitsfakes/fake_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/api/resources" ) type FakeRepository struct { @@ -51,15 +51,16 @@ func (fake *FakeRepository) GetApplicationFiles(arg1 []resources.AppFileResource fake.getApplicationFilesArgsForCall = append(fake.getApplicationFilesArgsForCall, struct { arg1 []resources.AppFileResource }{arg1Copy}) + stub := fake.GetApplicationFilesStub + fakeReturns := fake.getApplicationFilesReturns fake.recordInvocation("GetApplicationFiles", []interface{}{arg1Copy}) fake.getApplicationFilesMutex.Unlock() - if fake.GetApplicationFilesStub != nil { - return fake.GetApplicationFilesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getApplicationFilesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -121,15 +122,16 @@ func (fake *FakeRepository) UploadBits(arg1 string, arg2 *os.File, arg3 []resour arg2 *os.File arg3 []resources.AppFileResource }{arg1, arg2, arg3Copy}) + stub := fake.UploadBitsStub + fakeReturns := fake.uploadBitsReturns fake.recordInvocation("UploadBits", []interface{}{arg1, arg2, arg3Copy}) fake.uploadBitsMutex.Unlock() - if fake.UploadBitsStub != nil { - return fake.UploadBitsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.uploadBitsReturns return fakeReturns.result1 } diff --git a/cf/api/applications/applications.go b/cf/api/applications/applications.go index 32058b5ba0f..b5238f65502 100644 --- a/cf/api/applications/applications.go +++ b/cf/api/applications/applications.go @@ -7,13 +7,13 @@ import ( "net/url" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/applications/applications_suite_test.go b/cf/api/applications/applications_suite_test.go index 4fc00bc02a7..9e877a7d3d7 100644 --- a/cf/api/applications/applications_suite_test.go +++ b/cf/api/applications/applications_suite_test.go @@ -1,8 +1,8 @@ package applications_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/applications/applications_test.go b/cf/api/applications/applications_test.go index 125da3522a9..974662d5208 100644 --- a/cf/api/applications/applications_test.go +++ b/cf/api/applications/applications_test.go @@ -8,19 +8,19 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/applications/applicationsfakes/fake_repository.go b/cf/api/applications/applicationsfakes/fake_repository.go index 0d7974f80d5..766349b8dba 100644 --- a/cf/api/applications/applicationsfakes/fake_repository.go +++ b/cf/api/applications/applicationsfakes/fake_repository.go @@ -4,8 +4,8 @@ package applicationsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRepository struct { @@ -134,15 +134,16 @@ func (fake *FakeRepository) Create(arg1 models.AppParams) (models.Application, e fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.AppParams }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -197,15 +198,16 @@ func (fake *FakeRepository) CreateRestageRequest(arg1 string) error { fake.createRestageRequestArgsForCall = append(fake.createRestageRequestArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateRestageRequestStub + fakeReturns := fake.createRestageRequestReturns fake.recordInvocation("CreateRestageRequest", []interface{}{arg1}) fake.createRestageRequestMutex.Unlock() - if fake.CreateRestageRequestStub != nil { - return fake.CreateRestageRequestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createRestageRequestReturns return fakeReturns.result1 } @@ -257,15 +259,16 @@ func (fake *FakeRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -317,15 +320,16 @@ func (fake *FakeRepository) GetApp(arg1 string) (models.Application, error) { fake.getAppArgsForCall = append(fake.getAppArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetAppStub + fakeReturns := fake.getAppReturns fake.recordInvocation("GetApp", []interface{}{arg1}) fake.getAppMutex.Unlock() - if fake.GetAppStub != nil { - return fake.GetAppStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAppReturns return fakeReturns.result1, fakeReturns.result2 } @@ -380,15 +384,16 @@ func (fake *FakeRepository) GetAppRoutes(arg1 string) ([]models.Route, error) { fake.getAppRoutesArgsForCall = append(fake.getAppRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetAppRoutesStub + fakeReturns := fake.getAppRoutesReturns fake.recordInvocation("GetAppRoutes", []interface{}{arg1}) fake.getAppRoutesMutex.Unlock() - if fake.GetAppRoutesStub != nil { - return fake.GetAppRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAppRoutesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -443,15 +448,16 @@ func (fake *FakeRepository) Read(arg1 string) (models.Application, error) { fake.readArgsForCall = append(fake.readArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } @@ -506,15 +512,16 @@ func (fake *FakeRepository) ReadEnv(arg1 string) (*models.Environment, error) { fake.readEnvArgsForCall = append(fake.readEnvArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadEnvStub + fakeReturns := fake.readEnvReturns fake.recordInvocation("ReadEnv", []interface{}{arg1}) fake.readEnvMutex.Unlock() - if fake.ReadEnvStub != nil { - return fake.ReadEnvStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readEnvReturns return fakeReturns.result1, fakeReturns.result2 } @@ -570,15 +577,16 @@ func (fake *FakeRepository) ReadFromSpace(arg1 string, arg2 string) (models.Appl arg1 string arg2 string }{arg1, arg2}) + stub := fake.ReadFromSpaceStub + fakeReturns := fake.readFromSpaceReturns fake.recordInvocation("ReadFromSpace", []interface{}{arg1, arg2}) fake.readFromSpaceMutex.Unlock() - if fake.ReadFromSpaceStub != nil { - return fake.ReadFromSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readFromSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -634,15 +642,16 @@ func (fake *FakeRepository) Update(arg1 string, arg2 models.AppParams) (models.A arg1 string arg2 models.AppParams }{arg1, arg2}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1, arg2}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/authentication/authentication.go b/cf/api/authentication/authentication.go index 5e0fc670c64..f5f1238181f 100644 --- a/cf/api/authentication/authentication.go +++ b/cf/api/authentication/authentication.go @@ -10,11 +10,11 @@ import ( "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/util" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . TokenRefresher diff --git a/cf/api/authentication/authentication_suite_test.go b/cf/api/authentication/authentication_suite_test.go index 1469b4e91b5..14e4bb19d85 100644 --- a/cf/api/authentication/authentication_suite_test.go +++ b/cf/api/authentication/authentication_suite_test.go @@ -1,8 +1,8 @@ package authentication_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/authentication/authentication_test.go b/cf/api/authentication/authentication_test.go index a00143c9ee1..6f482acb5b0 100644 --- a/cf/api/authentication/authentication_test.go +++ b/cf/api/authentication/authentication_test.go @@ -7,15 +7,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/authentication/authenticationfakes/fake_repository.go b/cf/api/authentication/authenticationfakes/fake_repository.go index fc59759766a..a28b6e87a7f 100644 --- a/cf/api/authentication/authenticationfakes/fake_repository.go +++ b/cf/api/authentication/authenticationfakes/fake_repository.go @@ -5,8 +5,8 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" ) type FakeRepository struct { @@ -91,15 +91,16 @@ func (fake *FakeRepository) Authenticate(arg1 map[string]string) error { fake.authenticateArgsForCall = append(fake.authenticateArgsForCall, struct { arg1 map[string]string }{arg1}) + stub := fake.AuthenticateStub + fakeReturns := fake.authenticateReturns fake.recordInvocation("Authenticate", []interface{}{arg1}) fake.authenticateMutex.Unlock() - if fake.AuthenticateStub != nil { - return fake.AuthenticateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.authenticateReturns return fakeReturns.result1 } @@ -151,15 +152,16 @@ func (fake *FakeRepository) Authorize(arg1 string) (string, error) { fake.authorizeArgsForCall = append(fake.authorizeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.AuthorizeStub + fakeReturns := fake.authorizeReturns fake.recordInvocation("Authorize", []interface{}{arg1}) fake.authorizeMutex.Unlock() - if fake.AuthorizeStub != nil { - return fake.AuthorizeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.authorizeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -213,9 +215,10 @@ func (fake *FakeRepository) DumpRequest(arg1 *http.Request) { fake.dumpRequestArgsForCall = append(fake.dumpRequestArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.DumpRequestStub fake.recordInvocation("DumpRequest", []interface{}{arg1}) fake.dumpRequestMutex.Unlock() - if fake.DumpRequestStub != nil { + if stub != nil { fake.DumpRequestStub(arg1) } } @@ -244,9 +247,10 @@ func (fake *FakeRepository) DumpResponse(arg1 *http.Response) { fake.dumpResponseArgsForCall = append(fake.dumpResponseArgsForCall, struct { arg1 *http.Response }{arg1}) + stub := fake.DumpResponseStub fake.recordInvocation("DumpResponse", []interface{}{arg1}) fake.dumpResponseMutex.Unlock() - if fake.DumpResponseStub != nil { + if stub != nil { fake.DumpResponseStub(arg1) } } @@ -275,15 +279,16 @@ func (fake *FakeRepository) GetLoginPromptsAndSaveUAAServerURL() (map[string]cor ret, specificReturn := fake.getLoginPromptsAndSaveUAAServerURLReturnsOnCall[len(fake.getLoginPromptsAndSaveUAAServerURLArgsForCall)] fake.getLoginPromptsAndSaveUAAServerURLArgsForCall = append(fake.getLoginPromptsAndSaveUAAServerURLArgsForCall, struct { }{}) + stub := fake.GetLoginPromptsAndSaveUAAServerURLStub + fakeReturns := fake.getLoginPromptsAndSaveUAAServerURLReturns fake.recordInvocation("GetLoginPromptsAndSaveUAAServerURL", []interface{}{}) fake.getLoginPromptsAndSaveUAAServerURLMutex.Unlock() - if fake.GetLoginPromptsAndSaveUAAServerURLStub != nil { - return fake.GetLoginPromptsAndSaveUAAServerURLStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getLoginPromptsAndSaveUAAServerURLReturns return fakeReturns.result1, fakeReturns.result2 } @@ -330,15 +335,16 @@ func (fake *FakeRepository) RefreshAuthToken() (string, error) { ret, specificReturn := fake.refreshAuthTokenReturnsOnCall[len(fake.refreshAuthTokenArgsForCall)] fake.refreshAuthTokenArgsForCall = append(fake.refreshAuthTokenArgsForCall, struct { }{}) + stub := fake.RefreshAuthTokenStub + fakeReturns := fake.refreshAuthTokenReturns fake.recordInvocation("RefreshAuthToken", []interface{}{}) fake.refreshAuthTokenMutex.Unlock() - if fake.RefreshAuthTokenStub != nil { - return fake.RefreshAuthTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAuthTokenReturns return fakeReturns.result1, fakeReturns.result2 } @@ -386,15 +392,16 @@ func (fake *FakeRepository) RefreshToken(arg1 string) (string, error) { fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{arg1}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/authentication/authenticationfakes/fake_token_refresher.go b/cf/api/authentication/authenticationfakes/fake_token_refresher.go index 7df7aadfc84..c217811f1b5 100644 --- a/cf/api/authentication/authenticationfakes/fake_token_refresher.go +++ b/cf/api/authentication/authenticationfakes/fake_token_refresher.go @@ -4,7 +4,7 @@ package authenticationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" ) type FakeTokenRefresher struct { @@ -29,15 +29,16 @@ func (fake *FakeTokenRefresher) RefreshAuthToken() (string, error) { ret, specificReturn := fake.refreshAuthTokenReturnsOnCall[len(fake.refreshAuthTokenArgsForCall)] fake.refreshAuthTokenArgsForCall = append(fake.refreshAuthTokenArgsForCall, struct { }{}) + stub := fake.RefreshAuthTokenStub + fakeReturns := fake.refreshAuthTokenReturns fake.recordInvocation("RefreshAuthToken", []interface{}{}) fake.refreshAuthTokenMutex.Unlock() - if fake.RefreshAuthTokenStub != nil { - return fake.RefreshAuthTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAuthTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/buildpack_bits.go b/cf/api/buildpack_bits.go index da6efd357eb..3a1e68661a2 100644 --- a/cf/api/buildpack_bits.go +++ b/cf/api/buildpack_bits.go @@ -16,13 +16,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/util" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/api/buildpack_bits_test.go b/cf/api/buildpack_bits_test.go index ae480e1fbba..c7e68244930 100644 --- a/cf/api/buildpack_bits_test.go +++ b/cf/api/buildpack_bits_test.go @@ -15,17 +15,17 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/buildpacks.go b/cf/api/buildpacks.go index abb6206eafb..270b857e54f 100644 --- a/cf/api/buildpacks.go +++ b/cf/api/buildpacks.go @@ -6,12 +6,12 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BuildpackRepository diff --git a/cf/api/buildpacks_test.go b/cf/api/buildpacks_test.go index 0cebb449ef7..8f9bc6b59c9 100644 --- a/cf/api/buildpacks_test.go +++ b/cf/api/buildpacks_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/clients.go b/cf/api/clients.go index d1d9476252e..ec075d93873 100644 --- a/cf/api/clients.go +++ b/cf/api/clients.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ClientRepository diff --git a/cf/api/clients_test.go b/cf/api/clients_test.go index 0749a849131..b78b81dbe42 100644 --- a/cf/api/clients_test.go +++ b/cf/api/clients_test.go @@ -4,13 +4,13 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/copyapplicationsource/copy_application_source.go b/cf/api/copyapplicationsource/copy_application_source.go index 06e6486cdc8..222f47bf854 100644 --- a/cf/api/copyapplicationsource/copy_application_source.go +++ b/cf/api/copyapplicationsource/copy_application_source.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/copyapplicationsource/copy_application_source_suite_test.go b/cf/api/copyapplicationsource/copy_application_source_suite_test.go index e32ffea0f3e..abd61de112e 100644 --- a/cf/api/copyapplicationsource/copy_application_source_suite_test.go +++ b/cf/api/copyapplicationsource/copy_application_source_suite_test.go @@ -1,8 +1,8 @@ package copyapplicationsource_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/copyapplicationsource/copy_application_source_test.go b/cf/api/copyapplicationsource/copy_application_source_test.go index fa2b3139b95..e6b7596c922 100644 --- a/cf/api/copyapplicationsource/copy_application_source_test.go +++ b/cf/api/copyapplicationsource/copy_application_source_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - . "code.cloudfoundry.org/cli/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + . "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go b/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go index 3e4eb5f0137..49f34ce288c 100644 --- a/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go +++ b/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go @@ -4,7 +4,7 @@ package copyapplicationsourcefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource" ) type FakeRepository struct { @@ -31,15 +31,16 @@ func (fake *FakeRepository) CopyApplication(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.CopyApplicationStub + fakeReturns := fake.copyApplicationReturns fake.recordInvocation("CopyApplication", []interface{}{arg1, arg2}) fake.copyApplicationMutex.Unlock() - if fake.CopyApplicationStub != nil { - return fake.CopyApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.copyApplicationReturns return fakeReturns.result1 } diff --git a/cf/api/curl.go b/cf/api/curl.go index dd09950d009..50cc592b7e3 100644 --- a/cf/api/curl.go +++ b/cf/api/curl.go @@ -9,10 +9,10 @@ import ( "net/textproto" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CurlRepository diff --git a/cf/api/curl_test.go b/cf/api/curl_test.go index 34fcd62e4d1..adf59753aa0 100644 --- a/cf/api/curl_test.go +++ b/cf/api/curl_test.go @@ -6,16 +6,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/domains.go b/cf/api/domains.go index cb56fd65cb5..928e3eee59f 100644 --- a/cf/api/domains.go +++ b/cf/api/domains.go @@ -6,13 +6,13 @@ import ( "fmt" "net/url" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DomainRepository diff --git a/cf/api/domains_test.go b/cf/api/domains_test.go index 54925d15bdb..40618873f95 100644 --- a/cf/api/domains_test.go +++ b/cf/api/domains_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/endpoints.go b/cf/api/endpoints.go index ce3e085ba8b..164f29d9ad7 100644 --- a/cf/api/endpoints.go +++ b/cf/api/endpoints.go @@ -3,8 +3,8 @@ package api import ( "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" ) type RemoteInfoRepository struct { diff --git a/cf/api/endpoints_test.go b/cf/api/endpoints_test.go index 3892bba24ed..8c2ec49579e 100644 --- a/cf/api/endpoints_test.go +++ b/cf/api/endpoints_test.go @@ -10,14 +10,14 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/environmentvariablegroups/environment_variable_groups.go b/cf/api/environmentvariablegroups/environment_variable_groups.go index 296553615c1..95a1adf81f5 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go b/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go index 5725fb98667..287fa433eec 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go @@ -1,8 +1,8 @@ package environmentvariablegroups_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/environmentvariablegroups/environment_variable_groups_test.go b/cf/api/environmentvariablegroups/environment_variable_groups_test.go index 48a3724aebc..a4901d1203d 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups_test.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups_test.go @@ -4,17 +4,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go b/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go index 6bd8cefec96..d55759cfeba 100644 --- a/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go +++ b/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go @@ -4,8 +4,8 @@ package environmentvariablegroupsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRepository struct { @@ -64,15 +64,16 @@ func (fake *FakeRepository) ListRunning() ([]models.EnvironmentVariable, error) ret, specificReturn := fake.listRunningReturnsOnCall[len(fake.listRunningArgsForCall)] fake.listRunningArgsForCall = append(fake.listRunningArgsForCall, struct { }{}) + stub := fake.ListRunningStub + fakeReturns := fake.listRunningReturns fake.recordInvocation("ListRunning", []interface{}{}) fake.listRunningMutex.Unlock() - if fake.ListRunningStub != nil { - return fake.ListRunningStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listRunningReturns return fakeReturns.result1, fakeReturns.result2 } @@ -119,15 +120,16 @@ func (fake *FakeRepository) ListStaging() ([]models.EnvironmentVariable, error) ret, specificReturn := fake.listStagingReturnsOnCall[len(fake.listStagingArgsForCall)] fake.listStagingArgsForCall = append(fake.listStagingArgsForCall, struct { }{}) + stub := fake.ListStagingStub + fakeReturns := fake.listStagingReturns fake.recordInvocation("ListStaging", []interface{}{}) fake.listStagingMutex.Unlock() - if fake.ListStagingStub != nil { - return fake.ListStagingStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listStagingReturns return fakeReturns.result1, fakeReturns.result2 } @@ -175,15 +177,16 @@ func (fake *FakeRepository) SetRunning(arg1 string) error { fake.setRunningArgsForCall = append(fake.setRunningArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRunningStub + fakeReturns := fake.setRunningReturns fake.recordInvocation("SetRunning", []interface{}{arg1}) fake.setRunningMutex.Unlock() - if fake.SetRunningStub != nil { - return fake.SetRunningStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.setRunningReturns return fakeReturns.result1 } @@ -235,15 +238,16 @@ func (fake *FakeRepository) SetStaging(arg1 string) error { fake.setStagingArgsForCall = append(fake.setStagingArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetStagingStub + fakeReturns := fake.setStagingReturns fake.recordInvocation("SetStaging", []interface{}{arg1}) fake.setStagingMutex.Unlock() - if fake.SetStagingStub != nil { - return fake.SetStagingStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.setStagingReturns return fakeReturns.result1 } diff --git a/cf/api/featureflags/feature_flags.go b/cf/api/featureflags/feature_flags.go index e9a038236cc..b24f3d4c6e2 100644 --- a/cf/api/featureflags/feature_flags.go +++ b/cf/api/featureflags/feature_flags.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . FeatureFlagRepository diff --git a/cf/api/featureflags/feature_flags_suite_test.go b/cf/api/featureflags/feature_flags_suite_test.go index 26e7da8db51..e13b27da38a 100644 --- a/cf/api/featureflags/feature_flags_suite_test.go +++ b/cf/api/featureflags/feature_flags_suite_test.go @@ -1,8 +1,8 @@ package featureflags_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/featureflags/feature_flags_test.go b/cf/api/featureflags/feature_flags_test.go index 6c0cf5f925b..15e7d300266 100644 --- a/cf/api/featureflags/feature_flags_test.go +++ b/cf/api/featureflags/feature_flags_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go b/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go index a68aa95f6b9..f81353350d9 100644 --- a/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go +++ b/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go @@ -4,8 +4,8 @@ package featureflagsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeFeatureFlagRepository struct { @@ -56,15 +56,16 @@ func (fake *FakeFeatureFlagRepository) FindByName(arg1 string) (models.FeatureFl fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -118,15 +119,16 @@ func (fake *FakeFeatureFlagRepository) List() ([]models.FeatureFlag, error) { ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] fake.listArgsForCall = append(fake.listArgsForCall, struct { }{}) + stub := fake.ListStub + fakeReturns := fake.listReturns fake.recordInvocation("List", []interface{}{}) fake.listMutex.Unlock() - if fake.ListStub != nil { - return fake.ListStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listReturns return fakeReturns.result1, fakeReturns.result2 } @@ -175,15 +177,16 @@ func (fake *FakeFeatureFlagRepository) Update(arg1 string, arg2 bool) error { arg1 string arg2 bool }{arg1, arg2}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1, arg2}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/logs/log_cache_message.go b/cf/api/logs/log_cache_message.go index 798b1653d3c..1bee1f80347 100644 --- a/cf/api/logs/log_cache_message.go +++ b/cf/api/logs/log_cache_message.go @@ -6,7 +6,7 @@ import ( "time" "unicode/utf8" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ColorLogger diff --git a/cf/api/logs/log_cache_message_test.go b/cf/api/logs/log_cache_message_test.go index ee73874b72e..4e147dffaf2 100644 --- a/cf/api/logs/log_cache_message_test.go +++ b/cf/api/logs/log_cache_message_test.go @@ -3,9 +3,9 @@ package logs_test import ( "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/api/logs/logsfakes" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs/logsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/log_cache_repository.go b/cf/api/logs/log_cache_repository.go index e6c39836903..1e5e6600100 100644 --- a/cf/api/logs/log_cache_repository.go +++ b/cf/api/logs/log_cache_repository.go @@ -3,8 +3,8 @@ package logs import ( "context" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type terminalColorLogger struct { diff --git a/cf/api/logs/log_cache_repository_test.go b/cf/api/logs/log_cache_repository_test.go index a3c48c45a77..7c0ba800046 100644 --- a/cf/api/logs/log_cache_repository_test.go +++ b/cf/api/logs/log_cache_repository_test.go @@ -5,9 +5,9 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/cf/api/logs" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/cf/api/logs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/logsfakes/fake_color_logger.go b/cf/api/logs/logsfakes/fake_color_logger.go index 74720c02748..57b5eb05c3b 100644 --- a/cf/api/logs/logsfakes/fake_color_logger.go +++ b/cf/api/logs/logsfakes/fake_color_logger.go @@ -4,7 +4,7 @@ package logsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs" ) type FakeColorLogger struct { @@ -51,15 +51,16 @@ func (fake *FakeColorLogger) LogStderrColor(arg1 string) string { fake.logStderrColorArgsForCall = append(fake.logStderrColorArgsForCall, struct { arg1 string }{arg1}) + stub := fake.LogStderrColorStub + fakeReturns := fake.logStderrColorReturns fake.recordInvocation("LogStderrColor", []interface{}{arg1}) fake.logStderrColorMutex.Unlock() - if fake.LogStderrColorStub != nil { - return fake.LogStderrColorStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.logStderrColorReturns return fakeReturns.result1 } @@ -111,15 +112,16 @@ func (fake *FakeColorLogger) LogStdoutColor(arg1 string) string { fake.logStdoutColorArgsForCall = append(fake.logStdoutColorArgsForCall, struct { arg1 string }{arg1}) + stub := fake.LogStdoutColorStub + fakeReturns := fake.logStdoutColorReturns fake.recordInvocation("LogStdoutColor", []interface{}{arg1}) fake.logStdoutColorMutex.Unlock() - if fake.LogStdoutColorStub != nil { - return fake.LogStdoutColorStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.logStdoutColorReturns return fakeReturns.result1 } @@ -171,15 +173,16 @@ func (fake *FakeColorLogger) LogSysHeaderColor(arg1 string) string { fake.logSysHeaderColorArgsForCall = append(fake.logSysHeaderColorArgsForCall, struct { arg1 string }{arg1}) + stub := fake.LogSysHeaderColorStub + fakeReturns := fake.logSysHeaderColorReturns fake.recordInvocation("LogSysHeaderColor", []interface{}{arg1}) fake.logSysHeaderColorMutex.Unlock() - if fake.LogSysHeaderColorStub != nil { - return fake.LogSysHeaderColorStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.logSysHeaderColorReturns return fakeReturns.result1 } diff --git a/cf/api/logs/logsfakes/fake_loggable.go b/cf/api/logs/logsfakes/fake_loggable.go index a89a655a1f7..3ba8b07f98d 100644 --- a/cf/api/logs/logsfakes/fake_loggable.go +++ b/cf/api/logs/logsfakes/fake_loggable.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs" ) type FakeLoggable struct { @@ -49,15 +49,16 @@ func (fake *FakeLoggable) GetSourceName() string { ret, specificReturn := fake.getSourceNameReturnsOnCall[len(fake.getSourceNameArgsForCall)] fake.getSourceNameArgsForCall = append(fake.getSourceNameArgsForCall, struct { }{}) + stub := fake.GetSourceNameStub + fakeReturns := fake.getSourceNameReturns fake.recordInvocation("GetSourceName", []interface{}{}) fake.getSourceNameMutex.Unlock() - if fake.GetSourceNameStub != nil { - return fake.GetSourceNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getSourceNameReturns return fakeReturns.result1 } @@ -102,15 +103,16 @@ func (fake *FakeLoggable) ToLog(arg1 *time.Location) string { fake.toLogArgsForCall = append(fake.toLogArgsForCall, struct { arg1 *time.Location }{arg1}) + stub := fake.ToLogStub + fakeReturns := fake.toLogReturns fake.recordInvocation("ToLog", []interface{}{arg1}) fake.toLogMutex.Unlock() - if fake.ToLogStub != nil { - return fake.ToLogStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.toLogReturns return fakeReturns.result1 } @@ -161,15 +163,16 @@ func (fake *FakeLoggable) ToSimpleLog() string { ret, specificReturn := fake.toSimpleLogReturnsOnCall[len(fake.toSimpleLogArgsForCall)] fake.toSimpleLogArgsForCall = append(fake.toSimpleLogArgsForCall, struct { }{}) + stub := fake.ToSimpleLogStub + fakeReturns := fake.toSimpleLogReturns fake.recordInvocation("ToSimpleLog", []interface{}{}) fake.toSimpleLogMutex.Unlock() - if fake.ToSimpleLogStub != nil { - return fake.ToSimpleLogStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.toSimpleLogReturns return fakeReturns.result1 } diff --git a/cf/api/logs/logsfakes/fake_repository.go b/cf/api/logs/logsfakes/fake_repository.go index 58c98a08a72..d0acc7b17db 100644 --- a/cf/api/logs/logsfakes/fake_repository.go +++ b/cf/api/logs/logsfakes/fake_repository.go @@ -4,7 +4,7 @@ package logsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs" ) type FakeRepository struct { @@ -41,9 +41,10 @@ func (fake *FakeRepository) Close() { fake.closeMutex.Lock() fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { + if stub != nil { fake.CloseStub() } } @@ -66,15 +67,16 @@ func (fake *FakeRepository) RecentLogsFor(arg1 string) ([]logs.Loggable, error) fake.recentLogsForArgsForCall = append(fake.recentLogsForArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RecentLogsForStub + fakeReturns := fake.recentLogsForReturns fake.recordInvocation("RecentLogsFor", []interface{}{arg1}) fake.recentLogsForMutex.Unlock() - if fake.RecentLogsForStub != nil { - return fake.RecentLogsForStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.recentLogsForReturns return fakeReturns.result1, fakeReturns.result2 } @@ -131,9 +133,10 @@ func (fake *FakeRepository) TailLogsFor(arg1 string, arg2 func(), arg3 chan<- lo arg3 chan<- logs.Loggable arg4 chan<- error }{arg1, arg2, arg3, arg4}) + stub := fake.TailLogsForStub fake.recordInvocation("TailLogsFor", []interface{}{arg1, arg2, arg3, arg4}) fake.tailLogsForMutex.Unlock() - if fake.TailLogsForStub != nil { + if stub != nil { fake.TailLogsForStub(arg1, arg2, arg3, arg4) } } diff --git a/cf/api/organizations/organizations.go b/cf/api/organizations/organizations.go index d376547ed76..a8c154f0a96 100644 --- a/cf/api/organizations/organizations.go +++ b/cf/api/organizations/organizations.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrganizationRepository diff --git a/cf/api/organizations/organizations_suite_test.go b/cf/api/organizations/organizations_suite_test.go index 3c75cf6d186..2362d94a345 100644 --- a/cf/api/organizations/organizations_suite_test.go +++ b/cf/api/organizations/organizations_suite_test.go @@ -1,8 +1,8 @@ package organizations_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/organizations/organizations_test.go b/cf/api/organizations/organizations_test.go index 8819e5fe40d..bfdafa8d15d 100644 --- a/cf/api/organizations/organizations_test.go +++ b/cf/api/organizations/organizations_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/organizations/organizationsfakes/fake_organization_repository.go b/cf/api/organizations/organizationsfakes/fake_organization_repository.go index 316d80c421b..181830ca0f0 100644 --- a/cf/api/organizations/organizationsfakes/fake_organization_repository.go +++ b/cf/api/organizations/organizationsfakes/fake_organization_repository.go @@ -4,8 +4,8 @@ package organizationsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeOrganizationRepository struct { @@ -116,15 +116,16 @@ func (fake *FakeOrganizationRepository) Create(arg1 models.Organization) error { fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.Organization }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -176,15 +177,16 @@ func (fake *FakeOrganizationRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -236,15 +238,16 @@ func (fake *FakeOrganizationRepository) FindByName(arg1 string) (models.Organiza fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -304,15 +307,16 @@ func (fake *FakeOrganizationRepository) GetManyOrgsByGUID(arg1 []string) ([]mode fake.getManyOrgsByGUIDArgsForCall = append(fake.getManyOrgsByGUIDArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.GetManyOrgsByGUIDStub + fakeReturns := fake.getManyOrgsByGUIDReturns fake.recordInvocation("GetManyOrgsByGUID", []interface{}{arg1Copy}) fake.getManyOrgsByGUIDMutex.Unlock() - if fake.GetManyOrgsByGUIDStub != nil { - return fake.GetManyOrgsByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getManyOrgsByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -367,15 +371,16 @@ func (fake *FakeOrganizationRepository) ListOrgs(arg1 int) ([]models.Organizatio fake.listOrgsArgsForCall = append(fake.listOrgsArgsForCall, struct { arg1 int }{arg1}) + stub := fake.ListOrgsStub + fakeReturns := fake.listOrgsReturns fake.recordInvocation("ListOrgs", []interface{}{arg1}) fake.listOrgsMutex.Unlock() - if fake.ListOrgsStub != nil { - return fake.ListOrgsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -431,15 +436,16 @@ func (fake *FakeOrganizationRepository) Rename(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.RenameStub + fakeReturns := fake.renameReturns fake.recordInvocation("Rename", []interface{}{arg1, arg2}) fake.renameMutex.Unlock() - if fake.RenameStub != nil { - return fake.RenameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.renameReturns return fakeReturns.result1 } @@ -492,15 +498,16 @@ func (fake *FakeOrganizationRepository) SharePrivateDomain(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.SharePrivateDomainStub + fakeReturns := fake.sharePrivateDomainReturns fake.recordInvocation("SharePrivateDomain", []interface{}{arg1, arg2}) fake.sharePrivateDomainMutex.Unlock() - if fake.SharePrivateDomainStub != nil { - return fake.SharePrivateDomainStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.sharePrivateDomainReturns return fakeReturns.result1 } @@ -553,15 +560,16 @@ func (fake *FakeOrganizationRepository) UnsharePrivateDomain(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnsharePrivateDomainStub + fakeReturns := fake.unsharePrivateDomainReturns fake.recordInvocation("UnsharePrivateDomain", []interface{}{arg1, arg2}) fake.unsharePrivateDomainMutex.Unlock() - if fake.UnsharePrivateDomainStub != nil { - return fake.UnsharePrivateDomainStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsharePrivateDomainReturns return fakeReturns.result1 } diff --git a/cf/api/password/password.go b/cf/api/password/password.go index 639248f2b97..9983b200a8d 100644 --- a/cf/api/password/password.go +++ b/cf/api/password/password.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/password/password_suite_test.go b/cf/api/password/password_suite_test.go index 9c8d685ba89..44c32b90e63 100644 --- a/cf/api/password/password_suite_test.go +++ b/cf/api/password/password_suite_test.go @@ -1,8 +1,8 @@ package password_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/password/password_test.go b/cf/api/password/password_test.go index b1b22d29c14..d77e46b898c 100644 --- a/cf/api/password/password_test.go +++ b/cf/api/password/password_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api/password" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api/password" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/password/passwordfakes/fake_repository.go b/cf/api/password/passwordfakes/fake_repository.go index 2ba9b6b5e18..a7578a881ba 100644 --- a/cf/api/password/passwordfakes/fake_repository.go +++ b/cf/api/password/passwordfakes/fake_repository.go @@ -4,7 +4,7 @@ package passwordfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/password" + "code.cloudfoundry.org/cli/v9/cf/api/password" ) type FakeRepository struct { @@ -31,15 +31,16 @@ func (fake *FakeRepository) UpdatePassword(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdatePasswordStub + fakeReturns := fake.updatePasswordReturns fake.recordInvocation("UpdatePassword", []interface{}{arg1, arg2}) fake.updatePasswordMutex.Unlock() - if fake.UpdatePasswordStub != nil { - return fake.UpdatePasswordStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.updatePasswordReturns return fakeReturns.result1 } diff --git a/cf/api/quotas/quotas.go b/cf/api/quotas/quotas.go index 3781151ec11..0708f89772c 100644 --- a/cf/api/quotas/quotas.go +++ b/cf/api/quotas/quotas.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . QuotaRepository diff --git a/cf/api/quotas/quotas_suite_test.go b/cf/api/quotas/quotas_suite_test.go index 04d290d00bd..02ab38949f9 100644 --- a/cf/api/quotas/quotas_suite_test.go +++ b/cf/api/quotas/quotas_suite_test.go @@ -1,8 +1,8 @@ package quotas_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/quotas/quotas_test.go b/cf/api/quotas/quotas_test.go index bfc056e5afa..61c892ce612 100644 --- a/cf/api/quotas/quotas_test.go +++ b/cf/api/quotas/quotas_test.go @@ -4,19 +4,19 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" "encoding/json" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/quotas/quotasfakes/fake_quota_repository.go b/cf/api/quotas/quotasfakes/fake_quota_repository.go index cd31317b515..0591f43b778 100644 --- a/cf/api/quotas/quotasfakes/fake_quota_repository.go +++ b/cf/api/quotas/quotasfakes/fake_quota_repository.go @@ -4,8 +4,8 @@ package quotasfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeQuotaRepository struct { @@ -90,15 +90,16 @@ func (fake *FakeQuotaRepository) AssignQuotaToOrg(arg1 string, arg2 string) erro arg1 string arg2 string }{arg1, arg2}) + stub := fake.AssignQuotaToOrgStub + fakeReturns := fake.assignQuotaToOrgReturns fake.recordInvocation("AssignQuotaToOrg", []interface{}{arg1, arg2}) fake.assignQuotaToOrgMutex.Unlock() - if fake.AssignQuotaToOrgStub != nil { - return fake.AssignQuotaToOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.assignQuotaToOrgReturns return fakeReturns.result1 } @@ -150,15 +151,16 @@ func (fake *FakeQuotaRepository) Create(arg1 models.QuotaFields) error { fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.QuotaFields }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -210,15 +212,16 @@ func (fake *FakeQuotaRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -269,15 +272,16 @@ func (fake *FakeQuotaRepository) FindAll() ([]models.QuotaFields, error) { ret, specificReturn := fake.findAllReturnsOnCall[len(fake.findAllArgsForCall)] fake.findAllArgsForCall = append(fake.findAllArgsForCall, struct { }{}) + stub := fake.FindAllStub + fakeReturns := fake.findAllReturns fake.recordInvocation("FindAll", []interface{}{}) fake.findAllMutex.Unlock() - if fake.FindAllStub != nil { - return fake.FindAllStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllReturns return fakeReturns.result1, fakeReturns.result2 } @@ -325,15 +329,16 @@ func (fake *FakeQuotaRepository) FindByName(arg1 string) (models.QuotaFields, er fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -388,15 +393,16 @@ func (fake *FakeQuotaRepository) Update(arg1 models.QuotaFields) error { fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.QuotaFields }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/repository_locator.go b/cf/api/repository_locator.go index f0ad31cb1db..62a77971a5b 100644 --- a/cf/api/repository_locator.go +++ b/cf/api/repository_locator.go @@ -1,34 +1,34 @@ package api import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - v7action2 "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/cf/api/appevents" - api_appfiles "code.cloudfoundry.org/cli/cf/api/appfiles" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/password" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - securitygroupspaces "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + v7action2 "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/cf/api/appevents" + api_appfiles "code.cloudfoundry.org/cli/v9/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/password" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + securitygroupspaces "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type RepositoryLocator struct { diff --git a/cf/api/resources/applications.go b/cf/api/resources/applications.go index 16e8e1a11b6..6488a70b6fa 100644 --- a/cf/api/resources/applications.go +++ b/cf/api/resources/applications.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type PaginatedApplicationResources struct { diff --git a/cf/api/resources/applications_test.go b/cf/api/resources/applications_test.go index e2ad37d376b..a1d88bf3cab 100644 --- a/cf/api/resources/applications_test.go +++ b/cf/api/resources/applications_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/auth_tokens.go b/cf/api/resources/auth_tokens.go index e39dd918f19..d69f7fdb1af 100644 --- a/cf/api/resources/auth_tokens.go +++ b/cf/api/resources/auth_tokens.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedAuthTokenResources struct { Resources []AuthTokenResource diff --git a/cf/api/resources/buildpacks.go b/cf/api/resources/buildpacks.go index 12db203a222..a91bb641303 100644 --- a/cf/api/resources/buildpacks.go +++ b/cf/api/resources/buildpacks.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type BuildpackResource struct { Resource diff --git a/cf/api/resources/domains.go b/cf/api/resources/domains.go index 4a0488ae7c8..8e0f00e2936 100644 --- a/cf/api/resources/domains.go +++ b/cf/api/resources/domains.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type DomainResource struct { Resource diff --git a/cf/api/resources/events.go b/cf/api/resources/events.go index a94d520589e..45d7e068e60 100644 --- a/cf/api/resources/events.go +++ b/cf/api/resources/events.go @@ -6,9 +6,9 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/util/generic" ) type EventResource interface { diff --git a/cf/api/resources/events_test.go b/cf/api/resources/events_test.go index 46cf9df9ec0..9f17dacfde9 100644 --- a/cf/api/resources/events_test.go +++ b/cf/api/resources/events_test.go @@ -5,7 +5,7 @@ import ( "time" - . "code.cloudfoundry.org/cli/cf/api/resources" + . "code.cloudfoundry.org/cli/v9/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/feature_flags.go b/cf/api/resources/feature_flags.go index c800c492072..b1f95de383d 100644 --- a/cf/api/resources/feature_flags.go +++ b/cf/api/resources/feature_flags.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type FeatureFlagResource struct { Entity models.FeatureFlag diff --git a/cf/api/resources/organizations.go b/cf/api/resources/organizations.go index de7677b6f7e..55d5f74e301 100644 --- a/cf/api/resources/organizations.go +++ b/cf/api/resources/organizations.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type OrganizationResource struct { Resource diff --git a/cf/api/resources/quotas.go b/cf/api/resources/quotas.go index be3234992b7..59032ea3457 100644 --- a/cf/api/resources/quotas.go +++ b/cf/api/resources/quotas.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedQuotaResources struct { Resources []QuotaResource diff --git a/cf/api/resources/quotas_test.go b/cf/api/resources/quotas_test.go index a79e1712866..37959c026ec 100644 --- a/cf/api/resources/quotas_test.go +++ b/cf/api/resources/quotas_test.go @@ -1,9 +1,9 @@ package resources_test import ( - . "code.cloudfoundry.org/cli/cf/api/resources" + . "code.cloudfoundry.org/cli/v9/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" "encoding/json" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/resources/resources_test.go b/cf/api/resources/resources_test.go index 1e1735288d2..1b7e5db85c3 100644 --- a/cf/api/resources/resources_test.go +++ b/cf/api/resources/resources_test.go @@ -3,8 +3,8 @@ package resources_test import ( "testing" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/routes.go b/cf/api/resources/routes.go index 55e8ac47497..df951766cb1 100644 --- a/cf/api/resources/routes.go +++ b/cf/api/resources/routes.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type RouteResource struct { Resource diff --git a/cf/api/resources/security_groups.go b/cf/api/resources/security_groups.go index 5b4a58f3c20..04d173cd11a 100644 --- a/cf/api/resources/security_groups.go +++ b/cf/api/resources/security_groups.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedSecurityGroupResources struct { Resources []SecurityGroupResource diff --git a/cf/api/resources/service_bindings.go b/cf/api/resources/service_bindings.go index df28cd11f6b..58d2a06e557 100644 --- a/cf/api/resources/service_bindings.go +++ b/cf/api/resources/service_bindings.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type ServiceBindingResource struct { Resource diff --git a/cf/api/resources/service_brokers.go b/cf/api/resources/service_brokers.go index ad37ad9ce43..ea3e22d4835 100644 --- a/cf/api/resources/service_brokers.go +++ b/cf/api/resources/service_brokers.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type ServiceBrokerResource struct { Resource diff --git a/cf/api/resources/service_instances.go b/cf/api/resources/service_instances.go index a8315a66308..31121877648 100644 --- a/cf/api/resources/service_instances.go +++ b/cf/api/resources/service_instances.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedServiceInstanceResources struct { TotalResults int `json:"total_results"` diff --git a/cf/api/resources/service_instances_test.go b/cf/api/resources/service_instances_test.go index 1b88be8a86c..c2982013fad 100644 --- a/cf/api/resources/service_instances_test.go +++ b/cf/api/resources/service_instances_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - . "code.cloudfoundry.org/cli/cf/api/resources" + . "code.cloudfoundry.org/cli/v9/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/resources/service_keys.go b/cf/api/resources/service_keys.go index 6727fe33101..03b1479525e 100644 --- a/cf/api/resources/service_keys.go +++ b/cf/api/resources/service_keys.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type ServiceKeyResource struct { Resource diff --git a/cf/api/resources/service_keys_test.go b/cf/api/resources/service_keys_test.go index a74423b1cdb..8a85d2e7eae 100644 --- a/cf/api/resources/service_keys_test.go +++ b/cf/api/resources/service_keys_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/cf/api/resources" + . "code.cloudfoundry.org/cli/v9/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/resources/service_offerings.go b/cf/api/resources/service_offerings.go index 5cc8cc26752..586136c3196 100644 --- a/cf/api/resources/service_offerings.go +++ b/cf/api/resources/service_offerings.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strconv" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type PaginatedServiceOfferingResources struct { diff --git a/cf/api/resources/service_plan_visibility.go b/cf/api/resources/service_plan_visibility.go index 939bb16c8a8..0acc5b3b78f 100644 --- a/cf/api/resources/service_plan_visibility.go +++ b/cf/api/resources/service_plan_visibility.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type ServicePlanVisibilityResource struct { Resource diff --git a/cf/api/resources/service_plans.go b/cf/api/resources/service_plans.go index 1e310d00211..a1d4e8e1cfe 100644 --- a/cf/api/resources/service_plans.go +++ b/cf/api/resources/service_plans.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type ServicePlanResource struct { diff --git a/cf/api/resources/space_quotas.go b/cf/api/resources/space_quotas.go index 8a3d8658a43..47094088600 100644 --- a/cf/api/resources/space_quotas.go +++ b/cf/api/resources/space_quotas.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedSpaceQuotaResources struct { Resources []SpaceQuotaResource diff --git a/cf/api/resources/spaces.go b/cf/api/resources/spaces.go index e081c3fed6c..9a4536c11e7 100644 --- a/cf/api/resources/spaces.go +++ b/cf/api/resources/spaces.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type SpaceResource struct { Resource diff --git a/cf/api/resources/stacks.go b/cf/api/resources/stacks.go index fd114673cde..b8c0eeaed7c 100644 --- a/cf/api/resources/stacks.go +++ b/cf/api/resources/stacks.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedStackResources struct { Resources []StackResource diff --git a/cf/api/resources/users.go b/cf/api/resources/users.go index 61cbd23e463..b2f9b7fd8c9 100644 --- a/cf/api/resources/users.go +++ b/cf/api/resources/users.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type UserResource struct { Resource diff --git a/cf/api/route_service_binding_repository.go b/cf/api/route_service_binding_repository.go index 85215a48b17..96f76aa26ae 100644 --- a/cf/api/route_service_binding_repository.go +++ b/cf/api/route_service_binding_repository.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteServiceBindingRepository diff --git a/cf/api/route_service_binding_repository_test.go b/cf/api/route_service_binding_repository_test.go index 47a8409de76..480ad34c6e7 100644 --- a/cf/api/route_service_binding_repository_test.go +++ b/cf/api/route_service_binding_repository_test.go @@ -5,17 +5,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/routes.go b/cf/api/routes.go index 0fc4f405cf8..0a539e1721e 100644 --- a/cf/api/routes.go +++ b/cf/api/routes.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" "github.com/google/go-querystring/query" ) diff --git a/cf/api/routes_test.go b/cf/api/routes_test.go index e1862374acf..dc938af51f6 100644 --- a/cf/api/routes_test.go +++ b/cf/api/routes_test.go @@ -6,18 +6,18 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/routing_api.go b/cf/api/routing_api.go index 08cf6fd970c..744042251e2 100644 --- a/cf/api/routing_api.go +++ b/cf/api/routing_api.go @@ -3,9 +3,9 @@ package api import ( "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type routingAPIRepository struct { diff --git a/cf/api/routing_api_test.go b/cf/api/routing_api_test.go index 37d874bb92e..e43cfe93021 100644 --- a/cf/api/routing_api_test.go +++ b/cf/api/routing_api_test.go @@ -6,14 +6,14 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/securitygroups/defaults/defaults.go b/cf/api/securitygroups/defaults/defaults.go index 57e0e08d5d3..bb545ff0369 100644 --- a/cf/api/securitygroups/defaults/defaults.go +++ b/cf/api/securitygroups/defaults/defaults.go @@ -3,10 +3,10 @@ package defaults import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type DefaultSecurityGroupsRepoBase struct { diff --git a/cf/api/securitygroups/defaults/running/running.go b/cf/api/securitygroups/defaults/running/running.go index 879669a72f6..be24c2a98ba 100644 --- a/cf/api/securitygroups/defaults/running/running.go +++ b/cf/api/securitygroups/defaults/running/running.go @@ -1,11 +1,11 @@ package running import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults" ) const urlPath = "/v2/config/running_security_groups" diff --git a/cf/api/securitygroups/defaults/running/running_suite_test.go b/cf/api/securitygroups/defaults/running/running_suite_test.go index beeaf9853e2..5fcd5a18d1b 100644 --- a/cf/api/securitygroups/defaults/running/running_suite_test.go +++ b/cf/api/securitygroups/defaults/running/running_suite_test.go @@ -1,8 +1,8 @@ package running_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/defaults/running/running_test.go b/cf/api/securitygroups/defaults/running/running_test.go index 340d0b329fd..10bf91e9c61 100644 --- a/cf/api/securitygroups/defaults/running/running_test.go +++ b/cf/api/securitygroups/defaults/running/running_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go b/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go index 22b51815f6d..a90a98ac437 100644 --- a/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go +++ b/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go @@ -4,8 +4,8 @@ package runningfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSecurityGroupsRepo struct { @@ -53,15 +53,16 @@ func (fake *FakeSecurityGroupsRepo) BindToRunningSet(arg1 string) error { fake.bindToRunningSetArgsForCall = append(fake.bindToRunningSetArgsForCall, struct { arg1 string }{arg1}) + stub := fake.BindToRunningSetStub + fakeReturns := fake.bindToRunningSetReturns fake.recordInvocation("BindToRunningSet", []interface{}{arg1}) fake.bindToRunningSetMutex.Unlock() - if fake.BindToRunningSetStub != nil { - return fake.BindToRunningSetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindToRunningSetReturns return fakeReturns.result1 } @@ -112,15 +113,16 @@ func (fake *FakeSecurityGroupsRepo) List() ([]models.SecurityGroupFields, error) ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] fake.listArgsForCall = append(fake.listArgsForCall, struct { }{}) + stub := fake.ListStub + fakeReturns := fake.listReturns fake.recordInvocation("List", []interface{}{}) fake.listMutex.Unlock() - if fake.ListStub != nil { - return fake.ListStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listReturns return fakeReturns.result1, fakeReturns.result2 } @@ -168,15 +170,16 @@ func (fake *FakeSecurityGroupsRepo) UnbindFromRunningSet(arg1 string) error { fake.unbindFromRunningSetArgsForCall = append(fake.unbindFromRunningSetArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UnbindFromRunningSetStub + fakeReturns := fake.unbindFromRunningSetReturns fake.recordInvocation("UnbindFromRunningSet", []interface{}{arg1}) fake.unbindFromRunningSetMutex.Unlock() - if fake.UnbindFromRunningSetStub != nil { - return fake.UnbindFromRunningSetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindFromRunningSetReturns return fakeReturns.result1 } diff --git a/cf/api/securitygroups/defaults/staging/staging.go b/cf/api/securitygroups/defaults/staging/staging.go index d75143f1653..a8713767072 100644 --- a/cf/api/securitygroups/defaults/staging/staging.go +++ b/cf/api/securitygroups/defaults/staging/staging.go @@ -1,11 +1,11 @@ package staging import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults" ) const urlPath = "/v2/config/staging_security_groups" diff --git a/cf/api/securitygroups/defaults/staging/staging_suite_test.go b/cf/api/securitygroups/defaults/staging/staging_suite_test.go index 0e39b6127ab..70988c05f40 100644 --- a/cf/api/securitygroups/defaults/staging/staging_suite_test.go +++ b/cf/api/securitygroups/defaults/staging/staging_suite_test.go @@ -1,8 +1,8 @@ package staging_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/defaults/staging/staging_test.go b/cf/api/securitygroups/defaults/staging/staging_test.go index 6d805551bb2..6a7928640e3 100644 --- a/cf/api/securitygroups/defaults/staging/staging_test.go +++ b/cf/api/securitygroups/defaults/staging/staging_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go b/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go index 5b4f8a39bfd..acbb211aa06 100644 --- a/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go +++ b/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go @@ -4,8 +4,8 @@ package stagingfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSecurityGroupsRepo struct { @@ -53,15 +53,16 @@ func (fake *FakeSecurityGroupsRepo) BindToStagingSet(arg1 string) error { fake.bindToStagingSetArgsForCall = append(fake.bindToStagingSetArgsForCall, struct { arg1 string }{arg1}) + stub := fake.BindToStagingSetStub + fakeReturns := fake.bindToStagingSetReturns fake.recordInvocation("BindToStagingSet", []interface{}{arg1}) fake.bindToStagingSetMutex.Unlock() - if fake.BindToStagingSetStub != nil { - return fake.BindToStagingSetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindToStagingSetReturns return fakeReturns.result1 } @@ -112,15 +113,16 @@ func (fake *FakeSecurityGroupsRepo) List() ([]models.SecurityGroupFields, error) ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] fake.listArgsForCall = append(fake.listArgsForCall, struct { }{}) + stub := fake.ListStub + fakeReturns := fake.listReturns fake.recordInvocation("List", []interface{}{}) fake.listMutex.Unlock() - if fake.ListStub != nil { - return fake.ListStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listReturns return fakeReturns.result1, fakeReturns.result2 } @@ -168,15 +170,16 @@ func (fake *FakeSecurityGroupsRepo) UnbindFromStagingSet(arg1 string) error { fake.unbindFromStagingSetArgsForCall = append(fake.unbindFromStagingSetArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UnbindFromStagingSetStub + fakeReturns := fake.unbindFromStagingSetReturns fake.recordInvocation("UnbindFromStagingSet", []interface{}{arg1}) fake.unbindFromStagingSetMutex.Unlock() - if fake.UnbindFromStagingSetStub != nil { - return fake.UnbindFromStagingSetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindFromStagingSetReturns return fakeReturns.result1 } diff --git a/cf/api/securitygroups/security_groups.go b/cf/api/securitygroups/security_groups.go index 4e72ff80857..3752de99956 100644 --- a/cf/api/securitygroups/security_groups.go +++ b/cf/api/securitygroups/security_groups.go @@ -4,11 +4,11 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecurityGroupRepo diff --git a/cf/api/securitygroups/security_groups_suite_test.go b/cf/api/securitygroups/security_groups_suite_test.go index 093c14f29a8..18bd946a180 100644 --- a/cf/api/securitygroups/security_groups_suite_test.go +++ b/cf/api/securitygroups/security_groups_suite_test.go @@ -1,8 +1,8 @@ package securitygroups_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/security_groups_test.go b/cf/api/securitygroups/security_groups_test.go index c7846968046..4501bf8f419 100644 --- a/cf/api/securitygroups/security_groups_test.go +++ b/cf/api/securitygroups/security_groups_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go b/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go index 7d6736c7f52..b46bb81454a 100644 --- a/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go +++ b/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go @@ -4,8 +4,8 @@ package securitygroupsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSecurityGroupRepo struct { @@ -85,15 +85,16 @@ func (fake *FakeSecurityGroupRepo) Create(arg1 string, arg2 []map[string]interfa arg1 string arg2 []map[string]interface{} }{arg1, arg2Copy}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2Copy}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -145,15 +146,16 @@ func (fake *FakeSecurityGroupRepo) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -204,15 +206,16 @@ func (fake *FakeSecurityGroupRepo) FindAll() ([]models.SecurityGroup, error) { ret, specificReturn := fake.findAllReturnsOnCall[len(fake.findAllArgsForCall)] fake.findAllArgsForCall = append(fake.findAllArgsForCall, struct { }{}) + stub := fake.FindAllStub + fakeReturns := fake.findAllReturns fake.recordInvocation("FindAll", []interface{}{}) fake.findAllMutex.Unlock() - if fake.FindAllStub != nil { - return fake.FindAllStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllReturns return fakeReturns.result1, fakeReturns.result2 } @@ -260,15 +263,16 @@ func (fake *FakeSecurityGroupRepo) Read(arg1 string) (models.SecurityGroup, erro fake.readArgsForCall = append(fake.readArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } @@ -329,15 +333,16 @@ func (fake *FakeSecurityGroupRepo) Update(arg1 string, arg2 []map[string]interfa arg1 string arg2 []map[string]interface{} }{arg1, arg2Copy}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1, arg2Copy}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/securitygroups/spaces/space_binder.go b/cf/api/securitygroups/spaces/space_binder.go index 16691d3a03d..4c1868d5399 100644 --- a/cf/api/securitygroups/spaces/space_binder.go +++ b/cf/api/securitygroups/spaces/space_binder.go @@ -3,9 +3,9 @@ package spaces import ( "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecurityGroupSpaceBinder diff --git a/cf/api/securitygroups/spaces/space_binder_test.go b/cf/api/securitygroups/spaces/space_binder_test.go index f3992f96346..aab76ea5438 100644 --- a/cf/api/securitygroups/spaces/space_binder_test.go +++ b/cf/api/securitygroups/spaces/space_binder_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go b/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go index 768032bd026..c70fb6e972a 100644 --- a/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go +++ b/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go @@ -4,7 +4,7 @@ package spacesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" ) type FakeSecurityGroupSpaceBinder struct { @@ -43,15 +43,16 @@ func (fake *FakeSecurityGroupSpaceBinder) BindSpace(arg1 string, arg2 string) er arg1 string arg2 string }{arg1, arg2}) + stub := fake.BindSpaceStub + fakeReturns := fake.bindSpaceReturns fake.recordInvocation("BindSpace", []interface{}{arg1, arg2}) fake.bindSpaceMutex.Unlock() - if fake.BindSpaceStub != nil { - return fake.BindSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindSpaceReturns return fakeReturns.result1 } @@ -104,15 +105,16 @@ func (fake *FakeSecurityGroupSpaceBinder) UnbindSpace(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnbindSpaceStub + fakeReturns := fake.unbindSpaceReturns fake.recordInvocation("UnbindSpace", []interface{}{arg1, arg2}) fake.unbindSpaceMutex.Unlock() - if fake.UnbindSpaceStub != nil { - return fake.UnbindSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindSpaceReturns return fakeReturns.result1 } diff --git a/cf/api/securitygroups/spaces/suite_test.go b/cf/api/securitygroups/spaces/suite_test.go index 935c3f694a8..2c97f58c25a 100644 --- a/cf/api/securitygroups/spaces/suite_test.go +++ b/cf/api/securitygroups/spaces/suite_test.go @@ -1,8 +1,8 @@ package spaces_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/service_auth_tokens.go b/cf/api/service_auth_tokens.go index 931327e870d..881622cf119 100644 --- a/cf/api/service_auth_tokens.go +++ b/cf/api/service_auth_tokens.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceAuthTokenRepository diff --git a/cf/api/service_auth_tokens_test.go b/cf/api/service_auth_tokens_test.go index 2a8fba16eb7..0e4f8f0bcf9 100644 --- a/cf/api/service_auth_tokens_test.go +++ b/cf/api/service_auth_tokens_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_bindings.go b/cf/api/service_bindings.go index 05d9118e84a..9646200dfd7 100644 --- a/cf/api/service_bindings.go +++ b/cf/api/service_bindings.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBindingRepository diff --git a/cf/api/service_bindings_test.go b/cf/api/service_bindings_test.go index 1d7f9dcb1d0..ab8c971f380 100644 --- a/cf/api/service_bindings_test.go +++ b/cf/api/service_bindings_test.go @@ -4,15 +4,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/service_brokers.go b/cf/api/service_brokers.go index df0080320fd..228134bb1eb 100644 --- a/cf/api/service_brokers.go +++ b/cf/api/service_brokers.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBrokerRepository diff --git a/cf/api/service_brokers_test.go b/cf/api/service_brokers_test.go index 6c979f1135c..bef3a697758 100644 --- a/cf/api/service_brokers_test.go +++ b/cf/api/service_brokers_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" @@ -203,7 +203,7 @@ var _ = Describe("Service Brokers Repo", func() { req := apifakes.NewCloudControllerTestRequest(testnet.TestRequest{ Method: "GET", Path: "/v2/service_brokers/bogus-guid", - //This error code may not reflect reality. Check it, change the code to match, and remove this comment. + // This error code may not reflect reality. Check it, change the code to match, and remove this comment. Response: testnet.TestResponse{Status: http.StatusNotFound, Body: `{"error_code":"ServiceBrokerNotFound","description":"Service Broker bogus-guid not found","code":270042}`}, }) diff --git a/cf/api/service_keys.go b/cf/api/service_keys.go index c7e2c006e98..294eb084530 100644 --- a/cf/api/service_keys.go +++ b/cf/api/service_keys.go @@ -6,11 +6,11 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceKeyRepository diff --git a/cf/api/service_keys_test.go b/cf/api/service_keys_test.go index f404f12ac04..aa338366307 100644 --- a/cf/api/service_keys_test.go +++ b/cf/api/service_keys_test.go @@ -4,19 +4,19 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - . "code.cloudfoundry.org/cli/cf/api" + . "code.cloudfoundry.org/cli/v9/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_plan.go b/cf/api/service_plan.go index a2ad0291a9c..f0fd410fa04 100644 --- a/cf/api/service_plan.go +++ b/cf/api/service_plan.go @@ -5,10 +5,10 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanRepository diff --git a/cf/api/service_plan_test.go b/cf/api/service_plan_test.go index 26a74c13d07..7586ba5becf 100644 --- a/cf/api/service_plan_test.go +++ b/cf/api/service_plan_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_plan_visibility.go b/cf/api/service_plan_visibility.go index 9d2aed39a85..ef9d1c06686 100644 --- a/cf/api/service_plan_visibility.go +++ b/cf/api/service_plan_visibility.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanVisibilityRepository diff --git a/cf/api/service_plan_visibility_test.go b/cf/api/service_plan_visibility_test.go index cb17887ee42..e237b9d3a6c 100644 --- a/cf/api/service_plan_visibility_test.go +++ b/cf/api/service_plan_visibility_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_summary.go b/cf/api/service_summary.go index a1920e80086..ea13863efef 100644 --- a/cf/api/service_summary.go +++ b/cf/api/service_summary.go @@ -3,9 +3,9 @@ package api import ( "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type ServiceInstancesSummaries struct { diff --git a/cf/api/service_summary_test.go b/cf/api/service_summary_test.go index 15e7b1bd0d3..0640853110f 100644 --- a/cf/api/service_summary_test.go +++ b/cf/api/service_summary_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/services.go b/cf/api/services.go index 87e91e208ce..65697faaa81 100644 --- a/cf/api/services.go +++ b/cf/api/services.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceRepository diff --git a/cf/api/services_test.go b/cf/api/services_test.go index 62d5b1f476a..f46ba743d79 100644 --- a/cf/api/services_test.go +++ b/cf/api/services_test.go @@ -7,19 +7,19 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/spacequotas/space_quotas.go b/cf/api/spacequotas/space_quotas.go index 07ab2cb248c..d7952d3ffef 100644 --- a/cf/api/spacequotas/space_quotas.go +++ b/cf/api/spacequotas/space_quotas.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceQuotaRepository diff --git a/cf/api/spacequotas/space_quotas_suite_test.go b/cf/api/spacequotas/space_quotas_suite_test.go index 92d80051778..0fe2163efae 100644 --- a/cf/api/spacequotas/space_quotas_suite_test.go +++ b/cf/api/spacequotas/space_quotas_suite_test.go @@ -1,8 +1,8 @@ package spacequotas_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/spacequotas/space_quotas_test.go b/cf/api/spacequotas/space_quotas_test.go index d895031c543..bdbd613b667 100644 --- a/cf/api/spacequotas/space_quotas_test.go +++ b/cf/api/spacequotas/space_quotas_test.go @@ -5,17 +5,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go b/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go index c80e8b605cf..c5ba2953412 100644 --- a/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go +++ b/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go @@ -4,8 +4,8 @@ package spacequotasfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSpaceQuotaRepository struct { @@ -130,15 +130,16 @@ func (fake *FakeSpaceQuotaRepository) AssociateSpaceWithQuota(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.AssociateSpaceWithQuotaStub + fakeReturns := fake.associateSpaceWithQuotaReturns fake.recordInvocation("AssociateSpaceWithQuota", []interface{}{arg1, arg2}) fake.associateSpaceWithQuotaMutex.Unlock() - if fake.AssociateSpaceWithQuotaStub != nil { - return fake.AssociateSpaceWithQuotaStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.associateSpaceWithQuotaReturns return fakeReturns.result1 } @@ -190,15 +191,16 @@ func (fake *FakeSpaceQuotaRepository) Create(arg1 models.SpaceQuota) error { fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.SpaceQuota }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -250,15 +252,16 @@ func (fake *FakeSpaceQuotaRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -310,15 +313,16 @@ func (fake *FakeSpaceQuotaRepository) FindByGUID(arg1 string) (models.SpaceQuota fake.findByGUIDArgsForCall = append(fake.findByGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByGUIDStub + fakeReturns := fake.findByGUIDReturns fake.recordInvocation("FindByGUID", []interface{}{arg1}) fake.findByGUIDMutex.Unlock() - if fake.FindByGUIDStub != nil { - return fake.FindByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -373,15 +377,16 @@ func (fake *FakeSpaceQuotaRepository) FindByName(arg1 string) (models.SpaceQuota fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -437,15 +442,16 @@ func (fake *FakeSpaceQuotaRepository) FindByNameAndOrgGUID(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByNameAndOrgGUIDStub + fakeReturns := fake.findByNameAndOrgGUIDReturns fake.recordInvocation("FindByNameAndOrgGUID", []interface{}{arg1, arg2}) fake.findByNameAndOrgGUIDMutex.Unlock() - if fake.FindByNameAndOrgGUIDStub != nil { - return fake.FindByNameAndOrgGUIDStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameAndOrgGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -500,15 +506,16 @@ func (fake *FakeSpaceQuotaRepository) FindByOrg(arg1 string) ([]models.SpaceQuot fake.findByOrgArgsForCall = append(fake.findByOrgArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByOrgStub + fakeReturns := fake.findByOrgReturns fake.recordInvocation("FindByOrg", []interface{}{arg1}) fake.findByOrgMutex.Unlock() - if fake.FindByOrgStub != nil { - return fake.FindByOrgStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -564,15 +571,16 @@ func (fake *FakeSpaceQuotaRepository) UnassignQuotaFromSpace(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnassignQuotaFromSpaceStub + fakeReturns := fake.unassignQuotaFromSpaceReturns fake.recordInvocation("UnassignQuotaFromSpace", []interface{}{arg1, arg2}) fake.unassignQuotaFromSpaceMutex.Unlock() - if fake.UnassignQuotaFromSpaceStub != nil { - return fake.UnassignQuotaFromSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unassignQuotaFromSpaceReturns return fakeReturns.result1 } @@ -624,15 +632,16 @@ func (fake *FakeSpaceQuotaRepository) Update(arg1 models.SpaceQuota) error { fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.SpaceQuota }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/spaces/spaces.go b/cf/api/spaces/spaces.go index c7421629961..a624ad2af65 100644 --- a/cf/api/spaces/spaces.go +++ b/cf/api/spaces/spaces.go @@ -6,11 +6,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRepository diff --git a/cf/api/spaces/spaces_suite_test.go b/cf/api/spaces/spaces_suite_test.go index 4fa12fe9ce2..be807425dbf 100644 --- a/cf/api/spaces/spaces_suite_test.go +++ b/cf/api/spaces/spaces_suite_test.go @@ -1,8 +1,8 @@ package spaces_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/spaces/spaces_test.go b/cf/api/spaces/spaces_test.go index 157cb557444..357118d9f8b 100644 --- a/cf/api/spaces/spaces_test.go +++ b/cf/api/spaces/spaces_test.go @@ -6,17 +6,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/spaces" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/spaces" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/spaces/spacesfakes/fake_space_repository.go b/cf/api/spaces/spacesfakes/fake_space_repository.go index 0112f8ec720..aaad96ad30a 100644 --- a/cf/api/spaces/spacesfakes/fake_space_repository.go +++ b/cf/api/spaces/spacesfakes/fake_space_repository.go @@ -4,8 +4,8 @@ package spacesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSpaceRepository struct { @@ -121,15 +121,16 @@ func (fake *FakeSpaceRepository) Create(arg1 string, arg2 string, arg3 string) ( arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -184,15 +185,16 @@ func (fake *FakeSpaceRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -244,15 +246,16 @@ func (fake *FakeSpaceRepository) FindByName(arg1 string) (models.Space, error) { fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -308,15 +311,16 @@ func (fake *FakeSpaceRepository) FindByNameInOrg(arg1 string, arg2 string) (mode arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByNameInOrgStub + fakeReturns := fake.findByNameInOrgReturns fake.recordInvocation("FindByNameInOrg", []interface{}{arg1, arg2}) fake.findByNameInOrgMutex.Unlock() - if fake.FindByNameInOrgStub != nil { - return fake.FindByNameInOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameInOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -371,15 +375,16 @@ func (fake *FakeSpaceRepository) ListSpaces(arg1 func(models.Space) bool) error fake.listSpacesArgsForCall = append(fake.listSpacesArgsForCall, struct { arg1 func(models.Space) bool }{arg1}) + stub := fake.ListSpacesStub + fakeReturns := fake.listSpacesReturns fake.recordInvocation("ListSpaces", []interface{}{arg1}) fake.listSpacesMutex.Unlock() - if fake.ListSpacesStub != nil { - return fake.ListSpacesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listSpacesReturns return fakeReturns.result1 } @@ -432,15 +437,16 @@ func (fake *FakeSpaceRepository) ListSpacesFromOrg(arg1 string, arg2 func(models arg1 string arg2 func(models.Space) bool }{arg1, arg2}) + stub := fake.ListSpacesFromOrgStub + fakeReturns := fake.listSpacesFromOrgReturns fake.recordInvocation("ListSpacesFromOrg", []interface{}{arg1, arg2}) fake.listSpacesFromOrgMutex.Unlock() - if fake.ListSpacesFromOrgStub != nil { - return fake.ListSpacesFromOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.listSpacesFromOrgReturns return fakeReturns.result1 } @@ -493,15 +499,16 @@ func (fake *FakeSpaceRepository) Rename(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.RenameStub + fakeReturns := fake.renameReturns fake.recordInvocation("Rename", []interface{}{arg1, arg2}) fake.renameMutex.Unlock() - if fake.RenameStub != nil { - return fake.RenameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.renameReturns return fakeReturns.result1 } @@ -554,15 +561,16 @@ func (fake *FakeSpaceRepository) SetAllowSSH(arg1 string, arg2 bool) error { arg1 string arg2 bool }{arg1, arg2}) + stub := fake.SetAllowSSHStub + fakeReturns := fake.setAllowSSHReturns fake.recordInvocation("SetAllowSSH", []interface{}{arg1, arg2}) fake.setAllowSSHMutex.Unlock() - if fake.SetAllowSSHStub != nil { - return fake.SetAllowSSHStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setAllowSSHReturns return fakeReturns.result1 } diff --git a/cf/api/stacks/stacks.go b/cf/api/stacks/stacks.go index 94c5136102c..eefbbc04a9b 100644 --- a/cf/api/stacks/stacks.go +++ b/cf/api/stacks/stacks.go @@ -4,13 +4,13 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . StackRepository diff --git a/cf/api/stacks/stacks_suite_test.go b/cf/api/stacks/stacks_suite_test.go index 0b75daba4be..a57dc5255bf 100644 --- a/cf/api/stacks/stacks_suite_test.go +++ b/cf/api/stacks/stacks_suite_test.go @@ -1,8 +1,8 @@ package stacks_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/stacks/stacks_test.go b/cf/api/stacks/stacks_test.go index 65a78a827a5..02599c2352b 100644 --- a/cf/api/stacks/stacks_test.go +++ b/cf/api/stacks/stacks_test.go @@ -4,18 +4,18 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - . "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/stacks/stacksfakes/fake_stack_repository.go b/cf/api/stacks/stacksfakes/fake_stack_repository.go index bd4f105e3ff..a790f0891a8 100644 --- a/cf/api/stacks/stacksfakes/fake_stack_repository.go +++ b/cf/api/stacks/stacksfakes/fake_stack_repository.go @@ -4,8 +4,8 @@ package stacksfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeStackRepository struct { @@ -56,15 +56,16 @@ func (fake *FakeStackRepository) FindAll() ([]models.Stack, error) { ret, specificReturn := fake.findAllReturnsOnCall[len(fake.findAllArgsForCall)] fake.findAllArgsForCall = append(fake.findAllArgsForCall, struct { }{}) + stub := fake.FindAllStub + fakeReturns := fake.findAllReturns fake.recordInvocation("FindAll", []interface{}{}) fake.findAllMutex.Unlock() - if fake.FindAllStub != nil { - return fake.FindAllStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllReturns return fakeReturns.result1, fakeReturns.result2 } @@ -112,15 +113,16 @@ func (fake *FakeStackRepository) FindByGUID(arg1 string) (models.Stack, error) { fake.findByGUIDArgsForCall = append(fake.findByGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByGUIDStub + fakeReturns := fake.findByGUIDReturns fake.recordInvocation("FindByGUID", []interface{}{arg1}) fake.findByGUIDMutex.Unlock() - if fake.FindByGUIDStub != nil { - return fake.FindByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -175,15 +177,16 @@ func (fake *FakeStackRepository) FindByName(arg1 string) (models.Stack, error) { fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/user_provided_service_instances.go b/cf/api/user_provided_service_instances.go index 2f19444dedc..b6c1d1c0da8 100644 --- a/cf/api/user_provided_service_instances.go +++ b/cf/api/user_provided_service_instances.go @@ -5,9 +5,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserProvidedServiceInstanceRepository diff --git a/cf/api/user_provided_service_instances_test.go b/cf/api/user_provided_service_instances_test.go index 87dd06baadf..da785d7906b 100644 --- a/cf/api/user_provided_service_instances_test.go +++ b/cf/api/user_provided_service_instances_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/users.go b/cf/api/users.go index bfe2c69520c..61ec08d8291 100644 --- a/cf/api/users.go +++ b/cf/api/users.go @@ -9,12 +9,12 @@ import ( neturl "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) var orgRoleToPathMap = map[models.Role]string{ @@ -312,8 +312,8 @@ func (repo CloudControllerUserRepository) SetSpaceRoleByUsername(username, space setOrgRoleErr := apiErrResponse{} apiErr = repo.assocUserWithOrgByUsername(username, orgGUID, &setOrgRoleErr) if setOrgRoleErr.Code == 10003 { - //operator lacking the privilege to set org role - //user might already be in org, so ignoring error and attempt to set space role + // operator lacking the privilege to set org role + // user might already be in org, so ignoring error and attempt to set space role } else if apiErr != nil { return } diff --git a/cf/api/users_test.go b/cf/api/users_test.go index a2f06eddbbd..d8a480efce1 100644 --- a/cf/api/users_test.go +++ b/cf/api/users_test.go @@ -4,15 +4,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/appfiles/app_files.go b/cf/appfiles/app_files.go index 216d1107676..bcd5a7d4d1b 100644 --- a/cf/appfiles/app_files.go +++ b/cf/appfiles/app_files.go @@ -9,7 +9,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" securejoin "github.com/cyphar/filepath-securejoin" ) diff --git a/cf/appfiles/app_files_suite_test.go b/cf/appfiles/app_files_suite_test.go index eccda8a285c..364aa668301 100644 --- a/cf/appfiles/app_files_suite_test.go +++ b/cf/appfiles/app_files_suite_test.go @@ -3,8 +3,8 @@ package appfiles_test import ( "testing" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/appfiles/app_files_test.go b/cf/appfiles/app_files_test.go index 63e79ce3571..4975d5be224 100644 --- a/cf/appfiles/app_files_test.go +++ b/cf/appfiles/app_files_test.go @@ -7,10 +7,10 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/appfiles" uuid "github.com/nu7hatch/gouuid" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/appfiles/appfilesfakes/fake_app_files.go b/cf/appfiles/appfilesfakes/fake_app_files.go index 2075d71e7cb..12116baf03e 100644 --- a/cf/appfiles/appfilesfakes/fake_app_files.go +++ b/cf/appfiles/appfilesfakes/fake_app_files.go @@ -4,8 +4,8 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeAppFiles struct { @@ -68,15 +68,16 @@ func (fake *FakeAppFiles) AppFilesInDir(arg1 string) ([]models.AppFileFields, er fake.appFilesInDirArgsForCall = append(fake.appFilesInDirArgsForCall, struct { arg1 string }{arg1}) + stub := fake.AppFilesInDirStub + fakeReturns := fake.appFilesInDirReturns fake.recordInvocation("AppFilesInDir", []interface{}{arg1}) fake.appFilesInDirMutex.Unlock() - if fake.AppFilesInDirStub != nil { - return fake.AppFilesInDirStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.appFilesInDirReturns return fakeReturns.result1, fakeReturns.result2 } @@ -138,15 +139,16 @@ func (fake *FakeAppFiles) CopyFiles(arg1 []models.AppFileFields, arg2 string, ar arg2 string arg3 string }{arg1Copy, arg2, arg3}) + stub := fake.CopyFilesStub + fakeReturns := fake.copyFilesReturns fake.recordInvocation("CopyFiles", []interface{}{arg1Copy, arg2, arg3}) fake.copyFilesMutex.Unlock() - if fake.CopyFilesStub != nil { - return fake.CopyFilesStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.copyFilesReturns return fakeReturns.result1 } @@ -198,15 +200,16 @@ func (fake *FakeAppFiles) CountFiles(arg1 string) int64 { fake.countFilesArgsForCall = append(fake.countFilesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CountFilesStub + fakeReturns := fake.countFilesReturns fake.recordInvocation("CountFiles", []interface{}{arg1}) fake.countFilesMutex.Unlock() - if fake.CountFilesStub != nil { - return fake.CountFilesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.countFilesReturns return fakeReturns.result1 } @@ -259,15 +262,16 @@ func (fake *FakeAppFiles) WalkAppFiles(arg1 string, arg2 func(string, string) er arg1 string arg2 func(string, string) error }{arg1, arg2}) + stub := fake.WalkAppFilesStub + fakeReturns := fake.walkAppFilesReturns fake.recordInvocation("WalkAppFiles", []interface{}{arg1, arg2}) fake.walkAppFilesMutex.Unlock() - if fake.WalkAppFilesStub != nil { - return fake.WalkAppFilesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.walkAppFilesReturns return fakeReturns.result1 } diff --git a/cf/appfiles/appfilesfakes/fake_cf_ignore.go b/cf/appfiles/appfilesfakes/fake_cf_ignore.go index 3efcacff4b5..1402b8ab5cd 100644 --- a/cf/appfiles/appfilesfakes/fake_cf_ignore.go +++ b/cf/appfiles/appfilesfakes/fake_cf_ignore.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/appfiles" ) type FakeCfIgnore struct { @@ -29,15 +29,16 @@ func (fake *FakeCfIgnore) FileShouldBeIgnored(arg1 string) bool { fake.fileShouldBeIgnoredArgsForCall = append(fake.fileShouldBeIgnoredArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FileShouldBeIgnoredStub + fakeReturns := fake.fileShouldBeIgnoredReturns fake.recordInvocation("FileShouldBeIgnored", []interface{}{arg1}) fake.fileShouldBeIgnoredMutex.Unlock() - if fake.FileShouldBeIgnoredStub != nil { - return fake.FileShouldBeIgnoredStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.fileShouldBeIgnoredReturns return fakeReturns.result1 } diff --git a/cf/appfiles/appfilesfakes/fake_zipper.go b/cf/appfiles/appfilesfakes/fake_zipper.go index 1dff9a5b641..3207fa9c028 100644 --- a/cf/appfiles/appfilesfakes/fake_zipper.go +++ b/cf/appfiles/appfilesfakes/fake_zipper.go @@ -5,7 +5,7 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/appfiles" ) type FakeZipper struct { @@ -67,15 +67,16 @@ func (fake *FakeZipper) GetZipSize(arg1 *os.File) (int64, error) { fake.getZipSizeArgsForCall = append(fake.getZipSizeArgsForCall, struct { arg1 *os.File }{arg1}) + stub := fake.GetZipSizeStub + fakeReturns := fake.getZipSizeReturns fake.recordInvocation("GetZipSize", []interface{}{arg1}) fake.getZipSizeMutex.Unlock() - if fake.GetZipSizeStub != nil { - return fake.GetZipSizeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getZipSizeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -130,15 +131,16 @@ func (fake *FakeZipper) IsZipFile(arg1 string) bool { fake.isZipFileArgsForCall = append(fake.isZipFileArgsForCall, struct { arg1 string }{arg1}) + stub := fake.IsZipFileStub + fakeReturns := fake.isZipFileReturns fake.recordInvocation("IsZipFile", []interface{}{arg1}) fake.isZipFileMutex.Unlock() - if fake.IsZipFileStub != nil { - return fake.IsZipFileStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isZipFileReturns return fakeReturns.result1 } @@ -191,15 +193,16 @@ func (fake *FakeZipper) Unzip(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnzipStub + fakeReturns := fake.unzipReturns fake.recordInvocation("Unzip", []interface{}{arg1, arg2}) fake.unzipMutex.Unlock() - if fake.UnzipStub != nil { - return fake.UnzipStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unzipReturns return fakeReturns.result1 } @@ -252,15 +255,16 @@ func (fake *FakeZipper) Zip(arg1 string, arg2 *os.File) error { arg1 string arg2 *os.File }{arg1, arg2}) + stub := fake.ZipStub + fakeReturns := fake.zipReturns fake.recordInvocation("Zip", []interface{}{arg1, arg2}) fake.zipMutex.Unlock() - if fake.ZipStub != nil { - return fake.ZipStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.zipReturns return fakeReturns.result1 } diff --git a/cf/appfiles/cf_ignore.go b/cf/appfiles/cf_ignore.go index 6faecd3ed8e..c4922dca9d8 100644 --- a/cf/appfiles/cf_ignore.go +++ b/cf/appfiles/cf_ignore.go @@ -4,7 +4,7 @@ import ( "path" "strings" - "code.cloudfoundry.org/cli/cf/util/glob" + "code.cloudfoundry.org/cli/v9/cf/util/glob" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CfIgnore diff --git a/cf/appfiles/cf_ignore_test.go b/cf/appfiles/cf_ignore_test.go index 12410ce8a83..75838bdcac7 100644 --- a/cf/appfiles/cf_ignore_test.go +++ b/cf/appfiles/cf_ignore_test.go @@ -1,7 +1,7 @@ package appfiles_test import ( - . "code.cloudfoundry.org/cli/cf/appfiles" + . "code.cloudfoundry.org/cli/v9/cf/appfiles" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/appfiles/zipper.go b/cf/appfiles/zipper.go index 22bccb71e54..a01e86ca773 100644 --- a/cf/appfiles/zipper.go +++ b/cf/appfiles/zipper.go @@ -9,7 +9,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/errors" "code.cloudfoundry.org/gofileutils/fileutils" securejoin "github.com/cyphar/filepath-securejoin" ) diff --git a/cf/appfiles/zipper_test.go b/cf/appfiles/zipper_test.go index a262b2fdcf9..4e469e16830 100644 --- a/cf/appfiles/zipper_test.go +++ b/cf/appfiles/zipper_test.go @@ -12,7 +12,7 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/cf/appfiles" + . "code.cloudfoundry.org/cli/v9/cf/appfiles" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/cmd/cmd.go b/cf/cmd/cmd.go index d2c1a38264c..671a4afa337 100644 --- a/cf/cmd/cmd.go +++ b/cf/cmd/cmd.go @@ -8,21 +8,21 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commandsloader" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/cf/util/spellcheck" - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandsloader" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/util/spellcheck" + "code.cloudfoundry.org/cli/v9/plugin/rpc" netrpc "net/rpc" ) @@ -31,18 +31,18 @@ var cmdRegistry = commandregistry.Commands func Main(traceEnv string, args []string) { - //handle `cf -v` for cf version + // handle `cf -v` for cf version if len(args) == 2 && (args[1] == "-v" || args[1] == "--version") { args[1] = "version" } - //handles `cf` + // handles `cf` if len(args) == 1 { args = []string{args[0], "help"} } - //handles `cf [COMMAND] -h ...` - //rearrange args to `cf help COMMAND` and let `command help` to print out usage + // handles `cf [COMMAND] -h ...` + // rearrange args to `cf help COMMAND` and let `command help` to print out usage args = append([]string{args[0]}, handleHelp(args[1:])...) newArgs, isVerbose := handleVerbose(args) @@ -86,7 +86,7 @@ func Main(traceEnv string, args []string) { commandsloader.Load() - //run core command + // run core command cmdName := args[1] cmd := cmdRegistry.FindCommand(cmdName) if cmd != nil { @@ -137,7 +137,7 @@ func Main(traceEnv string, args []string) { os.Exit(0) } - //non core command, try plugin command + // non core command, try plugin command server := netrpc.NewServer() rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, deps.Config, deps.RepoLocator, rpc.NewCommandRunner(), deps.Logger, Writer, server) if err != nil { diff --git a/cf/commandregistry/command.go b/cf/commandregistry/command.go index 5141c9bffd9..c9e0d37c823 100644 --- a/cf/commandregistry/command.go +++ b/cf/commandregistry/command.go @@ -1,8 +1,8 @@ package commandregistry import ( - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Command @@ -21,7 +21,7 @@ type CommandMetadata struct { Description string Flags map[string]flags.FlagSet SkipFlagParsing bool - TotalArgs int //Optional: number of required arguments to skip for flag verification + TotalArgs int // Optional: number of required arguments to skip for flag verification Hidden bool Examples []string } diff --git a/cf/commandregistry/commandregistryfakes/fake_command.go b/cf/commandregistry/commandregistryfakes/fake_command.go index 7941211b441..37e55bbc7d9 100644 --- a/cf/commandregistry/commandregistryfakes/fake_command.go +++ b/cf/commandregistry/commandregistryfakes/fake_command.go @@ -4,9 +4,9 @@ package commandregistryfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand struct { @@ -67,15 +67,16 @@ func (fake *FakeCommand) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -126,15 +127,16 @@ func (fake *FakeCommand) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -180,15 +182,16 @@ func (fake *FakeCommand) Requirements(arg1 requirements.Factory, arg2 flags.Flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -244,15 +247,16 @@ func (fake *FakeCommand) SetDependency(arg1 commandregistry.Dependency, arg2 boo arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } diff --git a/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go b/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go index 5bb4798d2b6..7a33ebbc7cf 100644 --- a/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go +++ b/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go @@ -4,7 +4,7 @@ package commandregistryfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" ) type FakeRandomWordGenerator struct { @@ -27,15 +27,16 @@ func (fake *FakeRandomWordGenerator) Babble() string { ret, specificReturn := fake.babbleReturnsOnCall[len(fake.babbleArgsForCall)] fake.babbleArgsForCall = append(fake.babbleArgsForCall, struct { }{}) + stub := fake.BabbleStub + fakeReturns := fake.babbleReturns fake.recordInvocation("Babble", []interface{}{}) fake.babbleMutex.Unlock() - if fake.BabbleStub != nil { - return fake.BabbleStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.babbleReturns return fakeReturns.result1 } diff --git a/cf/commandregistry/dependency.go b/cf/commandregistry/dependency.go index 8360e9b8ed1..8126a5172ed 100644 --- a/cf/commandregistry/dependency.go +++ b/cf/commandregistry/dependency.go @@ -8,24 +8,24 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/plugin/models" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/randomword" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/plugin/models" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/util/randomword" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RandomWordGenerator @@ -56,7 +56,7 @@ type Dependency struct { PushActor actors.PushActor RouteActor actors.RouteActor ChecksumUtil util.Sha1Checksum - WildcardDependency interface{} //use for injecting fakes + WildcardDependency interface{} // use for injecting fakes Logger trace.Printer } diff --git a/cf/commandregistry/dependency_test.go b/cf/commandregistry/dependency_test.go index a58824a9799..5f2d94c869b 100644 --- a/cf/commandregistry/dependency_test.go +++ b/cf/commandregistry/dependency_test.go @@ -1,8 +1,8 @@ package commandregistry_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" "os" diff --git a/cf/commandregistry/fakecommand/fake_command1.go b/cf/commandregistry/fakecommand/fake_command1.go index 46c6a7a4599..e94046b6150 100644 --- a/cf/commandregistry/fakecommand/fake_command1.go +++ b/cf/commandregistry/fakecommand/fake_command1.go @@ -3,9 +3,9 @@ package fakecommand import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand1 struct { diff --git a/cf/commandregistry/fakecommand/fake_command2.go b/cf/commandregistry/fakecommand/fake_command2.go index 0d15e461c83..b89d1a28130 100644 --- a/cf/commandregistry/fakecommand/fake_command2.go +++ b/cf/commandregistry/fakecommand/fake_command2.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand2 struct { diff --git a/cf/commandregistry/fakecommand/fake_command_max_length_name.go b/cf/commandregistry/fakecommand/fake_command_max_length_name.go index 1dacefa59db..82a2fb2c8d1 100644 --- a/cf/commandregistry/fakecommand/fake_command_max_length_name.go +++ b/cf/commandregistry/fakecommand/fake_command_max_length_name.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand3 struct { diff --git a/cf/commandregistry/registry.go b/cf/commandregistry/registry.go index 2b7ee3cbf7f..c58e2ca56de 100644 --- a/cf/commandregistry/registry.go +++ b/cf/commandregistry/registry.go @@ -6,13 +6,13 @@ import ( "strings" "unicode/utf8" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" - . "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/terminal" ) var _ = initI18nFunc() diff --git a/cf/commandregistry/registry_test.go b/cf/commandregistry/registry_test.go index 86c5cfea4dc..20032fc5be9 100644 --- a/cf/commandregistry/registry_test.go +++ b/cf/commandregistry/registry_test.go @@ -3,13 +3,13 @@ package commandregistry_test import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/commandregistry/fakecommand" + . "code.cloudfoundry.org/cli/v9/cf/commandregistry/fakecommand" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/api.go b/cf/commands/api.go index 8c448835745..edb9a7ae92c 100644 --- a/cf/commands/api.go +++ b/cf/commands/api.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type API struct { diff --git a/cf/commands/api_test.go b/cf/commands/api_test.go index 93d86d5ad66..1cfe115c497 100644 --- a/cf/commands/api_test.go +++ b/cf/commands/api_test.go @@ -3,20 +3,20 @@ package commands_test import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("Api", func() { diff --git a/cf/commands/application/app.go b/cf/commands/application/app.go index de7ef2e8797..79b1b371f49 100644 --- a/cf/commands/application/app.go +++ b/cf/commands/application/app.go @@ -4,21 +4,21 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Displayer diff --git a/cf/commands/application/app_test.go b/cf/commands/application/app_test.go index c419071b81e..6897b2a5148 100644 --- a/cf/commands/application/app_test.go +++ b/cf/commands/application/app_test.go @@ -4,26 +4,26 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/plugin/models" - - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/appinstances/appinstancesfakes" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/plugin/models" + + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances/appinstancesfakes" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -476,7 +476,7 @@ var _ = Describe("App", func() { getAppSummaryModel.State = "stopped" appSummaryRepo.GetSummaryReturns(getAppSummaryModel, nil) - var instances []models.AppInstanceFields //Very important since this is a nil body + var instances []models.AppInstanceFields // Very important since this is a nil body appInstancesRepo.GetInstancesReturns(instances, errors.New("Bonzi")) }) diff --git a/cf/commands/application/application_suite_test.go b/cf/commands/application/application_suite_test.go index 7d66957acfd..00356164f0f 100644 --- a/cf/commands/application/application_suite_test.go +++ b/cf/commands/application/application_suite_test.go @@ -1,8 +1,8 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/application/applicationfakes/fake_app_displayer.go b/cf/commands/application/applicationfakes/fake_app_displayer.go index 95024a07f4b..b5aaea7783d 100644 --- a/cf/commands/application/applicationfakes/fake_app_displayer.go +++ b/cf/commands/application/applicationfakes/fake_app_displayer.go @@ -1,10 +1,10 @@ package applicationfakes import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeAppDisplayer struct { diff --git a/cf/commands/application/applicationfakes/fake_displayer.go b/cf/commands/application/applicationfakes/fake_displayer.go index 29fd79fd744..35e4f4dfd38 100644 --- a/cf/commands/application/applicationfakes/fake_displayer.go +++ b/cf/commands/application/applicationfakes/fake_displayer.go @@ -4,8 +4,8 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeDisplayer struct { @@ -34,15 +34,16 @@ func (fake *FakeDisplayer) ShowApp(arg1 models.Application, arg2 string, arg3 st arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ShowAppStub + fakeReturns := fake.showAppReturns fake.recordInvocation("ShowApp", []interface{}{arg1, arg2, arg3}) fake.showAppMutex.Unlock() - if fake.ShowAppStub != nil { - return fake.ShowAppStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.showAppReturns return fakeReturns.result1 } diff --git a/cf/commands/application/applicationfakes/fake_restarter.go b/cf/commands/application/applicationfakes/fake_restarter.go index 1ee736c2abf..6d5a2e1c2de 100644 --- a/cf/commands/application/applicationfakes/fake_restarter.go +++ b/cf/commands/application/applicationfakes/fake_restarter.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeRestarter struct { @@ -84,15 +84,16 @@ func (fake *FakeRestarter) ApplicationRestart(arg1 models.Application, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ApplicationRestartStub + fakeReturns := fake.applicationRestartReturns fake.recordInvocation("ApplicationRestart", []interface{}{arg1, arg2, arg3}) fake.applicationRestartMutex.Unlock() - if fake.ApplicationRestartStub != nil { - return fake.ApplicationRestartStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.applicationRestartReturns return fakeReturns.result1 } @@ -144,15 +145,16 @@ func (fake *FakeRestarter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -203,15 +205,16 @@ func (fake *FakeRestarter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -257,15 +260,16 @@ func (fake *FakeRestarter) Requirements(arg1 requirements.Factory, arg2 flags.Fl arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -321,15 +325,16 @@ func (fake *FakeRestarter) SetDependency(arg1 commandregistry.Dependency, arg2 b arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } diff --git a/cf/commands/application/applicationfakes/fake_staging_watcher.go b/cf/commands/application/applicationfakes/fake_staging_watcher.go index 6fdda4de082..18fd2f8890d 100644 --- a/cf/commands/application/applicationfakes/fake_staging_watcher.go +++ b/cf/commands/application/applicationfakes/fake_staging_watcher.go @@ -4,8 +4,8 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeStagingWatcher struct { @@ -38,15 +38,16 @@ func (fake *FakeStagingWatcher) WatchStaging(arg1 models.Application, arg2 strin arg3 string arg4 func(app models.Application) (models.Application, error) }{arg1, arg2, arg3, arg4}) + stub := fake.WatchStagingStub + fakeReturns := fake.watchStagingReturns fake.recordInvocation("WatchStaging", []interface{}{arg1, arg2, arg3, arg4}) fake.watchStagingMutex.Unlock() - if fake.WatchStagingStub != nil { - return fake.WatchStagingStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.watchStagingReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/commands/application/applicationfakes/fake_starter.go b/cf/commands/application/applicationfakes/fake_starter.go index 43ff78cdc40..e99908db8fb 100644 --- a/cf/commands/application/applicationfakes/fake_starter.go +++ b/cf/commands/application/applicationfakes/fake_starter.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeStarter struct { @@ -91,15 +91,16 @@ func (fake *FakeStarter) ApplicationStart(arg1 models.Application, arg2 string, arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ApplicationStartStub + fakeReturns := fake.applicationStartReturns fake.recordInvocation("ApplicationStart", []interface{}{arg1, arg2, arg3}) fake.applicationStartMutex.Unlock() - if fake.ApplicationStartStub != nil { - return fake.ApplicationStartStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.applicationStartReturns return fakeReturns.result1, fakeReturns.result2 } @@ -154,15 +155,16 @@ func (fake *FakeStarter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -213,15 +215,16 @@ func (fake *FakeStarter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -267,15 +270,16 @@ func (fake *FakeStarter) Requirements(arg1 requirements.Factory, arg2 flags.Flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -331,15 +335,16 @@ func (fake *FakeStarter) SetDependency(arg1 commandregistry.Dependency, arg2 boo arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } @@ -390,9 +395,10 @@ func (fake *FakeStarter) SetStartTimeoutInSeconds(arg1 int) { fake.setStartTimeoutInSecondsArgsForCall = append(fake.setStartTimeoutInSecondsArgsForCall, struct { arg1 int }{arg1}) + stub := fake.SetStartTimeoutInSecondsStub fake.recordInvocation("SetStartTimeoutInSeconds", []interface{}{arg1}) fake.setStartTimeoutInSecondsMutex.Unlock() - if fake.SetStartTimeoutInSecondsStub != nil { + if stub != nil { fake.SetStartTimeoutInSecondsStub(arg1) } } diff --git a/cf/commands/application/applicationfakes/fake_stopper.go b/cf/commands/application/applicationfakes/fake_stopper.go index fed79044c61..003ec6265b3 100644 --- a/cf/commands/application/applicationfakes/fake_stopper.go +++ b/cf/commands/application/applicationfakes/fake_stopper.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeStopper struct { @@ -86,15 +86,16 @@ func (fake *FakeStopper) ApplicationStop(arg1 models.Application, arg2 string, a arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ApplicationStopStub + fakeReturns := fake.applicationStopReturns fake.recordInvocation("ApplicationStop", []interface{}{arg1, arg2, arg3}) fake.applicationStopMutex.Unlock() - if fake.ApplicationStopStub != nil { - return fake.ApplicationStopStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.applicationStopReturns return fakeReturns.result1, fakeReturns.result2 } @@ -149,15 +150,16 @@ func (fake *FakeStopper) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -208,15 +210,16 @@ func (fake *FakeStopper) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -262,15 +265,16 @@ func (fake *FakeStopper) Requirements(arg1 requirements.Factory, arg2 flags.Flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -326,15 +330,16 @@ func (fake *FakeStopper) SetDependency(arg1 commandregistry.Dependency, arg2 boo arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } diff --git a/cf/commands/application/apps.go b/cf/commands/application/apps.go index e246f9ff09b..a627ffdc1fc 100644 --- a/cf/commands/application/apps.go +++ b/cf/commands/application/apps.go @@ -3,18 +3,18 @@ package application import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - plugin_models "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" ) type ListApps struct { diff --git a/cf/commands/application/apps_test.go b/cf/commands/application/apps_test.go index 3ad32e19e38..5e58761c52e 100644 --- a/cf/commands/application/apps_test.go +++ b/cf/commands/application/apps_test.go @@ -1,25 +1,25 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("list-apps command", func() { diff --git a/cf/commands/application/copy_source.go b/cf/commands/application/copy_source.go index a5c9b286bd5..98e1e7381a9 100644 --- a/cf/commands/application/copy_source.go +++ b/cf/commands/application/copy_source.go @@ -5,18 +5,18 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CopySource struct { @@ -76,7 +76,7 @@ func (cmd *CopySource) SetDependency(deps commandregistry.Dependency, pluginCall cmd.spaceRepo = deps.RepoLocator.GetSpaceRepository() cmd.copyAppSourceRepo = deps.RepoLocator.GetCopyApplicationSourceRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("restart") commandDep = commandDep.SetDependency(deps, false) cmd.appRestart = commandDep.(Restarter) diff --git a/cf/commands/application/copy_source_test.go b/cf/commands/application/copy_source_test.go index 5d8e6ba0a22..626f71a19eb 100644 --- a/cf/commands/application/copy_source_test.go +++ b/cf/commands/application/copy_source_test.go @@ -1,24 +1,24 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/api/copyapplicationsource/copyapplicationsourcefakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource/copyapplicationsourcefakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -48,7 +48,7 @@ var _ = Describe("CopySource", func() { deps.RepoLocator = deps.RepoLocator.SetOrganizationRepository(orgRepo) deps.Config = config - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(appRestarter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("copy-source").SetDependency(deps, pluginCall)) @@ -64,11 +64,11 @@ var _ = Describe("CopySource", func() { orgRepo = new(organizationsfakes.FakeOrganizationRepository) config = testconfig.NewRepositoryWithDefaults() - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("restart") appRestarter = new(applicationfakes.FakeRestarter) - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry appRestarter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return appRestarter } diff --git a/cf/commands/application/delete.go b/cf/commands/application/delete.go index caa784d5258..22502e98544 100644 --- a/cf/commands/application/delete.go +++ b/cf/commands/application/delete.go @@ -1,15 +1,15 @@ package application import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteApp struct { diff --git a/cf/commands/application/delete_test.go b/cf/commands/application/delete_test.go index 23d2bef4100..83a0d9290cd 100644 --- a/cf/commands/application/delete_test.go +++ b/cf/commands/application/delete_test.go @@ -1,21 +1,21 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete app command", func() { diff --git a/cf/commands/application/disable_ssh.go b/cf/commands/application/disable_ssh.go index 0f7f8f19235..38520d7f4c2 100644 --- a/cf/commands/application/disable_ssh.go +++ b/cf/commands/application/disable_ssh.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DisableSSH struct { diff --git a/cf/commands/application/disable_ssh_test.go b/cf/commands/application/disable_ssh_test.go index b223af0b660..36af702ab27 100644 --- a/cf/commands/application/disable_ssh_test.go +++ b/cf/commands/application/disable_ssh_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/enable_ssh.go b/cf/commands/application/enable_ssh.go index 6971c44a607..181f20d2a84 100644 --- a/cf/commands/application/enable_ssh.go +++ b/cf/commands/application/enable_ssh.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type EnableSSH struct { diff --git a/cf/commands/application/enable_ssh_test.go b/cf/commands/application/enable_ssh_test.go index aa820d3252e..9a0beedddb8 100644 --- a/cf/commands/application/enable_ssh_test.go +++ b/cf/commands/application/enable_ssh_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/env.go b/cf/commands/application/env.go index 0783a5fd993..c04bfa9689e 100644 --- a/cf/commands/application/env.go +++ b/cf/commands/application/env.go @@ -5,15 +5,15 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Env struct { diff --git a/cf/commands/application/env_test.go b/cf/commands/application/env_test.go index a4493225004..2a9c6e92eba 100644 --- a/cf/commands/application/env_test.go +++ b/cf/commands/application/env_test.go @@ -1,18 +1,18 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/events.go b/cf/commands/application/events.go index 1c143d75317..19f30b49f89 100644 --- a/cf/commands/application/events.go +++ b/cf/commands/application/events.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/appevents" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/appevents" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Events struct { diff --git a/cf/commands/application/events_test.go b/cf/commands/application/events_test.go index c75b8507ce5..da335caad78 100644 --- a/cf/commands/application/events_test.go +++ b/cf/commands/application/events_test.go @@ -4,19 +4,19 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - - "code.cloudfoundry.org/cli/cf/api/appevents/appeventsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + + "code.cloudfoundry.org/cli/v9/cf/api/appevents/appeventsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/files.go b/cf/commands/application/files.go index 8584493eb53..a779f77c148 100644 --- a/cf/commands/application/files.go +++ b/cf/commands/application/files.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/appfiles" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Files struct { diff --git a/cf/commands/application/files_test.go b/cf/commands/application/files_test.go index cf8520b4155..973d2aeb339 100644 --- a/cf/commands/application/files_test.go +++ b/cf/commands/application/files_test.go @@ -3,19 +3,19 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/appfiles/appfilesfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/appfiles/appfilesfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/get_health_check.go b/cf/commands/application/get_health_check.go index b0dd926cf6b..157ee39e1d7 100644 --- a/cf/commands/application/get_health_check.go +++ b/cf/commands/application/get_health_check.go @@ -3,14 +3,14 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type GetHealthCheck struct { diff --git a/cf/commands/application/get_health_check_test.go b/cf/commands/application/get_health_check_test.go index 33b4071cdfb..795b3897e60 100644 --- a/cf/commands/application/get_health_check_test.go +++ b/cf/commands/application/get_health_check_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/logs.go b/cf/commands/application/logs.go index 9bed3f1d754..1dc990a8ecf 100644 --- a/cf/commands/application/logs.go +++ b/cf/commands/application/logs.go @@ -4,15 +4,15 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Logs struct { diff --git a/cf/commands/application/logs_test.go b/cf/commands/application/logs_test.go index e82d6e04d87..db241013d4f 100644 --- a/cf/commands/application/logs_test.go +++ b/cf/commands/application/logs_test.go @@ -1,19 +1,19 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/api/logs/logsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs/logsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/push.go b/cf/commands/application/push.go index 8c48a7839a3..96b2fc2549d 100644 --- a/cf/commands/application/push.go +++ b/cf/commands/application/push.go @@ -8,24 +8,24 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Push struct { @@ -122,17 +122,17 @@ func (cmd *Push) SetDependency(deps commandregistry.Dependency, pluginCall bool) cmd.config = deps.Config cmd.manifestRepo = deps.ManifestRepo - //set appStarter + // set appStarter appCommand := commandregistry.Commands.FindCommand("start") appCommand = appCommand.SetDependency(deps, false) cmd.appStarter = appCommand.(Starter) - //set appStopper + // set appStopper appCommand = commandregistry.Commands.FindCommand("stop") appCommand = appCommand.SetDependency(deps, false) cmd.appStopper = appCommand.(Stopper) - //set serviceBinder + // set serviceBinder appCommand = commandregistry.Commands.FindCommand("bind-service") appCommand = appCommand.SetDependency(deps, false) cmd.serviceBinder = appCommand.(service.Binder) @@ -438,7 +438,7 @@ func (cmd *Push) createAndBindRoute( case host != nil: hostname = *host case UseRandomPort: - //do nothing + // do nothing case UseRandomRoute: hostname = hostNameForString(app.Name) + "-" + cmd.wordGenerator.Babble() default: diff --git a/cf/commands/application/push_test.go b/cf/commands/application/push_test.go index 2447c675510..974d41c0194 100644 --- a/cf/commands/application/push_test.go +++ b/cf/commands/application/push_test.go @@ -5,31 +5,31 @@ import ( "path/filepath" "syscall" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/cf/appfiles/appfilesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commandregistry/commandregistryfakes" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/commands/service/servicefakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/manifest/manifestfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v9/cf/appfiles/appfilesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry/commandregistryfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/service/servicefakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/manifest/manifestfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" @@ -68,7 +68,7 @@ var _ = Describe("Push Command", func() { ) BeforeEach(func() { - //save original command dependences and restore later + // save original command dependences and restore later OriginalCommandStart = commandregistry.Commands.FindCommand("start") OriginalCommandStop = commandregistry.Commands.FindCommand("stop") OriginalCommandServiceBind = commandregistry.Commands.FindCommand("bind-service") @@ -83,7 +83,7 @@ var _ = Describe("Push Command", func() { minVersionReq = requirements.Passing{Type: "minVersionReq"} requirementsFactory.NewMinAPIVersionRequirementReturns(minVersionReq) - ui = &testterm.FakeUI{} //new(terminalfakes.FakeUI) + ui = &testterm.FakeUI{} // new(terminalfakes.FakeUI) configRepo = testconfig.NewRepositoryWithDefaults() manifestRepo = new(manifestfakes.FakeRepository) wordGenerator = new(commandregistryfakes.FakeRandomWordGenerator) @@ -117,7 +117,7 @@ var _ = Describe("Push Command", func() { deps.RepoLocator = deps.RepoLocator.SetStackRepository(stackRepo) deps.RepoLocator = deps.RepoLocator.SetAuthenticationRepository(authRepo) - //setup fake commands (counterfeiter) to correctly interact with commandregistry + // setup fake commands (counterfeiter) to correctly interact with commandregistry starter = new(applicationfakes.FakeStarter) starter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return starter @@ -132,7 +132,7 @@ var _ = Describe("Push Command", func() { stopper.MetaDataReturns(commandregistry.CommandMetadata{Name: "stop"}) commandregistry.Register(stopper) - //inject fake commands dependencies into registry + // inject fake commands dependencies into registry serviceBinder = new(servicefakes.OldFakeAppBinder) commandregistry.Register(serviceBinder) diff --git a/cf/commands/application/rename.go b/cf/commands/application/rename.go index 870217f8390..73370990549 100644 --- a/cf/commands/application/rename.go +++ b/cf/commands/application/rename.go @@ -3,14 +3,14 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameApp struct { diff --git a/cf/commands/application/rename_test.go b/cf/commands/application/rename_test.go index eda7d25bcc5..c9df5d258a5 100644 --- a/cf/commands/application/rename_test.go +++ b/cf/commands/application/rename_test.go @@ -1,17 +1,17 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/restage.go b/cf/commands/application/restage.go index 248a2b0453c..01a4a631983 100644 --- a/cf/commands/application/restage.go +++ b/cf/commands/application/restage.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Restage struct { @@ -55,7 +55,7 @@ func (cmd *Restage) SetDependency(deps commandregistry.Dependency, pluginCall bo cmd.config = deps.Config cmd.appRepo = deps.RepoLocator.GetApplicationRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("start") commandDep = commandDep.SetDependency(deps, false) cmd.appStagingWatcher = commandDep.(StagingWatcher) diff --git a/cf/commands/application/restage_test.go b/cf/commands/application/restage_test.go index e55890f7ba6..d9bd76c3432 100644 --- a/cf/commands/application/restage_test.go +++ b/cf/commands/application/restage_test.go @@ -1,18 +1,18 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -34,7 +34,7 @@ var _ = Describe("restage command", func() { deps.RepoLocator = deps.RepoLocator.SetApplicationRepository(appRepo) deps.Config = configRepo - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(stagingWatcher) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("restage").SetDependency(deps, pluginCall)) @@ -54,7 +54,7 @@ var _ = Describe("restage command", func() { requirementsFactory.NewLoginRequirementReturns(requirements.Passing{}) requirementsFactory.NewTargetedSpaceRequirementReturns(requirements.Passing{}) - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("start") stagingWatcher = &fakeStagingWatcher{} diff --git a/cf/commands/application/restart.go b/cf/commands/application/restart.go index 2668be291c0..99db808f42a 100644 --- a/cf/commands/application/restart.go +++ b/cf/commands/application/restart.go @@ -3,13 +3,13 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Restarter @@ -63,12 +63,12 @@ func (cmd *Restart) SetDependency(deps commandregistry.Dependency, pluginCall bo cmd.ui = deps.UI cmd.config = deps.Config - //get start for dependency + // get start for dependency starter := commandregistry.Commands.FindCommand("start") starter = starter.SetDependency(deps, false) cmd.starter = starter.(Starter) - //get stop for dependency + // get stop for dependency stopper := commandregistry.Commands.FindCommand("stop") stopper = stopper.SetDependency(deps, false) cmd.stopper = stopper.(Stopper) diff --git a/cf/commands/application/restart_app_instance.go b/cf/commands/application/restart_app_instance.go index c19dd6af3fd..b0e9464a25d 100644 --- a/cf/commands/application/restart_app_instance.go +++ b/cf/commands/application/restart_app_instance.go @@ -5,13 +5,13 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RestartAppInstance struct { diff --git a/cf/commands/application/restart_app_instance_test.go b/cf/commands/application/restart_app_instance_test.go index b7e5f3545e9..d7cfcd6e216 100644 --- a/cf/commands/application/restart_app_instance_test.go +++ b/cf/commands/application/restart_app_instance_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/appinstances/appinstancesfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances/appinstancesfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/restart_test.go b/cf/commands/application/restart_test.go index c4d2ba48cd0..9a4bb439663 100644 --- a/cf/commands/application/restart_test.go +++ b/cf/commands/application/restart_test.go @@ -3,18 +3,18 @@ package application_test import ( "os" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -37,7 +37,7 @@ var _ = Describe("restart command", func() { deps.UI = ui deps.Config = config - //inject fake 'stopper and starter' into registry + // inject fake 'stopper and starter' into registry commandregistry.Register(starter) commandregistry.Register(stopper) @@ -63,11 +63,11 @@ var _ = Describe("restart command", func() { applicationReq = new(requirementsfakes.FakeApplicationRequirement) applicationReq.GetApplicationReturns(app) - //save original command and restore later + // save original command and restore later originalStart = commandregistry.Commands.FindCommand("start") originalStop = commandregistry.Commands.FindCommand("stop") - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry starter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return starter } diff --git a/cf/commands/application/scale.go b/cf/commands/application/scale.go index b6bc67957f0..e333b9f55d7 100644 --- a/cf/commands/application/scale.go +++ b/cf/commands/application/scale.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Scale struct { @@ -66,7 +66,7 @@ func (cmd *Scale) SetDependency(deps commandregistry.Dependency, pluginCall bool cmd.config = deps.Config cmd.appRepo = deps.RepoLocator.GetApplicationRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("restart") commandDep = commandDep.SetDependency(deps, false) cmd.restarter = commandDep.(Restarter) diff --git a/cf/commands/application/scale_test.go b/cf/commands/application/scale_test.go index 368e6241e42..2a41b990ad1 100644 --- a/cf/commands/application/scale_test.go +++ b/cf/commands/application/scale_test.go @@ -1,20 +1,20 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("scale command", func() { @@ -34,7 +34,7 @@ var _ = Describe("scale command", func() { deps.RepoLocator = deps.RepoLocator.SetApplicationRepository(appRepo) deps.Config = config - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(restarter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("scale").SetDependency(deps, pluginCall)) @@ -45,11 +45,11 @@ var _ = Describe("scale command", func() { requirementsFactory.NewLoginRequirementReturns(requirements.Passing{}) requirementsFactory.NewTargetedSpaceRequirementReturns(requirements.Passing{}) - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("restart") restarter = new(applicationfakes.FakeRestarter) - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry restarter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return restarter } diff --git a/cf/commands/application/set_env.go b/cf/commands/application/set_env.go index 30363830d61..05563fe0a31 100644 --- a/cf/commands/application/set_env.go +++ b/cf/commands/application/set_env.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetEnv struct { diff --git a/cf/commands/application/set_env_test.go b/cf/commands/application/set_env_test.go index 6089e957218..d3b071301f9 100644 --- a/cf/commands/application/set_env_test.go +++ b/cf/commands/application/set_env_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/set_health_check.go b/cf/commands/application/set_health_check.go index 6a744a23def..61158d1aea1 100644 --- a/cf/commands/application/set_health_check.go +++ b/cf/commands/application/set_health_check.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetHealthCheck struct { diff --git a/cf/commands/application/set_health_check_test.go b/cf/commands/application/set_health_check_test.go index 18c1fc26947..d31ca22f749 100644 --- a/cf/commands/application/set_health_check_test.go +++ b/cf/commands/application/set_health_check_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/ssh.go b/cf/commands/application/ssh.go index f2a8e24481b..6774fcdb03d 100644 --- a/cf/commands/application/ssh.go +++ b/cf/commands/application/ssh.go @@ -8,17 +8,17 @@ import ( "golang.org/x/crypto/ssh" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/requirements" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" - "code.cloudfoundry.org/cli/cf/ssh/options" - sshTerminal "code.cloudfoundry.org/cli/cf/ssh/terminal" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/requirements" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" + sshTerminal "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SSH struct { @@ -95,7 +95,7 @@ func (cmd *SSH) SetDependency(deps commandregistry.Dependency, pluginCall bool) cmd.secureShell = deps.WildcardDependency.(sshCmd.SecureShell) } - //get ssh-code for dependency + // get ssh-code for dependency sshCodeGetter := commandregistry.Commands.FindCommand("ssh-code") sshCodeGetter = sshCodeGetter.SetDependency(deps, false) cmd.sshCodeGetter = sshCodeGetter.(commands.SSHCodeGetter) @@ -125,7 +125,7 @@ func (cmd *SSH) Execute(fc flags.FlagContext) error { return errors.New(T("Error getting one time auth code: ") + err.Error()) } - //init secureShell if it is not already set by SetDependency() with fakes + // init secureShell if it is not already set by SetDependency() with fakes if cmd.secureShell == nil { cmd.secureShell = sshCmd.NewSecureShell( sshCmd.DefaultSecureDialer(), diff --git a/cf/commands/application/ssh_enabled.go b/cf/commands/application/ssh_enabled.go index 7152209b907..0c70c21aff8 100644 --- a/cf/commands/application/ssh_enabled.go +++ b/cf/commands/application/ssh_enabled.go @@ -3,12 +3,12 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SSHEnabled struct { diff --git a/cf/commands/application/ssh_enabled_test.go b/cf/commands/application/ssh_enabled_test.go index a5ef948be20..225ac0703ab 100644 --- a/cf/commands/application/ssh_enabled_test.go +++ b/cf/commands/application/ssh_enabled_test.go @@ -1,16 +1,16 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/ssh_test.go b/cf/commands/application/ssh_test.go index 99c93cc3228..18bccaff487 100644 --- a/cf/commands/application/ssh_test.go +++ b/cf/commands/application/ssh_test.go @@ -6,22 +6,22 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/commandsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/ssh/sshfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/commandsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/ssh/sshfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -47,12 +47,12 @@ var _ = Describe("SSH command", func() { requirementsFactory = new(requirementsfakes.FakeFactory) deps.Gateways = make(map[string]net.Gateway) - //save original command and restore later + // save original command and restore later originalSSHCodeGetter = commandregistry.Commands.FindCommand("ssh-code") sshCodeGetter = new(commandsfakes.FakeSSHCodeGetter) - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry sshCodeGetter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return sshCodeGetter } @@ -60,7 +60,7 @@ var _ = Describe("SSH command", func() { }) AfterEach(func() { - //restore original command + // restore original command commandregistry.Register(originalSSHCodeGetter) }) @@ -68,7 +68,7 @@ var _ = Describe("SSH command", func() { deps.UI = ui deps.Config = configRepo - //inject fake 'sshCodeGetter' into registry + // inject fake 'sshCodeGetter' into registry commandregistry.Register(sshCodeGetter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("ssh").SetDependency(deps, pluginCall)) diff --git a/cf/commands/application/start.go b/cf/commands/application/start.go index ee78184b8ee..4a5efaf3533 100644 --- a/cf/commands/application/start.go +++ b/cf/commands/application/start.go @@ -10,17 +10,17 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) const ( @@ -195,7 +195,7 @@ func (cmd *Start) WatchStaging(app models.Application, orgName, spaceName string } cmd.ui.Ok() - //detectedstartcommand on first push is not present until starting completes + // detectedstartcommand on first push is not present until starting completes startedApp, err := cmd.appRepo.GetApp(updatedApp.GUID) if err != nil { return models.Application{}, err diff --git a/cf/commands/application/start_test.go b/cf/commands/application/start_test.go index 9ed242e6203..8f3d4926881 100644 --- a/cf/commands/application/start_test.go +++ b/cf/commands/application/start_test.go @@ -5,26 +5,26 @@ import ( "runtime" "time" - . "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - - "code.cloudfoundry.org/cli/cf/api/appinstances/appinstancesfakes" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/api/logs/logsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + + "code.cloudfoundry.org/cli/v9/cf/api/appinstances/appinstancesfakes" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs/logsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" "sync" @@ -59,7 +59,7 @@ var _ = Describe("start command", func() { deps.RepoLocator = deps.RepoLocator.SetApplicationRepository(appRepo) deps.RepoLocator = deps.RepoLocator.SetAppInstancesRepository(appInstancesRepo) - //inject fake 'Start' into registry + // inject fake 'Start' into registry commandregistry.Register(displayApp) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("start").SetDependency(deps, false)) @@ -104,7 +104,7 @@ var _ = Describe("start command", func() { displayApp = new(applicationfakes.FakeAppDisplayer) - //save original command dependency and restore later + // save original command dependency and restore later originalAppCommand = commandregistry.Commands.FindCommand("app") defaultInstanceErrorCodes = []string{"", ""} @@ -291,14 +291,14 @@ var _ = Describe("start command", func() { }) Context("when the timeout happens exactly when the connection is established", func() { - //var startWait *sync.WaitGroup + // var startWait *sync.WaitGroup BeforeEach(func() { requirementsFactory.NewLoginRequirementReturns(requirements.Passing{}) requirementsFactory.NewTargetedSpaceRequirementReturns(requirements.Passing{}) configRepo = testconfig.NewRepositoryWithDefaults() logRepo.TailLogsForStub = func(appGUID string, onConnect func(), logChan chan<- logs.Loggable, errChan chan<- error) { - //startWait.Wait() + // startWait.Wait() onConnect() } }) diff --git a/cf/commands/application/stop.go b/cf/commands/application/stop.go index c78385ae9fc..aa2fcf9b607 100644 --- a/cf/commands/application/stop.go +++ b/cf/commands/application/stop.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Stopper diff --git a/cf/commands/application/stop_test.go b/cf/commands/application/stop_test.go index d118e219df5..d7bd49ae60b 100644 --- a/cf/commands/application/stop_test.go +++ b/cf/commands/application/stop_test.go @@ -3,18 +3,18 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/unset_env.go b/cf/commands/application/unset_env.go index f3754350cb4..1554b5f4f3c 100644 --- a/cf/commands/application/unset_env.go +++ b/cf/commands/application/unset_env.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsetEnv struct { diff --git a/cf/commands/application/unset_env_test.go b/cf/commands/application/unset_env_test.go index 64fca2773ed..38f433a4e34 100644 --- a/cf/commands/application/unset_env_test.go +++ b/cf/commands/application/unset_env_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/auth.go b/cf/commands/auth.go index f65539edfff..90752f511b2 100644 --- a/cf/commands/auth.go +++ b/cf/commands/auth.go @@ -3,14 +3,14 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Authenticate struct { diff --git a/cf/commands/auth_test.go b/cf/commands/auth_test.go index 03202145677..868a384848c 100644 --- a/cf/commands/auth_test.go +++ b/cf/commands/auth_test.go @@ -3,22 +3,22 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("auth command", func() { diff --git a/cf/commands/buildpack/buildpack_suite_test.go b/cf/commands/buildpack/buildpack_suite_test.go index a5d02389fc0..b1a9368e4ab 100644 --- a/cf/commands/buildpack/buildpack_suite_test.go +++ b/cf/commands/buildpack/buildpack_suite_test.go @@ -1,8 +1,8 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/buildpack/buildpacks.go b/cf/commands/buildpack/buildpacks.go index 9971cce2136..b39505c1b86 100644 --- a/cf/commands/buildpack/buildpacks.go +++ b/cf/commands/buildpack/buildpacks.go @@ -4,14 +4,14 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListBuildpacks struct { diff --git a/cf/commands/buildpack/buildpacks_test.go b/cf/commands/buildpack/buildpacks_test.go index 2b9c00fc954..fde1abeda59 100644 --- a/cf/commands/buildpack/buildpacks_test.go +++ b/cf/commands/buildpack/buildpacks_test.go @@ -1,17 +1,17 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commands/buildpack" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/buildpack" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/buildpack/create_buildpack.go b/cf/commands/buildpack/create_buildpack.go index b04eceb9f05..f42ab132d5a 100644 --- a/cf/commands/buildpack/create_buildpack.go +++ b/cf/commands/buildpack/create_buildpack.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateBuildpack struct { diff --git a/cf/commands/buildpack/create_buildpack_test.go b/cf/commands/buildpack/create_buildpack_test.go index 8a5870fbb43..a249cb37866 100644 --- a/cf/commands/buildpack/create_buildpack_test.go +++ b/cf/commands/buildpack/create_buildpack_test.go @@ -3,16 +3,16 @@ package buildpack_test import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/buildpack/delete_buildpack.go b/cf/commands/buildpack/delete_buildpack.go index d46f119b5e6..a417a477ddf 100644 --- a/cf/commands/buildpack/delete_buildpack.go +++ b/cf/commands/buildpack/delete_buildpack.go @@ -3,14 +3,14 @@ package buildpack import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteBuildpack struct { @@ -87,7 +87,7 @@ func (cmd *DeleteBuildpack) Execute(c flags.FlagContext) error { } switch err.(type) { - case nil: //do nothing + case nil: // do nothing case *errors.ModelNotFoundError: cmd.ui.Ok() if stack == "" { diff --git a/cf/commands/buildpack/delete_buildpack_test.go b/cf/commands/buildpack/delete_buildpack_test.go index 4829e1c82bd..58d71921863 100644 --- a/cf/commands/buildpack/delete_buildpack_test.go +++ b/cf/commands/buildpack/delete_buildpack_test.go @@ -1,18 +1,18 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-buildpack command", func() { diff --git a/cf/commands/buildpack/rename_buildpack.go b/cf/commands/buildpack/rename_buildpack.go index d9341db19d1..5166e8270f1 100644 --- a/cf/commands/buildpack/rename_buildpack.go +++ b/cf/commands/buildpack/rename_buildpack.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameBuildpack struct { diff --git a/cf/commands/buildpack/rename_buildpack_test.go b/cf/commands/buildpack/rename_buildpack_test.go index d6cc8333250..96559d61b8d 100644 --- a/cf/commands/buildpack/rename_buildpack_test.go +++ b/cf/commands/buildpack/rename_buildpack_test.go @@ -1,18 +1,18 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("rename-buildpack command", func() { diff --git a/cf/commands/buildpack/update_buildpack.go b/cf/commands/buildpack/update_buildpack.go index a6d50a0bcc9..12083a32c12 100644 --- a/cf/commands/buildpack/update_buildpack.go +++ b/cf/commands/buildpack/update_buildpack.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateBuildpack struct { diff --git a/cf/commands/buildpack/update_buildpack_test.go b/cf/commands/buildpack/update_buildpack_test.go index 64c572985d7..40971f12414 100644 --- a/cf/commands/buildpack/update_buildpack_test.go +++ b/cf/commands/buildpack/update_buildpack_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/commands_suite_test.go b/cf/commands/commands_suite_test.go index c3529d26edd..a31de4866cc 100644 --- a/cf/commands/commands_suite_test.go +++ b/cf/commands/commands_suite_test.go @@ -1,9 +1,9 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/cf/commands/commandsfakes/fake_sshcode_getter.go b/cf/commands/commandsfakes/fake_sshcode_getter.go index f7b1615709f..a1cb6b212d7 100644 --- a/cf/commands/commandsfakes/fake_sshcode_getter.go +++ b/cf/commands/commandsfakes/fake_sshcode_getter.go @@ -4,10 +4,10 @@ package commandsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeSSHCodeGetter struct { @@ -80,15 +80,16 @@ func (fake *FakeSSHCodeGetter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -139,15 +140,16 @@ func (fake *FakeSSHCodeGetter) Get() (string, error) { ret, specificReturn := fake.getReturnsOnCall[len(fake.getArgsForCall)] fake.getArgsForCall = append(fake.getArgsForCall, struct { }{}) + stub := fake.GetStub + fakeReturns := fake.getReturns fake.recordInvocation("Get", []interface{}{}) fake.getMutex.Unlock() - if fake.GetStub != nil { - return fake.GetStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getReturns return fakeReturns.result1, fakeReturns.result2 } @@ -194,15 +196,16 @@ func (fake *FakeSSHCodeGetter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -248,15 +251,16 @@ func (fake *FakeSSHCodeGetter) Requirements(arg1 requirements.Factory, arg2 flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -312,15 +316,16 @@ func (fake *FakeSSHCodeGetter) SetDependency(arg1 commandregistry.Dependency, ar arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } diff --git a/cf/commands/config.go b/cf/commands/config.go index 83d003e59d3..cf64e108afd 100644 --- a/cf/commands/config.go +++ b/cf/commands/config.go @@ -4,13 +4,13 @@ import ( "errors" "sort" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ConfigCommands struct { diff --git a/cf/commands/config_test.go b/cf/commands/config_test.go index a2f4630dd54..c2cca9bacde 100644 --- a/cf/commands/config_test.go +++ b/cf/commands/config_test.go @@ -1,14 +1,14 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/create_app_manifest.go b/cf/commands/create_app_manifest.go index b70141873df..0653aacb8b1 100644 --- a/cf/commands/create_app_manifest.go +++ b/cf/commands/create_app_manifest.go @@ -6,18 +6,18 @@ import ( "os" "sort" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateAppManifest struct { @@ -157,7 +157,7 @@ func (cmd *CreateAppManifest) createManifest(app models.Application) error { default: return errors.New(T("Failed to create manifest, unable to parse environment variable: ") + envVarKey) case float64: - //json.Unmarshal turn all numbers to float64 + // json.Unmarshal turn all numbers to float64 value := int(app.EnvironmentVars[envVarKey].(float64)) cmd.manifest.EnvironmentVars(app.Name, envVarKey, fmt.Sprintf("%d", value)) case bool: diff --git a/cf/commands/create_app_manifest_test.go b/cf/commands/create_app_manifest_test.go index ad3b71d9b76..0e8bee8e970 100644 --- a/cf/commands/create_app_manifest_test.go +++ b/cf/commands/create_app_manifest_test.go @@ -4,23 +4,23 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/manifest/manifestfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/manifest/manifestfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" uuid "github.com/nu7hatch/gouuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/curl.go b/cf/commands/curl.go index 783577c3aa1..aaf848c99fe 100644 --- a/cf/commands/curl.go +++ b/cf/commands/curl.go @@ -10,17 +10,17 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/cf/flagcontext" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cfErrors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cfErrors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type Curl struct { diff --git a/cf/commands/curl_test.go b/cf/commands/curl_test.go index 870836436e5..7e52189dcd7 100644 --- a/cf/commands/curl_test.go +++ b/cf/commands/curl_test.go @@ -5,19 +5,19 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "code.cloudfoundry.org/gofileutils/fileutils" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/trace" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/create_domain.go b/cf/commands/domain/create_domain.go index b818e8540df..eab89940169 100644 --- a/cf/commands/domain/create_domain.go +++ b/cf/commands/domain/create_domain.go @@ -3,13 +3,13 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateDomain struct { diff --git a/cf/commands/domain/create_domain_test.go b/cf/commands/domain/create_domain_test.go index c2fd102c87a..94ae481c169 100644 --- a/cf/commands/domain/create_domain_test.go +++ b/cf/commands/domain/create_domain_test.go @@ -1,17 +1,17 @@ package domain_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/create_shared_domain.go b/cf/commands/domain/create_shared_domain.go index ef6a1cae14b..3ee10ec5047 100644 --- a/cf/commands/domain/create_shared_domain.go +++ b/cf/commands/domain/create_shared_domain.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateSharedDomain struct { diff --git a/cf/commands/domain/create_shared_domain_test.go b/cf/commands/domain/create_shared_domain_test.go index 33ee11a1001..0fdd062f446 100644 --- a/cf/commands/domain/create_shared_domain_test.go +++ b/cf/commands/domain/create_shared_domain_test.go @@ -3,20 +3,20 @@ package domain_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/cf/commands/domain" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/domain" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/delete_domain.go b/cf/commands/domain/delete_domain.go index 09c650ba6b5..c8e50649525 100644 --- a/cf/commands/domain/delete_domain.go +++ b/cf/commands/domain/delete_domain.go @@ -3,14 +3,14 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteDomain struct { diff --git a/cf/commands/domain/delete_domain_test.go b/cf/commands/domain/delete_domain_test.go index a4af8db6a77..863152c69ca 100644 --- a/cf/commands/domain/delete_domain_test.go +++ b/cf/commands/domain/delete_domain_test.go @@ -1,20 +1,20 @@ package domain_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-domain command", func() { diff --git a/cf/commands/domain/delete_shared_domain.go b/cf/commands/domain/delete_shared_domain.go index c8f966a1c87..a0c9ff3ad02 100644 --- a/cf/commands/domain/delete_shared_domain.go +++ b/cf/commands/domain/delete_shared_domain.go @@ -3,14 +3,14 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteSharedDomain struct { diff --git a/cf/commands/domain/delete_shared_domain_test.go b/cf/commands/domain/delete_shared_domain_test.go index c3517a09c43..db131d629f3 100644 --- a/cf/commands/domain/delete_shared_domain_test.go +++ b/cf/commands/domain/delete_shared_domain_test.go @@ -1,18 +1,18 @@ package domain_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/domain_suite_test.go b/cf/commands/domain/domain_suite_test.go index 1134db11e9f..71cc47baf96 100644 --- a/cf/commands/domain/domain_suite_test.go +++ b/cf/commands/domain/domain_suite_test.go @@ -1,8 +1,8 @@ package domain_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/domain/domains.go b/cf/commands/domain/domains.go index 8956bc42843..23422485292 100644 --- a/cf/commands/domain/domains.go +++ b/cf/commands/domain/domains.go @@ -3,14 +3,14 @@ package domain import ( "errors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListDomains struct { diff --git a/cf/commands/domain/domains_test.go b/cf/commands/domain/domains_test.go index 4c0e07406a2..7b837603ddc 100644 --- a/cf/commands/domain/domains_test.go +++ b/cf/commands/domain/domains_test.go @@ -3,21 +3,21 @@ package domain_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/cf/commands/domain" + "code.cloudfoundry.org/cli/v9/cf/commands/domain" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go b/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go index 1390d465359..e605137a919 100644 --- a/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go +++ b/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go @@ -1,8 +1,8 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/environmentvariablegroup/running_environment_variable_group.go b/cf/commands/environmentvariablegroup/running_environment_variable_group.go index d123fcd468f..dafda77a9d6 100644 --- a/cf/commands/environmentvariablegroup/running_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/running_environment_variable_group.go @@ -3,14 +3,14 @@ package environmentvariablegroup import ( "sort" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RunningEnvironmentVariableGroup struct { diff --git a/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go index 51a06ebf13e..ee4d0ef9005 100644 --- a/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go @@ -1,18 +1,18 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go b/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go index 45430d558c2..cabcc1ba80a 100644 --- a/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetRunningEnvironmentVariableGroup struct { diff --git a/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go index ebe73f6c22e..de807f019de 100644 --- a/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go @@ -1,16 +1,16 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go index e995b8cf2e0..5fa9fba1196 100644 --- a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetStagingEnvironmentVariableGroup struct { diff --git a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go index a5c3a05a2bc..24c016874fc 100644 --- a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go @@ -1,16 +1,16 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/staging_environment_variable_group.go b/cf/commands/environmentvariablegroup/staging_environment_variable_group.go index ba246d57fec..50865691e5f 100644 --- a/cf/commands/environmentvariablegroup/staging_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/staging_environment_variable_group.go @@ -3,14 +3,14 @@ package environmentvariablegroup import ( "sort" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type StagingEnvironmentVariableGroup struct { diff --git a/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go index affe6255406..600058497e6 100644 --- a/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go @@ -1,18 +1,18 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/disable_feature_flag.go b/cf/commands/featureflag/disable_feature_flag.go index 2ae884c2df7..388f7f6f636 100644 --- a/cf/commands/featureflag/disable_feature_flag.go +++ b/cf/commands/featureflag/disable_feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DisableFeatureFlag struct { diff --git a/cf/commands/featureflag/disable_feature_flag_test.go b/cf/commands/featureflag/disable_feature_flag_test.go index c5a33a98a59..e22a5781169 100644 --- a/cf/commands/featureflag/disable_feature_flag_test.go +++ b/cf/commands/featureflag/disable_feature_flag_test.go @@ -3,15 +3,15 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/enable_feature_flag.go b/cf/commands/featureflag/enable_feature_flag.go index 196dc9cafc0..8e597bbce93 100644 --- a/cf/commands/featureflag/enable_feature_flag.go +++ b/cf/commands/featureflag/enable_feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type EnableFeatureFlag struct { diff --git a/cf/commands/featureflag/enable_feature_flag_test.go b/cf/commands/featureflag/enable_feature_flag_test.go index f08ebdcdc96..3ae1251aef7 100644 --- a/cf/commands/featureflag/enable_feature_flag_test.go +++ b/cf/commands/featureflag/enable_feature_flag_test.go @@ -3,15 +3,15 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/feature_flag.go b/cf/commands/featureflag/feature_flag.go index 284fc95c7c7..0eea09cc67f 100644 --- a/cf/commands/featureflag/feature_flag.go +++ b/cf/commands/featureflag/feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ShowFeatureFlag struct { diff --git a/cf/commands/featureflag/feature_flag_test.go b/cf/commands/featureflag/feature_flag_test.go index bb7a483ee17..7fec142fcf7 100644 --- a/cf/commands/featureflag/feature_flag_test.go +++ b/cf/commands/featureflag/feature_flag_test.go @@ -3,16 +3,16 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/feature_flags.go b/cf/commands/featureflag/feature_flags.go index 045e5575bc3..5d631623fed 100644 --- a/cf/commands/featureflag/feature_flags.go +++ b/cf/commands/featureflag/feature_flags.go @@ -1,13 +1,13 @@ package featureflag import ( - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListFeatureFlags struct { diff --git a/cf/commands/featureflag/feature_flags_test.go b/cf/commands/featureflag/feature_flags_test.go index 1c0599416c9..08c1e3d0821 100644 --- a/cf/commands/featureflag/feature_flags_test.go +++ b/cf/commands/featureflag/feature_flags_test.go @@ -3,18 +3,18 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/featureflag" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/featureflag" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/featureflag_suite_test.go b/cf/commands/featureflag/featureflag_suite_test.go index 29d57065073..68814bf5da1 100644 --- a/cf/commands/featureflag/featureflag_suite_test.go +++ b/cf/commands/featureflag/featureflag_suite_test.go @@ -1,8 +1,8 @@ package featureflag_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/help.go b/cf/commands/help.go index 4415d7de931..84a18306067 100644 --- a/cf/commands/help.go +++ b/cf/commands/help.go @@ -4,14 +4,14 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/help" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/help" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type Help struct { @@ -53,7 +53,7 @@ func (cmd *Help) Execute(c flags.FlagContext) error { if commandregistry.Commands.CommandExists(cmdName) { cmd.ui.Say(commandregistry.Commands.CommandUsage(cmdName)) } else { - //check plugin commands + // check plugin commands found := false for _, meta := range cmd.config.Plugins() { for _, c := range meta.Commands { @@ -72,7 +72,7 @@ func (cmd *Help) Execute(c flags.FlagContext) error { if len(c.UsageDetails.Options) > 0 { output += "\n" + T("OPTIONS:") + "\n" - //find longest name length + // find longest name length l := 0 for n := range c.UsageDetails.Options { if len(n) > l { diff --git a/cf/commands/help_test.go b/cf/commands/help_test.go index b9e838d3f45..6e7aeb0c6de 100644 --- a/cf/commands/help_test.go +++ b/cf/commands/help_test.go @@ -3,16 +3,16 @@ package commands_test import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/commandsloader" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/plugin" - - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/commandsloader" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/plugin" + + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/cf/commands/login.go b/cf/commands/login.go index 4dbea14d2e9..520dfffda24 100644 --- a/cf/commands/login.go +++ b/cf/commands/login.go @@ -4,20 +4,20 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) const maxLoginTries = 3 diff --git a/cf/commands/login_test.go b/cf/commands/login_test.go index 09d81bcc944..1cf57dff6d5 100644 --- a/cf/commands/login_test.go +++ b/cf/commands/login_test.go @@ -3,21 +3,21 @@ package commands_test import ( "strconv" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("Login Command", func() { diff --git a/cf/commands/logout.go b/cf/commands/logout.go index e74e6d58ae4..69691b5f071 100644 --- a/cf/commands/logout.go +++ b/cf/commands/logout.go @@ -1,12 +1,12 @@ package commands import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Logout struct { diff --git a/cf/commands/logout_test.go b/cf/commands/logout_test.go index 1ac2947ed21..ae9bc1fbe5d 100644 --- a/cf/commands/logout_test.go +++ b/cf/commands/logout_test.go @@ -1,12 +1,12 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/oauth_token.go b/cf/commands/oauth_token.go index 3013e9d9764..3770e2387ba 100644 --- a/cf/commands/oauth_token.go +++ b/cf/commands/oauth_token.go @@ -1,14 +1,14 @@ package commands import ( - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type OAuthToken struct { diff --git a/cf/commands/oauth_token_test.go b/cf/commands/oauth_token_test.go index 4e74a28de30..191a1198380 100644 --- a/cf/commands/oauth_token_test.go +++ b/cf/commands/oauth_token_test.go @@ -3,20 +3,20 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/create_org.go b/cf/commands/organization/create_org.go index 598c20fc4d5..04ddf5a1b94 100644 --- a/cf/commands/organization/create_org.go +++ b/cf/commands/organization/create_org.go @@ -3,19 +3,19 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateOrg struct { @@ -66,7 +66,7 @@ func (cmd *CreateOrg) SetDependency(deps commandregistry.Dependency, pluginCall cmd.quotaRepo = deps.RepoLocator.GetQuotaRepository() cmd.flagRepo = deps.RepoLocator.GetFeatureFlagRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("set-org-role") commandDep = commandDep.SetDependency(deps, false) cmd.orgRoleSetter = commandDep.(user.OrgRoleSetter) diff --git a/cf/commands/organization/create_org_test.go b/cf/commands/organization/create_org_test.go index d4f78576149..eea5366448f 100644 --- a/cf/commands/organization/create_org_test.go +++ b/cf/commands/organization/create_org_test.go @@ -1,22 +1,22 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/commands/user/userfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/user/userfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -41,7 +41,7 @@ var _ = Describe("create-org command", func() { deps.RepoLocator = deps.RepoLocator.SetFeatureFlagRepository(flagRepo) deps.Config = config - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(orgRoleSetter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("create-org").SetDependency(deps, pluginCall)) @@ -58,13 +58,13 @@ var _ = Describe("create-org command", func() { config.SetAPIVersion("2.36.9") orgRoleSetter = new(userfakes.FakeOrgRoleSetter) - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry orgRoleSetter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return orgRoleSetter } orgRoleSetter.MetaDataReturns(commandregistry.CommandMetadata{Name: "set-org-role"}) - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("set-org-role") }) diff --git a/cf/commands/organization/delete_org.go b/cf/commands/organization/delete_org.go index de15697f965..5982e22dbd5 100644 --- a/cf/commands/organization/delete_org.go +++ b/cf/commands/organization/delete_org.go @@ -3,15 +3,15 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteOrg struct { diff --git a/cf/commands/organization/delete_org_test.go b/cf/commands/organization/delete_org_test.go index f0fea1a9d61..aed14009e47 100644 --- a/cf/commands/organization/delete_org_test.go +++ b/cf/commands/organization/delete_org_test.go @@ -1,19 +1,19 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/org.go b/cf/commands/organization/org.go index c8d2034267e..6a57fc2057b 100644 --- a/cf/commands/organization/org.go +++ b/cf/commands/organization/org.go @@ -5,16 +5,16 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type ShowOrg struct { diff --git a/cf/commands/organization/org_test.go b/cf/commands/organization/org_test.go index f310f83184a..1d89fc2c45d 100644 --- a/cf/commands/organization/org_test.go +++ b/cf/commands/organization/org_test.go @@ -1,18 +1,18 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commands/organization" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commands/organization" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/organization_suite_test.go b/cf/commands/organization/organization_suite_test.go index 6f809a00db5..2d0b51549ff 100644 --- a/cf/commands/organization/organization_suite_test.go +++ b/cf/commands/organization/organization_suite_test.go @@ -1,8 +1,8 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/organization/orgs.go b/cf/commands/organization/orgs.go index 6168ccfc974..c54b423a900 100644 --- a/cf/commands/organization/orgs.go +++ b/cf/commands/organization/orgs.go @@ -3,15 +3,15 @@ package organization import ( "errors" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) const orgLimit = 0 diff --git a/cf/commands/organization/orgs_test.go b/cf/commands/organization/orgs_test.go index ae0d7822baf..7285bacfeb7 100644 --- a/cf/commands/organization/orgs_test.go +++ b/cf/commands/organization/orgs_test.go @@ -3,23 +3,23 @@ package organization_test import ( "os" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commands/organization" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/organization" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("orgs command", func() { diff --git a/cf/commands/organization/rename_org.go b/cf/commands/organization/rename_org.go index cbbf929bd2f..54ac7e36e44 100644 --- a/cf/commands/organization/rename_org.go +++ b/cf/commands/organization/rename_org.go @@ -3,13 +3,13 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameOrg struct { diff --git a/cf/commands/organization/rename_org_test.go b/cf/commands/organization/rename_org_test.go index 8d9fe048cdf..98776fb734a 100644 --- a/cf/commands/organization/rename_org_test.go +++ b/cf/commands/organization/rename_org_test.go @@ -1,19 +1,19 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("rename-org command", func() { diff --git a/cf/commands/organization/set_quota.go b/cf/commands/organization/set_quota.go index b743579a57b..eb17e82bc56 100644 --- a/cf/commands/organization/set_quota.go +++ b/cf/commands/organization/set_quota.go @@ -3,13 +3,13 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetQuota struct { diff --git a/cf/commands/organization/set_quota_test.go b/cf/commands/organization/set_quota_test.go index 166bc33525c..2d6f9de4c08 100644 --- a/cf/commands/organization/set_quota_test.go +++ b/cf/commands/organization/set_quota_test.go @@ -1,17 +1,17 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/share_private_domain.go b/cf/commands/organization/share_private_domain.go index 0e254c8efe0..bce59a4414b 100644 --- a/cf/commands/organization/share_private_domain.go +++ b/cf/commands/organization/share_private_domain.go @@ -3,14 +3,14 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SharePrivateDomain struct { diff --git a/cf/commands/organization/unshare_private_domain.go b/cf/commands/organization/unshare_private_domain.go index 0f60dd0739c..12ebe7f1f68 100644 --- a/cf/commands/organization/unshare_private_domain.go +++ b/cf/commands/organization/unshare_private_domain.go @@ -3,14 +3,14 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsharePrivateDomain struct { diff --git a/cf/commands/passwd.go b/cf/commands/passwd.go index 51c9b1fa809..c23e2006345 100644 --- a/cf/commands/passwd.go +++ b/cf/commands/passwd.go @@ -1,14 +1,14 @@ package commands import ( - "code.cloudfoundry.org/cli/cf/api/password" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/password" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Password struct { diff --git a/cf/commands/passwd_test.go b/cf/commands/passwd_test.go index 2a7b9a25021..f584f081210 100644 --- a/cf/commands/passwd_test.go +++ b/cf/commands/passwd_test.go @@ -1,19 +1,19 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("password command", func() { diff --git a/cf/commands/plugin/install_plugin.go b/cf/commands/plugin/install_plugin.go index ac9c21d567f..fd86ce86098 100644 --- a/cf/commands/plugin/install_plugin.go +++ b/cf/commands/plugin/install_plugin.go @@ -8,21 +8,21 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/cf/actors/plugininstaller" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/downloader" - "code.cloudfoundry.org/cli/plugin" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/cf/actors/plugininstaller" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/downloader" + "code.cloudfoundry.org/cli/v9/plugin" + "code.cloudfoundry.org/cli/v9/util" "code.cloudfoundry.org/gofileutils/fileutils" - pluginRPCService "code.cloudfoundry.org/cli/plugin/rpc" + pluginRPCService "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type PluginInstall struct { @@ -78,8 +78,8 @@ func (cmd *PluginInstall) SetDependency(deps commandregistry.Dependency, pluginC cmd.pluginRepo = deps.PluginRepo cmd.checksum = deps.ChecksumUtil - //reset rpc registration in case there is other running instance, - //each service can only be registered once + // reset rpc registration in case there is other running instance, + // each service can only be registered once server := rpc.NewServer() rpcService, err := pluginRPCService.NewRpcService(deps.TeePrinter, deps.TeePrinter, deps.Config, deps.RepoLocator, pluginRPCService.NewCommandRunner(), deps.Logger, cmd.ui.Writer(), server) @@ -220,7 +220,7 @@ func (cmd *PluginInstall) ensurePluginIsSafeForInstallation(pluginMetadata *plug } for _, pluginCmd := range pluginMetadata.Commands { - //check for command conflicting core commands/alias + // check for command conflicting core commands/alias if pluginCmd.Name == "help" || commandregistry.Commands.CommandExists(pluginCmd.Name) { return errors.New(T( "Command `{{.Command}}` in the plugin being installed is a native CF command/alias. Rename the `{{.Command}}` command in the plugin being installed in order to enable its installation and use.", @@ -230,7 +230,7 @@ func (cmd *PluginInstall) ensurePluginIsSafeForInstallation(pluginMetadata *plug ) } - //check for alias conflicting core command/alias + // check for alias conflicting core command/alias if pluginCmd.Alias == "help" || commandregistry.Commands.CommandExists(pluginCmd.Alias) { return errors.New(T( "Alias `{{.Command}}` in the plugin being installed is a native CF command/alias. Rename the `{{.Command}}` command in the plugin being installed in order to enable its installation and use.", @@ -243,7 +243,7 @@ func (cmd *PluginInstall) ensurePluginIsSafeForInstallation(pluginMetadata *plug for installedPluginName, installedPlugin := range plugins { for _, installedPluginCmd := range installedPlugin.Commands { - //check for command conflicting other plugin commands/alias + // check for command conflicting other plugin commands/alias if installedPluginCmd.Name == pluginCmd.Name || installedPluginCmd.Alias == pluginCmd.Name { return errors.New(T( "Command `{{.Command}}` is a command/alias in plugin '{{.PluginName}}'. You could try uninstalling plugin '{{.PluginName}}' and then install this plugin in order to invoke the `{{.Command}}` command. However, you should first fully understand the impact of uninstalling the existing '{{.PluginName}}' plugin.", @@ -254,7 +254,7 @@ func (cmd *PluginInstall) ensurePluginIsSafeForInstallation(pluginMetadata *plug ) } - //check for alias conflicting other plugin commands/alias + // check for alias conflicting other plugin commands/alias if pluginCmd.Alias != "" && (installedPluginCmd.Name == pluginCmd.Alias || installedPluginCmd.Alias == pluginCmd.Alias) { return errors.New(T( "Alias `{{.Command}}` is a command/alias in plugin '{{.PluginName}}'. You could try uninstalling plugin '{{.PluginName}}' and then install this plugin in order to invoke the `{{.Command}}` command. However, you should first fully understand the impact of uninstalling the existing '{{.PluginName}}' plugin.", diff --git a/cf/commands/plugin/install_plugin_test.go b/cf/commands/plugin/install_plugin_test.go index d0913e59874..5fc38d6ea10 100644 --- a/cf/commands/plugin/install_plugin_test.go +++ b/cf/commands/plugin/install_plugin_test.go @@ -9,25 +9,25 @@ import ( "runtime" "sync" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo/pluginrepofakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commandregistry/commandregistryfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/util/utilfakes" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo/pluginrepofakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry/commandregistryfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/utilfakes" + "code.cloudfoundry.org/cli/v9/plugin" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/plugin/plugin_suite_test.go b/cf/commands/plugin/plugin_suite_test.go index b3609ae1eb2..804c53060ae 100644 --- a/cf/commands/plugin/plugin_suite_test.go +++ b/cf/commands/plugin/plugin_suite_test.go @@ -3,10 +3,10 @@ package plugin_test import ( "path/filepath" - "code.cloudfoundry.org/cli/cf/commands/plugin" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v9/cf/commands/plugin" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/plugin/plugins.go b/cf/commands/plugin/plugins.go index 844b1ff5768..320d1f7225f 100644 --- a/cf/commands/plugin/plugins.go +++ b/cf/commands/plugin/plugins.go @@ -4,14 +4,14 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/util/sorting" ) type Plugins struct { diff --git a/cf/commands/plugin/plugins_test.go b/cf/commands/plugin/plugins_test.go index d9634b02190..b18181f1c13 100644 --- a/cf/commands/plugin/plugins_test.go +++ b/cf/commands/plugin/plugins_test.go @@ -3,16 +3,16 @@ package plugin_test import ( "net/rpc" - "code.cloudfoundry.org/cli/cf/commandregistry" - plugincmd "code.cloudfoundry.org/cli/cf/commands/plugin" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + plugincmd "code.cloudfoundry.org/cli/v9/cf/commands/plugin" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/plugin/uninstall_plugin.go b/cf/commands/plugin/uninstall_plugin.go index 5d7574d7436..62a5eb8039e 100644 --- a/cf/commands/plugin/uninstall_plugin.go +++ b/cf/commands/plugin/uninstall_plugin.go @@ -8,13 +8,13 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - rpcService "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + rpcService "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type PluginUninstall struct { @@ -51,8 +51,8 @@ func (cmd *PluginUninstall) SetDependency(deps commandregistry.Dependency, plugi cmd.ui = deps.UI cmd.config = deps.PluginConfig - //reset rpc registration in case there is other running instance, - //each service can only be registered once + // reset rpc registration in case there is other running instance, + // each service can only be registered once server := rpc.NewServer() RPCService, err := rpcService.NewRpcService(deps.TeePrinter, deps.TeePrinter, deps.Config, deps.RepoLocator, rpcService.NewCommandRunner(), deps.Logger, cmd.ui.Writer(), server) @@ -87,7 +87,7 @@ func (cmd *PluginUninstall) Execute(c flags.FlagContext) error { cmd.ui.Say("Error invoking plugin: " + warn.Error() + ". Process to uninstall ...") } - time.Sleep(500 * time.Millisecond) //prevent 'process being used' error in Windows + time.Sleep(500 * time.Millisecond) // prevent 'process being used' error in Windows err = os.Remove(pluginMetadata.Location) if err != nil { diff --git a/cf/commands/plugin/uninstall_plugin_test.go b/cf/commands/plugin/uninstall_plugin_test.go index 2060faa3565..a49dabc358c 100644 --- a/cf/commands/plugin/uninstall_plugin_test.go +++ b/cf/commands/plugin/uninstall_plugin_test.go @@ -4,17 +4,17 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" "code.cloudfoundry.org/gofileutils/fileutils" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/pluginrepo/add_plugin_repo.go b/cf/commands/pluginrepo/add_plugin_repo.go index b91f44bb42b..d24b91972cd 100644 --- a/cf/commands/pluginrepo/add_plugin_repo.go +++ b/cf/commands/pluginrepo/add_plugin_repo.go @@ -10,16 +10,16 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type AddPluginRepo struct { diff --git a/cf/commands/pluginrepo/add_plugin_repo_test.go b/cf/commands/pluginrepo/add_plugin_repo_test.go index 4c1189e7c7c..10ed6d71721 100644 --- a/cf/commands/pluginrepo/add_plugin_repo_test.go +++ b/cf/commands/pluginrepo/add_plugin_repo_test.go @@ -5,15 +5,15 @@ import ( "net/http" "net/http/httptest" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/list_plugin_repos.go b/cf/commands/pluginrepo/list_plugin_repos.go index d7a1b0a6294..bd396df6616 100644 --- a/cf/commands/pluginrepo/list_plugin_repos.go +++ b/cf/commands/pluginrepo/list_plugin_repos.go @@ -1,13 +1,13 @@ package pluginrepo import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ListPluginRepos struct { diff --git a/cf/commands/pluginrepo/list_plugin_repos_test.go b/cf/commands/pluginrepo/list_plugin_repos_test.go index 246ddfb4126..31dbbf44be0 100644 --- a/cf/commands/pluginrepo/list_plugin_repos_test.go +++ b/cf/commands/pluginrepo/list_plugin_repos_test.go @@ -1,16 +1,16 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/plugin_repo_suite_test.go b/cf/commands/pluginrepo/plugin_repo_suite_test.go index eb1596a24e3..9a493a28b8f 100644 --- a/cf/commands/pluginrepo/plugin_repo_suite_test.go +++ b/cf/commands/pluginrepo/plugin_repo_suite_test.go @@ -1,9 +1,9 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/remove_plugin_repo.go b/cf/commands/pluginrepo/remove_plugin_repo.go index 6d4aa411e02..5e406a637a2 100644 --- a/cf/commands/pluginrepo/remove_plugin_repo.go +++ b/cf/commands/pluginrepo/remove_plugin_repo.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type RemovePluginRepo struct { diff --git a/cf/commands/pluginrepo/remove_plugin_repo_test.go b/cf/commands/pluginrepo/remove_plugin_repo_test.go index 679f75bdca4..5fda18ecda8 100644 --- a/cf/commands/pluginrepo/remove_plugin_repo_test.go +++ b/cf/commands/pluginrepo/remove_plugin_repo_test.go @@ -1,15 +1,15 @@ package pluginrepo_test import ( - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/repo_plugins.go b/cf/commands/pluginrepo/repo_plugins.go index dd0af956b9d..163ed5136f1 100644 --- a/cf/commands/pluginrepo/repo_plugins.go +++ b/cf/commands/pluginrepo/repo_plugins.go @@ -4,17 +4,17 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type RepoPlugins struct { diff --git a/cf/commands/pluginrepo/repo_plugins_test.go b/cf/commands/pluginrepo/repo_plugins_test.go index d1cc91420ac..72e6062dec8 100644 --- a/cf/commands/pluginrepo/repo_plugins_test.go +++ b/cf/commands/pluginrepo/repo_plugins_test.go @@ -1,20 +1,20 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/cf/actors/pluginrepo/pluginrepofakes" - "code.cloudfoundry.org/cli/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo/pluginrepofakes" + "code.cloudfoundry.org/cli/v9/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/create_quota.go b/cf/commands/quota/create_quota.go index bfcce949868..0dfac3e50bd 100644 --- a/cf/commands/quota/create_quota.go +++ b/cf/commands/quota/create_quota.go @@ -5,17 +5,17 @@ import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateQuota struct { diff --git a/cf/commands/quota/create_quota_test.go b/cf/commands/quota/create_quota_test.go index 4baad819055..4954df696d5 100644 --- a/cf/commands/quota/create_quota_test.go +++ b/cf/commands/quota/create_quota_test.go @@ -1,24 +1,24 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "encoding/json" - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commands/quota" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commands/quota" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" ) var _ = Describe("create-quota command", func() { diff --git a/cf/commands/quota/delete_quota.go b/cf/commands/quota/delete_quota.go index d8e08d7fbb1..a41fd2f1b97 100644 --- a/cf/commands/quota/delete_quota.go +++ b/cf/commands/quota/delete_quota.go @@ -3,14 +3,14 @@ package quota import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteQuota struct { diff --git a/cf/commands/quota/delete_quota_test.go b/cf/commands/quota/delete_quota_test.go index 936521414b3..7728af8ddda 100644 --- a/cf/commands/quota/delete_quota_test.go +++ b/cf/commands/quota/delete_quota_test.go @@ -1,18 +1,18 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/quota.go b/cf/commands/quota/quota.go index d1e91e8b5d5..d2cd2e1bed5 100644 --- a/cf/commands/quota/quota.go +++ b/cf/commands/quota/quota.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type showQuota struct { diff --git a/cf/commands/quota/quota_suite_test.go b/cf/commands/quota/quota_suite_test.go index 87b6847303e..017ecf35a43 100644 --- a/cf/commands/quota/quota_suite_test.go +++ b/cf/commands/quota/quota_suite_test.go @@ -1,8 +1,8 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/quota/quota_test.go b/cf/commands/quota/quota_test.go index bc1a7ff6c13..2589b89da8d 100644 --- a/cf/commands/quota/quota_test.go +++ b/cf/commands/quota/quota_test.go @@ -4,18 +4,18 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("quota", func() { diff --git a/cf/commands/quota/quotas.go b/cf/commands/quota/quotas.go index ef9396576a8..0f9ff7c309c 100644 --- a/cf/commands/quota/quotas.go +++ b/cf/commands/quota/quotas.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListQuotas struct { diff --git a/cf/commands/quota/quotas_test.go b/cf/commands/quota/quotas_test.go index 2d74520bac4..987d1780bcf 100644 --- a/cf/commands/quota/quotas_test.go +++ b/cf/commands/quota/quotas_test.go @@ -1,21 +1,21 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/commands/quota" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/terminal" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/quota" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/update_quota.go b/cf/commands/quota/update_quota.go index ead549e3791..2244dbafa10 100644 --- a/cf/commands/quota/update_quota.go +++ b/cf/commands/quota/update_quota.go @@ -6,14 +6,14 @@ import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateQuota struct { diff --git a/cf/commands/quota/update_quota_test.go b/cf/commands/quota/update_quota_test.go index d149aa4e645..1b99a150277 100644 --- a/cf/commands/quota/update_quota_test.go +++ b/cf/commands/quota/update_quota_test.go @@ -1,23 +1,23 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - cmdsQuota "code.cloudfoundry.org/cli/cf/commands/quota" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + cmdsQuota "code.cloudfoundry.org/cli/v9/cf/commands/quota" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "encoding/json" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/check_route.go b/cf/commands/route/check_route.go index 846d09ceeb6..5feeb99cb26 100644 --- a/cf/commands/route/check_route.go +++ b/cf/commands/route/check_route.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CheckRoute struct { diff --git a/cf/commands/route/check_route_test.go b/cf/commands/route/check_route_test.go index 960c7b7affa..8122055c8e6 100644 --- a/cf/commands/route/check_route_test.go +++ b/cf/commands/route/check_route_test.go @@ -3,20 +3,20 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/create_route.go b/cf/commands/route/create_route.go index d9c0cd3c707..0e4844be200 100644 --- a/cf/commands/route/create_route.go +++ b/cf/commands/route/create_route.go @@ -3,14 +3,14 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Creator diff --git a/cf/commands/route/create_route_test.go b/cf/commands/route/create_route_test.go index e68a88bdc52..c596a5efbf7 100644 --- a/cf/commands/route/create_route_test.go +++ b/cf/commands/route/create_route_test.go @@ -3,19 +3,19 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/route/delete_orphaned_routes.go b/cf/commands/route/delete_orphaned_routes.go index 7eb1ec04a23..624bd7a67a2 100644 --- a/cf/commands/route/delete_orphaned_routes.go +++ b/cf/commands/route/delete_orphaned_routes.go @@ -3,14 +3,14 @@ package route import ( "errors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteOrphanedRoutes struct { diff --git a/cf/commands/route/delete_orphaned_routes_test.go b/cf/commands/route/delete_orphaned_routes_test.go index dcc43843bb8..7744fa65c3e 100644 --- a/cf/commands/route/delete_orphaned_routes_test.go +++ b/cf/commands/route/delete_orphaned_routes_test.go @@ -1,19 +1,19 @@ package route_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/delete_route.go b/cf/commands/route/delete_route.go index 99eee02add9..52fb1bab87e 100644 --- a/cf/commands/route/delete_route.go +++ b/cf/commands/route/delete_route.go @@ -3,15 +3,15 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteRoute struct { diff --git a/cf/commands/route/delete_route_test.go b/cf/commands/route/delete_route_test.go index 44be4ba9ead..56d2dc4ca39 100644 --- a/cf/commands/route/delete_route_test.go +++ b/cf/commands/route/delete_route_test.go @@ -3,21 +3,21 @@ package route_test import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/map_route.go b/cf/commands/route/map_route.go index 4c0c1f2a43d..438b7956597 100644 --- a/cf/commands/route/map_route.go +++ b/cf/commands/route/map_route.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type MapRoute struct { @@ -100,7 +100,7 @@ func (cmd *MapRoute) SetDependency(deps commandregistry.Dependency, pluginCall b cmd.config = deps.Config cmd.routeRepo = deps.RepoLocator.GetRouteRepository() - //get create-route for dependency + // get create-route for dependency createRoute := commandregistry.Commands.FindCommand("create-route") createRoute = createRoute.SetDependency(deps, false) cmd.routeCreator = createRoute.(Creator) diff --git a/cf/commands/route/map_route_test.go b/cf/commands/route/map_route_test.go index ed11581b32a..206bba7e58b 100644 --- a/cf/commands/route/map_route_test.go +++ b/cf/commands/route/map_route_test.go @@ -3,23 +3,23 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/commands/route/routefakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/commands/route/routefakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/route_suite_test.go b/cf/commands/route/route_suite_test.go index c08170a3660..c936cf6fcb7 100644 --- a/cf/commands/route/route_suite_test.go +++ b/cf/commands/route/route_suite_test.go @@ -1,8 +1,8 @@ package route_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/route/routefakes/fake_creator.go b/cf/commands/route/routefakes/fake_creator.go index b0118b6c417..ed13094f875 100644 --- a/cf/commands/route/routefakes/fake_creator.go +++ b/cf/commands/route/routefakes/fake_creator.go @@ -4,8 +4,8 @@ package routefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeCreator struct { @@ -42,15 +42,16 @@ func (fake *FakeCreator) CreateRoute(arg1 string, arg2 string, arg3 int, arg4 bo arg5 models.DomainFields arg6 models.SpaceFields }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.CreateRouteStub + fakeReturns := fake.createRouteReturns fake.recordInvocation("CreateRoute", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) fake.createRouteMutex.Unlock() - if fake.CreateRouteStub != nil { - return fake.CreateRouteStub(arg1, arg2, arg3, arg4, arg5, arg6) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createRouteReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/commands/route/routefakes/old_fake_route_creator.go b/cf/commands/route/routefakes/old_fake_route_creator.go index c95e3c09e21..f1ec9a6e0a4 100644 --- a/cf/commands/route/routefakes/old_fake_route_creator.go +++ b/cf/commands/route/routefakes/old_fake_route_creator.go @@ -3,11 +3,11 @@ package routefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type OldFakeRouteCreator struct { diff --git a/cf/commands/route/routes.go b/cf/commands/route/routes.go index 1c2c1ed139c..4e28356aa72 100644 --- a/cf/commands/route/routes.go +++ b/cf/commands/route/routes.go @@ -5,15 +5,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListRoutes struct { diff --git a/cf/commands/route/routes_test.go b/cf/commands/route/routes_test.go index bf61c979916..b0bc900e982 100644 --- a/cf/commands/route/routes_test.go +++ b/cf/commands/route/routes_test.go @@ -3,22 +3,22 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/terminal" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commands/route" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("routes command", func() { diff --git a/cf/commands/route/unmap_route.go b/cf/commands/route/unmap_route.go index a49f850d7ec..748a8859476 100644 --- a/cf/commands/route/unmap_route.go +++ b/cf/commands/route/unmap_route.go @@ -3,13 +3,13 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnmapRoute struct { diff --git a/cf/commands/route/unmap_route_test.go b/cf/commands/route/unmap_route_test.go index 1784e8ee0c7..49b50b67f3b 100644 --- a/cf/commands/route/unmap_route_test.go +++ b/cf/commands/route/unmap_route_test.go @@ -3,22 +3,22 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/routergroups/router_groups.go b/cf/commands/routergroups/router_groups.go index 71f8fc8f629..8b6510c765f 100644 --- a/cf/commands/routergroups/router_groups.go +++ b/cf/commands/routergroups/router_groups.go @@ -3,14 +3,14 @@ package routergroups import ( "errors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RouterGroups struct { diff --git a/cf/commands/routergroups/router_groups_test.go b/cf/commands/routergroups/router_groups_test.go index 4377182cd0b..00e92a49a3e 100644 --- a/cf/commands/routergroups/router_groups_test.go +++ b/cf/commands/routergroups/router_groups_test.go @@ -3,18 +3,18 @@ package routergroups_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commands/routergroups" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/routergroups" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/routergroups/routergroups_suite_test.go b/cf/commands/routergroups/routergroups_suite_test.go index 2c07f499dbe..0dac586dcfe 100644 --- a/cf/commands/routergroups/routergroups_suite_test.go +++ b/cf/commands/routergroups/routergroups_suite_test.go @@ -1,8 +1,8 @@ package routergroups_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/securitygroup/bind_running_security_group.go b/cf/commands/securitygroup/bind_running_security_group.go index c2258fd452c..b3293ac0e21 100644 --- a/cf/commands/securitygroup/bind_running_security_group.go +++ b/cf/commands/securitygroup/bind_running_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type bindToRunningGroup struct { diff --git a/cf/commands/securitygroup/bind_running_security_group_test.go b/cf/commands/securitygroup/bind_running_security_group_test.go index 79a2fcedb0c..210edfafaa3 100644 --- a/cf/commands/securitygroup/bind_running_security_group_test.go +++ b/cf/commands/securitygroup/bind_running_security_group_test.go @@ -3,18 +3,18 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running/runningfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running/runningfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/bind_security_group.go b/cf/commands/securitygroup/bind_security_group.go index 0f6d97f9969..a323bc5cfed 100644 --- a/cf/commands/securitygroup/bind_security_group.go +++ b/cf/commands/securitygroup/bind_security_group.go @@ -3,17 +3,17 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - sgbinder "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + sgbinder "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type BindSecurityGroup struct { diff --git a/cf/commands/securitygroup/bind_security_group_test.go b/cf/commands/securitygroup/bind_security_group_test.go index d7b26669a30..15fadb2721d 100644 --- a/cf/commands/securitygroup/bind_security_group_test.go +++ b/cf/commands/securitygroup/bind_security_group_test.go @@ -1,21 +1,21 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces/spacesfakes" - spacesapifakes "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces/spacesfakes" + spacesapifakes "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/bind_staging_security_group.go b/cf/commands/securitygroup/bind_staging_security_group.go index cb9daaa463b..b5f0b9c69ea 100644 --- a/cf/commands/securitygroup/bind_staging_security_group.go +++ b/cf/commands/securitygroup/bind_staging_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type bindToStagingGroup struct { diff --git a/cf/commands/securitygroup/bind_staging_security_group_test.go b/cf/commands/securitygroup/bind_staging_security_group_test.go index 9b38fa6f7ea..4a3a3d5bb33 100644 --- a/cf/commands/securitygroup/bind_staging_security_group_test.go +++ b/cf/commands/securitygroup/bind_staging_security_group_test.go @@ -3,18 +3,18 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging/stagingfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging/stagingfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/create_security_group.go b/cf/commands/securitygroup/create_security_group.go index 03b0cb7265b..c01eb65bd93 100644 --- a/cf/commands/securitygroup/create_security_group.go +++ b/cf/commands/securitygroup/create_security_group.go @@ -3,16 +3,16 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) type CreateSecurityGroup struct { diff --git a/cf/commands/securitygroup/create_security_group_test.go b/cf/commands/securitygroup/create_security_group_test.go index a3b07f35786..4c4fb892ff4 100644 --- a/cf/commands/securitygroup/create_security_group_test.go +++ b/cf/commands/securitygroup/create_security_group_test.go @@ -4,17 +4,17 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/delete_security_group.go b/cf/commands/securitygroup/delete_security_group.go index 5b650d2cd0c..9f24efc3a04 100644 --- a/cf/commands/securitygroup/delete_security_group.go +++ b/cf/commands/securitygroup/delete_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteSecurityGroup struct { diff --git a/cf/commands/securitygroup/delete_security_group_test.go b/cf/commands/securitygroup/delete_security_group_test.go index bba0e5a5922..3b1e97a95fb 100644 --- a/cf/commands/securitygroup/delete_security_group_test.go +++ b/cf/commands/securitygroup/delete_security_group_test.go @@ -1,18 +1,18 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/running_security_groups.go b/cf/commands/securitygroup/running_security_groups.go index ea1d979668a..463a1ba47ed 100644 --- a/cf/commands/securitygroup/running_security_groups.go +++ b/cf/commands/securitygroup/running_security_groups.go @@ -1,13 +1,13 @@ package securitygroup import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type listRunningSecurityGroups struct { diff --git a/cf/commands/securitygroup/running_security_groups_test.go b/cf/commands/securitygroup/running_security_groups_test.go index 519c5281f03..274f5a6cd1f 100644 --- a/cf/commands/securitygroup/running_security_groups_test.go +++ b/cf/commands/securitygroup/running_security_groups_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running/runningfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running/runningfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/security_group.go b/cf/commands/securitygroup/security_group.go index 8027bbceec7..98f4d824e75 100644 --- a/cf/commands/securitygroup/security_group.go +++ b/cf/commands/securitygroup/security_group.go @@ -4,14 +4,14 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ShowSecurityGroup struct { diff --git a/cf/commands/securitygroup/security_group_test.go b/cf/commands/securitygroup/security_group_test.go index dfdb9034a08..9c8de883e8c 100644 --- a/cf/commands/securitygroup/security_group_test.go +++ b/cf/commands/securitygroup/security_group_test.go @@ -1,18 +1,18 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/security_groups.go b/cf/commands/securitygroup/security_groups.go index e72e63370f6..b10f08a9000 100644 --- a/cf/commands/securitygroup/security_groups.go +++ b/cf/commands/securitygroup/security_groups.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SecurityGroups struct { diff --git a/cf/commands/securitygroup/security_groups_test.go b/cf/commands/securitygroup/security_groups_test.go index a7ee40ee96d..fd2f3f79a22 100644 --- a/cf/commands/securitygroup/security_groups_test.go +++ b/cf/commands/securitygroup/security_groups_test.go @@ -1,20 +1,20 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commands/securitygroup" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/securitygroup" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/staging_security_groups.go b/cf/commands/securitygroup/staging_security_groups.go index bdf730f1c0c..e1e0abd81b5 100644 --- a/cf/commands/securitygroup/staging_security_groups.go +++ b/cf/commands/securitygroup/staging_security_groups.go @@ -1,13 +1,13 @@ package securitygroup import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type listStagingSecurityGroups struct { diff --git a/cf/commands/securitygroup/staging_security_groups_test.go b/cf/commands/securitygroup/staging_security_groups_test.go index 65dc53ad1ec..9409fd243f9 100644 --- a/cf/commands/securitygroup/staging_security_groups_test.go +++ b/cf/commands/securitygroup/staging_security_groups_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging/stagingfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging/stagingfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/suite_test.go b/cf/commands/securitygroup/suite_test.go index e0607c6b755..8e40366e26d 100644 --- a/cf/commands/securitygroup/suite_test.go +++ b/cf/commands/securitygroup/suite_test.go @@ -1,8 +1,8 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/securitygroup/unbind_running_security_group.go b/cf/commands/securitygroup/unbind_running_security_group.go index 2e4bbc4192f..ed5a9c5cafc 100644 --- a/cf/commands/securitygroup/unbind_running_security_group.go +++ b/cf/commands/securitygroup/unbind_running_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type unbindFromRunningGroup struct { diff --git a/cf/commands/securitygroup/unbind_running_security_group_test.go b/cf/commands/securitygroup/unbind_running_security_group_test.go index 18a5860cce2..0d4d0d4f82e 100644 --- a/cf/commands/securitygroup/unbind_running_security_group_test.go +++ b/cf/commands/securitygroup/unbind_running_security_group_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running/runningfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running/runningfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/unbind_security_group.go b/cf/commands/securitygroup/unbind_security_group.go index ca1159d28c6..1d9e047d380 100644 --- a/cf/commands/securitygroup/unbind_security_group.go +++ b/cf/commands/securitygroup/unbind_security_group.go @@ -3,16 +3,16 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - sgbinder "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + sgbinder "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnbindSecurityGroup struct { diff --git a/cf/commands/securitygroup/unbind_security_group_test.go b/cf/commands/securitygroup/unbind_security_group_test.go index 14eafedec97..d31963f1948 100644 --- a/cf/commands/securitygroup/unbind_security_group_test.go +++ b/cf/commands/securitygroup/unbind_security_group_test.go @@ -3,20 +3,20 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces/spacesfakes" - spacesapifakes "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces/spacesfakes" + spacesapifakes "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/unbind_staging_security_group.go b/cf/commands/securitygroup/unbind_staging_security_group.go index c47897625e2..fa8963d362f 100644 --- a/cf/commands/securitygroup/unbind_staging_security_group.go +++ b/cf/commands/securitygroup/unbind_staging_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type unbindFromStagingGroup struct { diff --git a/cf/commands/securitygroup/unbind_staging_security_group_test.go b/cf/commands/securitygroup/unbind_staging_security_group_test.go index df832815cc5..9d725f5cd0a 100644 --- a/cf/commands/securitygroup/unbind_staging_security_group_test.go +++ b/cf/commands/securitygroup/unbind_staging_security_group_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging/stagingfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging/stagingfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/update_security_group.go b/cf/commands/securitygroup/update_security_group.go index d249bded6c1..1a2291420c0 100644 --- a/cf/commands/securitygroup/update_security_group.go +++ b/cf/commands/securitygroup/update_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) type UpdateSecurityGroup struct { diff --git a/cf/commands/securitygroup/update_security_group_test.go b/cf/commands/securitygroup/update_security_group_test.go index 477092709ef..4fab724894b 100644 --- a/cf/commands/securitygroup/update_security_group_test.go +++ b/cf/commands/securitygroup/update_security_group_test.go @@ -4,18 +4,18 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/bind_route_service.go b/cf/commands/service/bind_route_service.go index 6cf791376cb..db121b41fb0 100644 --- a/cf/commands/service/bind_route_service.go +++ b/cf/commands/service/bind_route_service.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flagcontext" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type BindRouteService struct { diff --git a/cf/commands/service/bind_route_service_test.go b/cf/commands/service/bind_route_service_test.go index fcdd8264d67..2e343d50b21 100644 --- a/cf/commands/service/bind_route_service_test.go +++ b/cf/commands/service/bind_route_service_test.go @@ -5,20 +5,20 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/bind_service.go b/cf/commands/service/bind_service.go index 7acdb3c8755..383000e7ffb 100644 --- a/cf/commands/service/bind_service.go +++ b/cf/commands/service/bind_service.go @@ -3,17 +3,17 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Binder diff --git a/cf/commands/service/bind_service_test.go b/cf/commands/service/bind_service_test.go index f87e080aaea..7c895c7fd09 100644 --- a/cf/commands/service/bind_service_test.go +++ b/cf/commands/service/bind_service_test.go @@ -5,20 +5,20 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("bind-service command", func() { diff --git a/cf/commands/service/create_service.go b/cf/commands/service/create_service.go index 62b75952d31..500af1b5071 100644 --- a/cf/commands/service/create_service.go +++ b/cf/commands/service/create_service.go @@ -3,18 +3,18 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/uihelpers" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) type CreateService struct { diff --git a/cf/commands/service/create_service_test.go b/cf/commands/service/create_service_test.go index c794355e531..af85efa2447 100644 --- a/cf/commands/service/create_service_test.go +++ b/cf/commands/service/create_service_test.go @@ -5,24 +5,24 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("create-service command", func() { diff --git a/cf/commands/service/create_user_provided_service.go b/cf/commands/service/create_user_provided_service.go index c56846f61b6..0ededa88843 100644 --- a/cf/commands/service/create_user_provided_service.go +++ b/cf/commands/service/create_user_provided_service.go @@ -4,19 +4,19 @@ import ( "encoding/json" "strings" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/flagcontext" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateUserProvidedService struct { diff --git a/cf/commands/service/create_user_provided_service_test.go b/cf/commands/service/create_user_provided_service_test.go index 6db247a7929..55886ae2e49 100644 --- a/cf/commands/service/create_user_provided_service_test.go +++ b/cf/commands/service/create_user_provided_service_test.go @@ -5,19 +5,19 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/delete_service.go b/cf/commands/service/delete_service.go index c069134ade0..3be842e397d 100644 --- a/cf/commands/service/delete_service.go +++ b/cf/commands/service/delete_service.go @@ -3,14 +3,14 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteService struct { diff --git a/cf/commands/service/delete_service_test.go b/cf/commands/service/delete_service_test.go index 40717f1196a..a00fe2ba950 100644 --- a/cf/commands/service/delete_service_test.go +++ b/cf/commands/service/delete_service_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-service command", func() { diff --git a/cf/commands/service/marketplace.go b/cf/commands/service/marketplace.go index 83df62512e5..53f6e47662e 100644 --- a/cf/commands/service/marketplace.go +++ b/cf/commands/service/marketplace.go @@ -6,15 +6,15 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type MarketplaceServices struct { diff --git a/cf/commands/service/marketplace_test.go b/cf/commands/service/marketplace_test.go index 06d236443ac..437baa003bb 100644 --- a/cf/commands/service/marketplace_test.go +++ b/cf/commands/service/marketplace_test.go @@ -1,21 +1,21 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commands/service" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("marketplace command", func() { diff --git a/cf/commands/service/migrate_service_instances.go b/cf/commands/service/migrate_service_instances.go index 6424d85884b..44839d21e5d 100644 --- a/cf/commands/service/migrate_service_instances.go +++ b/cf/commands/service/migrate_service_instances.go @@ -3,17 +3,17 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type MigrateServiceInstances struct { diff --git a/cf/commands/service/migrate_service_instances_test.go b/cf/commands/service/migrate_service_instances_test.go index 6cb83874d7c..27ba1bdd0c8 100644 --- a/cf/commands/service/migrate_service_instances_test.go +++ b/cf/commands/service/migrate_service_instances_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("migrating service instances from v1 to v2", func() { diff --git a/cf/commands/service/purge_service_instance.go b/cf/commands/service/purge_service_instance.go index 3a29865c962..af14b3531bd 100644 --- a/cf/commands/service/purge_service_instance.go +++ b/cf/commands/service/purge_service_instance.go @@ -3,13 +3,13 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type PurgeServiceInstance struct { diff --git a/cf/commands/service/purge_service_instance_test.go b/cf/commands/service/purge_service_instance_test.go index dc7e8450305..2cc4ff3beb6 100644 --- a/cf/commands/service/purge_service_instance_test.go +++ b/cf/commands/service/purge_service_instance_test.go @@ -3,21 +3,21 @@ package service_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cferrors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cferrors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/service/purge_service_offering.go b/cf/commands/service/purge_service_offering.go index 4c55e772b89..3fa6345d347 100644 --- a/cf/commands/service/purge_service_offering.go +++ b/cf/commands/service/purge_service_offering.go @@ -3,15 +3,15 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type PurgeServiceOffering struct { diff --git a/cf/commands/service/purge_service_offering_test.go b/cf/commands/service/purge_service_offering_test.go index b114e6d0e2b..e79db24320b 100644 --- a/cf/commands/service/purge_service_offering_test.go +++ b/cf/commands/service/purge_service_offering_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/rename_service.go b/cf/commands/service/rename_service.go index 9557ebe3e5c..b8366085e60 100644 --- a/cf/commands/service/rename_service.go +++ b/cf/commands/service/rename_service.go @@ -3,15 +3,15 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameService struct { diff --git a/cf/commands/service/rename_service_test.go b/cf/commands/service/rename_service_test.go index cb6c9bc1278..3b8f3d3b82e 100644 --- a/cf/commands/service/rename_service_test.go +++ b/cf/commands/service/rename_service_test.go @@ -1,17 +1,17 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/service.go b/cf/commands/service/service.go index ce9faaa8a67..152b4bb9ee1 100644 --- a/cf/commands/service/service.go +++ b/cf/commands/service/service.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type ShowService struct { diff --git a/cf/commands/service/service_suite_test.go b/cf/commands/service/service_suite_test.go index c61fa706b20..8d5fd5093dc 100644 --- a/cf/commands/service/service_suite_test.go +++ b/cf/commands/service/service_suite_test.go @@ -1,8 +1,8 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/service/service_test.go b/cf/commands/service/service_test.go index 5c0bd774f83..92f89c4cc93 100644 --- a/cf/commands/service/service_test.go +++ b/cf/commands/service/service_test.go @@ -1,21 +1,21 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/servicefakes/fake_app_binder.go b/cf/commands/service/servicefakes/fake_app_binder.go index 6ac63f8dc6e..2cc47f05e4b 100644 --- a/cf/commands/service/servicefakes/fake_app_binder.go +++ b/cf/commands/service/servicefakes/fake_app_binder.go @@ -1,10 +1,10 @@ package servicefakes import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type OldFakeAppBinder struct { diff --git a/cf/commands/service/servicefakes/fake_binder.go b/cf/commands/service/servicefakes/fake_binder.go index b6ad688476c..bd99537e275 100644 --- a/cf/commands/service/servicefakes/fake_binder.go +++ b/cf/commands/service/servicefakes/fake_binder.go @@ -4,8 +4,8 @@ package servicefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeBinder struct { @@ -34,15 +34,16 @@ func (fake *FakeBinder) BindApplication(arg1 models.Application, arg2 models.Ser arg2 models.ServiceInstance arg3 map[string]interface{} }{arg1, arg2, arg3}) + stub := fake.BindApplicationStub + fakeReturns := fake.bindApplicationReturns fake.recordInvocation("BindApplication", []interface{}{arg1, arg2, arg3}) fake.bindApplicationMutex.Unlock() - if fake.BindApplicationStub != nil { - return fake.BindApplicationStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindApplicationReturns return fakeReturns.result1 } diff --git a/cf/commands/service/servicefakes/fake_route_service_unbinder.go b/cf/commands/service/servicefakes/fake_route_service_unbinder.go index a8790fdbe71..af812457a6e 100644 --- a/cf/commands/service/servicefakes/fake_route_service_unbinder.go +++ b/cf/commands/service/servicefakes/fake_route_service_unbinder.go @@ -4,8 +4,8 @@ package servicefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRouteServiceUnbinder struct { @@ -32,15 +32,16 @@ func (fake *FakeRouteServiceUnbinder) UnbindRoute(arg1 models.Route, arg2 models arg1 models.Route arg2 models.ServiceInstance }{arg1, arg2}) + stub := fake.UnbindRouteStub + fakeReturns := fake.unbindRouteReturns fake.recordInvocation("UnbindRoute", []interface{}{arg1, arg2}) fake.unbindRouteMutex.Unlock() - if fake.UnbindRouteStub != nil { - return fake.UnbindRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindRouteReturns return fakeReturns.result1 } diff --git a/cf/commands/service/services.go b/cf/commands/service/services.go index e13ab149fa8..5ba3c77a43d 100644 --- a/cf/commands/service/services.go +++ b/cf/commands/service/services.go @@ -3,15 +3,15 @@ package service import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListServices struct { diff --git a/cf/commands/service/services_test.go b/cf/commands/service/services_test.go index 1093af70348..f20d608f215 100644 --- a/cf/commands/service/services_test.go +++ b/cf/commands/service/services_test.go @@ -3,23 +3,23 @@ package service_test import ( "os" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - - "code.cloudfoundry.org/cli/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + + "code.cloudfoundry.org/cli/v9/cf/commands/service" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/unbind_route_service.go b/cf/commands/service/unbind_route_service.go index 258cfa9d535..bab252e5c76 100644 --- a/cf/commands/service/unbind_route_service.go +++ b/cf/commands/service/unbind_route_service.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteServiceUnbinder diff --git a/cf/commands/service/unbind_route_service_test.go b/cf/commands/service/unbind_route_service_test.go index 8c0fa50d3f1..92adade5c91 100644 --- a/cf/commands/service/unbind_route_service_test.go +++ b/cf/commands/service/unbind_route_service_test.go @@ -3,20 +3,20 @@ package service_test import ( "net/http" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/unbind_service.go b/cf/commands/service/unbind_service.go index 7f3f0a9c855..066a58e5be8 100644 --- a/cf/commands/service/unbind_service.go +++ b/cf/commands/service/unbind_service.go @@ -3,13 +3,13 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnbindService struct { diff --git a/cf/commands/service/unbind_service_test.go b/cf/commands/service/unbind_service_test.go index 026d88ed30c..79c7b061694 100644 --- a/cf/commands/service/unbind_service_test.go +++ b/cf/commands/service/unbind_service_test.go @@ -1,19 +1,19 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("unbind-service command", func() { diff --git a/cf/commands/service/update_service.go b/cf/commands/service/update_service.go index 25eecda7a95..8f55bc8f277 100644 --- a/cf/commands/service/update_service.go +++ b/cf/commands/service/update_service.go @@ -1,21 +1,21 @@ package service import ( - "code.cloudfoundry.org/cli/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" "errors" "fmt" "strings" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) type UpdateService struct { diff --git a/cf/commands/service/update_service_test.go b/cf/commands/service/update_service_test.go index 029d2fb276a..3da9d90ea2f 100644 --- a/cf/commands/service/update_service_test.go +++ b/cf/commands/service/update_service_test.go @@ -5,20 +5,20 @@ import ( "io/ioutil" "os" - planbuilderfakes "code.cloudfoundry.org/cli/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + planbuilderfakes "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("update-service command", func() { diff --git a/cf/commands/service/update_user_provided_service.go b/cf/commands/service/update_user_provided_service.go index 1c91365f713..0eb11e3c37d 100644 --- a/cf/commands/service/update_user_provided_service.go +++ b/cf/commands/service/update_user_provided_service.go @@ -6,17 +6,17 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/flagcontext" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/uihelpers" - - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" + + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateUserProvidedService struct { diff --git a/cf/commands/service/update_user_provided_service_test.go b/cf/commands/service/update_user_provided_service_test.go index 36aa4c6deaf..60230987ddd 100644 --- a/cf/commands/service/update_user_provided_service_test.go +++ b/cf/commands/service/update_user_provided_service_test.go @@ -5,20 +5,20 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/disable_service_access.go b/cf/commands/serviceaccess/disable_service_access.go index ae0fa27bf26..332fb0e1165 100644 --- a/cf/commands/serviceaccess/disable_service_access.go +++ b/cf/commands/serviceaccess/disable_service_access.go @@ -3,14 +3,14 @@ package serviceaccess import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DisableServiceAccess struct { diff --git a/cf/commands/serviceaccess/disable_service_access_test.go b/cf/commands/serviceaccess/disable_service_access_test.go index 7f99ec062ef..c8fb17adb1a 100644 --- a/cf/commands/serviceaccess/disable_service_access_test.go +++ b/cf/commands/serviceaccess/disable_service_access_test.go @@ -3,16 +3,16 @@ package serviceaccess_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/enable_service_access.go b/cf/commands/serviceaccess/enable_service_access.go index 17a2edfdb92..238193f1287 100644 --- a/cf/commands/serviceaccess/enable_service_access.go +++ b/cf/commands/serviceaccess/enable_service_access.go @@ -3,15 +3,15 @@ package serviceaccess import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type EnableServiceAccess struct { diff --git a/cf/commands/serviceaccess/enable_service_access_test.go b/cf/commands/serviceaccess/enable_service_access_test.go index a182f38252f..507d91f9652 100644 --- a/cf/commands/serviceaccess/enable_service_access_test.go +++ b/cf/commands/serviceaccess/enable_service_access_test.go @@ -3,17 +3,17 @@ package serviceaccess_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/service_access.go b/cf/commands/serviceaccess/service_access.go index 0a3ecf62897..c8e74cbf61f 100644 --- a/cf/commands/serviceaccess/service_access.go +++ b/cf/commands/serviceaccess/service_access.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ServiceAccess struct { diff --git a/cf/commands/serviceaccess/service_access_test.go b/cf/commands/serviceaccess/service_access_test.go index 99e579e942c..1a86f20e3e0 100644 --- a/cf/commands/serviceaccess/service_access_test.go +++ b/cf/commands/serviceaccess/service_access_test.go @@ -4,20 +4,20 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/serviceaccess" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/serviceaccess" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/serviceaccess_suite_test.go b/cf/commands/serviceaccess/serviceaccess_suite_test.go index 0907c997e6b..cdee22395ac 100644 --- a/cf/commands/serviceaccess/serviceaccess_suite_test.go +++ b/cf/commands/serviceaccess/serviceaccess_suite_test.go @@ -1,8 +1,8 @@ package serviceaccess_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/serviceauthtoken/create_service_auth_token.go b/cf/commands/serviceauthtoken/create_service_auth_token.go index 1adfd140eb2..6e162a200a9 100644 --- a/cf/commands/serviceauthtoken/create_service_auth_token.go +++ b/cf/commands/serviceauthtoken/create_service_auth_token.go @@ -3,15 +3,15 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/create_service_auth_token_test.go b/cf/commands/serviceauthtoken/create_service_auth_token_test.go index 541e3169c2c..8caa20ce63a 100644 --- a/cf/commands/serviceauthtoken/create_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/create_service_auth_token_test.go @@ -1,17 +1,17 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceauthtoken/delete_service_auth_token.go b/cf/commands/serviceauthtoken/delete_service_auth_token.go index c83b9814163..168b55f0fb5 100644 --- a/cf/commands/serviceauthtoken/delete_service_auth_token.go +++ b/cf/commands/serviceauthtoken/delete_service_auth_token.go @@ -3,16 +3,16 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/delete_service_auth_token_test.go b/cf/commands/serviceauthtoken/delete_service_auth_token_test.go index 87f971ac1c4..92d0e372a21 100644 --- a/cf/commands/serviceauthtoken/delete_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/delete_service_auth_token_test.go @@ -1,21 +1,21 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-service-auth-token command", func() { diff --git a/cf/commands/serviceauthtoken/service_auth_tokens.go b/cf/commands/serviceauthtoken/service_auth_tokens.go index d9b3898b436..6e200a86047 100644 --- a/cf/commands/serviceauthtoken/service_auth_tokens.go +++ b/cf/commands/serviceauthtoken/service_auth_tokens.go @@ -1,14 +1,14 @@ package serviceauthtoken import ( - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListServiceAuthTokens struct { diff --git a/cf/commands/serviceauthtoken/service_auth_tokens_test.go b/cf/commands/serviceauthtoken/service_auth_tokens_test.go index 3c6d7f8fb48..918102a1480 100644 --- a/cf/commands/serviceauthtoken/service_auth_tokens_test.go +++ b/cf/commands/serviceauthtoken/service_auth_tokens_test.go @@ -1,19 +1,19 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commands/serviceauthtoken" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/serviceauthtoken" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go b/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go index c58e9859ee5..00ff866a9da 100644 --- a/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go +++ b/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go @@ -1,8 +1,8 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/serviceauthtoken/update_service_auth_token.go b/cf/commands/serviceauthtoken/update_service_auth_token.go index 744f00a978e..240ea35be2f 100644 --- a/cf/commands/serviceauthtoken/update_service_auth_token.go +++ b/cf/commands/serviceauthtoken/update_service_auth_token.go @@ -3,14 +3,14 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/update_service_auth_token_test.go b/cf/commands/serviceauthtoken/update_service_auth_token_test.go index f671dbabfc1..6029c09145c 100644 --- a/cf/commands/serviceauthtoken/update_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/update_service_auth_token_test.go @@ -1,17 +1,17 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/create_service_broker.go b/cf/commands/servicebroker/create_service_broker.go index db3aaf3ae0a..944f93ae39d 100644 --- a/cf/commands/servicebroker/create_service_broker.go +++ b/cf/commands/servicebroker/create_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateServiceBroker struct { diff --git a/cf/commands/servicebroker/create_service_broker_test.go b/cf/commands/servicebroker/create_service_broker_test.go index 6742386d3bc..e24e0e40c95 100644 --- a/cf/commands/servicebroker/create_service_broker_test.go +++ b/cf/commands/servicebroker/create_service_broker_test.go @@ -3,18 +3,18 @@ package servicebroker_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/servicebroker" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/servicebroker" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/delete_service_broker.go b/cf/commands/servicebroker/delete_service_broker.go index 46951793977..29fc4b28299 100644 --- a/cf/commands/servicebroker/delete_service_broker.go +++ b/cf/commands/servicebroker/delete_service_broker.go @@ -3,14 +3,14 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteServiceBroker struct { diff --git a/cf/commands/servicebroker/delete_service_broker_test.go b/cf/commands/servicebroker/delete_service_broker_test.go index 09a91150702..1f7d2b2e214 100644 --- a/cf/commands/servicebroker/delete_service_broker_test.go +++ b/cf/commands/servicebroker/delete_service_broker_test.go @@ -1,17 +1,17 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/rename_service_broker.go b/cf/commands/servicebroker/rename_service_broker.go index 0f367b2a55e..c0a45416439 100644 --- a/cf/commands/servicebroker/rename_service_broker.go +++ b/cf/commands/servicebroker/rename_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameServiceBroker struct { diff --git a/cf/commands/servicebroker/rename_service_broker_test.go b/cf/commands/servicebroker/rename_service_broker_test.go index aeea99f96a7..2ee7e27adcd 100644 --- a/cf/commands/servicebroker/rename_service_broker_test.go +++ b/cf/commands/servicebroker/rename_service_broker_test.go @@ -1,16 +1,16 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/service_brokers.go b/cf/commands/servicebroker/service_brokers.go index 72a20de68cb..16c963135d3 100644 --- a/cf/commands/servicebroker/service_brokers.go +++ b/cf/commands/servicebroker/service_brokers.go @@ -3,14 +3,14 @@ package servicebroker import ( "sort" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListServiceBrokers struct { diff --git a/cf/commands/servicebroker/service_brokers_test.go b/cf/commands/servicebroker/service_brokers_test.go index ccf77690f9c..4dc3c475fd3 100644 --- a/cf/commands/servicebroker/service_brokers_test.go +++ b/cf/commands/servicebroker/service_brokers_test.go @@ -3,23 +3,23 @@ package servicebroker_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "strings" - "code.cloudfoundry.org/cli/cf/commands/servicebroker" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/servicebroker" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("service-brokers command", func() { diff --git a/cf/commands/servicebroker/servicebroker_suite_test.go b/cf/commands/servicebroker/servicebroker_suite_test.go index b47a081abbc..49d781aed67 100644 --- a/cf/commands/servicebroker/servicebroker_suite_test.go +++ b/cf/commands/servicebroker/servicebroker_suite_test.go @@ -1,8 +1,8 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicebroker/update_service_broker.go b/cf/commands/servicebroker/update_service_broker.go index 375111bd054..9bab61bcc71 100644 --- a/cf/commands/servicebroker/update_service_broker.go +++ b/cf/commands/servicebroker/update_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateServiceBroker struct { diff --git a/cf/commands/servicebroker/update_service_broker_test.go b/cf/commands/servicebroker/update_service_broker_test.go index fe69c995f2a..1797e0d3244 100644 --- a/cf/commands/servicebroker/update_service_broker_test.go +++ b/cf/commands/servicebroker/update_service_broker_test.go @@ -1,19 +1,19 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("update-service-broker command", func() { diff --git a/cf/commands/servicekey/create_service_key.go b/cf/commands/servicekey/create_service_key.go index 1c202774f90..c16ef94e552 100644 --- a/cf/commands/servicekey/create_service_key.go +++ b/cf/commands/servicekey/create_service_key.go @@ -3,16 +3,16 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type CreateServiceKey struct { diff --git a/cf/commands/servicekey/create_service_key_test.go b/cf/commands/servicekey/create_service_key_test.go index 39526952d0b..d2e32040d11 100644 --- a/cf/commands/servicekey/create_service_key_test.go +++ b/cf/commands/servicekey/create_service_key_test.go @@ -4,19 +4,19 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/delete_service_key.go b/cf/commands/servicekey/delete_service_key.go index 9ad4934b2e1..3237d392fba 100644 --- a/cf/commands/servicekey/delete_service_key.go +++ b/cf/commands/servicekey/delete_service_key.go @@ -3,15 +3,15 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type DeleteServiceKey struct { diff --git a/cf/commands/servicekey/delete_service_key_test.go b/cf/commands/servicekey/delete_service_key_test.go index 4fe1dbb8eec..79110927ed5 100644 --- a/cf/commands/servicekey/delete_service_key_test.go +++ b/cf/commands/servicekey/delete_service_key_test.go @@ -1,19 +1,19 @@ package servicekey_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/service_key.go b/cf/commands/servicekey/service_key.go index df3101514c0..002df9aae81 100644 --- a/cf/commands/servicekey/service_key.go +++ b/cf/commands/servicekey/service_key.go @@ -4,15 +4,15 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ServiceKey struct { diff --git a/cf/commands/servicekey/service_key_test.go b/cf/commands/servicekey/service_key_test.go index eaf178a6040..e49524f59cb 100644 --- a/cf/commands/servicekey/service_key_test.go +++ b/cf/commands/servicekey/service_key_test.go @@ -1,19 +1,19 @@ package servicekey_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/service_keys.go b/cf/commands/servicekey/service_keys.go index 8289c83b7e1..377e85b3da6 100644 --- a/cf/commands/servicekey/service_keys.go +++ b/cf/commands/servicekey/service_keys.go @@ -3,14 +3,14 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ServiceKeys struct { diff --git a/cf/commands/servicekey/service_keys_test.go b/cf/commands/servicekey/service_keys_test.go index f657caf0666..5a1dcd9a549 100644 --- a/cf/commands/servicekey/service_keys_test.go +++ b/cf/commands/servicekey/service_keys_test.go @@ -3,18 +3,18 @@ package servicekey_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/servicekey_suite_test.go b/cf/commands/servicekey/servicekey_suite_test.go index 37d37527186..81f9b5f3805 100644 --- a/cf/commands/servicekey/servicekey_suite_test.go +++ b/cf/commands/servicekey/servicekey_suite_test.go @@ -3,8 +3,8 @@ package servicekey_test import ( "testing" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/space/allow_space_ssh.go b/cf/commands/space/allow_space_ssh.go index 7254ddf9330..97968be2a61 100644 --- a/cf/commands/space/allow_space_ssh.go +++ b/cf/commands/space/allow_space_ssh.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type AllowSpaceSSH struct { diff --git a/cf/commands/space/allow_space_ssh_test.go b/cf/commands/space/allow_space_ssh_test.go index 141a556dfb6..793cc9a9e0d 100644 --- a/cf/commands/space/allow_space_ssh_test.go +++ b/cf/commands/space/allow_space_ssh_test.go @@ -3,17 +3,17 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/create_space.go b/cf/commands/space/create_space.go index bb862ee4db6..7d189a3d985 100644 --- a/cf/commands/space/create_space.go +++ b/cf/commands/space/create_space.go @@ -3,20 +3,20 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateSpace struct { @@ -73,7 +73,7 @@ func (cmd *CreateSpace) SetDependency(deps commandregistry.Dependency, pluginCal cmd.userRepo = deps.RepoLocator.GetUserRepository() cmd.spaceQuotaRepo = deps.RepoLocator.GetSpaceQuotaRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("set-space-role") commandDep = commandDep.SetDependency(deps, false) cmd.spaceRoleSetter = commandDep.(user.SpaceRoleSetter) diff --git a/cf/commands/space/create_space_test.go b/cf/commands/space/create_space_test.go index 2f52b593725..27c1b46cab1 100644 --- a/cf/commands/space/create_space_test.go +++ b/cf/commands/space/create_space_test.go @@ -1,23 +1,23 @@ package space_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -47,7 +47,7 @@ var _ = Describe("create-space command", func() { deps.RepoLocator = deps.RepoLocator.SetUserRepository(userRepo) deps.Config = configRepo - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(spaceRoleSetter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("create-space").SetDependency(deps, pluginCall)) @@ -75,7 +75,7 @@ var _ = Describe("create-space command", func() { GUID: "my-org-guid", } - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("set-space-role") spaceRepo = new(spacesfakes.FakeSpaceRepository) diff --git a/cf/commands/space/delete_space.go b/cf/commands/space/delete_space.go index 90268df5b07..c724b772b80 100644 --- a/cf/commands/space/delete_space.go +++ b/cf/commands/space/delete_space.go @@ -3,16 +3,16 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteSpace struct { diff --git a/cf/commands/space/delete_space_test.go b/cf/commands/space/delete_space_test.go index 38d0880439e..fe800f66470 100644 --- a/cf/commands/space/delete_space_test.go +++ b/cf/commands/space/delete_space_test.go @@ -3,20 +3,20 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-space command", func() { diff --git a/cf/commands/space/disallow_space_ssh.go b/cf/commands/space/disallow_space_ssh.go index 8095f19a8ff..8bc85e08cb5 100644 --- a/cf/commands/space/disallow_space_ssh.go +++ b/cf/commands/space/disallow_space_ssh.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DisallowSpaceSSH struct { diff --git a/cf/commands/space/disallow_space_ssh_test.go b/cf/commands/space/disallow_space_ssh_test.go index 0cc82512edd..86b8cd2c2b4 100644 --- a/cf/commands/space/disallow_space_ssh_test.go +++ b/cf/commands/space/disallow_space_ssh_test.go @@ -3,17 +3,17 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/rename_space.go b/cf/commands/space/rename_space.go index 92bfdb47787..2bf5e963460 100644 --- a/cf/commands/space/rename_space.go +++ b/cf/commands/space/rename_space.go @@ -3,13 +3,13 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameSpace struct { diff --git a/cf/commands/space/rename_space_test.go b/cf/commands/space/rename_space_test.go index 2b82fbac5b8..fc0c42e9f94 100644 --- a/cf/commands/space/rename_space_test.go +++ b/cf/commands/space/rename_space_test.go @@ -3,19 +3,19 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("rename-space command", func() { diff --git a/cf/commands/space/space.go b/cf/commands/space/space.go index e169568d62f..fde7ea219bd 100644 --- a/cf/commands/space/space.go +++ b/cf/commands/space/space.go @@ -4,17 +4,17 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ShowSpace struct { diff --git a/cf/commands/space/space_ssh_allowed.go b/cf/commands/space/space_ssh_allowed.go index bf4c70ec3b6..4ccef502bab 100644 --- a/cf/commands/space/space_ssh_allowed.go +++ b/cf/commands/space/space_ssh_allowed.go @@ -3,13 +3,13 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SSHAllowed struct { diff --git a/cf/commands/space/space_ssh_allowed_test.go b/cf/commands/space/space_ssh_allowed_test.go index 028ec8c5ddd..94c94547aff 100644 --- a/cf/commands/space/space_ssh_allowed_test.go +++ b/cf/commands/space/space_ssh_allowed_test.go @@ -3,13 +3,13 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/space_suite_test.go b/cf/commands/space/space_suite_test.go index 74d0383eece..a193ad0d49f 100644 --- a/cf/commands/space/space_suite_test.go +++ b/cf/commands/space/space_suite_test.go @@ -1,8 +1,8 @@ package space_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/space/space_test.go b/cf/commands/space/space_test.go index f0d6301e773..6b80538b186 100644 --- a/cf/commands/space/space_test.go +++ b/cf/commands/space/space_test.go @@ -1,22 +1,22 @@ package space_test import ( - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commands/space" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commands/space" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("space command", func() { diff --git a/cf/commands/space/spaces.go b/cf/commands/space/spaces.go index 951c40c0268..a11a382822e 100644 --- a/cf/commands/space/spaces.go +++ b/cf/commands/space/spaces.go @@ -3,15 +3,15 @@ package space import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type ListSpaces struct { diff --git a/cf/commands/space/spaces_test.go b/cf/commands/space/spaces_test.go index dc19e7ab0ad..9d29309836e 100644 --- a/cf/commands/space/spaces_test.go +++ b/cf/commands/space/spaces_test.go @@ -4,21 +4,21 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/commands/space" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/commands/space" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/create_space_quota.go b/cf/commands/spacequota/create_space_quota.go index 876c580c531..441ee7e0bcf 100644 --- a/cf/commands/spacequota/create_space_quota.go +++ b/cf/commands/spacequota/create_space_quota.go @@ -5,17 +5,17 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateSpaceQuota struct { diff --git a/cf/commands/spacequota/create_space_quota_test.go b/cf/commands/spacequota/create_space_quota_test.go index 337d4507852..3b9d30a4f82 100644 --- a/cf/commands/spacequota/create_space_quota_test.go +++ b/cf/commands/spacequota/create_space_quota_test.go @@ -3,21 +3,21 @@ package spacequota_test import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commands/spacequota" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/delete_space_quota.go b/cf/commands/spacequota/delete_space_quota.go index d23a6b04e48..569cf316031 100644 --- a/cf/commands/spacequota/delete_space_quota.go +++ b/cf/commands/spacequota/delete_space_quota.go @@ -3,15 +3,15 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type DeleteSpaceQuota struct { diff --git a/cf/commands/spacequota/delete_space_quota_test.go b/cf/commands/spacequota/delete_space_quota_test.go index e58f51eae55..29b76896017 100644 --- a/cf/commands/spacequota/delete_space_quota_test.go +++ b/cf/commands/spacequota/delete_space_quota_test.go @@ -1,19 +1,19 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/set_space_quota.go b/cf/commands/spacequota/set_space_quota.go index 0829c3734a5..45ac3ff70d8 100644 --- a/cf/commands/spacequota/set_space_quota.go +++ b/cf/commands/spacequota/set_space_quota.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetSpaceQuota struct { diff --git a/cf/commands/spacequota/set_space_quota_test.go b/cf/commands/spacequota/set_space_quota_test.go index eafc3503e76..49bcf19ada3 100644 --- a/cf/commands/spacequota/set_space_quota_test.go +++ b/cf/commands/spacequota/set_space_quota_test.go @@ -1,19 +1,19 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commands/spacequota" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/space_quota.go b/cf/commands/spacequota/space_quota.go index 52d134a9f20..08351e82690 100644 --- a/cf/commands/spacequota/space_quota.go +++ b/cf/commands/spacequota/space_quota.go @@ -3,14 +3,14 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SpaceQuota struct { diff --git a/cf/commands/spacequota/space_quota_test.go b/cf/commands/spacequota/space_quota_test.go index 7a83b45de21..d6fbc93a5fe 100644 --- a/cf/commands/spacequota/space_quota_test.go +++ b/cf/commands/spacequota/space_quota_test.go @@ -1,18 +1,18 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/space_quotas.go b/cf/commands/spacequota/space_quotas.go index 563b449f78e..30021e83f8e 100644 --- a/cf/commands/spacequota/space_quotas.go +++ b/cf/commands/spacequota/space_quotas.go @@ -4,14 +4,14 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListSpaceQuotas struct { diff --git a/cf/commands/spacequota/space_quotas_test.go b/cf/commands/spacequota/space_quotas_test.go index a2efb46bd53..d06d55ed144 100644 --- a/cf/commands/spacequota/space_quotas_test.go +++ b/cf/commands/spacequota/space_quotas_test.go @@ -1,20 +1,20 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commands/spacequota" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/spacequota" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/spacequota_suite_test.go b/cf/commands/spacequota/spacequota_suite_test.go index ca6f9b07226..9e3f67b3323 100644 --- a/cf/commands/spacequota/spacequota_suite_test.go +++ b/cf/commands/spacequota/spacequota_suite_test.go @@ -1,8 +1,8 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/spacequota/unset_space_quota.go b/cf/commands/spacequota/unset_space_quota.go index d603e4a7b71..a466bf446ec 100644 --- a/cf/commands/spacequota/unset_space_quota.go +++ b/cf/commands/spacequota/unset_space_quota.go @@ -3,14 +3,14 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsetSpaceQuota struct { diff --git a/cf/commands/spacequota/unset_space_quota_test.go b/cf/commands/spacequota/unset_space_quota_test.go index 9b348503d4e..413b4c4b03e 100644 --- a/cf/commands/spacequota/unset_space_quota_test.go +++ b/cf/commands/spacequota/unset_space_quota_test.go @@ -3,18 +3,18 @@ package spacequota_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/update_space_quota.go b/cf/commands/spacequota/update_space_quota.go index e006966cc69..ccedea96c16 100644 --- a/cf/commands/spacequota/update_space_quota.go +++ b/cf/commands/spacequota/update_space_quota.go @@ -6,14 +6,14 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateSpaceQuota struct { diff --git a/cf/commands/spacequota/update_space_quota_test.go b/cf/commands/spacequota/update_space_quota_test.go index a984e36c21b..d1bdecbd7d9 100644 --- a/cf/commands/spacequota/update_space_quota_test.go +++ b/cf/commands/spacequota/update_space_quota_test.go @@ -3,17 +3,17 @@ package spacequota_test import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/ssh_code.go b/cf/commands/ssh_code.go index 57d3e3a2f4a..8226dc5407e 100644 --- a/cf/commands/ssh_code.go +++ b/cf/commands/ssh_code.go @@ -3,14 +3,14 @@ package commands import ( "errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHCodeGetter diff --git a/cf/commands/ssh_code_test.go b/cf/commands/ssh_code_test.go index 34f2d49d695..98cb48b7877 100644 --- a/cf/commands/ssh_code_test.go +++ b/cf/commands/ssh_code_test.go @@ -3,19 +3,19 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/stack.go b/cf/commands/stack.go index 8374503ba4d..6630e5f4191 100644 --- a/cf/commands/stack.go +++ b/cf/commands/stack.go @@ -3,13 +3,13 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListStack struct { diff --git a/cf/commands/stack_test.go b/cf/commands/stack_test.go index 51138196b9c..a755e9b5758 100644 --- a/cf/commands/stack_test.go +++ b/cf/commands/stack_test.go @@ -3,20 +3,20 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("stack command", func() { diff --git a/cf/commands/stacks.go b/cf/commands/stacks.go index a2899eac905..81f581a5807 100644 --- a/cf/commands/stacks.go +++ b/cf/commands/stacks.go @@ -1,13 +1,13 @@ package commands import ( - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListStacks struct { diff --git a/cf/commands/stacks_test.go b/cf/commands/stacks_test.go index 0cae63393a7..d2377d5212b 100644 --- a/cf/commands/stacks_test.go +++ b/cf/commands/stacks_test.go @@ -1,21 +1,21 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commands" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("stacks command", func() { diff --git a/cf/commands/target.go b/cf/commands/target.go index 107ddb96fae..37c15de9109 100644 --- a/cf/commands/target.go +++ b/cf/commands/target.go @@ -3,16 +3,16 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Target struct { diff --git a/cf/commands/target_test.go b/cf/commands/target_test.go index 08676260163..e71c77d8ca9 100644 --- a/cf/commands/target_test.go +++ b/cf/commands/target_test.go @@ -1,24 +1,24 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/commands" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("target command", func() { diff --git a/cf/commands/user/create_user.go b/cf/commands/user/create_user.go index 9076dd1d6ed..6fedde5d678 100644 --- a/cf/commands/user/create_user.go +++ b/cf/commands/user/create_user.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateUser struct { diff --git a/cf/commands/user/create_user_test.go b/cf/commands/user/create_user_test.go index 7e964fc1a36..8fc9eba5885 100644 --- a/cf/commands/user/create_user_test.go +++ b/cf/commands/user/create_user_test.go @@ -1,19 +1,19 @@ package user_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("Create user command", func() { diff --git a/cf/commands/user/delete_user.go b/cf/commands/user/delete_user.go index 2d5dbd16855..09def376fd0 100644 --- a/cf/commands/user/delete_user.go +++ b/cf/commands/user/delete_user.go @@ -3,14 +3,14 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteUser struct { diff --git a/cf/commands/user/delete_user_test.go b/cf/commands/user/delete_user_test.go index ce79ef84cb9..99c9d4ed059 100644 --- a/cf/commands/user/delete_user_test.go +++ b/cf/commands/user/delete_user_test.go @@ -1,20 +1,20 @@ package user_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-user command", func() { diff --git a/cf/commands/user/org_users.go b/cf/commands/user/org_users.go index 3d24c6e94f0..af17c0b8077 100644 --- a/cf/commands/user/org_users.go +++ b/cf/commands/user/org_users.go @@ -3,16 +3,16 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors/userprint" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/actors/userprint" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type OrgUsers struct { diff --git a/cf/commands/user/org_users_test.go b/cf/commands/user/org_users_test.go index 942b9597cd5..b6365ddc1b2 100644 --- a/cf/commands/user/org_users_test.go +++ b/cf/commands/user/org_users_test.go @@ -1,23 +1,23 @@ package user_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("org-users command", func() { diff --git a/cf/commands/user/set_org_role.go b/cf/commands/user/set_org_role.go index d87a84f1168..817939836f3 100644 --- a/cf/commands/user/set_org_role.go +++ b/cf/commands/user/set_org_role.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrgRoleSetter diff --git a/cf/commands/user/set_org_role_test.go b/cf/commands/user/set_org_role_test.go index 33c07a5952d..b96f7cff982 100644 --- a/cf/commands/user/set_org_role_test.go +++ b/cf/commands/user/set_org_role_test.go @@ -3,20 +3,20 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/set_space_role.go b/cf/commands/user/set_space_role.go index 14329d26bc4..56a333a7aaa 100644 --- a/cf/commands/user/set_space_role.go +++ b/cf/commands/user/set_space_role.go @@ -3,17 +3,17 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRoleSetter diff --git a/cf/commands/user/set_space_role_test.go b/cf/commands/user/set_space_role_test.go index 64d3926662d..2c6077e7ccf 100644 --- a/cf/commands/user/set_space_role_test.go +++ b/cf/commands/user/set_space_role_test.go @@ -3,21 +3,21 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/space_users.go b/cf/commands/user/space_users.go index 0764b130451..863302183d5 100644 --- a/cf/commands/user/space_users.go +++ b/cf/commands/user/space_users.go @@ -3,17 +3,17 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors/userprint" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/actors/userprint" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type SpaceUsers struct { diff --git a/cf/commands/user/space_users_test.go b/cf/commands/user/space_users_test.go index a28f136e989..31b7a137dfb 100644 --- a/cf/commands/user/space_users_test.go +++ b/cf/commands/user/space_users_test.go @@ -3,24 +3,24 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("space-users command", func() { diff --git a/cf/commands/user/unset_org_role.go b/cf/commands/user/unset_org_role.go index 7f97312132d..101ad6e94c9 100644 --- a/cf/commands/user/unset_org_role.go +++ b/cf/commands/user/unset_org_role.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsetOrgRole struct { diff --git a/cf/commands/user/unset_org_role_test.go b/cf/commands/user/unset_org_role_test.go index 32f68ead1fd..60fa1f4ce66 100644 --- a/cf/commands/user/unset_org_role_test.go +++ b/cf/commands/user/unset_org_role_test.go @@ -3,20 +3,20 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - testapi "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + testapi "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/unset_space_role.go b/cf/commands/user/unset_space_role.go index 2697e8b57f6..849091a4bc6 100644 --- a/cf/commands/user/unset_space_role.go +++ b/cf/commands/user/unset_space_role.go @@ -3,16 +3,16 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsetSpaceRole struct { diff --git a/cf/commands/user/unset_space_role_test.go b/cf/commands/user/unset_space_role_test.go index cc42cbf4c6a..2e731585b3f 100644 --- a/cf/commands/user/unset_space_role_test.go +++ b/cf/commands/user/unset_space_role_test.go @@ -3,21 +3,21 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/user_suite_test.go b/cf/commands/user/user_suite_test.go index 720eecbf23f..565fd889b01 100644 --- a/cf/commands/user/user_suite_test.go +++ b/cf/commands/user/user_suite_test.go @@ -1,8 +1,8 @@ package user_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/user/userfakes/fake_org_role_setter.go b/cf/commands/user/userfakes/fake_org_role_setter.go index 0acf6936607..aee75374a7d 100644 --- a/cf/commands/user/userfakes/fake_org_role_setter.go +++ b/cf/commands/user/userfakes/fake_org_role_setter.go @@ -4,11 +4,11 @@ package userfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeOrgRoleSetter struct { @@ -83,15 +83,16 @@ func (fake *FakeOrgRoleSetter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -142,15 +143,16 @@ func (fake *FakeOrgRoleSetter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -196,15 +198,16 @@ func (fake *FakeOrgRoleSetter) Requirements(arg1 requirements.Factory, arg2 flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -260,15 +263,16 @@ func (fake *FakeOrgRoleSetter) SetDependency(arg1 commandregistry.Dependency, ar arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } @@ -323,15 +327,16 @@ func (fake *FakeOrgRoleSetter) SetOrgRole(arg1 string, arg2 models.Role, arg3 st arg3 string arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.SetOrgRoleStub + fakeReturns := fake.setOrgRoleReturns fake.recordInvocation("SetOrgRole", []interface{}{arg1, arg2, arg3, arg4}) fake.setOrgRoleMutex.Unlock() - if fake.SetOrgRoleStub != nil { - return fake.SetOrgRoleStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.setOrgRoleReturns return fakeReturns.result1 } diff --git a/cf/commands/user/userfakes/fake_space_role_setter.go b/cf/commands/user/userfakes/fake_space_role_setter.go index 5499c3d74a9..2245ca37281 100644 --- a/cf/commands/user/userfakes/fake_space_role_setter.go +++ b/cf/commands/user/userfakes/fake_space_role_setter.go @@ -4,11 +4,11 @@ package userfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeSpaceRoleSetter struct { @@ -85,15 +85,16 @@ func (fake *FakeSpaceRoleSetter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -144,15 +145,16 @@ func (fake *FakeSpaceRoleSetter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -198,15 +200,16 @@ func (fake *FakeSpaceRoleSetter) Requirements(arg1 requirements.Factory, arg2 fl arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -262,15 +265,16 @@ func (fake *FakeSpaceRoleSetter) SetDependency(arg1 commandregistry.Dependency, arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } @@ -327,15 +331,16 @@ func (fake *FakeSpaceRoleSetter) SetSpaceRole(arg1 models.Space, arg2 string, ar arg5 string arg6 string }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.SetSpaceRoleStub + fakeReturns := fake.setSpaceRoleReturns fake.recordInvocation("SetSpaceRole", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) fake.setSpaceRoleMutex.Unlock() - if fake.SetSpaceRoleStub != nil { - return fake.SetSpaceRoleStub(arg1, arg2, arg3, arg4, arg5, arg6) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6) } if specificReturn { return ret.result1 } - fakeReturns := fake.setSpaceRoleReturns return fakeReturns.result1 } diff --git a/cf/commands/version.go b/cf/commands/version.go index 13c76e8b7de..663e1c71668 100644 --- a/cf/commands/version.go +++ b/cf/commands/version.go @@ -3,13 +3,13 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/version" ) type Version struct { diff --git a/cf/commands/version_test.go b/cf/commands/version_test.go index 5d52a679330..c1d884922d5 100644 --- a/cf/commands/version_test.go +++ b/cf/commands/version_test.go @@ -1,13 +1,13 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/flags" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf" + "code.cloudfoundry.org/cli/v9/cf" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commandsloader/commands_loader.go b/cf/commandsloader/commands_loader.go index 5e884cb60dd..54a44352202 100644 --- a/cf/commandsloader/commands_loader.go +++ b/cf/commandsloader/commands_loader.go @@ -1,27 +1,27 @@ package commandsloader import ( - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/commands/buildpack" - "code.cloudfoundry.org/cli/cf/commands/domain" - "code.cloudfoundry.org/cli/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/cf/commands/featureflag" - "code.cloudfoundry.org/cli/cf/commands/organization" - "code.cloudfoundry.org/cli/cf/commands/plugin" - "code.cloudfoundry.org/cli/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/cf/commands/quota" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/commands/routergroups" - "code.cloudfoundry.org/cli/cf/commands/securitygroup" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/commands/serviceaccess" - "code.cloudfoundry.org/cli/cf/commands/serviceauthtoken" - "code.cloudfoundry.org/cli/cf/commands/servicebroker" - "code.cloudfoundry.org/cli/cf/commands/servicekey" - "code.cloudfoundry.org/cli/cf/commands/space" - "code.cloudfoundry.org/cli/cf/commands/spacequota" - "code.cloudfoundry.org/cli/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/commands/buildpack" + "code.cloudfoundry.org/cli/v9/cf/commands/domain" + "code.cloudfoundry.org/cli/v9/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v9/cf/commands/featureflag" + "code.cloudfoundry.org/cli/v9/cf/commands/organization" + "code.cloudfoundry.org/cli/v9/cf/commands/plugin" + "code.cloudfoundry.org/cli/v9/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/commands/quota" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/commands/routergroups" + "code.cloudfoundry.org/cli/v9/cf/commands/securitygroup" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/commands/serviceaccess" + "code.cloudfoundry.org/cli/v9/cf/commands/serviceauthtoken" + "code.cloudfoundry.org/cli/v9/cf/commands/servicebroker" + "code.cloudfoundry.org/cli/v9/cf/commands/servicekey" + "code.cloudfoundry.org/cli/v9/cf/commands/space" + "code.cloudfoundry.org/cli/v9/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v9/cf/commands/user" ) /******************* diff --git a/cf/commandsloader/commands_loader_test.go b/cf/commandsloader/commands_loader_test.go index 922a84ed28b..9e11abb8b59 100644 --- a/cf/commandsloader/commands_loader_test.go +++ b/cf/commandsloader/commands_loader_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commandsloader" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandsloader" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/config_disk_persistor_test.go b/cf/configuration/config_disk_persistor_test.go index 288486627f5..3167f874449 100644 --- a/cf/configuration/config_disk_persistor_test.go +++ b/cf/configuration/config_disk_persistor_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - . "code.cloudfoundry.org/cli/cf/configuration" + . "code.cloudfoundry.org/cli/v9/cf/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/configurationfakes/fake_data_interface.go b/cf/configuration/configurationfakes/fake_data_interface.go index 3746d42ee7b..d8d436af347 100644 --- a/cf/configuration/configurationfakes/fake_data_interface.go +++ b/cf/configuration/configurationfakes/fake_data_interface.go @@ -4,7 +4,7 @@ package configurationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration" ) type FakeDataInterface struct { @@ -40,15 +40,16 @@ func (fake *FakeDataInterface) JSONMarshalV3() ([]byte, error) { ret, specificReturn := fake.jSONMarshalV3ReturnsOnCall[len(fake.jSONMarshalV3ArgsForCall)] fake.jSONMarshalV3ArgsForCall = append(fake.jSONMarshalV3ArgsForCall, struct { }{}) + stub := fake.JSONMarshalV3Stub + fakeReturns := fake.jSONMarshalV3Returns fake.recordInvocation("JSONMarshalV3", []interface{}{}) fake.jSONMarshalV3Mutex.Unlock() - if fake.JSONMarshalV3Stub != nil { - return fake.JSONMarshalV3Stub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.jSONMarshalV3Returns return fakeReturns.result1, fakeReturns.result2 } @@ -101,15 +102,16 @@ func (fake *FakeDataInterface) JSONUnmarshalV3(arg1 []byte) error { fake.jSONUnmarshalV3ArgsForCall = append(fake.jSONUnmarshalV3ArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.JSONUnmarshalV3Stub + fakeReturns := fake.jSONUnmarshalV3Returns fake.recordInvocation("JSONUnmarshalV3", []interface{}{arg1Copy}) fake.jSONUnmarshalV3Mutex.Unlock() - if fake.JSONUnmarshalV3Stub != nil { - return fake.JSONUnmarshalV3Stub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.jSONUnmarshalV3Returns return fakeReturns.result1 } diff --git a/cf/configuration/configurationfakes/fake_persistor.go b/cf/configuration/configurationfakes/fake_persistor.go index 3283bb555d5..6ebfccfba89 100644 --- a/cf/configuration/configurationfakes/fake_persistor.go +++ b/cf/configuration/configurationfakes/fake_persistor.go @@ -4,7 +4,7 @@ package configurationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration" ) type FakePersistor struct { @@ -52,9 +52,10 @@ func (fake *FakePersistor) Delete() { fake.deleteMutex.Lock() fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { }{}) + stub := fake.DeleteStub fake.recordInvocation("Delete", []interface{}{}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { + if stub != nil { fake.DeleteStub() } } @@ -76,15 +77,16 @@ func (fake *FakePersistor) Exists() bool { ret, specificReturn := fake.existsReturnsOnCall[len(fake.existsArgsForCall)] fake.existsArgsForCall = append(fake.existsArgsForCall, struct { }{}) + stub := fake.ExistsStub + fakeReturns := fake.existsReturns fake.recordInvocation("Exists", []interface{}{}) fake.existsMutex.Unlock() - if fake.ExistsStub != nil { - return fake.ExistsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.existsReturns return fakeReturns.result1 } @@ -129,15 +131,16 @@ func (fake *FakePersistor) Load(arg1 configuration.DataInterface) error { fake.loadArgsForCall = append(fake.loadArgsForCall, struct { arg1 configuration.DataInterface }{arg1}) + stub := fake.LoadStub + fakeReturns := fake.loadReturns fake.recordInvocation("Load", []interface{}{arg1}) fake.loadMutex.Unlock() - if fake.LoadStub != nil { - return fake.LoadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.loadReturns return fakeReturns.result1 } @@ -189,15 +192,16 @@ func (fake *FakePersistor) Save(arg1 configuration.DataInterface) error { fake.saveArgsForCall = append(fake.saveArgsForCall, struct { arg1 configuration.DataInterface }{arg1}) + stub := fake.SaveStub + fakeReturns := fake.saveReturns fake.recordInvocation("Save", []interface{}{arg1}) fake.saveMutex.Unlock() - if fake.SaveStub != nil { - return fake.SaveStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.saveReturns return fakeReturns.result1 } diff --git a/cf/configuration/coreconfig/access_token_test.go b/cf/configuration/coreconfig/access_token_test.go index d9278e88325..5b8056cab87 100644 --- a/cf/configuration/coreconfig/access_token_test.go +++ b/cf/configuration/coreconfig/access_token_test.go @@ -1,7 +1,7 @@ package coreconfig_test import ( - . "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/api_config_refresher.go b/cf/configuration/coreconfig/api_config_refresher.go index 3e933ce4775..b96a529eeac 100644 --- a/cf/configuration/coreconfig/api_config_refresher.go +++ b/cf/configuration/coreconfig/api_config_refresher.go @@ -3,7 +3,7 @@ package coreconfig import ( "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . EndpointRepository diff --git a/cf/configuration/coreconfig/api_config_refresher_test.go b/cf/configuration/coreconfig/api_config_refresher_test.go index 2f52d74caec..082c901ab42 100644 --- a/cf/configuration/coreconfig/api_config_refresher_test.go +++ b/cf/configuration/coreconfig/api_config_refresher_test.go @@ -1,11 +1,11 @@ package coreconfig_test import ( - . "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/config_data.go b/cf/configuration/coreconfig/config_data.go index a5314a124c4..7eb4dd8dd15 100644 --- a/cf/configuration/coreconfig/config_data.go +++ b/cf/configuration/coreconfig/config_data.go @@ -3,8 +3,8 @@ package coreconfig import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type AuthPromptType string diff --git a/cf/configuration/coreconfig/config_data_test.go b/cf/configuration/coreconfig/config_data_test.go index e3f44d726c9..33d48309cf3 100644 --- a/cf/configuration/coreconfig/config_data_test.go +++ b/cf/configuration/coreconfig/config_data_test.go @@ -1,8 +1,8 @@ package coreconfig_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/configuration/coreconfig/config_repository.go b/cf/configuration/coreconfig/config_repository.go index 6da594b364d..60e1f59ae22 100644 --- a/cf/configuration/coreconfig/config_repository.go +++ b/cf/configuration/coreconfig/config_repository.go @@ -4,9 +4,9 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" ) @@ -40,7 +40,7 @@ func NewRepositoryFromFilepath(filepath string, errorHandler func(error)) Reposi func NewRepositoryFromPersistor(persistor configuration.Persistor, errorHandler func(error)) Repository { data := NewData() if !persistor.Exists() { - //set default plugin repo + // set default plugin repo data.PluginRepos = append(data.PluginRepos, models.PluginRepo{ Name: "CF-Community", URL: "https://plugins.cloudfoundry.org", diff --git a/cf/configuration/coreconfig/config_repository_test.go b/cf/configuration/coreconfig/config_repository_test.go index d71006e4b0d..0031bfb0bcb 100644 --- a/cf/configuration/coreconfig/config_repository_test.go +++ b/cf/configuration/coreconfig/config_repository_test.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/configurationfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/configurationfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go b/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go index aaf2b94c6f3..34b423c8210 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go @@ -4,7 +4,7 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" ) type FakeEndpointRepository struct { @@ -33,15 +33,16 @@ func (fake *FakeEndpointRepository) GetCCInfo(arg1 string) (*coreconfig.CCInfo, fake.getCCInfoArgsForCall = append(fake.getCCInfoArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetCCInfoStub + fakeReturns := fake.getCCInfoReturns fake.recordInvocation("GetCCInfo", []interface{}{arg1}) fake.getCCInfoMutex.Unlock() - if fake.GetCCInfoStub != nil { - return fake.GetCCInfoStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getCCInfoReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go b/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go index 1e924f299c6..0cf961ce5d5 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go @@ -4,9 +4,9 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "github.com/blang/semver/v4" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + semver "github.com/blang/semver/v4" ) type FakeReadWriter struct { @@ -480,15 +480,16 @@ func (fake *FakeReadWriter) APIEndpoint() string { ret, specificReturn := fake.aPIEndpointReturnsOnCall[len(fake.aPIEndpointArgsForCall)] fake.aPIEndpointArgsForCall = append(fake.aPIEndpointArgsForCall, struct { }{}) + stub := fake.APIEndpointStub + fakeReturns := fake.aPIEndpointReturns fake.recordInvocation("APIEndpoint", []interface{}{}) fake.aPIEndpointMutex.Unlock() - if fake.APIEndpointStub != nil { - return fake.APIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIEndpointReturns return fakeReturns.result1 } @@ -532,15 +533,16 @@ func (fake *FakeReadWriter) APIVersion() string { ret, specificReturn := fake.aPIVersionReturnsOnCall[len(fake.aPIVersionArgsForCall)] fake.aPIVersionArgsForCall = append(fake.aPIVersionArgsForCall, struct { }{}) + stub := fake.APIVersionStub + fakeReturns := fake.aPIVersionReturns fake.recordInvocation("APIVersion", []interface{}{}) fake.aPIVersionMutex.Unlock() - if fake.APIVersionStub != nil { - return fake.APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIVersionReturns return fakeReturns.result1 } @@ -584,15 +586,16 @@ func (fake *FakeReadWriter) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -636,15 +639,16 @@ func (fake *FakeReadWriter) AsyncTimeout() uint { ret, specificReturn := fake.asyncTimeoutReturnsOnCall[len(fake.asyncTimeoutArgsForCall)] fake.asyncTimeoutArgsForCall = append(fake.asyncTimeoutArgsForCall, struct { }{}) + stub := fake.AsyncTimeoutStub + fakeReturns := fake.asyncTimeoutReturns fake.recordInvocation("AsyncTimeout", []interface{}{}) fake.asyncTimeoutMutex.Unlock() - if fake.AsyncTimeoutStub != nil { - return fake.AsyncTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.asyncTimeoutReturns return fakeReturns.result1 } @@ -688,15 +692,16 @@ func (fake *FakeReadWriter) AuthenticationEndpoint() string { ret, specificReturn := fake.authenticationEndpointReturnsOnCall[len(fake.authenticationEndpointArgsForCall)] fake.authenticationEndpointArgsForCall = append(fake.authenticationEndpointArgsForCall, struct { }{}) + stub := fake.AuthenticationEndpointStub + fakeReturns := fake.authenticationEndpointReturns fake.recordInvocation("AuthenticationEndpoint", []interface{}{}) fake.authenticationEndpointMutex.Unlock() - if fake.AuthenticationEndpointStub != nil { - return fake.AuthenticationEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.authenticationEndpointReturns return fakeReturns.result1 } @@ -740,15 +745,16 @@ func (fake *FakeReadWriter) CLIVersion() string { ret, specificReturn := fake.cLIVersionReturnsOnCall[len(fake.cLIVersionArgsForCall)] fake.cLIVersionArgsForCall = append(fake.cLIVersionArgsForCall, struct { }{}) + stub := fake.CLIVersionStub + fakeReturns := fake.cLIVersionReturns fake.recordInvocation("CLIVersion", []interface{}{}) fake.cLIVersionMutex.Unlock() - if fake.CLIVersionStub != nil { - return fake.CLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cLIVersionReturns return fakeReturns.result1 } @@ -791,9 +797,10 @@ func (fake *FakeReadWriter) ClearSession() { fake.clearSessionMutex.Lock() fake.clearSessionArgsForCall = append(fake.clearSessionArgsForCall, struct { }{}) + stub := fake.ClearSessionStub fake.recordInvocation("ClearSession", []interface{}{}) fake.clearSessionMutex.Unlock() - if fake.ClearSessionStub != nil { + if stub != nil { fake.ClearSessionStub() } } @@ -815,15 +822,16 @@ func (fake *FakeReadWriter) ColorEnabled() string { ret, specificReturn := fake.colorEnabledReturnsOnCall[len(fake.colorEnabledArgsForCall)] fake.colorEnabledArgsForCall = append(fake.colorEnabledArgsForCall, struct { }{}) + stub := fake.ColorEnabledStub + fakeReturns := fake.colorEnabledReturns fake.recordInvocation("ColorEnabled", []interface{}{}) fake.colorEnabledMutex.Unlock() - if fake.ColorEnabledStub != nil { - return fake.ColorEnabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.colorEnabledReturns return fakeReturns.result1 } @@ -867,15 +875,16 @@ func (fake *FakeReadWriter) DopplerEndpoint() string { ret, specificReturn := fake.dopplerEndpointReturnsOnCall[len(fake.dopplerEndpointArgsForCall)] fake.dopplerEndpointArgsForCall = append(fake.dopplerEndpointArgsForCall, struct { }{}) + stub := fake.DopplerEndpointStub + fakeReturns := fake.dopplerEndpointReturns fake.recordInvocation("DopplerEndpoint", []interface{}{}) fake.dopplerEndpointMutex.Unlock() - if fake.DopplerEndpointStub != nil { - return fake.DopplerEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dopplerEndpointReturns return fakeReturns.result1 } @@ -919,15 +928,16 @@ func (fake *FakeReadWriter) HasAPIEndpoint() bool { ret, specificReturn := fake.hasAPIEndpointReturnsOnCall[len(fake.hasAPIEndpointArgsForCall)] fake.hasAPIEndpointArgsForCall = append(fake.hasAPIEndpointArgsForCall, struct { }{}) + stub := fake.HasAPIEndpointStub + fakeReturns := fake.hasAPIEndpointReturns fake.recordInvocation("HasAPIEndpoint", []interface{}{}) fake.hasAPIEndpointMutex.Unlock() - if fake.HasAPIEndpointStub != nil { - return fake.HasAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasAPIEndpointReturns return fakeReturns.result1 } @@ -971,15 +981,16 @@ func (fake *FakeReadWriter) HasOrganization() bool { ret, specificReturn := fake.hasOrganizationReturnsOnCall[len(fake.hasOrganizationArgsForCall)] fake.hasOrganizationArgsForCall = append(fake.hasOrganizationArgsForCall, struct { }{}) + stub := fake.HasOrganizationStub + fakeReturns := fake.hasOrganizationReturns fake.recordInvocation("HasOrganization", []interface{}{}) fake.hasOrganizationMutex.Unlock() - if fake.HasOrganizationStub != nil { - return fake.HasOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasOrganizationReturns return fakeReturns.result1 } @@ -1023,15 +1034,16 @@ func (fake *FakeReadWriter) HasSpace() bool { ret, specificReturn := fake.hasSpaceReturnsOnCall[len(fake.hasSpaceArgsForCall)] fake.hasSpaceArgsForCall = append(fake.hasSpaceArgsForCall, struct { }{}) + stub := fake.HasSpaceStub + fakeReturns := fake.hasSpaceReturns fake.recordInvocation("HasSpace", []interface{}{}) fake.hasSpaceMutex.Unlock() - if fake.HasSpaceStub != nil { - return fake.HasSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasSpaceReturns return fakeReturns.result1 } @@ -1075,15 +1087,16 @@ func (fake *FakeReadWriter) IsLoggedIn() bool { ret, specificReturn := fake.isLoggedInReturnsOnCall[len(fake.isLoggedInArgsForCall)] fake.isLoggedInArgsForCall = append(fake.isLoggedInArgsForCall, struct { }{}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1 } @@ -1128,15 +1141,16 @@ func (fake *FakeReadWriter) IsMinAPIVersion(arg1 semver.Version) bool { fake.isMinAPIVersionArgsForCall = append(fake.isMinAPIVersionArgsForCall, struct { arg1 semver.Version }{arg1}) + stub := fake.IsMinAPIVersionStub + fakeReturns := fake.isMinAPIVersionReturns fake.recordInvocation("IsMinAPIVersion", []interface{}{arg1}) fake.isMinAPIVersionMutex.Unlock() - if fake.IsMinAPIVersionStub != nil { - return fake.IsMinAPIVersionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinAPIVersionReturns return fakeReturns.result1 } @@ -1188,15 +1202,16 @@ func (fake *FakeReadWriter) IsMinCLIVersion(arg1 string) bool { fake.isMinCLIVersionArgsForCall = append(fake.isMinCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.IsMinCLIVersionStub + fakeReturns := fake.isMinCLIVersionReturns fake.recordInvocation("IsMinCLIVersion", []interface{}{arg1}) fake.isMinCLIVersionMutex.Unlock() - if fake.IsMinCLIVersionStub != nil { - return fake.IsMinCLIVersionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinCLIVersionReturns return fakeReturns.result1 } @@ -1247,15 +1262,16 @@ func (fake *FakeReadWriter) IsSSLDisabled() bool { ret, specificReturn := fake.isSSLDisabledReturnsOnCall[len(fake.isSSLDisabledArgsForCall)] fake.isSSLDisabledArgsForCall = append(fake.isSSLDisabledArgsForCall, struct { }{}) + stub := fake.IsSSLDisabledStub + fakeReturns := fake.isSSLDisabledReturns fake.recordInvocation("IsSSLDisabled", []interface{}{}) fake.isSSLDisabledMutex.Unlock() - if fake.IsSSLDisabledStub != nil { - return fake.IsSSLDisabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isSSLDisabledReturns return fakeReturns.result1 } @@ -1299,15 +1315,16 @@ func (fake *FakeReadWriter) Locale() string { ret, specificReturn := fake.localeReturnsOnCall[len(fake.localeArgsForCall)] fake.localeArgsForCall = append(fake.localeArgsForCall, struct { }{}) + stub := fake.LocaleStub + fakeReturns := fake.localeReturns fake.recordInvocation("Locale", []interface{}{}) fake.localeMutex.Unlock() - if fake.LocaleStub != nil { - return fake.LocaleStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.localeReturns return fakeReturns.result1 } @@ -1351,15 +1368,16 @@ func (fake *FakeReadWriter) LogCacheEndpoint() string { ret, specificReturn := fake.logCacheEndpointReturnsOnCall[len(fake.logCacheEndpointArgsForCall)] fake.logCacheEndpointArgsForCall = append(fake.logCacheEndpointArgsForCall, struct { }{}) + stub := fake.LogCacheEndpointStub + fakeReturns := fake.logCacheEndpointReturns fake.recordInvocation("LogCacheEndpoint", []interface{}{}) fake.logCacheEndpointMutex.Unlock() - if fake.LogCacheEndpointStub != nil { - return fake.LogCacheEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.logCacheEndpointReturns return fakeReturns.result1 } @@ -1403,15 +1421,16 @@ func (fake *FakeReadWriter) MinCLIVersion() string { ret, specificReturn := fake.minCLIVersionReturnsOnCall[len(fake.minCLIVersionArgsForCall)] fake.minCLIVersionArgsForCall = append(fake.minCLIVersionArgsForCall, struct { }{}) + stub := fake.MinCLIVersionStub + fakeReturns := fake.minCLIVersionReturns fake.recordInvocation("MinCLIVersion", []interface{}{}) fake.minCLIVersionMutex.Unlock() - if fake.MinCLIVersionStub != nil { - return fake.MinCLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.minCLIVersionReturns return fakeReturns.result1 } @@ -1455,15 +1474,16 @@ func (fake *FakeReadWriter) MinRecommendedCLIVersion() string { ret, specificReturn := fake.minRecommendedCLIVersionReturnsOnCall[len(fake.minRecommendedCLIVersionArgsForCall)] fake.minRecommendedCLIVersionArgsForCall = append(fake.minRecommendedCLIVersionArgsForCall, struct { }{}) + stub := fake.MinRecommendedCLIVersionStub + fakeReturns := fake.minRecommendedCLIVersionReturns fake.recordInvocation("MinRecommendedCLIVersion", []interface{}{}) fake.minRecommendedCLIVersionMutex.Unlock() - if fake.MinRecommendedCLIVersionStub != nil { - return fake.MinRecommendedCLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.minRecommendedCLIVersionReturns return fakeReturns.result1 } @@ -1507,15 +1527,16 @@ func (fake *FakeReadWriter) OrganizationFields() models.OrganizationFields { ret, specificReturn := fake.organizationFieldsReturnsOnCall[len(fake.organizationFieldsArgsForCall)] fake.organizationFieldsArgsForCall = append(fake.organizationFieldsArgsForCall, struct { }{}) + stub := fake.OrganizationFieldsStub + fakeReturns := fake.organizationFieldsReturns fake.recordInvocation("OrganizationFields", []interface{}{}) fake.organizationFieldsMutex.Unlock() - if fake.OrganizationFieldsStub != nil { - return fake.OrganizationFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.organizationFieldsReturns return fakeReturns.result1 } @@ -1559,15 +1580,16 @@ func (fake *FakeReadWriter) PluginRepos() []models.PluginRepo { ret, specificReturn := fake.pluginReposReturnsOnCall[len(fake.pluginReposArgsForCall)] fake.pluginReposArgsForCall = append(fake.pluginReposArgsForCall, struct { }{}) + stub := fake.PluginReposStub + fakeReturns := fake.pluginReposReturns fake.recordInvocation("PluginRepos", []interface{}{}) fake.pluginReposMutex.Unlock() - if fake.PluginReposStub != nil { - return fake.PluginReposStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginReposReturns return fakeReturns.result1 } @@ -1611,15 +1633,16 @@ func (fake *FakeReadWriter) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -1663,15 +1686,16 @@ func (fake *FakeReadWriter) RoutingAPIEndpoint() string { ret, specificReturn := fake.routingAPIEndpointReturnsOnCall[len(fake.routingAPIEndpointArgsForCall)] fake.routingAPIEndpointArgsForCall = append(fake.routingAPIEndpointArgsForCall, struct { }{}) + stub := fake.RoutingAPIEndpointStub + fakeReturns := fake.routingAPIEndpointReturns fake.recordInvocation("RoutingAPIEndpoint", []interface{}{}) fake.routingAPIEndpointMutex.Unlock() - if fake.RoutingAPIEndpointStub != nil { - return fake.RoutingAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.routingAPIEndpointReturns return fakeReturns.result1 } @@ -1715,15 +1739,16 @@ func (fake *FakeReadWriter) SSHOAuthClient() string { ret, specificReturn := fake.sSHOAuthClientReturnsOnCall[len(fake.sSHOAuthClientArgsForCall)] fake.sSHOAuthClientArgsForCall = append(fake.sSHOAuthClientArgsForCall, struct { }{}) + stub := fake.SSHOAuthClientStub + fakeReturns := fake.sSHOAuthClientReturns fake.recordInvocation("SSHOAuthClient", []interface{}{}) fake.sSHOAuthClientMutex.Unlock() - if fake.SSHOAuthClientStub != nil { - return fake.SSHOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.sSHOAuthClientReturns return fakeReturns.result1 } @@ -1767,9 +1792,10 @@ func (fake *FakeReadWriter) SetAPIEndpoint(arg1 string) { fake.setAPIEndpointArgsForCall = append(fake.setAPIEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAPIEndpointStub fake.recordInvocation("SetAPIEndpoint", []interface{}{arg1}) fake.setAPIEndpointMutex.Unlock() - if fake.SetAPIEndpointStub != nil { + if stub != nil { fake.SetAPIEndpointStub(arg1) } } @@ -1798,9 +1824,10 @@ func (fake *FakeReadWriter) SetAPIVersion(arg1 string) { fake.setAPIVersionArgsForCall = append(fake.setAPIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAPIVersionStub fake.recordInvocation("SetAPIVersion", []interface{}{arg1}) fake.setAPIVersionMutex.Unlock() - if fake.SetAPIVersionStub != nil { + if stub != nil { fake.SetAPIVersionStub(arg1) } } @@ -1829,9 +1856,10 @@ func (fake *FakeReadWriter) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -1860,9 +1888,10 @@ func (fake *FakeReadWriter) SetAsyncTimeout(arg1 uint) { fake.setAsyncTimeoutArgsForCall = append(fake.setAsyncTimeoutArgsForCall, struct { arg1 uint }{arg1}) + stub := fake.SetAsyncTimeoutStub fake.recordInvocation("SetAsyncTimeout", []interface{}{arg1}) fake.setAsyncTimeoutMutex.Unlock() - if fake.SetAsyncTimeoutStub != nil { + if stub != nil { fake.SetAsyncTimeoutStub(arg1) } } @@ -1891,9 +1920,10 @@ func (fake *FakeReadWriter) SetAuthenticationEndpoint(arg1 string) { fake.setAuthenticationEndpointArgsForCall = append(fake.setAuthenticationEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAuthenticationEndpointStub fake.recordInvocation("SetAuthenticationEndpoint", []interface{}{arg1}) fake.setAuthenticationEndpointMutex.Unlock() - if fake.SetAuthenticationEndpointStub != nil { + if stub != nil { fake.SetAuthenticationEndpointStub(arg1) } } @@ -1922,9 +1952,10 @@ func (fake *FakeReadWriter) SetCLIVersion(arg1 string) { fake.setCLIVersionArgsForCall = append(fake.setCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetCLIVersionStub fake.recordInvocation("SetCLIVersion", []interface{}{arg1}) fake.setCLIVersionMutex.Unlock() - if fake.SetCLIVersionStub != nil { + if stub != nil { fake.SetCLIVersionStub(arg1) } } @@ -1953,9 +1984,10 @@ func (fake *FakeReadWriter) SetColorEnabled(arg1 string) { fake.setColorEnabledArgsForCall = append(fake.setColorEnabledArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetColorEnabledStub fake.recordInvocation("SetColorEnabled", []interface{}{arg1}) fake.setColorEnabledMutex.Unlock() - if fake.SetColorEnabledStub != nil { + if stub != nil { fake.SetColorEnabledStub(arg1) } } @@ -1984,9 +2016,10 @@ func (fake *FakeReadWriter) SetDopplerEndpoint(arg1 string) { fake.setDopplerEndpointArgsForCall = append(fake.setDopplerEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetDopplerEndpointStub fake.recordInvocation("SetDopplerEndpoint", []interface{}{arg1}) fake.setDopplerEndpointMutex.Unlock() - if fake.SetDopplerEndpointStub != nil { + if stub != nil { fake.SetDopplerEndpointStub(arg1) } } @@ -2015,9 +2048,10 @@ func (fake *FakeReadWriter) SetLocale(arg1 string) { fake.setLocaleArgsForCall = append(fake.setLocaleArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetLocaleStub fake.recordInvocation("SetLocale", []interface{}{arg1}) fake.setLocaleMutex.Unlock() - if fake.SetLocaleStub != nil { + if stub != nil { fake.SetLocaleStub(arg1) } } @@ -2046,9 +2080,10 @@ func (fake *FakeReadWriter) SetLogCacheEndpoint(arg1 string) { fake.setLogCacheEndpointArgsForCall = append(fake.setLogCacheEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetLogCacheEndpointStub fake.recordInvocation("SetLogCacheEndpoint", []interface{}{arg1}) fake.setLogCacheEndpointMutex.Unlock() - if fake.SetLogCacheEndpointStub != nil { + if stub != nil { fake.SetLogCacheEndpointStub(arg1) } } @@ -2077,9 +2112,10 @@ func (fake *FakeReadWriter) SetMinCLIVersion(arg1 string) { fake.setMinCLIVersionArgsForCall = append(fake.setMinCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetMinCLIVersionStub fake.recordInvocation("SetMinCLIVersion", []interface{}{arg1}) fake.setMinCLIVersionMutex.Unlock() - if fake.SetMinCLIVersionStub != nil { + if stub != nil { fake.SetMinCLIVersionStub(arg1) } } @@ -2108,9 +2144,10 @@ func (fake *FakeReadWriter) SetMinRecommendedCLIVersion(arg1 string) { fake.setMinRecommendedCLIVersionArgsForCall = append(fake.setMinRecommendedCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetMinRecommendedCLIVersionStub fake.recordInvocation("SetMinRecommendedCLIVersion", []interface{}{arg1}) fake.setMinRecommendedCLIVersionMutex.Unlock() - if fake.SetMinRecommendedCLIVersionStub != nil { + if stub != nil { fake.SetMinRecommendedCLIVersionStub(arg1) } } @@ -2139,9 +2176,10 @@ func (fake *FakeReadWriter) SetOrganizationFields(arg1 models.OrganizationFields fake.setOrganizationFieldsArgsForCall = append(fake.setOrganizationFieldsArgsForCall, struct { arg1 models.OrganizationFields }{arg1}) + stub := fake.SetOrganizationFieldsStub fake.recordInvocation("SetOrganizationFields", []interface{}{arg1}) fake.setOrganizationFieldsMutex.Unlock() - if fake.SetOrganizationFieldsStub != nil { + if stub != nil { fake.SetOrganizationFieldsStub(arg1) } } @@ -2170,9 +2208,10 @@ func (fake *FakeReadWriter) SetPluginRepo(arg1 models.PluginRepo) { fake.setPluginRepoArgsForCall = append(fake.setPluginRepoArgsForCall, struct { arg1 models.PluginRepo }{arg1}) + stub := fake.SetPluginRepoStub fake.recordInvocation("SetPluginRepo", []interface{}{arg1}) fake.setPluginRepoMutex.Unlock() - if fake.SetPluginRepoStub != nil { + if stub != nil { fake.SetPluginRepoStub(arg1) } } @@ -2201,9 +2240,10 @@ func (fake *FakeReadWriter) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } @@ -2232,9 +2272,10 @@ func (fake *FakeReadWriter) SetRoutingAPIEndpoint(arg1 string) { fake.setRoutingAPIEndpointArgsForCall = append(fake.setRoutingAPIEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRoutingAPIEndpointStub fake.recordInvocation("SetRoutingAPIEndpoint", []interface{}{arg1}) fake.setRoutingAPIEndpointMutex.Unlock() - if fake.SetRoutingAPIEndpointStub != nil { + if stub != nil { fake.SetRoutingAPIEndpointStub(arg1) } } @@ -2263,9 +2304,10 @@ func (fake *FakeReadWriter) SetSSHOAuthClient(arg1 string) { fake.setSSHOAuthClientArgsForCall = append(fake.setSSHOAuthClientArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetSSHOAuthClientStub fake.recordInvocation("SetSSHOAuthClient", []interface{}{arg1}) fake.setSSHOAuthClientMutex.Unlock() - if fake.SetSSHOAuthClientStub != nil { + if stub != nil { fake.SetSSHOAuthClientStub(arg1) } } @@ -2294,9 +2336,10 @@ func (fake *FakeReadWriter) SetSSLDisabled(arg1 bool) { fake.setSSLDisabledArgsForCall = append(fake.setSSLDisabledArgsForCall, struct { arg1 bool }{arg1}) + stub := fake.SetSSLDisabledStub fake.recordInvocation("SetSSLDisabled", []interface{}{arg1}) fake.setSSLDisabledMutex.Unlock() - if fake.SetSSLDisabledStub != nil { + if stub != nil { fake.SetSSLDisabledStub(arg1) } } @@ -2325,9 +2368,10 @@ func (fake *FakeReadWriter) SetSpaceFields(arg1 models.SpaceFields) { fake.setSpaceFieldsArgsForCall = append(fake.setSpaceFieldsArgsForCall, struct { arg1 models.SpaceFields }{arg1}) + stub := fake.SetSpaceFieldsStub fake.recordInvocation("SetSpaceFields", []interface{}{arg1}) fake.setSpaceFieldsMutex.Unlock() - if fake.SetSpaceFieldsStub != nil { + if stub != nil { fake.SetSpaceFieldsStub(arg1) } } @@ -2356,9 +2400,10 @@ func (fake *FakeReadWriter) SetTrace(arg1 string) { fake.setTraceArgsForCall = append(fake.setTraceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetTraceStub fake.recordInvocation("SetTrace", []interface{}{arg1}) fake.setTraceMutex.Unlock() - if fake.SetTraceStub != nil { + if stub != nil { fake.SetTraceStub(arg1) } } @@ -2387,9 +2432,10 @@ func (fake *FakeReadWriter) SetUAAGrantType(arg1 string) { fake.setUAAGrantTypeArgsForCall = append(fake.setUAAGrantTypeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAGrantTypeStub fake.recordInvocation("SetUAAGrantType", []interface{}{arg1}) fake.setUAAGrantTypeMutex.Unlock() - if fake.SetUAAGrantTypeStub != nil { + if stub != nil { fake.SetUAAGrantTypeStub(arg1) } } @@ -2418,9 +2464,10 @@ func (fake *FakeReadWriter) SetUAAOAuthClient(arg1 string) { fake.setUAAOAuthClientArgsForCall = append(fake.setUAAOAuthClientArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAOAuthClientStub fake.recordInvocation("SetUAAOAuthClient", []interface{}{arg1}) fake.setUAAOAuthClientMutex.Unlock() - if fake.SetUAAOAuthClientStub != nil { + if stub != nil { fake.SetUAAOAuthClientStub(arg1) } } @@ -2449,9 +2496,10 @@ func (fake *FakeReadWriter) SetUAAOAuthClientSecret(arg1 string) { fake.setUAAOAuthClientSecretArgsForCall = append(fake.setUAAOAuthClientSecretArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAOAuthClientSecretStub fake.recordInvocation("SetUAAOAuthClientSecret", []interface{}{arg1}) fake.setUAAOAuthClientSecretMutex.Unlock() - if fake.SetUAAOAuthClientSecretStub != nil { + if stub != nil { fake.SetUAAOAuthClientSecretStub(arg1) } } @@ -2480,9 +2528,10 @@ func (fake *FakeReadWriter) SetUaaEndpoint(arg1 string) { fake.setUaaEndpointArgsForCall = append(fake.setUaaEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUaaEndpointStub fake.recordInvocation("SetUaaEndpoint", []interface{}{arg1}) fake.setUaaEndpointMutex.Unlock() - if fake.SetUaaEndpointStub != nil { + if stub != nil { fake.SetUaaEndpointStub(arg1) } } @@ -2511,15 +2560,16 @@ func (fake *FakeReadWriter) SpaceFields() models.SpaceFields { ret, specificReturn := fake.spaceFieldsReturnsOnCall[len(fake.spaceFieldsArgsForCall)] fake.spaceFieldsArgsForCall = append(fake.spaceFieldsArgsForCall, struct { }{}) + stub := fake.SpaceFieldsStub + fakeReturns := fake.spaceFieldsReturns fake.recordInvocation("SpaceFields", []interface{}{}) fake.spaceFieldsMutex.Unlock() - if fake.SpaceFieldsStub != nil { - return fake.SpaceFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.spaceFieldsReturns return fakeReturns.result1 } @@ -2563,15 +2613,16 @@ func (fake *FakeReadWriter) Trace() string { ret, specificReturn := fake.traceReturnsOnCall[len(fake.traceArgsForCall)] fake.traceArgsForCall = append(fake.traceArgsForCall, struct { }{}) + stub := fake.TraceStub + fakeReturns := fake.traceReturns fake.recordInvocation("Trace", []interface{}{}) fake.traceMutex.Unlock() - if fake.TraceStub != nil { - return fake.TraceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.traceReturns return fakeReturns.result1 } @@ -2615,15 +2666,16 @@ func (fake *FakeReadWriter) UAAGrantType() string { ret, specificReturn := fake.uAAGrantTypeReturnsOnCall[len(fake.uAAGrantTypeArgsForCall)] fake.uAAGrantTypeArgsForCall = append(fake.uAAGrantTypeArgsForCall, struct { }{}) + stub := fake.UAAGrantTypeStub + fakeReturns := fake.uAAGrantTypeReturns fake.recordInvocation("UAAGrantType", []interface{}{}) fake.uAAGrantTypeMutex.Unlock() - if fake.UAAGrantTypeStub != nil { - return fake.UAAGrantTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAGrantTypeReturns return fakeReturns.result1 } @@ -2667,15 +2719,16 @@ func (fake *FakeReadWriter) UAAOAuthClient() string { ret, specificReturn := fake.uAAOAuthClientReturnsOnCall[len(fake.uAAOAuthClientArgsForCall)] fake.uAAOAuthClientArgsForCall = append(fake.uAAOAuthClientArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientStub + fakeReturns := fake.uAAOAuthClientReturns fake.recordInvocation("UAAOAuthClient", []interface{}{}) fake.uAAOAuthClientMutex.Unlock() - if fake.UAAOAuthClientStub != nil { - return fake.UAAOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientReturns return fakeReturns.result1 } @@ -2719,15 +2772,16 @@ func (fake *FakeReadWriter) UAAOAuthClientSecret() string { ret, specificReturn := fake.uAAOAuthClientSecretReturnsOnCall[len(fake.uAAOAuthClientSecretArgsForCall)] fake.uAAOAuthClientSecretArgsForCall = append(fake.uAAOAuthClientSecretArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientSecretStub + fakeReturns := fake.uAAOAuthClientSecretReturns fake.recordInvocation("UAAOAuthClientSecret", []interface{}{}) fake.uAAOAuthClientSecretMutex.Unlock() - if fake.UAAOAuthClientSecretStub != nil { - return fake.UAAOAuthClientSecretStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientSecretReturns return fakeReturns.result1 } @@ -2771,15 +2825,16 @@ func (fake *FakeReadWriter) UaaEndpoint() string { ret, specificReturn := fake.uaaEndpointReturnsOnCall[len(fake.uaaEndpointArgsForCall)] fake.uaaEndpointArgsForCall = append(fake.uaaEndpointArgsForCall, struct { }{}) + stub := fake.UaaEndpointStub + fakeReturns := fake.uaaEndpointReturns fake.recordInvocation("UaaEndpoint", []interface{}{}) fake.uaaEndpointMutex.Unlock() - if fake.UaaEndpointStub != nil { - return fake.UaaEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uaaEndpointReturns return fakeReturns.result1 } @@ -2823,9 +2878,10 @@ func (fake *FakeReadWriter) UnSetPluginRepo(arg1 int) { fake.unSetPluginRepoArgsForCall = append(fake.unSetPluginRepoArgsForCall, struct { arg1 int }{arg1}) + stub := fake.UnSetPluginRepoStub fake.recordInvocation("UnSetPluginRepo", []interface{}{arg1}) fake.unSetPluginRepoMutex.Unlock() - if fake.UnSetPluginRepoStub != nil { + if stub != nil { fake.UnSetPluginRepoStub(arg1) } } @@ -2854,15 +2910,16 @@ func (fake *FakeReadWriter) UserEmail() string { ret, specificReturn := fake.userEmailReturnsOnCall[len(fake.userEmailArgsForCall)] fake.userEmailArgsForCall = append(fake.userEmailArgsForCall, struct { }{}) + stub := fake.UserEmailStub + fakeReturns := fake.userEmailReturns fake.recordInvocation("UserEmail", []interface{}{}) fake.userEmailMutex.Unlock() - if fake.UserEmailStub != nil { - return fake.UserEmailStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.userEmailReturns return fakeReturns.result1 } @@ -2906,15 +2963,16 @@ func (fake *FakeReadWriter) UserGUID() string { ret, specificReturn := fake.userGUIDReturnsOnCall[len(fake.userGUIDArgsForCall)] fake.userGUIDArgsForCall = append(fake.userGUIDArgsForCall, struct { }{}) + stub := fake.UserGUIDStub + fakeReturns := fake.userGUIDReturns fake.recordInvocation("UserGUID", []interface{}{}) fake.userGUIDMutex.Unlock() - if fake.UserGUIDStub != nil { - return fake.UserGUIDStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.userGUIDReturns return fakeReturns.result1 } @@ -2958,15 +3016,16 @@ func (fake *FakeReadWriter) Username() string { ret, specificReturn := fake.usernameReturnsOnCall[len(fake.usernameArgsForCall)] fake.usernameArgsForCall = append(fake.usernameArgsForCall, struct { }{}) + stub := fake.UsernameStub + fakeReturns := fake.usernameReturns fake.recordInvocation("Username", []interface{}{}) fake.usernameMutex.Unlock() - if fake.UsernameStub != nil { - return fake.UsernameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.usernameReturns return fakeReturns.result1 } diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go b/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go index 853f44f6073..430dcf2ef01 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go @@ -4,9 +4,9 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "github.com/blang/semver/v4" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + semver "github.com/blang/semver/v4" ) type FakeRepository struct { @@ -484,15 +484,16 @@ func (fake *FakeRepository) APIEndpoint() string { ret, specificReturn := fake.aPIEndpointReturnsOnCall[len(fake.aPIEndpointArgsForCall)] fake.aPIEndpointArgsForCall = append(fake.aPIEndpointArgsForCall, struct { }{}) + stub := fake.APIEndpointStub + fakeReturns := fake.aPIEndpointReturns fake.recordInvocation("APIEndpoint", []interface{}{}) fake.aPIEndpointMutex.Unlock() - if fake.APIEndpointStub != nil { - return fake.APIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIEndpointReturns return fakeReturns.result1 } @@ -536,15 +537,16 @@ func (fake *FakeRepository) APIVersion() string { ret, specificReturn := fake.aPIVersionReturnsOnCall[len(fake.aPIVersionArgsForCall)] fake.aPIVersionArgsForCall = append(fake.aPIVersionArgsForCall, struct { }{}) + stub := fake.APIVersionStub + fakeReturns := fake.aPIVersionReturns fake.recordInvocation("APIVersion", []interface{}{}) fake.aPIVersionMutex.Unlock() - if fake.APIVersionStub != nil { - return fake.APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIVersionReturns return fakeReturns.result1 } @@ -588,15 +590,16 @@ func (fake *FakeRepository) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -640,15 +643,16 @@ func (fake *FakeRepository) AsyncTimeout() uint { ret, specificReturn := fake.asyncTimeoutReturnsOnCall[len(fake.asyncTimeoutArgsForCall)] fake.asyncTimeoutArgsForCall = append(fake.asyncTimeoutArgsForCall, struct { }{}) + stub := fake.AsyncTimeoutStub + fakeReturns := fake.asyncTimeoutReturns fake.recordInvocation("AsyncTimeout", []interface{}{}) fake.asyncTimeoutMutex.Unlock() - if fake.AsyncTimeoutStub != nil { - return fake.AsyncTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.asyncTimeoutReturns return fakeReturns.result1 } @@ -692,15 +696,16 @@ func (fake *FakeRepository) AuthenticationEndpoint() string { ret, specificReturn := fake.authenticationEndpointReturnsOnCall[len(fake.authenticationEndpointArgsForCall)] fake.authenticationEndpointArgsForCall = append(fake.authenticationEndpointArgsForCall, struct { }{}) + stub := fake.AuthenticationEndpointStub + fakeReturns := fake.authenticationEndpointReturns fake.recordInvocation("AuthenticationEndpoint", []interface{}{}) fake.authenticationEndpointMutex.Unlock() - if fake.AuthenticationEndpointStub != nil { - return fake.AuthenticationEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.authenticationEndpointReturns return fakeReturns.result1 } @@ -744,15 +749,16 @@ func (fake *FakeRepository) CLIVersion() string { ret, specificReturn := fake.cLIVersionReturnsOnCall[len(fake.cLIVersionArgsForCall)] fake.cLIVersionArgsForCall = append(fake.cLIVersionArgsForCall, struct { }{}) + stub := fake.CLIVersionStub + fakeReturns := fake.cLIVersionReturns fake.recordInvocation("CLIVersion", []interface{}{}) fake.cLIVersionMutex.Unlock() - if fake.CLIVersionStub != nil { - return fake.CLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cLIVersionReturns return fakeReturns.result1 } @@ -795,9 +801,10 @@ func (fake *FakeRepository) ClearSession() { fake.clearSessionMutex.Lock() fake.clearSessionArgsForCall = append(fake.clearSessionArgsForCall, struct { }{}) + stub := fake.ClearSessionStub fake.recordInvocation("ClearSession", []interface{}{}) fake.clearSessionMutex.Unlock() - if fake.ClearSessionStub != nil { + if stub != nil { fake.ClearSessionStub() } } @@ -818,9 +825,10 @@ func (fake *FakeRepository) Close() { fake.closeMutex.Lock() fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { + if stub != nil { fake.CloseStub() } } @@ -842,15 +850,16 @@ func (fake *FakeRepository) ColorEnabled() string { ret, specificReturn := fake.colorEnabledReturnsOnCall[len(fake.colorEnabledArgsForCall)] fake.colorEnabledArgsForCall = append(fake.colorEnabledArgsForCall, struct { }{}) + stub := fake.ColorEnabledStub + fakeReturns := fake.colorEnabledReturns fake.recordInvocation("ColorEnabled", []interface{}{}) fake.colorEnabledMutex.Unlock() - if fake.ColorEnabledStub != nil { - return fake.ColorEnabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.colorEnabledReturns return fakeReturns.result1 } @@ -894,15 +903,16 @@ func (fake *FakeRepository) DopplerEndpoint() string { ret, specificReturn := fake.dopplerEndpointReturnsOnCall[len(fake.dopplerEndpointArgsForCall)] fake.dopplerEndpointArgsForCall = append(fake.dopplerEndpointArgsForCall, struct { }{}) + stub := fake.DopplerEndpointStub + fakeReturns := fake.dopplerEndpointReturns fake.recordInvocation("DopplerEndpoint", []interface{}{}) fake.dopplerEndpointMutex.Unlock() - if fake.DopplerEndpointStub != nil { - return fake.DopplerEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dopplerEndpointReturns return fakeReturns.result1 } @@ -946,15 +956,16 @@ func (fake *FakeRepository) HasAPIEndpoint() bool { ret, specificReturn := fake.hasAPIEndpointReturnsOnCall[len(fake.hasAPIEndpointArgsForCall)] fake.hasAPIEndpointArgsForCall = append(fake.hasAPIEndpointArgsForCall, struct { }{}) + stub := fake.HasAPIEndpointStub + fakeReturns := fake.hasAPIEndpointReturns fake.recordInvocation("HasAPIEndpoint", []interface{}{}) fake.hasAPIEndpointMutex.Unlock() - if fake.HasAPIEndpointStub != nil { - return fake.HasAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasAPIEndpointReturns return fakeReturns.result1 } @@ -998,15 +1009,16 @@ func (fake *FakeRepository) HasOrganization() bool { ret, specificReturn := fake.hasOrganizationReturnsOnCall[len(fake.hasOrganizationArgsForCall)] fake.hasOrganizationArgsForCall = append(fake.hasOrganizationArgsForCall, struct { }{}) + stub := fake.HasOrganizationStub + fakeReturns := fake.hasOrganizationReturns fake.recordInvocation("HasOrganization", []interface{}{}) fake.hasOrganizationMutex.Unlock() - if fake.HasOrganizationStub != nil { - return fake.HasOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasOrganizationReturns return fakeReturns.result1 } @@ -1050,15 +1062,16 @@ func (fake *FakeRepository) HasSpace() bool { ret, specificReturn := fake.hasSpaceReturnsOnCall[len(fake.hasSpaceArgsForCall)] fake.hasSpaceArgsForCall = append(fake.hasSpaceArgsForCall, struct { }{}) + stub := fake.HasSpaceStub + fakeReturns := fake.hasSpaceReturns fake.recordInvocation("HasSpace", []interface{}{}) fake.hasSpaceMutex.Unlock() - if fake.HasSpaceStub != nil { - return fake.HasSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasSpaceReturns return fakeReturns.result1 } @@ -1102,15 +1115,16 @@ func (fake *FakeRepository) IsLoggedIn() bool { ret, specificReturn := fake.isLoggedInReturnsOnCall[len(fake.isLoggedInArgsForCall)] fake.isLoggedInArgsForCall = append(fake.isLoggedInArgsForCall, struct { }{}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1 } @@ -1155,15 +1169,16 @@ func (fake *FakeRepository) IsMinAPIVersion(arg1 semver.Version) bool { fake.isMinAPIVersionArgsForCall = append(fake.isMinAPIVersionArgsForCall, struct { arg1 semver.Version }{arg1}) + stub := fake.IsMinAPIVersionStub + fakeReturns := fake.isMinAPIVersionReturns fake.recordInvocation("IsMinAPIVersion", []interface{}{arg1}) fake.isMinAPIVersionMutex.Unlock() - if fake.IsMinAPIVersionStub != nil { - return fake.IsMinAPIVersionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinAPIVersionReturns return fakeReturns.result1 } @@ -1215,15 +1230,16 @@ func (fake *FakeRepository) IsMinCLIVersion(arg1 string) bool { fake.isMinCLIVersionArgsForCall = append(fake.isMinCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.IsMinCLIVersionStub + fakeReturns := fake.isMinCLIVersionReturns fake.recordInvocation("IsMinCLIVersion", []interface{}{arg1}) fake.isMinCLIVersionMutex.Unlock() - if fake.IsMinCLIVersionStub != nil { - return fake.IsMinCLIVersionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinCLIVersionReturns return fakeReturns.result1 } @@ -1274,15 +1290,16 @@ func (fake *FakeRepository) IsSSLDisabled() bool { ret, specificReturn := fake.isSSLDisabledReturnsOnCall[len(fake.isSSLDisabledArgsForCall)] fake.isSSLDisabledArgsForCall = append(fake.isSSLDisabledArgsForCall, struct { }{}) + stub := fake.IsSSLDisabledStub + fakeReturns := fake.isSSLDisabledReturns fake.recordInvocation("IsSSLDisabled", []interface{}{}) fake.isSSLDisabledMutex.Unlock() - if fake.IsSSLDisabledStub != nil { - return fake.IsSSLDisabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isSSLDisabledReturns return fakeReturns.result1 } @@ -1326,15 +1343,16 @@ func (fake *FakeRepository) Locale() string { ret, specificReturn := fake.localeReturnsOnCall[len(fake.localeArgsForCall)] fake.localeArgsForCall = append(fake.localeArgsForCall, struct { }{}) + stub := fake.LocaleStub + fakeReturns := fake.localeReturns fake.recordInvocation("Locale", []interface{}{}) fake.localeMutex.Unlock() - if fake.LocaleStub != nil { - return fake.LocaleStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.localeReturns return fakeReturns.result1 } @@ -1378,15 +1396,16 @@ func (fake *FakeRepository) LogCacheEndpoint() string { ret, specificReturn := fake.logCacheEndpointReturnsOnCall[len(fake.logCacheEndpointArgsForCall)] fake.logCacheEndpointArgsForCall = append(fake.logCacheEndpointArgsForCall, struct { }{}) + stub := fake.LogCacheEndpointStub + fakeReturns := fake.logCacheEndpointReturns fake.recordInvocation("LogCacheEndpoint", []interface{}{}) fake.logCacheEndpointMutex.Unlock() - if fake.LogCacheEndpointStub != nil { - return fake.LogCacheEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.logCacheEndpointReturns return fakeReturns.result1 } @@ -1430,15 +1449,16 @@ func (fake *FakeRepository) MinCLIVersion() string { ret, specificReturn := fake.minCLIVersionReturnsOnCall[len(fake.minCLIVersionArgsForCall)] fake.minCLIVersionArgsForCall = append(fake.minCLIVersionArgsForCall, struct { }{}) + stub := fake.MinCLIVersionStub + fakeReturns := fake.minCLIVersionReturns fake.recordInvocation("MinCLIVersion", []interface{}{}) fake.minCLIVersionMutex.Unlock() - if fake.MinCLIVersionStub != nil { - return fake.MinCLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.minCLIVersionReturns return fakeReturns.result1 } @@ -1482,15 +1502,16 @@ func (fake *FakeRepository) MinRecommendedCLIVersion() string { ret, specificReturn := fake.minRecommendedCLIVersionReturnsOnCall[len(fake.minRecommendedCLIVersionArgsForCall)] fake.minRecommendedCLIVersionArgsForCall = append(fake.minRecommendedCLIVersionArgsForCall, struct { }{}) + stub := fake.MinRecommendedCLIVersionStub + fakeReturns := fake.minRecommendedCLIVersionReturns fake.recordInvocation("MinRecommendedCLIVersion", []interface{}{}) fake.minRecommendedCLIVersionMutex.Unlock() - if fake.MinRecommendedCLIVersionStub != nil { - return fake.MinRecommendedCLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.minRecommendedCLIVersionReturns return fakeReturns.result1 } @@ -1534,15 +1555,16 @@ func (fake *FakeRepository) OrganizationFields() models.OrganizationFields { ret, specificReturn := fake.organizationFieldsReturnsOnCall[len(fake.organizationFieldsArgsForCall)] fake.organizationFieldsArgsForCall = append(fake.organizationFieldsArgsForCall, struct { }{}) + stub := fake.OrganizationFieldsStub + fakeReturns := fake.organizationFieldsReturns fake.recordInvocation("OrganizationFields", []interface{}{}) fake.organizationFieldsMutex.Unlock() - if fake.OrganizationFieldsStub != nil { - return fake.OrganizationFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.organizationFieldsReturns return fakeReturns.result1 } @@ -1586,15 +1608,16 @@ func (fake *FakeRepository) PluginRepos() []models.PluginRepo { ret, specificReturn := fake.pluginReposReturnsOnCall[len(fake.pluginReposArgsForCall)] fake.pluginReposArgsForCall = append(fake.pluginReposArgsForCall, struct { }{}) + stub := fake.PluginReposStub + fakeReturns := fake.pluginReposReturns fake.recordInvocation("PluginRepos", []interface{}{}) fake.pluginReposMutex.Unlock() - if fake.PluginReposStub != nil { - return fake.PluginReposStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginReposReturns return fakeReturns.result1 } @@ -1638,15 +1661,16 @@ func (fake *FakeRepository) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -1690,15 +1714,16 @@ func (fake *FakeRepository) RoutingAPIEndpoint() string { ret, specificReturn := fake.routingAPIEndpointReturnsOnCall[len(fake.routingAPIEndpointArgsForCall)] fake.routingAPIEndpointArgsForCall = append(fake.routingAPIEndpointArgsForCall, struct { }{}) + stub := fake.RoutingAPIEndpointStub + fakeReturns := fake.routingAPIEndpointReturns fake.recordInvocation("RoutingAPIEndpoint", []interface{}{}) fake.routingAPIEndpointMutex.Unlock() - if fake.RoutingAPIEndpointStub != nil { - return fake.RoutingAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.routingAPIEndpointReturns return fakeReturns.result1 } @@ -1742,15 +1767,16 @@ func (fake *FakeRepository) SSHOAuthClient() string { ret, specificReturn := fake.sSHOAuthClientReturnsOnCall[len(fake.sSHOAuthClientArgsForCall)] fake.sSHOAuthClientArgsForCall = append(fake.sSHOAuthClientArgsForCall, struct { }{}) + stub := fake.SSHOAuthClientStub + fakeReturns := fake.sSHOAuthClientReturns fake.recordInvocation("SSHOAuthClient", []interface{}{}) fake.sSHOAuthClientMutex.Unlock() - if fake.SSHOAuthClientStub != nil { - return fake.SSHOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.sSHOAuthClientReturns return fakeReturns.result1 } @@ -1794,9 +1820,10 @@ func (fake *FakeRepository) SetAPIEndpoint(arg1 string) { fake.setAPIEndpointArgsForCall = append(fake.setAPIEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAPIEndpointStub fake.recordInvocation("SetAPIEndpoint", []interface{}{arg1}) fake.setAPIEndpointMutex.Unlock() - if fake.SetAPIEndpointStub != nil { + if stub != nil { fake.SetAPIEndpointStub(arg1) } } @@ -1825,9 +1852,10 @@ func (fake *FakeRepository) SetAPIVersion(arg1 string) { fake.setAPIVersionArgsForCall = append(fake.setAPIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAPIVersionStub fake.recordInvocation("SetAPIVersion", []interface{}{arg1}) fake.setAPIVersionMutex.Unlock() - if fake.SetAPIVersionStub != nil { + if stub != nil { fake.SetAPIVersionStub(arg1) } } @@ -1856,9 +1884,10 @@ func (fake *FakeRepository) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -1887,9 +1916,10 @@ func (fake *FakeRepository) SetAsyncTimeout(arg1 uint) { fake.setAsyncTimeoutArgsForCall = append(fake.setAsyncTimeoutArgsForCall, struct { arg1 uint }{arg1}) + stub := fake.SetAsyncTimeoutStub fake.recordInvocation("SetAsyncTimeout", []interface{}{arg1}) fake.setAsyncTimeoutMutex.Unlock() - if fake.SetAsyncTimeoutStub != nil { + if stub != nil { fake.SetAsyncTimeoutStub(arg1) } } @@ -1918,9 +1948,10 @@ func (fake *FakeRepository) SetAuthenticationEndpoint(arg1 string) { fake.setAuthenticationEndpointArgsForCall = append(fake.setAuthenticationEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAuthenticationEndpointStub fake.recordInvocation("SetAuthenticationEndpoint", []interface{}{arg1}) fake.setAuthenticationEndpointMutex.Unlock() - if fake.SetAuthenticationEndpointStub != nil { + if stub != nil { fake.SetAuthenticationEndpointStub(arg1) } } @@ -1949,9 +1980,10 @@ func (fake *FakeRepository) SetCLIVersion(arg1 string) { fake.setCLIVersionArgsForCall = append(fake.setCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetCLIVersionStub fake.recordInvocation("SetCLIVersion", []interface{}{arg1}) fake.setCLIVersionMutex.Unlock() - if fake.SetCLIVersionStub != nil { + if stub != nil { fake.SetCLIVersionStub(arg1) } } @@ -1980,9 +2012,10 @@ func (fake *FakeRepository) SetColorEnabled(arg1 string) { fake.setColorEnabledArgsForCall = append(fake.setColorEnabledArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetColorEnabledStub fake.recordInvocation("SetColorEnabled", []interface{}{arg1}) fake.setColorEnabledMutex.Unlock() - if fake.SetColorEnabledStub != nil { + if stub != nil { fake.SetColorEnabledStub(arg1) } } @@ -2011,9 +2044,10 @@ func (fake *FakeRepository) SetDopplerEndpoint(arg1 string) { fake.setDopplerEndpointArgsForCall = append(fake.setDopplerEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetDopplerEndpointStub fake.recordInvocation("SetDopplerEndpoint", []interface{}{arg1}) fake.setDopplerEndpointMutex.Unlock() - if fake.SetDopplerEndpointStub != nil { + if stub != nil { fake.SetDopplerEndpointStub(arg1) } } @@ -2042,9 +2076,10 @@ func (fake *FakeRepository) SetLocale(arg1 string) { fake.setLocaleArgsForCall = append(fake.setLocaleArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetLocaleStub fake.recordInvocation("SetLocale", []interface{}{arg1}) fake.setLocaleMutex.Unlock() - if fake.SetLocaleStub != nil { + if stub != nil { fake.SetLocaleStub(arg1) } } @@ -2073,9 +2108,10 @@ func (fake *FakeRepository) SetLogCacheEndpoint(arg1 string) { fake.setLogCacheEndpointArgsForCall = append(fake.setLogCacheEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetLogCacheEndpointStub fake.recordInvocation("SetLogCacheEndpoint", []interface{}{arg1}) fake.setLogCacheEndpointMutex.Unlock() - if fake.SetLogCacheEndpointStub != nil { + if stub != nil { fake.SetLogCacheEndpointStub(arg1) } } @@ -2104,9 +2140,10 @@ func (fake *FakeRepository) SetMinCLIVersion(arg1 string) { fake.setMinCLIVersionArgsForCall = append(fake.setMinCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetMinCLIVersionStub fake.recordInvocation("SetMinCLIVersion", []interface{}{arg1}) fake.setMinCLIVersionMutex.Unlock() - if fake.SetMinCLIVersionStub != nil { + if stub != nil { fake.SetMinCLIVersionStub(arg1) } } @@ -2135,9 +2172,10 @@ func (fake *FakeRepository) SetMinRecommendedCLIVersion(arg1 string) { fake.setMinRecommendedCLIVersionArgsForCall = append(fake.setMinRecommendedCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetMinRecommendedCLIVersionStub fake.recordInvocation("SetMinRecommendedCLIVersion", []interface{}{arg1}) fake.setMinRecommendedCLIVersionMutex.Unlock() - if fake.SetMinRecommendedCLIVersionStub != nil { + if stub != nil { fake.SetMinRecommendedCLIVersionStub(arg1) } } @@ -2166,9 +2204,10 @@ func (fake *FakeRepository) SetOrganizationFields(arg1 models.OrganizationFields fake.setOrganizationFieldsArgsForCall = append(fake.setOrganizationFieldsArgsForCall, struct { arg1 models.OrganizationFields }{arg1}) + stub := fake.SetOrganizationFieldsStub fake.recordInvocation("SetOrganizationFields", []interface{}{arg1}) fake.setOrganizationFieldsMutex.Unlock() - if fake.SetOrganizationFieldsStub != nil { + if stub != nil { fake.SetOrganizationFieldsStub(arg1) } } @@ -2197,9 +2236,10 @@ func (fake *FakeRepository) SetPluginRepo(arg1 models.PluginRepo) { fake.setPluginRepoArgsForCall = append(fake.setPluginRepoArgsForCall, struct { arg1 models.PluginRepo }{arg1}) + stub := fake.SetPluginRepoStub fake.recordInvocation("SetPluginRepo", []interface{}{arg1}) fake.setPluginRepoMutex.Unlock() - if fake.SetPluginRepoStub != nil { + if stub != nil { fake.SetPluginRepoStub(arg1) } } @@ -2228,9 +2268,10 @@ func (fake *FakeRepository) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } @@ -2259,9 +2300,10 @@ func (fake *FakeRepository) SetRoutingAPIEndpoint(arg1 string) { fake.setRoutingAPIEndpointArgsForCall = append(fake.setRoutingAPIEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRoutingAPIEndpointStub fake.recordInvocation("SetRoutingAPIEndpoint", []interface{}{arg1}) fake.setRoutingAPIEndpointMutex.Unlock() - if fake.SetRoutingAPIEndpointStub != nil { + if stub != nil { fake.SetRoutingAPIEndpointStub(arg1) } } @@ -2290,9 +2332,10 @@ func (fake *FakeRepository) SetSSHOAuthClient(arg1 string) { fake.setSSHOAuthClientArgsForCall = append(fake.setSSHOAuthClientArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetSSHOAuthClientStub fake.recordInvocation("SetSSHOAuthClient", []interface{}{arg1}) fake.setSSHOAuthClientMutex.Unlock() - if fake.SetSSHOAuthClientStub != nil { + if stub != nil { fake.SetSSHOAuthClientStub(arg1) } } @@ -2321,9 +2364,10 @@ func (fake *FakeRepository) SetSSLDisabled(arg1 bool) { fake.setSSLDisabledArgsForCall = append(fake.setSSLDisabledArgsForCall, struct { arg1 bool }{arg1}) + stub := fake.SetSSLDisabledStub fake.recordInvocation("SetSSLDisabled", []interface{}{arg1}) fake.setSSLDisabledMutex.Unlock() - if fake.SetSSLDisabledStub != nil { + if stub != nil { fake.SetSSLDisabledStub(arg1) } } @@ -2352,9 +2396,10 @@ func (fake *FakeRepository) SetSpaceFields(arg1 models.SpaceFields) { fake.setSpaceFieldsArgsForCall = append(fake.setSpaceFieldsArgsForCall, struct { arg1 models.SpaceFields }{arg1}) + stub := fake.SetSpaceFieldsStub fake.recordInvocation("SetSpaceFields", []interface{}{arg1}) fake.setSpaceFieldsMutex.Unlock() - if fake.SetSpaceFieldsStub != nil { + if stub != nil { fake.SetSpaceFieldsStub(arg1) } } @@ -2383,9 +2428,10 @@ func (fake *FakeRepository) SetTrace(arg1 string) { fake.setTraceArgsForCall = append(fake.setTraceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetTraceStub fake.recordInvocation("SetTrace", []interface{}{arg1}) fake.setTraceMutex.Unlock() - if fake.SetTraceStub != nil { + if stub != nil { fake.SetTraceStub(arg1) } } @@ -2414,9 +2460,10 @@ func (fake *FakeRepository) SetUAAGrantType(arg1 string) { fake.setUAAGrantTypeArgsForCall = append(fake.setUAAGrantTypeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAGrantTypeStub fake.recordInvocation("SetUAAGrantType", []interface{}{arg1}) fake.setUAAGrantTypeMutex.Unlock() - if fake.SetUAAGrantTypeStub != nil { + if stub != nil { fake.SetUAAGrantTypeStub(arg1) } } @@ -2445,9 +2492,10 @@ func (fake *FakeRepository) SetUAAOAuthClient(arg1 string) { fake.setUAAOAuthClientArgsForCall = append(fake.setUAAOAuthClientArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAOAuthClientStub fake.recordInvocation("SetUAAOAuthClient", []interface{}{arg1}) fake.setUAAOAuthClientMutex.Unlock() - if fake.SetUAAOAuthClientStub != nil { + if stub != nil { fake.SetUAAOAuthClientStub(arg1) } } @@ -2476,9 +2524,10 @@ func (fake *FakeRepository) SetUAAOAuthClientSecret(arg1 string) { fake.setUAAOAuthClientSecretArgsForCall = append(fake.setUAAOAuthClientSecretArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAOAuthClientSecretStub fake.recordInvocation("SetUAAOAuthClientSecret", []interface{}{arg1}) fake.setUAAOAuthClientSecretMutex.Unlock() - if fake.SetUAAOAuthClientSecretStub != nil { + if stub != nil { fake.SetUAAOAuthClientSecretStub(arg1) } } @@ -2507,9 +2556,10 @@ func (fake *FakeRepository) SetUaaEndpoint(arg1 string) { fake.setUaaEndpointArgsForCall = append(fake.setUaaEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUaaEndpointStub fake.recordInvocation("SetUaaEndpoint", []interface{}{arg1}) fake.setUaaEndpointMutex.Unlock() - if fake.SetUaaEndpointStub != nil { + if stub != nil { fake.SetUaaEndpointStub(arg1) } } @@ -2538,15 +2588,16 @@ func (fake *FakeRepository) SpaceFields() models.SpaceFields { ret, specificReturn := fake.spaceFieldsReturnsOnCall[len(fake.spaceFieldsArgsForCall)] fake.spaceFieldsArgsForCall = append(fake.spaceFieldsArgsForCall, struct { }{}) + stub := fake.SpaceFieldsStub + fakeReturns := fake.spaceFieldsReturns fake.recordInvocation("SpaceFields", []interface{}{}) fake.spaceFieldsMutex.Unlock() - if fake.SpaceFieldsStub != nil { - return fake.SpaceFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.spaceFieldsReturns return fakeReturns.result1 } @@ -2590,15 +2641,16 @@ func (fake *FakeRepository) Trace() string { ret, specificReturn := fake.traceReturnsOnCall[len(fake.traceArgsForCall)] fake.traceArgsForCall = append(fake.traceArgsForCall, struct { }{}) + stub := fake.TraceStub + fakeReturns := fake.traceReturns fake.recordInvocation("Trace", []interface{}{}) fake.traceMutex.Unlock() - if fake.TraceStub != nil { - return fake.TraceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.traceReturns return fakeReturns.result1 } @@ -2642,15 +2694,16 @@ func (fake *FakeRepository) UAAGrantType() string { ret, specificReturn := fake.uAAGrantTypeReturnsOnCall[len(fake.uAAGrantTypeArgsForCall)] fake.uAAGrantTypeArgsForCall = append(fake.uAAGrantTypeArgsForCall, struct { }{}) + stub := fake.UAAGrantTypeStub + fakeReturns := fake.uAAGrantTypeReturns fake.recordInvocation("UAAGrantType", []interface{}{}) fake.uAAGrantTypeMutex.Unlock() - if fake.UAAGrantTypeStub != nil { - return fake.UAAGrantTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAGrantTypeReturns return fakeReturns.result1 } @@ -2694,15 +2747,16 @@ func (fake *FakeRepository) UAAOAuthClient() string { ret, specificReturn := fake.uAAOAuthClientReturnsOnCall[len(fake.uAAOAuthClientArgsForCall)] fake.uAAOAuthClientArgsForCall = append(fake.uAAOAuthClientArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientStub + fakeReturns := fake.uAAOAuthClientReturns fake.recordInvocation("UAAOAuthClient", []interface{}{}) fake.uAAOAuthClientMutex.Unlock() - if fake.UAAOAuthClientStub != nil { - return fake.UAAOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientReturns return fakeReturns.result1 } @@ -2746,15 +2800,16 @@ func (fake *FakeRepository) UAAOAuthClientSecret() string { ret, specificReturn := fake.uAAOAuthClientSecretReturnsOnCall[len(fake.uAAOAuthClientSecretArgsForCall)] fake.uAAOAuthClientSecretArgsForCall = append(fake.uAAOAuthClientSecretArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientSecretStub + fakeReturns := fake.uAAOAuthClientSecretReturns fake.recordInvocation("UAAOAuthClientSecret", []interface{}{}) fake.uAAOAuthClientSecretMutex.Unlock() - if fake.UAAOAuthClientSecretStub != nil { - return fake.UAAOAuthClientSecretStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientSecretReturns return fakeReturns.result1 } @@ -2798,15 +2853,16 @@ func (fake *FakeRepository) UaaEndpoint() string { ret, specificReturn := fake.uaaEndpointReturnsOnCall[len(fake.uaaEndpointArgsForCall)] fake.uaaEndpointArgsForCall = append(fake.uaaEndpointArgsForCall, struct { }{}) + stub := fake.UaaEndpointStub + fakeReturns := fake.uaaEndpointReturns fake.recordInvocation("UaaEndpoint", []interface{}{}) fake.uaaEndpointMutex.Unlock() - if fake.UaaEndpointStub != nil { - return fake.UaaEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uaaEndpointReturns return fakeReturns.result1 } @@ -2850,9 +2906,10 @@ func (fake *FakeRepository) UnSetPluginRepo(arg1 int) { fake.unSetPluginRepoArgsForCall = append(fake.unSetPluginRepoArgsForCall, struct { arg1 int }{arg1}) + stub := fake.UnSetPluginRepoStub fake.recordInvocation("UnSetPluginRepo", []interface{}{arg1}) fake.unSetPluginRepoMutex.Unlock() - if fake.UnSetPluginRepoStub != nil { + if stub != nil { fake.UnSetPluginRepoStub(arg1) } } @@ -2881,15 +2938,16 @@ func (fake *FakeRepository) UserEmail() string { ret, specificReturn := fake.userEmailReturnsOnCall[len(fake.userEmailArgsForCall)] fake.userEmailArgsForCall = append(fake.userEmailArgsForCall, struct { }{}) + stub := fake.UserEmailStub + fakeReturns := fake.userEmailReturns fake.recordInvocation("UserEmail", []interface{}{}) fake.userEmailMutex.Unlock() - if fake.UserEmailStub != nil { - return fake.UserEmailStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.userEmailReturns return fakeReturns.result1 } @@ -2933,15 +2991,16 @@ func (fake *FakeRepository) UserGUID() string { ret, specificReturn := fake.userGUIDReturnsOnCall[len(fake.userGUIDArgsForCall)] fake.userGUIDArgsForCall = append(fake.userGUIDArgsForCall, struct { }{}) + stub := fake.UserGUIDStub + fakeReturns := fake.userGUIDReturns fake.recordInvocation("UserGUID", []interface{}{}) fake.userGUIDMutex.Unlock() - if fake.UserGUIDStub != nil { - return fake.UserGUIDStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.userGUIDReturns return fakeReturns.result1 } @@ -2985,15 +3044,16 @@ func (fake *FakeRepository) Username() string { ret, specificReturn := fake.usernameReturnsOnCall[len(fake.usernameArgsForCall)] fake.usernameArgsForCall = append(fake.usernameArgsForCall, struct { }{}) + stub := fake.UsernameStub + fakeReturns := fake.usernameReturns fake.recordInvocation("Username", []interface{}{}) fake.usernameMutex.Unlock() - if fake.UsernameStub != nil { - return fake.UsernameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.usernameReturns return fakeReturns.result1 } diff --git a/cf/configuration/pluginconfig/plugin_config.go b/cf/configuration/pluginconfig/plugin_config.go index c2212f7f880..00163ea5417 100644 --- a/cf/configuration/pluginconfig/plugin_config.go +++ b/cf/configuration/pluginconfig/plugin_config.go @@ -3,7 +3,7 @@ package pluginconfig import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginConfiguration @@ -74,7 +74,7 @@ func (c *PluginConfig) ListCommands() []string { } func (c *PluginConfig) init() { - //only read from disk if it was never read + // only read from disk if it was never read c.initOnce.Do(func() { err := c.persistor.Load(c.data) if err != nil { diff --git a/cf/configuration/pluginconfig/plugin_config_test.go b/cf/configuration/pluginconfig/plugin_config_test.go index 2b7c0b84547..6052a17e2de 100644 --- a/cf/configuration/pluginconfig/plugin_config_test.go +++ b/cf/configuration/pluginconfig/plugin_config_test.go @@ -5,12 +5,12 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - . "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + . "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/plugin" - "code.cloudfoundry.org/cli/cf/configuration/configurationfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/configurationfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/pluginconfig/plugin_data.go b/cf/configuration/pluginconfig/plugin_data.go index 9d9cebe4907..81354f9ae5c 100644 --- a/cf/configuration/pluginconfig/plugin_data.go +++ b/cf/configuration/pluginconfig/plugin_data.go @@ -3,7 +3,7 @@ package pluginconfig import ( "encoding/json" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type PluginData struct { diff --git a/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go b/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go index 42220dae934..856e4bb9ac8 100644 --- a/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go +++ b/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go @@ -4,7 +4,7 @@ package pluginconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" ) type FakePluginConfiguration struct { @@ -58,15 +58,16 @@ func (fake *FakePluginConfiguration) GetPluginPath() string { ret, specificReturn := fake.getPluginPathReturnsOnCall[len(fake.getPluginPathArgsForCall)] fake.getPluginPathArgsForCall = append(fake.getPluginPathArgsForCall, struct { }{}) + stub := fake.GetPluginPathStub + fakeReturns := fake.getPluginPathReturns fake.recordInvocation("GetPluginPath", []interface{}{}) fake.getPluginPathMutex.Unlock() - if fake.GetPluginPathStub != nil { - return fake.GetPluginPathStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getPluginPathReturns return fakeReturns.result1 } @@ -110,15 +111,16 @@ func (fake *FakePluginConfiguration) ListCommands() []string { ret, specificReturn := fake.listCommandsReturnsOnCall[len(fake.listCommandsArgsForCall)] fake.listCommandsArgsForCall = append(fake.listCommandsArgsForCall, struct { }{}) + stub := fake.ListCommandsStub + fakeReturns := fake.listCommandsReturns fake.recordInvocation("ListCommands", []interface{}{}) fake.listCommandsMutex.Unlock() - if fake.ListCommandsStub != nil { - return fake.ListCommandsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.listCommandsReturns return fakeReturns.result1 } @@ -162,15 +164,16 @@ func (fake *FakePluginConfiguration) Plugins() map[string]pluginconfig.PluginMet ret, specificReturn := fake.pluginsReturnsOnCall[len(fake.pluginsArgsForCall)] fake.pluginsArgsForCall = append(fake.pluginsArgsForCall, struct { }{}) + stub := fake.PluginsStub + fakeReturns := fake.pluginsReturns fake.recordInvocation("Plugins", []interface{}{}) fake.pluginsMutex.Unlock() - if fake.PluginsStub != nil { - return fake.PluginsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginsReturns return fakeReturns.result1 } @@ -214,9 +217,10 @@ func (fake *FakePluginConfiguration) RemovePlugin(arg1 string) { fake.removePluginArgsForCall = append(fake.removePluginArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RemovePluginStub fake.recordInvocation("RemovePlugin", []interface{}{arg1}) fake.removePluginMutex.Unlock() - if fake.RemovePluginStub != nil { + if stub != nil { fake.RemovePluginStub(arg1) } } @@ -246,9 +250,10 @@ func (fake *FakePluginConfiguration) SetPlugin(arg1 string, arg2 pluginconfig.Pl arg1 string arg2 pluginconfig.PluginMetadata }{arg1, arg2}) + stub := fake.SetPluginStub fake.recordInvocation("SetPlugin", []interface{}{arg1, arg2}) fake.setPluginMutex.Unlock() - if fake.SetPluginStub != nil { + if stub != nil { fake.SetPluginStub(arg1, arg2) } } diff --git a/cf/errors/access_denied_error.go b/cf/errors/access_denied_error.go index 36fb366d8aa..1088d9b83b3 100644 --- a/cf/errors/access_denied_error.go +++ b/cf/errors/access_denied_error.go @@ -1,6 +1,6 @@ package errors -import . "code.cloudfoundry.org/cli/cf/i18n" +import . "code.cloudfoundry.org/cli/v9/cf/i18n" type AccessDeniedError struct { } diff --git a/cf/errors/ambiguous_model_error.go b/cf/errors/ambiguous_model_error.go index 071745bcf01..850130c247a 100644 --- a/cf/errors/ambiguous_model_error.go +++ b/cf/errors/ambiguous_model_error.go @@ -3,7 +3,7 @@ package errors import ( "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type AmbiguousModelError struct { diff --git a/cf/errors/curl_http_error.go b/cf/errors/curl_http_error.go index 4883e943c4a..d2bef652a49 100644 --- a/cf/errors/curl_http_error.go +++ b/cf/errors/curl_http_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type CurlHTTPError struct { diff --git a/cf/errors/empty_dir_error.go b/cf/errors/empty_dir_error.go index 8cca87afa04..d829cc54ea6 100644 --- a/cf/errors/empty_dir_error.go +++ b/cf/errors/empty_dir_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type EmptyDirError struct { diff --git a/cf/errors/errorsfakes/fake_httperror.go b/cf/errors/errorsfakes/fake_httperror.go index ee993fdd855..767724a9cf9 100644 --- a/cf/errors/errorsfakes/fake_httperror.go +++ b/cf/errors/errorsfakes/fake_httperror.go @@ -4,7 +4,7 @@ package errorsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/errors" ) type FakeHTTPError struct { @@ -47,15 +47,16 @@ func (fake *FakeHTTPError) Error() string { ret, specificReturn := fake.errorReturnsOnCall[len(fake.errorArgsForCall)] fake.errorArgsForCall = append(fake.errorArgsForCall, struct { }{}) + stub := fake.ErrorStub + fakeReturns := fake.errorReturns fake.recordInvocation("Error", []interface{}{}) fake.errorMutex.Unlock() - if fake.ErrorStub != nil { - return fake.ErrorStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.errorReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeHTTPError) ErrorCode() string { ret, specificReturn := fake.errorCodeReturnsOnCall[len(fake.errorCodeArgsForCall)] fake.errorCodeArgsForCall = append(fake.errorCodeArgsForCall, struct { }{}) + stub := fake.ErrorCodeStub + fakeReturns := fake.errorCodeReturns fake.recordInvocation("ErrorCode", []interface{}{}) fake.errorCodeMutex.Unlock() - if fake.ErrorCodeStub != nil { - return fake.ErrorCodeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.errorCodeReturns return fakeReturns.result1 } @@ -151,15 +153,16 @@ func (fake *FakeHTTPError) StatusCode() int { ret, specificReturn := fake.statusCodeReturnsOnCall[len(fake.statusCodeArgsForCall)] fake.statusCodeArgsForCall = append(fake.statusCodeArgsForCall, struct { }{}) + stub := fake.StatusCodeStub + fakeReturns := fake.statusCodeReturns fake.recordInvocation("StatusCode", []interface{}{}) fake.statusCodeMutex.Unlock() - if fake.StatusCodeStub != nil { - return fake.StatusCodeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.statusCodeReturns return fakeReturns.result1 } diff --git a/cf/errors/gateway_error.go b/cf/errors/gateway_error.go index 22d908bbed3..090a34925bf 100644 --- a/cf/errors/gateway_error.go +++ b/cf/errors/gateway_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type AsyncTimeoutError struct { diff --git a/cf/errors/http_error.go b/cf/errors/http_error.go index bb8e1f60b08..d4fd145ddc6 100644 --- a/cf/errors/http_error.go +++ b/cf/errors/http_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . HTTPError diff --git a/cf/errors/invalid_ssl_cert_error.go b/cf/errors/invalid_ssl_cert_error.go index 70f81d7af1d..8c241e1fc44 100644 --- a/cf/errors/invalid_ssl_cert_error.go +++ b/cf/errors/invalid_ssl_cert_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type InvalidSSLCert struct { diff --git a/cf/errors/invalid_token_error.go b/cf/errors/invalid_token_error.go index 4860758669f..4d410f637ac 100644 --- a/cf/errors/invalid_token_error.go +++ b/cf/errors/invalid_token_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type InvalidTokenError struct { diff --git a/cf/errors/model_already_exists_error.go b/cf/errors/model_already_exists_error.go index ef8b832dc6b..35916127ccf 100644 --- a/cf/errors/model_already_exists_error.go +++ b/cf/errors/model_already_exists_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ModelAlreadyExistsError struct { diff --git a/cf/errors/model_not_found_error.go b/cf/errors/model_not_found_error.go index d41611978d2..79616cfb02f 100644 --- a/cf/errors/model_not_found_error.go +++ b/cf/errors/model_not_found_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ModelNotFoundError struct { diff --git a/cf/errors/not_authorized_error.go b/cf/errors/not_authorized_error.go index 4e9160bde13..1d60c99a5e8 100644 --- a/cf/errors/not_authorized_error.go +++ b/cf/errors/not_authorized_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type NotAuthorizedError struct { diff --git a/cf/errors/service_association_error.go b/cf/errors/service_association_error.go index 34ae899c037..fb93eb9f0bf 100644 --- a/cf/errors/service_association_error.go +++ b/cf/errors/service_association_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ServiceAssociationError struct { diff --git a/cf/errors/unbindable_service_error.go b/cf/errors/unbindable_service_error.go index 35a788a9a12..b99d177ee78 100644 --- a/cf/errors/unbindable_service_error.go +++ b/cf/errors/unbindable_service_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type UnbindableServiceError struct { diff --git a/cf/flagcontext/flag_content_helper_test.go b/cf/flagcontext/flag_content_helper_test.go index c57324995b9..a8a113448f7 100644 --- a/cf/flagcontext/flag_content_helper_test.go +++ b/cf/flagcontext/flag_content_helper_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/flags/flag_constructor_test.go b/cf/flags/flag_constructor_test.go index fcdd89c2911..653aaee211b 100644 --- a/cf/flags/flag_constructor_test.go +++ b/cf/flags/flag_constructor_test.go @@ -1,7 +1,7 @@ package flags_test import ( - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/flags/flags_test.go b/cf/flags/flags_test.go index 1e744afe6b2..683a00b6735 100644 --- a/cf/flags/flags_test.go +++ b/cf/flags/flags_test.go @@ -1,7 +1,7 @@ package flags_test import ( - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/flags/flags_usage_test.go b/cf/flags/flags_usage_test.go index 56851007ecc..de961cfafeb 100644 --- a/cf/flags/flags_usage_test.go +++ b/cf/flags/flags_usage_test.go @@ -3,7 +3,7 @@ package flags_test import ( "strings" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bools.go b/cf/formatters/bools.go index 4ce3d0c8418..7794fbda967 100644 --- a/cf/formatters/bools.go +++ b/cf/formatters/bools.go @@ -1,7 +1,7 @@ package formatters import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) func Allowed(allowed bool) string { diff --git a/cf/formatters/bools_test.go b/cf/formatters/bools_test.go index 4074e130d58..e7ecab04c9a 100644 --- a/cf/formatters/bools_test.go +++ b/cf/formatters/bools_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bytes.go b/cf/formatters/bytes.go index bdd76a65c28..5b055b32fe8 100644 --- a/cf/formatters/bytes.go +++ b/cf/formatters/bytes.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) const ( diff --git a/cf/formatters/bytes_test.go b/cf/formatters/bytes_test.go index 0e486e37a58..c93c9ebab52 100644 --- a/cf/formatters/bytes_test.go +++ b/cf/formatters/bytes_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/formatters_suite_test.go b/cf/formatters/formatters_suite_test.go index cfc282f00a2..db055131812 100644 --- a/cf/formatters/formatters_suite_test.go +++ b/cf/formatters/formatters_suite_test.go @@ -1,8 +1,8 @@ package formatters_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/formatters/memoryLimit_test.go b/cf/formatters/memoryLimit_test.go index 12e1af7f470..71b094d93e0 100644 --- a/cf/formatters/memoryLimit_test.go +++ b/cf/formatters/memoryLimit_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/help/help.go b/cf/help/help.go index bb992977d66..bb4bbfc5a25 100644 --- a/cf/help/help.go +++ b/cf/help/help.go @@ -11,13 +11,13 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/version" ) type appPresenter struct { @@ -64,7 +64,7 @@ func newAppPresenter() appPresenter { pluginConfig := pluginconfig.NewPluginConfig( func(err error) { - //fail silently when running help + // fail silently when running help }, configuration.NewDiskPersistor(filepath.Join(pluginPath, "config.json")), pluginPath, diff --git a/cf/help/help_suite_test.go b/cf/help/help_suite_test.go index 8c631e6d77c..35ab16df697 100644 --- a/cf/help/help_suite_test.go +++ b/cf/help/help_suite_test.go @@ -1,7 +1,7 @@ package help_test import ( - "code.cloudfoundry.org/cli/cf/commandsloader" + "code.cloudfoundry.org/cli/v9/cf/commandsloader" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/help/help_test.go b/cf/help/help_test.go index 83a2c269be1..378574b4318 100644 --- a/cf/help/help_test.go +++ b/cf/help/help_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/help" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/help" - "code.cloudfoundry.org/cli/cf/util/testhelpers/io" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/io" "os" diff --git a/cf/help/template.go b/cf/help/template.go index 850480fd584..230c61309e0 100644 --- a/cf/help/template.go +++ b/cf/help/template.go @@ -1,6 +1,6 @@ package help -import . "code.cloudfoundry.org/cli/cf/i18n" +import . "code.cloudfoundry.org/cli/v9/cf/i18n" func GetHelpTemplate() string { return `{{.Title "` + T("NAME:") + `"}} diff --git a/cf/i18n/i18n.go b/cf/i18n/i18n.go index 4084738e99c..f1f977f1c17 100644 --- a/cf/i18n/i18n.go +++ b/cf/i18n/i18n.go @@ -1,6 +1,6 @@ package i18n -import "code.cloudfoundry.org/cli/util/ui" +import "code.cloudfoundry.org/cli/v9/util/ui" var T ui.TranslateFunc diff --git a/cf/i18n/locale.go b/cf/i18n/locale.go index 3857d1e42d1..cf4b633b799 100644 --- a/cf/i18n/locale.go +++ b/cf/i18n/locale.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "code.cloudfoundry.org/cli/i18n/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/i18n/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) const resourceSuffix = ".all.json" diff --git a/cf/i18n/locale_test.go b/cf/i18n/locale_test.go index df8781dd85d..792bbc292d5 100644 --- a/cf/i18n/locale_test.go +++ b/cf/i18n/locale_test.go @@ -1,7 +1,7 @@ package i18n_test import ( - "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/manifest/generate_manifest.go b/cf/manifest/generate_manifest.go index 6a8a9eb68c4..a219702600a 100644 --- a/cf/manifest/generate_manifest.go +++ b/cf/manifest/generate_manifest.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" "gopkg.in/yaml.v2" "io" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . App diff --git a/cf/manifest/generate_manifest_test.go b/cf/manifest/generate_manifest_test.go index 78e35599267..677b1b0846f 100644 --- a/cf/manifest/generate_manifest_test.go +++ b/cf/manifest/generate_manifest_test.go @@ -5,7 +5,7 @@ import ( "bytes" - . "code.cloudfoundry.org/cli/cf/manifest" + . "code.cloudfoundry.org/cli/v9/cf/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/manifest/manifest.go b/cf/manifest/manifest.go index 4d959ae5a06..c46e1022cd5 100644 --- a/cf/manifest/manifest.go +++ b/cf/manifest/manifest.go @@ -7,12 +7,12 @@ import ( "regexp" "strconv" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/util/generic" - "code.cloudfoundry.org/cli/util/randomword" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/util/generic" + "code.cloudfoundry.org/cli/v9/util/randomword" ) type Manifest struct { diff --git a/cf/manifest/manifest_disk_repository.go b/cf/manifest/manifest_disk_repository.go index 166e3202bd1..3fee79ffca8 100644 --- a/cf/manifest/manifest_disk_repository.go +++ b/cf/manifest/manifest_disk_repository.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/util/generic" "gopkg.in/yaml.v2" ) diff --git a/cf/manifest/manifest_disk_repository_test.go b/cf/manifest/manifest_disk_repository_test.go index b59abaf8a5a..9b042a809b2 100644 --- a/cf/manifest/manifest_disk_repository_test.go +++ b/cf/manifest/manifest_disk_repository_test.go @@ -3,7 +3,7 @@ package manifest_test import ( "path/filepath" - . "code.cloudfoundry.org/cli/cf/manifest" + . "code.cloudfoundry.org/cli/v9/cf/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/manifest/manifest_suite_test.go b/cf/manifest/manifest_suite_test.go index 3e0fb18b5c2..6c2a4b06f24 100644 --- a/cf/manifest/manifest_suite_test.go +++ b/cf/manifest/manifest_suite_test.go @@ -1,8 +1,8 @@ package manifest_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/manifest/manifest_test.go b/cf/manifest/manifest_test.go index aa31a10414d..e0323834d06 100644 --- a/cf/manifest/manifest_test.go +++ b/cf/manifest/manifest_test.go @@ -4,12 +4,12 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) func NewManifest(path string, data generic.Map) (m *manifest.Manifest) { diff --git a/cf/manifest/manifestfakes/fake_app.go b/cf/manifest/manifestfakes/fake_app.go index 54860590aa5..cef2683b366 100644 --- a/cf/manifest/manifestfakes/fake_app.go +++ b/cf/manifest/manifestfakes/fake_app.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeApp struct { @@ -117,9 +117,10 @@ func (fake *FakeApp) BuildpackURL(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.BuildpackURLStub fake.recordInvocation("BuildpackURL", []interface{}{arg1, arg2}) fake.buildpackURLMutex.Unlock() - if fake.BuildpackURLStub != nil { + if stub != nil { fake.BuildpackURLStub(arg1, arg2) } } @@ -149,9 +150,10 @@ func (fake *FakeApp) DiskQuota(arg1 string, arg2 int64) { arg1 string arg2 int64 }{arg1, arg2}) + stub := fake.DiskQuotaStub fake.recordInvocation("DiskQuota", []interface{}{arg1, arg2}) fake.diskQuotaMutex.Unlock() - if fake.DiskQuotaStub != nil { + if stub != nil { fake.DiskQuotaStub(arg1, arg2) } } @@ -182,9 +184,10 @@ func (fake *FakeApp) EnvironmentVars(arg1 string, arg2 string, arg3 string) { arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.EnvironmentVarsStub fake.recordInvocation("EnvironmentVars", []interface{}{arg1, arg2, arg3}) fake.environmentVarsMutex.Unlock() - if fake.EnvironmentVarsStub != nil { + if stub != nil { fake.EnvironmentVarsStub(arg1, arg2, arg3) } } @@ -213,15 +216,16 @@ func (fake *FakeApp) GetContents() []models.Application { ret, specificReturn := fake.getContentsReturnsOnCall[len(fake.getContentsArgsForCall)] fake.getContentsArgsForCall = append(fake.getContentsArgsForCall, struct { }{}) + stub := fake.GetContentsStub + fakeReturns := fake.getContentsReturns fake.recordInvocation("GetContents", []interface{}{}) fake.getContentsMutex.Unlock() - if fake.GetContentsStub != nil { - return fake.GetContentsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getContentsReturns return fakeReturns.result1 } @@ -266,9 +270,10 @@ func (fake *FakeApp) HealthCheckHTTPEndpoint(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.HealthCheckHTTPEndpointStub fake.recordInvocation("HealthCheckHTTPEndpoint", []interface{}{arg1, arg2}) fake.healthCheckHTTPEndpointMutex.Unlock() - if fake.HealthCheckHTTPEndpointStub != nil { + if stub != nil { fake.HealthCheckHTTPEndpointStub(arg1, arg2) } } @@ -298,9 +303,10 @@ func (fake *FakeApp) HealthCheckTimeout(arg1 string, arg2 int) { arg1 string arg2 int }{arg1, arg2}) + stub := fake.HealthCheckTimeoutStub fake.recordInvocation("HealthCheckTimeout", []interface{}{arg1, arg2}) fake.healthCheckTimeoutMutex.Unlock() - if fake.HealthCheckTimeoutStub != nil { + if stub != nil { fake.HealthCheckTimeoutStub(arg1, arg2) } } @@ -330,9 +336,10 @@ func (fake *FakeApp) HealthCheckType(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.HealthCheckTypeStub fake.recordInvocation("HealthCheckType", []interface{}{arg1, arg2}) fake.healthCheckTypeMutex.Unlock() - if fake.HealthCheckTypeStub != nil { + if stub != nil { fake.HealthCheckTypeStub(arg1, arg2) } } @@ -362,9 +369,10 @@ func (fake *FakeApp) Instances(arg1 string, arg2 int) { arg1 string arg2 int }{arg1, arg2}) + stub := fake.InstancesStub fake.recordInvocation("Instances", []interface{}{arg1, arg2}) fake.instancesMutex.Unlock() - if fake.InstancesStub != nil { + if stub != nil { fake.InstancesStub(arg1, arg2) } } @@ -394,9 +402,10 @@ func (fake *FakeApp) Memory(arg1 string, arg2 int64) { arg1 string arg2 int64 }{arg1, arg2}) + stub := fake.MemoryStub fake.recordInvocation("Memory", []interface{}{arg1, arg2}) fake.memoryMutex.Unlock() - if fake.MemoryStub != nil { + if stub != nil { fake.MemoryStub(arg1, arg2) } } @@ -429,9 +438,10 @@ func (fake *FakeApp) Route(arg1 string, arg2 string, arg3 string, arg4 string, a arg4 string arg5 int }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.RouteStub fake.recordInvocation("Route", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.routeMutex.Unlock() - if fake.RouteStub != nil { + if stub != nil { fake.RouteStub(arg1, arg2, arg3, arg4, arg5) } } @@ -461,15 +471,16 @@ func (fake *FakeApp) Save(arg1 io.Writer) error { fake.saveArgsForCall = append(fake.saveArgsForCall, struct { arg1 io.Writer }{arg1}) + stub := fake.SaveStub + fakeReturns := fake.saveReturns fake.recordInvocation("Save", []interface{}{arg1}) fake.saveMutex.Unlock() - if fake.SaveStub != nil { - return fake.SaveStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.saveReturns return fakeReturns.result1 } @@ -521,9 +532,10 @@ func (fake *FakeApp) Service(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.ServiceStub fake.recordInvocation("Service", []interface{}{arg1, arg2}) fake.serviceMutex.Unlock() - if fake.ServiceStub != nil { + if stub != nil { fake.ServiceStub(arg1, arg2) } } @@ -553,9 +565,10 @@ func (fake *FakeApp) Stack(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.StackStub fake.recordInvocation("Stack", []interface{}{arg1, arg2}) fake.stackMutex.Unlock() - if fake.StackStub != nil { + if stub != nil { fake.StackStub(arg1, arg2) } } @@ -585,9 +598,10 @@ func (fake *FakeApp) StartCommand(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.StartCommandStub fake.recordInvocation("StartCommand", []interface{}{arg1, arg2}) fake.startCommandMutex.Unlock() - if fake.StartCommandStub != nil { + if stub != nil { fake.StartCommandStub(arg1, arg2) } } diff --git a/cf/manifest/manifestfakes/fake_repository.go b/cf/manifest/manifestfakes/fake_repository.go index a87be0e2861..20580116a7b 100644 --- a/cf/manifest/manifestfakes/fake_repository.go +++ b/cf/manifest/manifestfakes/fake_repository.go @@ -4,7 +4,7 @@ package manifestfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/manifest" ) type FakeRepository struct { @@ -31,15 +31,16 @@ func (fake *FakeRepository) ReadManifest(arg1 string) (*manifest.Manifest, error fake.readManifestArgsForCall = append(fake.readManifestArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadManifestStub + fakeReturns := fake.readManifestReturns fake.recordInvocation("ReadManifest", []interface{}{arg1}) fake.readManifestMutex.Unlock() - if fake.ReadManifestStub != nil { - return fake.ReadManifestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readManifestReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/models/application_test.go b/cf/models/application_test.go index ea7ad0ac178..d31897b2ea3 100644 --- a/cf/models/application_test.go +++ b/cf/models/application_test.go @@ -3,7 +3,7 @@ package models_test import ( "os" - . "code.cloudfoundry.org/cli/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/domain_test.go b/cf/models/domain_test.go index 251fa439906..4084388dbdd 100644 --- a/cf/models/domain_test.go +++ b/cf/models/domain_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/route_summary_test.go b/cf/models/route_summary_test.go index 8b69e271aea..a943f7d4743 100644 --- a/cf/models/route_summary_test.go +++ b/cf/models/route_summary_test.go @@ -1,7 +1,7 @@ package models_test import ( - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/models/route_test.go b/cf/models/route_test.go index 9772ba8ac0c..04b32375f4e 100644 --- a/cf/models/route_test.go +++ b/cf/models/route_test.go @@ -1,7 +1,7 @@ package models_test import ( - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/models/service_instance_test.go b/cf/models/service_instance_test.go index c58f8381287..88fc2b87f01 100644 --- a/cf/models/service_instance_test.go +++ b/cf/models/service_instance_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/service_plan_test.go b/cf/models/service_plan_test.go index af9d8510b92..002a84ae188 100644 --- a/cf/models/service_plan_test.go +++ b/cf/models/service_plan_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/space_quota.go b/cf/models/space_quota.go index 4edf2992ee1..5a83cc5a6d5 100644 --- a/cf/models/space_quota.go +++ b/cf/models/space_quota.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strconv" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type SpaceQuota struct { @@ -36,7 +36,7 @@ func (q SpaceQuota) FormattedInstanceMemoryLimit() string { func (q SpaceQuota) FormattedAppInstanceLimit() string { appInstanceLimit := T(UnlimitedDisplay) - if q.AppInstanceLimit != -1 { //TODO - figure out how to use resources.UnlimitedAppInstances + if q.AppInstanceLimit != -1 { // TODO - figure out how to use resources.UnlimitedAppInstances appInstanceLimit = strconv.Itoa(q.AppInstanceLimit) } diff --git a/cf/net/cloud_controller_gateway.go b/cf/net/cloud_controller_gateway.go index 449ccbf972e..9222511d710 100644 --- a/cf/net/cloud_controller_gateway.go +++ b/cf/net/cloud_controller_gateway.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type ccErrorResponse struct { diff --git a/cf/net/cloud_controller_gateway_test.go b/cf/net/cloud_controller_gateway_test.go index cbf72f34db4..37c6ac1ca33 100644 --- a/cf/net/cloud_controller_gateway_test.go +++ b/cf/net/cloud_controller_gateway_test.go @@ -8,13 +8,13 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/gateway.go b/cf/net/gateway.go index 9a7ee4f701f..f69bbd73eec 100644 --- a/cf/net/gateway.go +++ b/cf/net/gateway.go @@ -17,13 +17,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/version" ) const ( diff --git a/cf/net/gateway_test.go b/cf/net/gateway_test.go index b1926c950f6..9197d580ad3 100644 --- a/cf/net/gateway_test.go +++ b/cf/net/gateway_test.go @@ -15,16 +15,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/net/netfakes" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net/netfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/net/http_client.go b/cf/net/http_client.go index 8f6411cd697..496e1164772 100644 --- a/cf/net/http_client.go +++ b/cf/net/http_client.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" "golang.org/x/net/websocket" ) diff --git a/cf/net/http_client_test.go b/cf/net/http_client_test.go index e1c5ff5c496..e07165a0e31 100644 --- a/cf/net/http_client_test.go +++ b/cf/net/http_client_test.go @@ -7,9 +7,9 @@ import ( "net/url" "syscall" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "golang.org/x/net/websocket" diff --git a/cf/net/net_suite_test.go b/cf/net/net_suite_test.go index 8c16c8faf75..5191064959f 100644 --- a/cf/net/net_suite_test.go +++ b/cf/net/net_suite_test.go @@ -1,8 +1,8 @@ package net_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/net/netfakes/fake_httpclient_interface.go b/cf/net/netfakes/fake_httpclient_interface.go index 9040eef181c..2243192697a 100644 --- a/cf/net/netfakes/fake_httpclient_interface.go +++ b/cf/net/netfakes/fake_httpclient_interface.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net" ) type FakeHTTPClientInterface struct { @@ -54,15 +54,16 @@ func (fake *FakeHTTPClientInterface) Do(arg1 *http.Request) (*http.Response, err fake.doArgsForCall = append(fake.doArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.DoStub + fakeReturns := fake.doReturns fake.recordInvocation("Do", []interface{}{arg1}) fake.doMutex.Unlock() - if fake.DoStub != nil { - return fake.DoStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.doReturns return fakeReturns.result1, fakeReturns.result2 } @@ -116,9 +117,10 @@ func (fake *FakeHTTPClientInterface) DumpRequest(arg1 *http.Request) { fake.dumpRequestArgsForCall = append(fake.dumpRequestArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.DumpRequestStub fake.recordInvocation("DumpRequest", []interface{}{arg1}) fake.dumpRequestMutex.Unlock() - if fake.DumpRequestStub != nil { + if stub != nil { fake.DumpRequestStub(arg1) } } @@ -147,9 +149,10 @@ func (fake *FakeHTTPClientInterface) DumpResponse(arg1 *http.Response) { fake.dumpResponseArgsForCall = append(fake.dumpResponseArgsForCall, struct { arg1 *http.Response }{arg1}) + stub := fake.DumpResponseStub fake.recordInvocation("DumpResponse", []interface{}{arg1}) fake.dumpResponseMutex.Unlock() - if fake.DumpResponseStub != nil { + if stub != nil { fake.DumpResponseStub(arg1) } } @@ -185,15 +188,16 @@ func (fake *FakeHTTPClientInterface) ExecuteCheckRedirect(arg1 *http.Request, ar arg1 *http.Request arg2 []*http.Request }{arg1, arg2Copy}) + stub := fake.ExecuteCheckRedirectStub + fakeReturns := fake.executeCheckRedirectReturns fake.recordInvocation("ExecuteCheckRedirect", []interface{}{arg1, arg2Copy}) fake.executeCheckRedirectMutex.Unlock() - if fake.ExecuteCheckRedirectStub != nil { - return fake.ExecuteCheckRedirectStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeCheckRedirectReturns return fakeReturns.result1 } diff --git a/cf/net/netfakes/fake_request_dumper_interface.go b/cf/net/netfakes/fake_request_dumper_interface.go index 19350408b1a..915bf213eb3 100644 --- a/cf/net/netfakes/fake_request_dumper_interface.go +++ b/cf/net/netfakes/fake_request_dumper_interface.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net" ) type FakeRequestDumperInterface struct { @@ -28,9 +28,10 @@ func (fake *FakeRequestDumperInterface) DumpRequest(arg1 *http.Request) { fake.dumpRequestArgsForCall = append(fake.dumpRequestArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.DumpRequestStub fake.recordInvocation("DumpRequest", []interface{}{arg1}) fake.dumpRequestMutex.Unlock() - if fake.DumpRequestStub != nil { + if stub != nil { fake.DumpRequestStub(arg1) } } @@ -59,9 +60,10 @@ func (fake *FakeRequestDumperInterface) DumpResponse(arg1 *http.Response) { fake.dumpResponseArgsForCall = append(fake.dumpResponseArgsForCall, struct { arg1 *http.Response }{arg1}) + stub := fake.DumpResponseStub fake.recordInvocation("DumpResponse", []interface{}{arg1}) fake.dumpResponseMutex.Unlock() - if fake.DumpResponseStub != nil { + if stub != nil { fake.DumpResponseStub(arg1) } } diff --git a/cf/net/netfakes/fake_warning_producer.go b/cf/net/netfakes/fake_warning_producer.go index d21e5364852..516c46f07c4 100644 --- a/cf/net/netfakes/fake_warning_producer.go +++ b/cf/net/netfakes/fake_warning_producer.go @@ -4,7 +4,7 @@ package netfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net" ) type FakeWarningProducer struct { @@ -27,15 +27,16 @@ func (fake *FakeWarningProducer) Warnings() []string { ret, specificReturn := fake.warningsReturnsOnCall[len(fake.warningsArgsForCall)] fake.warningsArgsForCall = append(fake.warningsArgsForCall, struct { }{}) + stub := fake.WarningsStub + fakeReturns := fake.warningsReturns fake.recordInvocation("Warnings", []interface{}{}) fake.warningsMutex.Unlock() - if fake.WarningsStub != nil { - return fake.WarningsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.warningsReturns return fakeReturns.result1 } diff --git a/cf/net/progress_reader.go b/cf/net/progress_reader.go index 8716cafd980..58f3851955d 100644 --- a/cf/net/progress_reader.go +++ b/cf/net/progress_reader.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ProgressReader struct { @@ -67,8 +67,8 @@ func (progressReader *ProgressReader) printProgress(quit chan bool) { for { select { case <-quit: - //The spaces are there to ensure we overwrite the entire line - //before using the terminal printer to output Done Uploading + // The spaces are there to ensure we overwrite the entire line + // before using the terminal printer to output Done Uploading progressReader.ui.PrintCapturingNoOutput("\r ") progressReader.ui.Say("\rDone uploading") return diff --git a/cf/net/progress_reader_test.go b/cf/net/progress_reader_test.go index 3f5fecb9518..181c34d2cde 100644 --- a/cf/net/progress_reader_test.go +++ b/cf/net/progress_reader_test.go @@ -7,8 +7,8 @@ import ( "os" "time" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/request_dumper.go b/cf/net/request_dumper.go index 18670114846..876f83c1034 100644 --- a/cf/net/request_dumper.go +++ b/cf/net/request_dumper.go @@ -11,10 +11,10 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestDumperInterface diff --git a/cf/net/request_dumper_test.go b/cf/net/request_dumper_test.go index 97ff4513b49..66342332afa 100644 --- a/cf/net/request_dumper_test.go +++ b/cf/net/request_dumper_test.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/trace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/routing_api_gateway.go b/cf/net/routing_api_gateway.go index c186a87c1d8..5b965cc93a7 100644 --- a/cf/net/routing_api_gateway.go +++ b/cf/net/routing_api_gateway.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type errorResponse struct { diff --git a/cf/net/routing_api_gateway_test.go b/cf/net/routing_api_gateway_test.go index 86e1d57c714..846bee7a522 100644 --- a/cf/net/routing_api_gateway_test.go +++ b/cf/net/routing_api_gateway_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/uaa_gateway.go b/cf/net/uaa_gateway.go index 29d9105062c..23338b6e2a5 100644 --- a/cf/net/uaa_gateway.go +++ b/cf/net/uaa_gateway.go @@ -4,10 +4,10 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type uaaErrorResponse struct { diff --git a/cf/net/uaa_gateway_test.go b/cf/net/uaa_gateway_test.go index 79b92ca1f97..dbd8226217e 100644 --- a/cf/net/uaa_gateway_test.go +++ b/cf/net/uaa_gateway_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/warnings_collector.go b/cf/net/warnings_collector.go index 0ae16613dcd..b3463d4d95d 100644 --- a/cf/net/warnings_collector.go +++ b/cf/net/warnings_collector.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) const DeprecatedEndpointWarning = "Endpoint deprecated" diff --git a/cf/net/warnings_collector_test.go b/cf/net/warnings_collector_test.go index 81d434e9085..7b2e5368d2e 100644 --- a/cf/net/warnings_collector_test.go +++ b/cf/net/warnings_collector_test.go @@ -3,9 +3,9 @@ package net_test import ( "os" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/net/netfakes" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net/netfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/api_endpoint.go b/cf/requirements/api_endpoint.go index 6208289630d..78cd7e62f3a 100644 --- a/cf/requirements/api_endpoint.go +++ b/cf/requirements/api_endpoint.go @@ -5,10 +5,10 @@ import ( "errors" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type APIEndpointRequirement struct { diff --git a/cf/requirements/api_endpoint_test.go b/cf/requirements/api_endpoint_test.go index dd8ecd43f6d..52bcf2a9dce 100644 --- a/cf/requirements/api_endpoint_test.go +++ b/cf/requirements/api_endpoint_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/requirements" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/application.go b/cf/requirements/application.go index 3ce04a99cbc..019c356c1d0 100644 --- a/cf/requirements/application.go +++ b/cf/requirements/application.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ApplicationRequirement diff --git a/cf/requirements/application_test.go b/cf/requirements/application_test.go index de87d9fe455..89761025f26 100644 --- a/cf/requirements/application_test.go +++ b/cf/requirements/application_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/buildpack.go b/cf/requirements/buildpack.go index 0f8981e3da3..20ea40a76d1 100644 --- a/cf/requirements/buildpack.go +++ b/cf/requirements/buildpack.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BuildpackRequirement diff --git a/cf/requirements/buildpack_test.go b/cf/requirements/buildpack_test.go index b40e60e323c..ad60089cc21 100644 --- a/cf/requirements/buildpack_test.go +++ b/cf/requirements/buildpack_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/config_refreshing_requirement.go b/cf/requirements/config_refreshing_requirement.go index a6f46179b7b..b90ad9262fe 100644 --- a/cf/requirements/config_refreshing_requirement.go +++ b/cf/requirements/config_refreshing_requirement.go @@ -1,6 +1,6 @@ package requirements -import "code.cloudfoundry.org/cli/cf/configuration/coreconfig" +import "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" type configRefreshingRequirement struct { requirement Requirement diff --git a/cf/requirements/config_refreshing_requirement_test.go b/cf/requirements/config_refreshing_requirement_test.go index 3421504cc20..d2a81a9e258 100644 --- a/cf/requirements/config_refreshing_requirement_test.go +++ b/cf/requirements/config_refreshing_requirement_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" "errors" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/dea_application.go b/cf/requirements/dea_application.go index 747c9d42e4d..b78ea109759 100644 --- a/cf/requirements/dea_application.go +++ b/cf/requirements/dea_application.go @@ -1,10 +1,10 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DEAApplicationRequirement diff --git a/cf/requirements/dea_application_test.go b/cf/requirements/dea_application_test.go index bc6b6122239..44fdd9af3d5 100644 --- a/cf/requirements/dea_application_test.go +++ b/cf/requirements/dea_application_test.go @@ -3,10 +3,10 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/domain.go b/cf/requirements/domain.go index 72d9d01d212..454fb89178e 100644 --- a/cf/requirements/domain.go +++ b/cf/requirements/domain.go @@ -1,9 +1,9 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DomainRequirement diff --git a/cf/requirements/domain_test.go b/cf/requirements/domain_test.go index 20d31fc8871..fd3bfde2f5d 100644 --- a/cf/requirements/domain_test.go +++ b/cf/requirements/domain_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/factory.go b/cf/requirements/factory.go index 0e3d9cbcdcd..4d4f8dfd2f2 100644 --- a/cf/requirements/factory.go +++ b/cf/requirements/factory.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" "github.com/blang/semver/v4" ) diff --git a/cf/requirements/login.go b/cf/requirements/login.go index 05e54315a79..5ab26a11449 100644 --- a/cf/requirements/login.go +++ b/cf/requirements/login.go @@ -3,8 +3,8 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type LoginRequirement struct { diff --git a/cf/requirements/login_test.go b/cf/requirements/login_test.go index 68e18fd0a94..2d1f5eca471 100644 --- a/cf/requirements/login_test.go +++ b/cf/requirements/login_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" ) var _ = Describe("LoginRequirement", func() { diff --git a/cf/requirements/max_api_version.go b/cf/requirements/max_api_version.go index a93cd923995..b092a4592a1 100644 --- a/cf/requirements/max_api_version.go +++ b/cf/requirements/max_api_version.go @@ -3,10 +3,10 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" "github.com/blang/semver/v4" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type MaxAPIVersionRequirement struct { diff --git a/cf/requirements/max_api_version_test.go b/cf/requirements/max_api_version_test.go index 00d0465b348..81c3a46b311 100644 --- a/cf/requirements/max_api_version_test.go +++ b/cf/requirements/max_api_version_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" "github.com/blang/semver/v4" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/min_api_version.go b/cf/requirements/min_api_version.go index 063b00c7a74..580dfbc7423 100644 --- a/cf/requirements/min_api_version.go +++ b/cf/requirements/min_api_version.go @@ -3,10 +3,10 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" "github.com/blang/semver/v4" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type MinAPIVersionRequirement struct { diff --git a/cf/requirements/min_api_version_test.go b/cf/requirements/min_api_version_test.go index 4041ed37200..17501c6a69e 100644 --- a/cf/requirements/min_api_version_test.go +++ b/cf/requirements/min_api_version_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" "github.com/blang/semver/v4" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/number_arguments.go b/cf/requirements/number_arguments.go index 36672dabf66..34bae5d5530 100644 --- a/cf/requirements/number_arguments.go +++ b/cf/requirements/number_arguments.go @@ -3,7 +3,7 @@ package requirements import ( "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type NumberArguments struct { diff --git a/cf/requirements/number_arguments_test.go b/cf/requirements/number_arguments_test.go index 6e1e8e82fb8..1c3e7c6a13f 100644 --- a/cf/requirements/number_arguments_test.go +++ b/cf/requirements/number_arguments_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/organization.go b/cf/requirements/organization.go index 96d1c8d8007..17ef3115d52 100644 --- a/cf/requirements/organization.go +++ b/cf/requirements/organization.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrganizationRequirement diff --git a/cf/requirements/organization_test.go b/cf/requirements/organization_test.go index 6830194f6ff..1f97711ba53 100644 --- a/cf/requirements/organization_test.go +++ b/cf/requirements/organization_test.go @@ -3,9 +3,9 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/requirements_suite_test.go b/cf/requirements/requirements_suite_test.go index 410c11929dc..fee8a8225a4 100644 --- a/cf/requirements/requirements_suite_test.go +++ b/cf/requirements/requirements_suite_test.go @@ -1,8 +1,8 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/requirements_test.go b/cf/requirements/requirements_test.go index bda87e4e11b..3e291cedf72 100644 --- a/cf/requirements/requirements_test.go +++ b/cf/requirements/requirements_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" "errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/requirementsfakes/fake_application_requirement.go b/cf/requirements/requirementsfakes/fake_application_requirement.go index b165f5a7c20..d948f3c48cb 100644 --- a/cf/requirements/requirementsfakes/fake_application_requirement.go +++ b/cf/requirements/requirementsfakes/fake_application_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeApplicationRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeApplicationRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeApplicationRequirement) GetApplication() models.Application { ret, specificReturn := fake.getApplicationReturnsOnCall[len(fake.getApplicationArgsForCall)] fake.getApplicationArgsForCall = append(fake.getApplicationArgsForCall, struct { }{}) + stub := fake.GetApplicationStub + fakeReturns := fake.getApplicationReturns fake.recordInvocation("GetApplication", []interface{}{}) fake.getApplicationMutex.Unlock() - if fake.GetApplicationStub != nil { - return fake.GetApplicationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getApplicationReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_buildpack_requirement.go b/cf/requirements/requirementsfakes/fake_buildpack_requirement.go index 531ae8e0591..a83671f2ca7 100644 --- a/cf/requirements/requirementsfakes/fake_buildpack_requirement.go +++ b/cf/requirements/requirementsfakes/fake_buildpack_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeBuildpackRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeBuildpackRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeBuildpackRequirement) GetBuildpack() models.Buildpack { ret, specificReturn := fake.getBuildpackReturnsOnCall[len(fake.getBuildpackArgsForCall)] fake.getBuildpackArgsForCall = append(fake.getBuildpackArgsForCall, struct { }{}) + stub := fake.GetBuildpackStub + fakeReturns := fake.getBuildpackReturns fake.recordInvocation("GetBuildpack", []interface{}{}) fake.getBuildpackMutex.Unlock() - if fake.GetBuildpackStub != nil { - return fake.GetBuildpackStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getBuildpackReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_config_refresher.go b/cf/requirements/requirementsfakes/fake_config_refresher.go index 2a602ba115d..9a0e42c860c 100644 --- a/cf/requirements/requirementsfakes/fake_config_refresher.go +++ b/cf/requirements/requirementsfakes/fake_config_refresher.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeConfigRefresher struct { @@ -30,15 +30,16 @@ func (fake *FakeConfigRefresher) Refresh() (coreconfig.Warning, error) { ret, specificReturn := fake.refreshReturnsOnCall[len(fake.refreshArgsForCall)] fake.refreshArgsForCall = append(fake.refreshArgsForCall, struct { }{}) + stub := fake.RefreshStub + fakeReturns := fake.refreshReturns fake.recordInvocation("Refresh", []interface{}{}) fake.refreshMutex.Unlock() - if fake.RefreshStub != nil { - return fake.RefreshStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go b/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go index 282f0047e0d..5815c9c07ec 100644 --- a/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go +++ b/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeDEAApplicationRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeDEAApplicationRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeDEAApplicationRequirement) GetApplication() models.Application { ret, specificReturn := fake.getApplicationReturnsOnCall[len(fake.getApplicationArgsForCall)] fake.getApplicationArgsForCall = append(fake.getApplicationArgsForCall, struct { }{}) + stub := fake.GetApplicationStub + fakeReturns := fake.getApplicationReturns fake.recordInvocation("GetApplication", []interface{}{}) fake.getApplicationMutex.Unlock() - if fake.GetApplicationStub != nil { - return fake.GetApplicationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getApplicationReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_domain_requirement.go b/cf/requirements/requirementsfakes/fake_domain_requirement.go index 0e1bdca81d3..9b249ae9f9b 100644 --- a/cf/requirements/requirementsfakes/fake_domain_requirement.go +++ b/cf/requirements/requirementsfakes/fake_domain_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeDomainRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeDomainRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeDomainRequirement) GetDomain() models.DomainFields { ret, specificReturn := fake.getDomainReturnsOnCall[len(fake.getDomainArgsForCall)] fake.getDomainArgsForCall = append(fake.getDomainArgsForCall, struct { }{}) + stub := fake.GetDomainStub + fakeReturns := fake.getDomainReturns fake.recordInvocation("GetDomain", []interface{}{}) fake.getDomainMutex.Unlock() - if fake.GetDomainStub != nil { - return fake.GetDomainStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getDomainReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_factory.go b/cf/requirements/requirementsfakes/fake_factory.go index 2eadc27b032..ca1126e8736 100644 --- a/cf/requirements/requirementsfakes/fake_factory.go +++ b/cf/requirements/requirementsfakes/fake_factory.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/requirements" - "github.com/blang/semver/v4" + "code.cloudfoundry.org/cli/v9/cf/requirements" + semver "github.com/blang/semver/v4" ) type FakeFactory struct { @@ -219,15 +219,16 @@ func (fake *FakeFactory) NewAPIEndpointRequirement() requirements.Requirement { ret, specificReturn := fake.newAPIEndpointRequirementReturnsOnCall[len(fake.newAPIEndpointRequirementArgsForCall)] fake.newAPIEndpointRequirementArgsForCall = append(fake.newAPIEndpointRequirementArgsForCall, struct { }{}) + stub := fake.NewAPIEndpointRequirementStub + fakeReturns := fake.newAPIEndpointRequirementReturns fake.recordInvocation("NewAPIEndpointRequirement", []interface{}{}) fake.newAPIEndpointRequirementMutex.Unlock() - if fake.NewAPIEndpointRequirementStub != nil { - return fake.NewAPIEndpointRequirementStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.newAPIEndpointRequirementReturns return fakeReturns.result1 } @@ -272,15 +273,16 @@ func (fake *FakeFactory) NewApplicationRequirement(arg1 string) requirements.App fake.newApplicationRequirementArgsForCall = append(fake.newApplicationRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewApplicationRequirementStub + fakeReturns := fake.newApplicationRequirementReturns fake.recordInvocation("NewApplicationRequirement", []interface{}{arg1}) fake.newApplicationRequirementMutex.Unlock() - if fake.NewApplicationRequirementStub != nil { - return fake.NewApplicationRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newApplicationRequirementReturns return fakeReturns.result1 } @@ -333,15 +335,16 @@ func (fake *FakeFactory) NewBuildpackRequirement(arg1 string, arg2 string) requi arg1 string arg2 string }{arg1, arg2}) + stub := fake.NewBuildpackRequirementStub + fakeReturns := fake.newBuildpackRequirementReturns fake.recordInvocation("NewBuildpackRequirement", []interface{}{arg1, arg2}) fake.newBuildpackRequirementMutex.Unlock() - if fake.NewBuildpackRequirementStub != nil { - return fake.NewBuildpackRequirementStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newBuildpackRequirementReturns return fakeReturns.result1 } @@ -393,15 +396,16 @@ func (fake *FakeFactory) NewClientRequirement(arg1 string) requirements.UserRequ fake.newClientRequirementArgsForCall = append(fake.newClientRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewClientRequirementStub + fakeReturns := fake.newClientRequirementReturns fake.recordInvocation("NewClientRequirement", []interface{}{arg1}) fake.newClientRequirementMutex.Unlock() - if fake.NewClientRequirementStub != nil { - return fake.NewClientRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newClientRequirementReturns return fakeReturns.result1 } @@ -453,15 +457,16 @@ func (fake *FakeFactory) NewDEAApplicationRequirement(arg1 string) requirements. fake.newDEAApplicationRequirementArgsForCall = append(fake.newDEAApplicationRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewDEAApplicationRequirementStub + fakeReturns := fake.newDEAApplicationRequirementReturns fake.recordInvocation("NewDEAApplicationRequirement", []interface{}{arg1}) fake.newDEAApplicationRequirementMutex.Unlock() - if fake.NewDEAApplicationRequirementStub != nil { - return fake.NewDEAApplicationRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newDEAApplicationRequirementReturns return fakeReturns.result1 } @@ -513,15 +518,16 @@ func (fake *FakeFactory) NewDomainRequirement(arg1 string) requirements.DomainRe fake.newDomainRequirementArgsForCall = append(fake.newDomainRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewDomainRequirementStub + fakeReturns := fake.newDomainRequirementReturns fake.recordInvocation("NewDomainRequirement", []interface{}{arg1}) fake.newDomainRequirementMutex.Unlock() - if fake.NewDomainRequirementStub != nil { - return fake.NewDomainRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newDomainRequirementReturns return fakeReturns.result1 } @@ -572,15 +578,16 @@ func (fake *FakeFactory) NewLoginRequirement() requirements.Requirement { ret, specificReturn := fake.newLoginRequirementReturnsOnCall[len(fake.newLoginRequirementArgsForCall)] fake.newLoginRequirementArgsForCall = append(fake.newLoginRequirementArgsForCall, struct { }{}) + stub := fake.NewLoginRequirementStub + fakeReturns := fake.newLoginRequirementReturns fake.recordInvocation("NewLoginRequirement", []interface{}{}) fake.newLoginRequirementMutex.Unlock() - if fake.NewLoginRequirementStub != nil { - return fake.NewLoginRequirementStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.newLoginRequirementReturns return fakeReturns.result1 } @@ -626,15 +633,16 @@ func (fake *FakeFactory) NewMaxAPIVersionRequirement(arg1 string, arg2 semver.Ve arg1 string arg2 semver.Version }{arg1, arg2}) + stub := fake.NewMaxAPIVersionRequirementStub + fakeReturns := fake.newMaxAPIVersionRequirementReturns fake.recordInvocation("NewMaxAPIVersionRequirement", []interface{}{arg1, arg2}) fake.newMaxAPIVersionRequirementMutex.Unlock() - if fake.NewMaxAPIVersionRequirementStub != nil { - return fake.NewMaxAPIVersionRequirementStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newMaxAPIVersionRequirementReturns return fakeReturns.result1 } @@ -687,15 +695,16 @@ func (fake *FakeFactory) NewMinAPIVersionRequirement(arg1 string, arg2 semver.Ve arg1 string arg2 semver.Version }{arg1, arg2}) + stub := fake.NewMinAPIVersionRequirementStub + fakeReturns := fake.newMinAPIVersionRequirementReturns fake.recordInvocation("NewMinAPIVersionRequirement", []interface{}{arg1, arg2}) fake.newMinAPIVersionRequirementMutex.Unlock() - if fake.NewMinAPIVersionRequirementStub != nil { - return fake.NewMinAPIVersionRequirementStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newMinAPIVersionRequirementReturns return fakeReturns.result1 } @@ -753,15 +762,16 @@ func (fake *FakeFactory) NewNumberArguments(arg1 []string, arg2 ...string) requi arg1 []string arg2 []string }{arg1Copy, arg2}) + stub := fake.NewNumberArgumentsStub + fakeReturns := fake.newNumberArgumentsReturns fake.recordInvocation("NewNumberArguments", []interface{}{arg1Copy, arg2}) fake.newNumberArgumentsMutex.Unlock() - if fake.NewNumberArgumentsStub != nil { - return fake.NewNumberArgumentsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1 } - fakeReturns := fake.newNumberArgumentsReturns return fakeReturns.result1 } @@ -813,15 +823,16 @@ func (fake *FakeFactory) NewOrganizationRequirement(arg1 string) requirements.Or fake.newOrganizationRequirementArgsForCall = append(fake.newOrganizationRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewOrganizationRequirementStub + fakeReturns := fake.newOrganizationRequirementReturns fake.recordInvocation("NewOrganizationRequirement", []interface{}{arg1}) fake.newOrganizationRequirementMutex.Unlock() - if fake.NewOrganizationRequirementStub != nil { - return fake.NewOrganizationRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newOrganizationRequirementReturns return fakeReturns.result1 } @@ -873,15 +884,16 @@ func (fake *FakeFactory) NewServiceInstanceRequirement(arg1 string) requirements fake.newServiceInstanceRequirementArgsForCall = append(fake.newServiceInstanceRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewServiceInstanceRequirementStub + fakeReturns := fake.newServiceInstanceRequirementReturns fake.recordInvocation("NewServiceInstanceRequirement", []interface{}{arg1}) fake.newServiceInstanceRequirementMutex.Unlock() - if fake.NewServiceInstanceRequirementStub != nil { - return fake.NewServiceInstanceRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newServiceInstanceRequirementReturns return fakeReturns.result1 } @@ -933,15 +945,16 @@ func (fake *FakeFactory) NewSpaceRequirement(arg1 string) requirements.SpaceRequ fake.newSpaceRequirementArgsForCall = append(fake.newSpaceRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewSpaceRequirementStub + fakeReturns := fake.newSpaceRequirementReturns fake.recordInvocation("NewSpaceRequirement", []interface{}{arg1}) fake.newSpaceRequirementMutex.Unlock() - if fake.NewSpaceRequirementStub != nil { - return fake.NewSpaceRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newSpaceRequirementReturns return fakeReturns.result1 } @@ -992,15 +1005,16 @@ func (fake *FakeFactory) NewTargetedOrgRequirement() requirements.TargetedOrgReq ret, specificReturn := fake.newTargetedOrgRequirementReturnsOnCall[len(fake.newTargetedOrgRequirementArgsForCall)] fake.newTargetedOrgRequirementArgsForCall = append(fake.newTargetedOrgRequirementArgsForCall, struct { }{}) + stub := fake.NewTargetedOrgRequirementStub + fakeReturns := fake.newTargetedOrgRequirementReturns fake.recordInvocation("NewTargetedOrgRequirement", []interface{}{}) fake.newTargetedOrgRequirementMutex.Unlock() - if fake.NewTargetedOrgRequirementStub != nil { - return fake.NewTargetedOrgRequirementStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.newTargetedOrgRequirementReturns return fakeReturns.result1 } @@ -1044,15 +1058,16 @@ func (fake *FakeFactory) NewTargetedSpaceRequirement() requirements.Requirement ret, specificReturn := fake.newTargetedSpaceRequirementReturnsOnCall[len(fake.newTargetedSpaceRequirementArgsForCall)] fake.newTargetedSpaceRequirementArgsForCall = append(fake.newTargetedSpaceRequirementArgsForCall, struct { }{}) + stub := fake.NewTargetedSpaceRequirementStub + fakeReturns := fake.newTargetedSpaceRequirementReturns fake.recordInvocation("NewTargetedSpaceRequirement", []interface{}{}) fake.newTargetedSpaceRequirementMutex.Unlock() - if fake.NewTargetedSpaceRequirementStub != nil { - return fake.NewTargetedSpaceRequirementStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.newTargetedSpaceRequirementReturns return fakeReturns.result1 } @@ -1097,15 +1112,16 @@ func (fake *FakeFactory) NewUnsupportedLegacyFlagRequirement(arg1 ...string) req fake.newUnsupportedLegacyFlagRequirementArgsForCall = append(fake.newUnsupportedLegacyFlagRequirementArgsForCall, struct { arg1 []string }{arg1}) + stub := fake.NewUnsupportedLegacyFlagRequirementStub + fakeReturns := fake.newUnsupportedLegacyFlagRequirementReturns fake.recordInvocation("NewUnsupportedLegacyFlagRequirement", []interface{}{arg1}) fake.newUnsupportedLegacyFlagRequirementMutex.Unlock() - if fake.NewUnsupportedLegacyFlagRequirementStub != nil { - return fake.NewUnsupportedLegacyFlagRequirementStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1 } - fakeReturns := fake.newUnsupportedLegacyFlagRequirementReturns return fakeReturns.result1 } @@ -1159,15 +1175,16 @@ func (fake *FakeFactory) NewUsageRequirement(arg1 requirements.Usable, arg2 stri arg2 string arg3 func() bool }{arg1, arg2, arg3}) + stub := fake.NewUsageRequirementStub + fakeReturns := fake.newUsageRequirementReturns fake.recordInvocation("NewUsageRequirement", []interface{}{arg1, arg2, arg3}) fake.newUsageRequirementMutex.Unlock() - if fake.NewUsageRequirementStub != nil { - return fake.NewUsageRequirementStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.newUsageRequirementReturns return fakeReturns.result1 } @@ -1220,15 +1237,16 @@ func (fake *FakeFactory) NewUserRequirement(arg1 string, arg2 bool) requirements arg1 string arg2 bool }{arg1, arg2}) + stub := fake.NewUserRequirementStub + fakeReturns := fake.newUserRequirementReturns fake.recordInvocation("NewUserRequirement", []interface{}{arg1, arg2}) fake.newUserRequirementMutex.Unlock() - if fake.NewUserRequirementStub != nil { - return fake.NewUserRequirementStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newUserRequirementReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_organization_requirement.go b/cf/requirements/requirementsfakes/fake_organization_requirement.go index c9b1752a1ec..e186b5f5a99 100644 --- a/cf/requirements/requirementsfakes/fake_organization_requirement.go +++ b/cf/requirements/requirementsfakes/fake_organization_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeOrganizationRequirement struct { @@ -43,15 +43,16 @@ func (fake *FakeOrganizationRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -95,15 +96,16 @@ func (fake *FakeOrganizationRequirement) GetOrganization() models.Organization { ret, specificReturn := fake.getOrganizationReturnsOnCall[len(fake.getOrganizationArgsForCall)] fake.getOrganizationArgsForCall = append(fake.getOrganizationArgsForCall, struct { }{}) + stub := fake.GetOrganizationStub + fakeReturns := fake.getOrganizationReturns fake.recordInvocation("GetOrganization", []interface{}{}) fake.getOrganizationMutex.Unlock() - if fake.GetOrganizationStub != nil { - return fake.GetOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrganizationReturns return fakeReturns.result1 } @@ -147,9 +149,10 @@ func (fake *FakeOrganizationRequirement) SetOrganizationName(arg1 string) { fake.setOrganizationNameArgsForCall = append(fake.setOrganizationNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetOrganizationNameStub fake.recordInvocation("SetOrganizationName", []interface{}{arg1}) fake.setOrganizationNameMutex.Unlock() - if fake.SetOrganizationNameStub != nil { + if stub != nil { fake.SetOrganizationNameStub(arg1) } } diff --git a/cf/requirements/requirementsfakes/fake_requirement.go b/cf/requirements/requirementsfakes/fake_requirement.go index 0ebc0b1a938..69947707e88 100644 --- a/cf/requirements/requirementsfakes/fake_requirement.go +++ b/cf/requirements/requirementsfakes/fake_requirement.go @@ -4,7 +4,7 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeRequirement struct { @@ -27,15 +27,16 @@ func (fake *FakeRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_service_instance_requirement.go b/cf/requirements/requirementsfakes/fake_service_instance_requirement.go index 52a9c81065a..077e2856fcc 100644 --- a/cf/requirements/requirementsfakes/fake_service_instance_requirement.go +++ b/cf/requirements/requirementsfakes/fake_service_instance_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeServiceInstanceRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeServiceInstanceRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeServiceInstanceRequirement) GetServiceInstance() models.ServiceI ret, specificReturn := fake.getServiceInstanceReturnsOnCall[len(fake.getServiceInstanceArgsForCall)] fake.getServiceInstanceArgsForCall = append(fake.getServiceInstanceArgsForCall, struct { }{}) + stub := fake.GetServiceInstanceStub + fakeReturns := fake.getServiceInstanceReturns fake.recordInvocation("GetServiceInstance", []interface{}{}) fake.getServiceInstanceMutex.Unlock() - if fake.GetServiceInstanceStub != nil { - return fake.GetServiceInstanceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getServiceInstanceReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_space_requirement.go b/cf/requirements/requirementsfakes/fake_space_requirement.go index 12758455c70..f7a11c4fa14 100644 --- a/cf/requirements/requirementsfakes/fake_space_requirement.go +++ b/cf/requirements/requirementsfakes/fake_space_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeSpaceRequirement struct { @@ -43,15 +43,16 @@ func (fake *FakeSpaceRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -95,15 +96,16 @@ func (fake *FakeSpaceRequirement) GetSpace() models.Space { ret, specificReturn := fake.getSpaceReturnsOnCall[len(fake.getSpaceArgsForCall)] fake.getSpaceArgsForCall = append(fake.getSpaceArgsForCall, struct { }{}) + stub := fake.GetSpaceStub + fakeReturns := fake.getSpaceReturns fake.recordInvocation("GetSpace", []interface{}{}) fake.getSpaceMutex.Unlock() - if fake.GetSpaceStub != nil { - return fake.GetSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getSpaceReturns return fakeReturns.result1 } @@ -147,9 +149,10 @@ func (fake *FakeSpaceRequirement) SetSpaceName(arg1 string) { fake.setSpaceNameArgsForCall = append(fake.setSpaceNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetSpaceNameStub fake.recordInvocation("SetSpaceName", []interface{}{arg1}) fake.setSpaceNameMutex.Unlock() - if fake.SetSpaceNameStub != nil { + if stub != nil { fake.SetSpaceNameStub(arg1) } } diff --git a/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go b/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go index f4faa3ddb50..29c639eacce 100644 --- a/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go +++ b/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeTargetedOrgRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeTargetedOrgRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeTargetedOrgRequirement) GetOrganizationFields() models.Organizat ret, specificReturn := fake.getOrganizationFieldsReturnsOnCall[len(fake.getOrganizationFieldsArgsForCall)] fake.getOrganizationFieldsArgsForCall = append(fake.getOrganizationFieldsArgsForCall, struct { }{}) + stub := fake.GetOrganizationFieldsStub + fakeReturns := fake.getOrganizationFieldsReturns fake.recordInvocation("GetOrganizationFields", []interface{}{}) fake.getOrganizationFieldsMutex.Unlock() - if fake.GetOrganizationFieldsStub != nil { - return fake.GetOrganizationFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrganizationFieldsReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_user_requirement.go b/cf/requirements/requirementsfakes/fake_user_requirement.go index a8df8330825..d6b0641c11b 100644 --- a/cf/requirements/requirementsfakes/fake_user_requirement.go +++ b/cf/requirements/requirementsfakes/fake_user_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeUserRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeUserRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeUserRequirement) GetUser() models.UserFields { ret, specificReturn := fake.getUserReturnsOnCall[len(fake.getUserArgsForCall)] fake.getUserArgsForCall = append(fake.getUserArgsForCall, struct { }{}) + stub := fake.GetUserStub + fakeReturns := fake.getUserReturns fake.recordInvocation("GetUser", []interface{}{}) fake.getUserMutex.Unlock() - if fake.GetUserStub != nil { - return fake.GetUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getUserReturns return fakeReturns.result1 } diff --git a/cf/requirements/service_instance.go b/cf/requirements/service_instance.go index 7c4616934d5..2312d701757 100644 --- a/cf/requirements/service_instance.go +++ b/cf/requirements/service_instance.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceInstanceRequirement diff --git a/cf/requirements/service_instance_test.go b/cf/requirements/service_instance_test.go index da164134082..328aac87f17 100644 --- a/cf/requirements/service_instance_test.go +++ b/cf/requirements/service_instance_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/space.go b/cf/requirements/space.go index 7f56ba5aed9..3db9317d1d7 100644 --- a/cf/requirements/space.go +++ b/cf/requirements/space.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRequirement diff --git a/cf/requirements/space_test.go b/cf/requirements/space_test.go index 99cb6a34c85..3047db42f21 100644 --- a/cf/requirements/space_test.go +++ b/cf/requirements/space_test.go @@ -3,9 +3,9 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/targeted_organization.go b/cf/requirements/targeted_organization.go index adf4469ecf6..33a14fb6afa 100644 --- a/cf/requirements/targeted_organization.go +++ b/cf/requirements/targeted_organization.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . TargetedOrgRequirement diff --git a/cf/requirements/targeted_organization_test.go b/cf/requirements/targeted_organization_test.go index 6ffa2bde52d..25664f6d346 100644 --- a/cf/requirements/targeted_organization_test.go +++ b/cf/requirements/targeted_organization_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/targeted_space.go b/cf/requirements/targeted_space.go index 7f0bc55bba1..b3838a056bd 100644 --- a/cf/requirements/targeted_space.go +++ b/cf/requirements/targeted_space.go @@ -5,10 +5,10 @@ import ( "errors" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type TargetedSpaceRequirement struct { diff --git a/cf/requirements/targeted_space_test.go b/cf/requirements/targeted_space_test.go index 09e5ecae3dd..3b9660f15be 100644 --- a/cf/requirements/targeted_space_test.go +++ b/cf/requirements/targeted_space_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/unsupported_legacy_flag.go b/cf/requirements/unsupported_legacy_flag.go index 3b67eacd83a..8a9368d82d4 100644 --- a/cf/requirements/unsupported_legacy_flag.go +++ b/cf/requirements/unsupported_legacy_flag.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type UnsupportedLegacyFlagRequirement struct { diff --git a/cf/requirements/unsupported_legacy_flag_test.go b/cf/requirements/unsupported_legacy_flag_test.go index 1cd17b8b50e..5db64317890 100644 --- a/cf/requirements/unsupported_legacy_flag_test.go +++ b/cf/requirements/unsupported_legacy_flag_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/usage_requirement.go b/cf/requirements/usage_requirement.go index ac2f2197d8b..58a09369674 100644 --- a/cf/requirements/usage_requirement.go +++ b/cf/requirements/usage_requirement.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type RequirementFunction func() error diff --git a/cf/requirements/usage_requirement_test.go b/cf/requirements/usage_requirement_test.go index 67bfe9d7708..c2a0fc46869 100644 --- a/cf/requirements/usage_requirement_test.go +++ b/cf/requirements/usage_requirement_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/user.go b/cf/requirements/user.go index 298231fea07..66e4df27456 100644 --- a/cf/requirements/user.go +++ b/cf/requirements/user.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserRequirement diff --git a/cf/requirements/user_test.go b/cf/requirements/user_test.go index cc3956c1685..1b6771f8f23 100644 --- a/cf/requirements/user_test.go +++ b/cf/requirements/user_test.go @@ -3,10 +3,10 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/options/ssh_options.go b/cf/ssh/options/ssh_options.go index a4976a538cd..ebf5f745118 100644 --- a/cf/ssh/options/ssh_options.go +++ b/cf/ssh/options/ssh_options.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" ) type TTYRequest int diff --git a/cf/ssh/options/ssh_options_test.go b/cf/ssh/options/ssh_options_test.go index 914e3fcf359..31647ca8548 100644 --- a/cf/ssh/options/ssh_options_test.go +++ b/cf/ssh/options/ssh_options_test.go @@ -1,8 +1,8 @@ package options_test import ( - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/ssh/options" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/ssh.go b/cf/ssh/ssh.go index 68fbd5bf50b..5c32ee3ca14 100644 --- a/cf/ssh/ssh.go +++ b/cf/ssh/ssh.go @@ -19,10 +19,10 @@ import ( "golang.org/x/crypto/ssh" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/ssh/options" - "code.cloudfoundry.org/cli/cf/ssh/sigwinch" - "code.cloudfoundry.org/cli/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" + "code.cloudfoundry.org/cli/v9/cf/ssh/sigwinch" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" "github.com/moby/term" ) diff --git a/cf/ssh/ssh_test.go b/cf/ssh/ssh_test.go index f356f215f77..549297ede7d 100644 --- a/cf/ssh/ssh_test.go +++ b/cf/ssh/ssh_test.go @@ -16,12 +16,12 @@ import ( "syscall" "time" - "code.cloudfoundry.org/cli/cf/models" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" - "code.cloudfoundry.org/cli/cf/ssh/options" - "code.cloudfoundry.org/cli/cf/ssh/sshfakes" - "code.cloudfoundry.org/cli/cf/ssh/terminal" - "code.cloudfoundry.org/cli/cf/ssh/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" + "code.cloudfoundry.org/cli/v9/cf/ssh/sshfakes" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal/terminalfakes" "code.cloudfoundry.org/diego-ssh/server" fake_server "code.cloudfoundry.org/diego-ssh/server/fakes" "code.cloudfoundry.org/diego-ssh/test_helpers" diff --git a/cf/ssh/sshfakes/fake_listener_factory.go b/cf/ssh/sshfakes/fake_listener_factory.go index 2f378cdbf81..8d51c033525 100644 --- a/cf/ssh/sshfakes/fake_listener_factory.go +++ b/cf/ssh/sshfakes/fake_listener_factory.go @@ -5,7 +5,7 @@ import ( "net" "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" ) type FakeListenerFactory struct { @@ -34,15 +34,16 @@ func (fake *FakeListenerFactory) Listen(arg1 string, arg2 string) (net.Listener, arg1 string arg2 string }{arg1, arg2}) + stub := fake.ListenStub + fakeReturns := fake.listenReturns fake.recordInvocation("Listen", []interface{}{arg1, arg2}) fake.listenMutex.Unlock() - if fake.ListenStub != nil { - return fake.ListenStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/ssh/sshfakes/fake_secure_client.go b/cf/ssh/sshfakes/fake_secure_client.go index d2df9c7d0a8..f5422991820 100644 --- a/cf/ssh/sshfakes/fake_secure_client.go +++ b/cf/ssh/sshfakes/fake_secure_client.go @@ -5,7 +5,7 @@ import ( "net" "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" "golang.org/x/crypto/ssh" ) @@ -75,15 +75,16 @@ func (fake *FakeSecureClient) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -127,15 +128,16 @@ func (fake *FakeSecureClient) Conn() ssh.Conn { ret, specificReturn := fake.connReturnsOnCall[len(fake.connArgsForCall)] fake.connArgsForCall = append(fake.connArgsForCall, struct { }{}) + stub := fake.ConnStub + fakeReturns := fake.connReturns fake.recordInvocation("Conn", []interface{}{}) fake.connMutex.Unlock() - if fake.ConnStub != nil { - return fake.ConnStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.connReturns return fakeReturns.result1 } @@ -181,15 +183,16 @@ func (fake *FakeSecureClient) Dial(arg1 string, arg2 string) (net.Conn, error) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.DialStub + fakeReturns := fake.dialReturns fake.recordInvocation("Dial", []interface{}{arg1, arg2}) fake.dialMutex.Unlock() - if fake.DialStub != nil { - return fake.DialStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dialReturns return fakeReturns.result1, fakeReturns.result2 } @@ -243,15 +246,16 @@ func (fake *FakeSecureClient) NewSession() (sshCmd.SecureSession, error) { ret, specificReturn := fake.newSessionReturnsOnCall[len(fake.newSessionArgsForCall)] fake.newSessionArgsForCall = append(fake.newSessionArgsForCall, struct { }{}) + stub := fake.NewSessionStub + fakeReturns := fake.newSessionReturns fake.recordInvocation("NewSession", []interface{}{}) fake.newSessionMutex.Unlock() - if fake.NewSessionStub != nil { - return fake.NewSessionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.newSessionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -298,15 +302,16 @@ func (fake *FakeSecureClient) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/cf/ssh/sshfakes/fake_secure_dialer.go b/cf/ssh/sshfakes/fake_secure_dialer.go index d7fdc1d40db..6a296ff2c8d 100644 --- a/cf/ssh/sshfakes/fake_secure_dialer.go +++ b/cf/ssh/sshfakes/fake_secure_dialer.go @@ -4,7 +4,7 @@ package sshfakes import ( "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" "golang.org/x/crypto/ssh" ) @@ -36,15 +36,16 @@ func (fake *FakeSecureDialer) Dial(arg1 string, arg2 string, arg3 *ssh.ClientCon arg2 string arg3 *ssh.ClientConfig }{arg1, arg2, arg3}) + stub := fake.DialStub + fakeReturns := fake.dialReturns fake.recordInvocation("Dial", []interface{}{arg1, arg2, arg3}) fake.dialMutex.Unlock() - if fake.DialStub != nil { - return fake.DialStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dialReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/ssh/sshfakes/fake_secure_session.go b/cf/ssh/sshfakes/fake_secure_session.go index 16a44a39442..abf17921286 100644 --- a/cf/ssh/sshfakes/fake_secure_session.go +++ b/cf/ssh/sshfakes/fake_secure_session.go @@ -5,7 +5,7 @@ import ( "io" "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" "golang.org/x/crypto/ssh" ) @@ -125,15 +125,16 @@ func (fake *FakeSecureSession) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -181,15 +182,16 @@ func (fake *FakeSecureSession) RequestPty(arg1 string, arg2 int, arg3 int, arg4 arg3 int arg4 ssh.TerminalModes }{arg1, arg2, arg3, arg4}) + stub := fake.RequestPtyStub + fakeReturns := fake.requestPtyReturns fake.recordInvocation("RequestPty", []interface{}{arg1, arg2, arg3, arg4}) fake.requestPtyMutex.Unlock() - if fake.RequestPtyStub != nil { - return fake.RequestPtyStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.requestPtyReturns return fakeReturns.result1 } @@ -248,15 +250,16 @@ func (fake *FakeSecureSession) SendRequest(arg1 string, arg2 bool, arg3 []byte) arg2 bool arg3 []byte }{arg1, arg2, arg3Copy}) + stub := fake.SendRequestStub + fakeReturns := fake.sendRequestReturns fake.recordInvocation("SendRequest", []interface{}{arg1, arg2, arg3Copy}) fake.sendRequestMutex.Unlock() - if fake.SendRequestStub != nil { - return fake.SendRequestStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.sendRequestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -310,15 +313,16 @@ func (fake *FakeSecureSession) Shell() error { ret, specificReturn := fake.shellReturnsOnCall[len(fake.shellArgsForCall)] fake.shellArgsForCall = append(fake.shellArgsForCall, struct { }{}) + stub := fake.ShellStub + fakeReturns := fake.shellReturns fake.recordInvocation("Shell", []interface{}{}) fake.shellMutex.Unlock() - if fake.ShellStub != nil { - return fake.ShellStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.shellReturns return fakeReturns.result1 } @@ -363,15 +367,16 @@ func (fake *FakeSecureSession) Start(arg1 string) error { fake.startArgsForCall = append(fake.startArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{arg1}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -422,15 +427,16 @@ func (fake *FakeSecureSession) StderrPipe() (io.Reader, error) { ret, specificReturn := fake.stderrPipeReturnsOnCall[len(fake.stderrPipeArgsForCall)] fake.stderrPipeArgsForCall = append(fake.stderrPipeArgsForCall, struct { }{}) + stub := fake.StderrPipeStub + fakeReturns := fake.stderrPipeReturns fake.recordInvocation("StderrPipe", []interface{}{}) fake.stderrPipeMutex.Unlock() - if fake.StderrPipeStub != nil { - return fake.StderrPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stderrPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -477,15 +483,16 @@ func (fake *FakeSecureSession) StdinPipe() (io.WriteCloser, error) { ret, specificReturn := fake.stdinPipeReturnsOnCall[len(fake.stdinPipeArgsForCall)] fake.stdinPipeArgsForCall = append(fake.stdinPipeArgsForCall, struct { }{}) + stub := fake.StdinPipeStub + fakeReturns := fake.stdinPipeReturns fake.recordInvocation("StdinPipe", []interface{}{}) fake.stdinPipeMutex.Unlock() - if fake.StdinPipeStub != nil { - return fake.StdinPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stdinPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -532,15 +539,16 @@ func (fake *FakeSecureSession) StdoutPipe() (io.Reader, error) { ret, specificReturn := fake.stdoutPipeReturnsOnCall[len(fake.stdoutPipeArgsForCall)] fake.stdoutPipeArgsForCall = append(fake.stdoutPipeArgsForCall, struct { }{}) + stub := fake.StdoutPipeStub + fakeReturns := fake.stdoutPipeReturns fake.recordInvocation("StdoutPipe", []interface{}{}) fake.stdoutPipeMutex.Unlock() - if fake.StdoutPipeStub != nil { - return fake.StdoutPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stdoutPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -587,15 +595,16 @@ func (fake *FakeSecureSession) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/cf/ssh/sshfakes/fake_secure_shell.go b/cf/ssh/sshfakes/fake_secure_shell.go index 35dfa9f51f0..d600ac2e7cd 100644 --- a/cf/ssh/sshfakes/fake_secure_shell.go +++ b/cf/ssh/sshfakes/fake_secure_shell.go @@ -4,8 +4,8 @@ package sshfakes import ( "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" - "code.cloudfoundry.org/cli/cf/ssh/options" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" ) type FakeSecureShell struct { @@ -69,15 +69,16 @@ func (fake *FakeSecureShell) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -122,15 +123,16 @@ func (fake *FakeSecureShell) Connect(arg1 *options.SSHOptions) error { fake.connectArgsForCall = append(fake.connectArgsForCall, struct { arg1 *options.SSHOptions }{arg1}) + stub := fake.ConnectStub + fakeReturns := fake.connectReturns fake.recordInvocation("Connect", []interface{}{arg1}) fake.connectMutex.Unlock() - if fake.ConnectStub != nil { - return fake.ConnectStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.connectReturns return fakeReturns.result1 } @@ -181,15 +183,16 @@ func (fake *FakeSecureShell) InteractiveSession() error { ret, specificReturn := fake.interactiveSessionReturnsOnCall[len(fake.interactiveSessionArgsForCall)] fake.interactiveSessionArgsForCall = append(fake.interactiveSessionArgsForCall, struct { }{}) + stub := fake.InteractiveSessionStub + fakeReturns := fake.interactiveSessionReturns fake.recordInvocation("InteractiveSession", []interface{}{}) fake.interactiveSessionMutex.Unlock() - if fake.InteractiveSessionStub != nil { - return fake.InteractiveSessionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.interactiveSessionReturns return fakeReturns.result1 } @@ -233,15 +236,16 @@ func (fake *FakeSecureShell) LocalPortForward() error { ret, specificReturn := fake.localPortForwardReturnsOnCall[len(fake.localPortForwardArgsForCall)] fake.localPortForwardArgsForCall = append(fake.localPortForwardArgsForCall, struct { }{}) + stub := fake.LocalPortForwardStub + fakeReturns := fake.localPortForwardReturns fake.recordInvocation("LocalPortForward", []interface{}{}) fake.localPortForwardMutex.Unlock() - if fake.LocalPortForwardStub != nil { - return fake.LocalPortForwardStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.localPortForwardReturns return fakeReturns.result1 } @@ -285,15 +289,16 @@ func (fake *FakeSecureShell) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/cf/ssh/terminal/helper_test.go b/cf/ssh/terminal/helper_test.go index 9c243435407..ccc6000ec50 100644 --- a/cf/ssh/terminal/helper_test.go +++ b/cf/ssh/terminal/helper_test.go @@ -1,7 +1,7 @@ package terminal_test import ( - "code.cloudfoundry.org/cli/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go b/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go index 82bb9d228bc..b38185c584b 100644 --- a/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go +++ b/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" "github.com/moby/term" ) @@ -96,15 +96,16 @@ func (fake *FakeTerminalHelper) GetFdInfo(arg1 interface{}) (uintptr, bool) { fake.getFdInfoArgsForCall = append(fake.getFdInfoArgsForCall, struct { arg1 interface{} }{arg1}) + stub := fake.GetFdInfoStub + fakeReturns := fake.getFdInfoReturns fake.recordInvocation("GetFdInfo", []interface{}{arg1}) fake.getFdInfoMutex.Unlock() - if fake.GetFdInfoStub != nil { - return fake.GetFdInfoStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getFdInfoReturns return fakeReturns.result1, fakeReturns.result2 } @@ -159,15 +160,16 @@ func (fake *FakeTerminalHelper) GetWinsize(arg1 uintptr) (*term.Winsize, error) fake.getWinsizeArgsForCall = append(fake.getWinsizeArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.GetWinsizeStub + fakeReturns := fake.getWinsizeReturns fake.recordInvocation("GetWinsize", []interface{}{arg1}) fake.getWinsizeMutex.Unlock() - if fake.GetWinsizeStub != nil { - return fake.GetWinsizeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getWinsizeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -222,15 +224,16 @@ func (fake *FakeTerminalHelper) IsTerminal(arg1 uintptr) bool { fake.isTerminalArgsForCall = append(fake.isTerminalArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.IsTerminalStub + fakeReturns := fake.isTerminalReturns fake.recordInvocation("IsTerminal", []interface{}{arg1}) fake.isTerminalMutex.Unlock() - if fake.IsTerminalStub != nil { - return fake.IsTerminalStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isTerminalReturns return fakeReturns.result1 } @@ -283,15 +286,16 @@ func (fake *FakeTerminalHelper) RestoreTerminal(arg1 uintptr, arg2 *term.State) arg1 uintptr arg2 *term.State }{arg1, arg2}) + stub := fake.RestoreTerminalStub + fakeReturns := fake.restoreTerminalReturns fake.recordInvocation("RestoreTerminal", []interface{}{arg1, arg2}) fake.restoreTerminalMutex.Unlock() - if fake.RestoreTerminalStub != nil { - return fake.RestoreTerminalStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.restoreTerminalReturns return fakeReturns.result1 } @@ -343,15 +347,16 @@ func (fake *FakeTerminalHelper) SetRawTerminal(arg1 uintptr) (*term.State, error fake.setRawTerminalArgsForCall = append(fake.setRawTerminalArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.SetRawTerminalStub + fakeReturns := fake.setRawTerminalReturns fake.recordInvocation("SetRawTerminal", []interface{}{arg1}) fake.setRawTerminalMutex.Unlock() - if fake.SetRawTerminalStub != nil { - return fake.SetRawTerminalStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setRawTerminalReturns return fakeReturns.result1, fakeReturns.result2 } @@ -405,15 +410,16 @@ func (fake *FakeTerminalHelper) StdStreams() (io.ReadCloser, io.Writer, io.Write ret, specificReturn := fake.stdStreamsReturnsOnCall[len(fake.stdStreamsArgsForCall)] fake.stdStreamsArgsForCall = append(fake.stdStreamsArgsForCall, struct { }{}) + stub := fake.StdStreamsStub + fakeReturns := fake.stdStreamsReturns fake.recordInvocation("StdStreams", []interface{}{}) fake.stdStreamsMutex.Unlock() - if fake.StdStreamsStub != nil { - return fake.StdStreamsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.stdStreamsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/cf/terminal/color_test.go b/cf/terminal/color_test.go index a69a675b6bb..bf1eb3bae36 100644 --- a/cf/terminal/color_test.go +++ b/cf/terminal/color_test.go @@ -3,7 +3,7 @@ package terminal_test import ( "os" - . "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/terminal" "github.com/fatih/color" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/terminal/table_test.go b/cf/terminal/table_test.go index 542c1e7bcea..4aa06d6ec4e 100644 --- a/cf/terminal/table_test.go +++ b/cf/terminal/table_test.go @@ -4,8 +4,8 @@ import ( "bytes" "strings" - . "code.cloudfoundry.org/cli/cf/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/terminal/tee_printer_test.go b/cf/terminal/tee_printer_test.go index da6d70eb764..1313c5c5a3c 100644 --- a/cf/terminal/tee_printer_test.go +++ b/cf/terminal/tee_printer_test.go @@ -3,9 +3,9 @@ package terminal_test import ( "os" - . "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/terminal" - io_helpers "code.cloudfoundry.org/cli/cf/util/testhelpers/io" + io_helpers "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/io" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/cf/terminal/terminal_suite_test.go b/cf/terminal/terminal_suite_test.go index 611d5c1b14a..ecdae7bcf8a 100644 --- a/cf/terminal/terminal_suite_test.go +++ b/cf/terminal/terminal_suite_test.go @@ -1,8 +1,8 @@ package terminal_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/terminal/terminalfakes/fake_ui.go b/cf/terminal/terminalfakes/fake_ui.go index dda18707b17..3ccf190b0d5 100644 --- a/cf/terminal/terminalfakes/fake_ui.go +++ b/cf/terminal/terminalfakes/fake_ui.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type FakeUI struct { @@ -152,15 +152,16 @@ func (fake *FakeUI) Ask(arg1 string) string { fake.askArgsForCall = append(fake.askArgsForCall, struct { arg1 string }{arg1}) + stub := fake.AskStub + fakeReturns := fake.askReturns fake.recordInvocation("Ask", []interface{}{arg1}) fake.askMutex.Unlock() - if fake.AskStub != nil { - return fake.AskStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.askReturns return fakeReturns.result1 } @@ -212,15 +213,16 @@ func (fake *FakeUI) AskForPassword(arg1 string) string { fake.askForPasswordArgsForCall = append(fake.askForPasswordArgsForCall, struct { arg1 string }{arg1}) + stub := fake.AskForPasswordStub + fakeReturns := fake.askForPasswordReturns fake.recordInvocation("AskForPassword", []interface{}{arg1}) fake.askForPasswordMutex.Unlock() - if fake.AskForPasswordStub != nil { - return fake.AskForPasswordStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.askForPasswordReturns return fakeReturns.result1 } @@ -272,15 +274,16 @@ func (fake *FakeUI) Confirm(arg1 string) bool { fake.confirmArgsForCall = append(fake.confirmArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ConfirmStub + fakeReturns := fake.confirmReturns fake.recordInvocation("Confirm", []interface{}{arg1}) fake.confirmMutex.Unlock() - if fake.ConfirmStub != nil { - return fake.ConfirmStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.confirmReturns return fakeReturns.result1 } @@ -333,15 +336,16 @@ func (fake *FakeUI) ConfirmDelete(arg1 string, arg2 string) bool { arg1 string arg2 string }{arg1, arg2}) + stub := fake.ConfirmDeleteStub + fakeReturns := fake.confirmDeleteReturns fake.recordInvocation("ConfirmDelete", []interface{}{arg1, arg2}) fake.confirmDeleteMutex.Unlock() - if fake.ConfirmDeleteStub != nil { - return fake.ConfirmDeleteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.confirmDeleteReturns return fakeReturns.result1 } @@ -394,15 +398,16 @@ func (fake *FakeUI) ConfirmDeleteWithAssociations(arg1 string, arg2 string) bool arg1 string arg2 string }{arg1, arg2}) + stub := fake.ConfirmDeleteWithAssociationsStub + fakeReturns := fake.confirmDeleteWithAssociationsReturns fake.recordInvocation("ConfirmDeleteWithAssociations", []interface{}{arg1, arg2}) fake.confirmDeleteWithAssociationsMutex.Unlock() - if fake.ConfirmDeleteWithAssociationsStub != nil { - return fake.ConfirmDeleteWithAssociationsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.confirmDeleteWithAssociationsReturns return fakeReturns.result1 } @@ -454,9 +459,10 @@ func (fake *FakeUI) Failed(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.FailedStub fake.recordInvocation("Failed", []interface{}{arg1, arg2}) fake.failedMutex.Unlock() - if fake.FailedStub != nil { + if stub != nil { fake.FailedStub(arg1, arg2...) } } @@ -484,9 +490,10 @@ func (fake *FakeUI) LoadingIndication() { fake.loadingIndicationMutex.Lock() fake.loadingIndicationArgsForCall = append(fake.loadingIndicationArgsForCall, struct { }{}) + stub := fake.LoadingIndicationStub fake.recordInvocation("LoadingIndication", []interface{}{}) fake.loadingIndicationMutex.Unlock() - if fake.LoadingIndicationStub != nil { + if stub != nil { fake.LoadingIndicationStub() } } @@ -508,9 +515,10 @@ func (fake *FakeUI) NotifyUpdateIfNeeded(arg1 coreconfig.Reader) { fake.notifyUpdateIfNeededArgsForCall = append(fake.notifyUpdateIfNeededArgsForCall, struct { arg1 coreconfig.Reader }{arg1}) + stub := fake.NotifyUpdateIfNeededStub fake.recordInvocation("NotifyUpdateIfNeeded", []interface{}{arg1}) fake.notifyUpdateIfNeededMutex.Unlock() - if fake.NotifyUpdateIfNeededStub != nil { + if stub != nil { fake.NotifyUpdateIfNeededStub(arg1) } } @@ -538,9 +546,10 @@ func (fake *FakeUI) Ok() { fake.okMutex.Lock() fake.okArgsForCall = append(fake.okArgsForCall, struct { }{}) + stub := fake.OkStub fake.recordInvocation("Ok", []interface{}{}) fake.okMutex.Unlock() - if fake.OkStub != nil { + if stub != nil { fake.OkStub() } } @@ -563,9 +572,10 @@ func (fake *FakeUI) PrintCapturingNoOutput(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.PrintCapturingNoOutputStub fake.recordInvocation("PrintCapturingNoOutput", []interface{}{arg1, arg2}) fake.printCapturingNoOutputMutex.Unlock() - if fake.PrintCapturingNoOutputStub != nil { + if stub != nil { fake.PrintCapturingNoOutputStub(arg1, arg2...) } } @@ -600,9 +610,10 @@ func (fake *FakeUI) PrintPaginator(arg1 []string, arg2 error) { arg1 []string arg2 error }{arg1Copy, arg2}) + stub := fake.PrintPaginatorStub fake.recordInvocation("PrintPaginator", []interface{}{arg1Copy, arg2}) fake.printPaginatorMutex.Unlock() - if fake.PrintPaginatorStub != nil { + if stub != nil { fake.PrintPaginatorStub(arg1, arg2) } } @@ -632,9 +643,10 @@ func (fake *FakeUI) Say(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.SayStub fake.recordInvocation("Say", []interface{}{arg1, arg2}) fake.sayMutex.Unlock() - if fake.SayStub != nil { + if stub != nil { fake.SayStub(arg1, arg2...) } } @@ -664,15 +676,16 @@ func (fake *FakeUI) ShowConfiguration(arg1 coreconfig.Reader) error { fake.showConfigurationArgsForCall = append(fake.showConfigurationArgsForCall, struct { arg1 coreconfig.Reader }{arg1}) + stub := fake.ShowConfigurationStub + fakeReturns := fake.showConfigurationReturns fake.recordInvocation("ShowConfiguration", []interface{}{arg1}) fake.showConfigurationMutex.Unlock() - if fake.ShowConfigurationStub != nil { - return fake.ShowConfigurationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.showConfigurationReturns return fakeReturns.result1 } @@ -729,15 +742,16 @@ func (fake *FakeUI) Table(arg1 []string) *terminal.UITable { fake.tableArgsForCall = append(fake.tableArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.TableStub + fakeReturns := fake.tableReturns fake.recordInvocation("Table", []interface{}{arg1Copy}) fake.tableMutex.Unlock() - if fake.TableStub != nil { - return fake.TableStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.tableReturns return fakeReturns.result1 } @@ -789,9 +803,10 @@ func (fake *FakeUI) Warn(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.WarnStub fake.recordInvocation("Warn", []interface{}{arg1, arg2}) fake.warnMutex.Unlock() - if fake.WarnStub != nil { + if stub != nil { fake.WarnStub(arg1, arg2...) } } @@ -820,15 +835,16 @@ func (fake *FakeUI) Writer() io.Writer { ret, specificReturn := fake.writerReturnsOnCall[len(fake.writerArgsForCall)] fake.writerArgsForCall = append(fake.writerArgsForCall, struct { }{}) + stub := fake.WriterStub + fakeReturns := fake.writerReturns fake.recordInvocation("Writer", []interface{}{}) fake.writerMutex.Unlock() - if fake.WriterStub != nil { - return fake.WriterStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.writerReturns return fakeReturns.result1 } diff --git a/cf/terminal/ui.go b/cf/terminal/ui.go index 18df1937bd6..11879a6eeec 100644 --- a/cf/terminal/ui.go +++ b/cf/terminal/ui.go @@ -5,15 +5,15 @@ import ( "io" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" "bytes" "bufio" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type ColoringFunction func(value string, row int, col int) string diff --git a/cf/terminal/ui_test.go b/cf/terminal/ui_test.go index 33e803c49b4..72bd293013a 100644 --- a/cf/terminal/ui_test.go +++ b/cf/terminal/ui_test.go @@ -6,18 +6,18 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - io_helpers "code.cloudfoundry.org/cli/cf/util/testhelpers/io" - newUI "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + io_helpers "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/io" + newUI "code.cloudfoundry.org/cli/v9/util/ui" + + . "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/cf/terminal/ui_unix.go b/cf/terminal/ui_unix.go index 08ccdfbdd4a..bafb50cf5f1 100644 --- a/cf/terminal/ui_unix.go +++ b/cf/terminal/ui_unix.go @@ -13,7 +13,7 @@ import ( "strings" "syscall" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) const ( diff --git a/cf/trace/combined_printer_test.go b/cf/trace/combined_printer_test.go index 33d4dc420da..1b7dee0b2ed 100644 --- a/cf/trace/combined_printer_test.go +++ b/cf/trace/combined_printer_test.go @@ -1,9 +1,9 @@ package trace_test import ( - . "code.cloudfoundry.org/cli/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/trace" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/trace/logger_provider.go b/cf/trace/logger_provider.go index 6337b0dbd5d..c073693249d 100644 --- a/cf/trace/logger_provider.go +++ b/cf/trace/logger_provider.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) func NewLogger(writer io.Writer, verbose bool, boolsOrPaths ...string) Printer { diff --git a/cf/trace/logger_provider_test.go b/cf/trace/logger_provider_test.go index 2e1198fd443..7513cd3e03a 100644 --- a/cf/trace/logger_provider_test.go +++ b/cf/trace/logger_provider_test.go @@ -5,7 +5,7 @@ import ( "path" "runtime" - . "code.cloudfoundry.org/cli/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/trace" "code.cloudfoundry.org/gofileutils/fileutils" "os" diff --git a/cf/trace/trace.go b/cf/trace/trace.go index 25addf1c26e..3e0f076de49 100644 --- a/cf/trace/trace.go +++ b/cf/trace/trace.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) var LoggingToStdout bool diff --git a/cf/trace/trace_suite_test.go b/cf/trace/trace_suite_test.go index c8c3731a11c..1e5292d0938 100644 --- a/cf/trace/trace_suite_test.go +++ b/cf/trace/trace_suite_test.go @@ -1,8 +1,8 @@ package trace_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/trace/trace_test.go b/cf/trace/trace_test.go index 3d5aa9f628a..69366c39400 100644 --- a/cf/trace/trace_test.go +++ b/cf/trace/trace_test.go @@ -1,7 +1,7 @@ package trace_test import ( - . "code.cloudfoundry.org/cli/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/trace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/trace/tracefakes/fake_printer.go b/cf/trace/tracefakes/fake_printer.go index af366fefc72..3f9c24a61ee 100644 --- a/cf/trace/tracefakes/fake_printer.go +++ b/cf/trace/tracefakes/fake_printer.go @@ -4,7 +4,7 @@ package tracefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type FakePrinter struct { @@ -43,9 +43,10 @@ func (fake *FakePrinter) Print(arg1 ...interface{}) { fake.printArgsForCall = append(fake.printArgsForCall, struct { arg1 []interface{} }{arg1}) + stub := fake.PrintStub fake.recordInvocation("Print", []interface{}{arg1}) fake.printMutex.Unlock() - if fake.PrintStub != nil { + if stub != nil { fake.PrintStub(arg1...) } } @@ -75,9 +76,10 @@ func (fake *FakePrinter) Printf(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.PrintfStub fake.recordInvocation("Printf", []interface{}{arg1, arg2}) fake.printfMutex.Unlock() - if fake.PrintfStub != nil { + if stub != nil { fake.PrintfStub(arg1, arg2...) } } @@ -106,9 +108,10 @@ func (fake *FakePrinter) Println(arg1 ...interface{}) { fake.printlnArgsForCall = append(fake.printlnArgsForCall, struct { arg1 []interface{} }{arg1}) + stub := fake.PrintlnStub fake.recordInvocation("Println", []interface{}{arg1}) fake.printlnMutex.Unlock() - if fake.PrintlnStub != nil { + if stub != nil { fake.PrintlnStub(arg1...) } } @@ -137,15 +140,16 @@ func (fake *FakePrinter) WritesToConsole() bool { ret, specificReturn := fake.writesToConsoleReturnsOnCall[len(fake.writesToConsoleArgsForCall)] fake.writesToConsoleArgsForCall = append(fake.writesToConsoleArgsForCall, struct { }{}) + stub := fake.WritesToConsoleStub + fakeReturns := fake.writesToConsoleReturns fake.recordInvocation("WritesToConsole", []interface{}{}) fake.writesToConsoleMutex.Unlock() - if fake.WritesToConsoleStub != nil { - return fake.WritesToConsoleStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.writesToConsoleReturns return fakeReturns.result1 } diff --git a/cf/uihelpers/tags_parser_test.go b/cf/uihelpers/tags_parser_test.go index 11e01e09f2d..9a4b87e29cc 100644 --- a/cf/uihelpers/tags_parser_test.go +++ b/cf/uihelpers/tags_parser_test.go @@ -1,7 +1,7 @@ package uihelpers_test import ( - . "code.cloudfoundry.org/cli/cf/uihelpers" + . "code.cloudfoundry.org/cli/v9/cf/uihelpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/uihelpers/ui.go b/cf/uihelpers/ui.go index ca43771236f..9bfcd8eca1c 100644 --- a/cf/uihelpers/ui.go +++ b/cf/uihelpers/ui.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) func ColoredAppState(app models.ApplicationFields) string { diff --git a/cf/util/downloader/file_download.go b/cf/util/downloader/file_download.go index 8f5c41e0e7c..a40e0516be1 100644 --- a/cf/util/downloader/file_download.go +++ b/cf/util/downloader/file_download.go @@ -1,7 +1,7 @@ package downloader import ( - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/util" "fmt" "io" "net/http" @@ -38,7 +38,7 @@ func (d *downloader) DownloadFile(url string) (int64, string, error) { CheckRedirect: func(r *http.Request, via []*http.Request) error { r.URL.Opaque = r.URL.Path - //some redirect return '/' as url + // some redirect return '/' as url if strings.Trim(r.URL.Opaque, "/") != "" { url = r.URL.Opaque } diff --git a/cf/util/downloader/file_download_test.go b/cf/util/downloader/file_download_test.go index 1cf3a440c8a..ae2ab40ac03 100644 --- a/cf/util/downloader/file_download_test.go +++ b/cf/util/downloader/file_download_test.go @@ -6,7 +6,7 @@ import ( "os" "path" - "code.cloudfoundry.org/cli/cf/util/downloader" + "code.cloudfoundry.org/cli/v9/cf/util/downloader" "github.com/onsi/gomega/ghttp" diff --git a/cf/util/json/json_parser_test.go b/cf/util/json/json_parser_test.go index 2a79a289ca2..92a9bf5db4f 100644 --- a/cf/util/json/json_parser_test.go +++ b/cf/util/json/json_parser_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/util/json" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/spellcheck/spellcheck_test.go b/cf/util/spellcheck/spellcheck_test.go index 40e4cb8cc21..5c748fc0c32 100644 --- a/cf/util/spellcheck/spellcheck_test.go +++ b/cf/util/spellcheck/spellcheck_test.go @@ -1,7 +1,7 @@ package spellcheck_test import ( - . "code.cloudfoundry.org/cli/cf/util/spellcheck" + . "code.cloudfoundry.org/cli/v9/cf/util/spellcheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/commands/requirements.go b/cf/util/testhelpers/commands/requirements.go index d000c04096e..1ee63f80237 100644 --- a/cf/util/testhelpers/commands/requirements.go +++ b/cf/util/testhelpers/commands/requirements.go @@ -1,6 +1,6 @@ package commands -import "code.cloudfoundry.org/cli/cf/requirements" +import "code.cloudfoundry.org/cli/v9/cf/requirements" func RunRequirements(reqs []requirements.Requirement) error { var retErr error diff --git a/cf/util/testhelpers/commands/runner.go b/cf/util/testhelpers/commands/runner.go index 627ccd1fb63..f58648582ae 100644 --- a/cf/util/testhelpers/commands/runner.go +++ b/cf/util/testhelpers/commands/runner.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" ) type RunCommandResult int diff --git a/cf/util/testhelpers/configuration/access_token.go b/cf/util/testhelpers/configuration/access_token.go index 40819751fd6..e02c094fdbe 100644 --- a/cf/util/testhelpers/configuration/access_token.go +++ b/cf/util/testhelpers/configuration/access_token.go @@ -9,7 +9,7 @@ import ( "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" ) func EncodeAccessToken(tokenInfo coreconfig.TokenInfo) (accessToken string, err error) { diff --git a/cf/util/testhelpers/configuration/fake_config_persistance.go b/cf/util/testhelpers/configuration/fake_config_persistance.go index 358217b660b..ee124210087 100644 --- a/cf/util/testhelpers/configuration/fake_config_persistance.go +++ b/cf/util/testhelpers/configuration/fake_config_persistance.go @@ -1,8 +1,8 @@ package configuration import ( - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" ) type FakePersistor struct { diff --git a/cf/util/testhelpers/configuration/test_config.go b/cf/util/testhelpers/configuration/test_config.go index 0c7f0341bc6..f651907f16e 100644 --- a/cf/util/testhelpers/configuration/test_config.go +++ b/cf/util/testhelpers/configuration/test_config.go @@ -1,8 +1,8 @@ package configuration import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" ) func NewRepository() coreconfig.Repository { diff --git a/cf/util/testhelpers/io/io_test.go b/cf/util/testhelpers/io/io_test.go index 505ee413ed6..f95bf412ccd 100644 --- a/cf/util/testhelpers/io/io_test.go +++ b/cf/util/testhelpers/io/io_test.go @@ -4,7 +4,7 @@ import ( "os" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/io" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/io" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/all_requests_called_matcher.go b/cf/util/testhelpers/matchers/all_requests_called_matcher.go index fe425529a58..bc4e485efef 100644 --- a/cf/util/testhelpers/matchers/all_requests_called_matcher.go +++ b/cf/util/testhelpers/matchers/all_requests_called_matcher.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/be_in_display_order.go b/cf/util/testhelpers/matchers/be_in_display_order.go index ed52746c5d2..773c5de5637 100644 --- a/cf/util/testhelpers/matchers/be_in_display_order.go +++ b/cf/util/testhelpers/matchers/be_in_display_order.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/terminal" "github.com/onsi/gomega" ) @@ -25,11 +25,11 @@ func (matcher *OrderMatcher) Match(actualStr interface{}) (success bool, err err return false, nil } - //loop and match, stop at last actual[0] line + // loop and match, stop at last actual[0] line for len(actual) > 1 { if matched, msg := matchSingleLine(actual[0], matcher.expected[0]); matched { if len(matcher.expected) == 1 { - return true, nil //no more expected to match, all passed + return true, nil // no more expected to match, all passed } matcher.expected = matcher.expected[1:] } else if msg != "" { @@ -39,7 +39,7 @@ func (matcher *OrderMatcher) Match(actualStr interface{}) (success bool, err err actual = actual[1:] } - //match the last actual line with the rest of expected + // match the last actual line with the rest of expected matched, msg := matchSingleLine(actual[0], matcher.expected[0]) if matched && len(matcher.expected) == 1 { return true, nil diff --git a/cf/util/testhelpers/matchers/be_in_display_order_test.go b/cf/util/testhelpers/matchers/be_in_display_order_test.go index 168ddd8ec67..de5b57964f6 100644 --- a/cf/util/testhelpers/matchers/be_in_display_order_test.go +++ b/cf/util/testhelpers/matchers/be_in_display_order_test.go @@ -3,7 +3,7 @@ package matchers_test import ( "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/matchers/contain_element_times_test.go b/cf/util/testhelpers/matchers/contain_element_times_test.go index 3d9ab6b1e99..7bb5263f5de 100644 --- a/cf/util/testhelpers/matchers/contain_element_times_test.go +++ b/cf/util/testhelpers/matchers/contain_element_times_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/contain_elements_in_order_test.go b/cf/util/testhelpers/matchers/contain_elements_in_order_test.go index 55f3363c1bf..0245167d724 100644 --- a/cf/util/testhelpers/matchers/contain_elements_in_order_test.go +++ b/cf/util/testhelpers/matchers/contain_elements_in_order_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/contain_substrings.go b/cf/util/testhelpers/matchers/contain_substrings.go index bc31c2149bd..40ecc55294a 100644 --- a/cf/util/testhelpers/matchers/contain_substrings.go +++ b/cf/util/testhelpers/matchers/contain_substrings.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/terminal" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/have_succeeded.go b/cf/util/testhelpers/matchers/have_succeeded.go index 1537fb7c486..113466cb8f4 100644 --- a/cf/util/testhelpers/matchers/have_succeeded.go +++ b/cf/util/testhelpers/matchers/have_succeeded.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/have_type_of_test.go b/cf/util/testhelpers/matchers/have_type_of_test.go index a058e4ea6e2..f17f53ffdc3 100644 --- a/cf/util/testhelpers/matchers/have_type_of_test.go +++ b/cf/util/testhelpers/matchers/have_type_of_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" . "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/matchers/match_func_name_test.go b/cf/util/testhelpers/matchers/match_func_name_test.go index 723ebdc964c..5204423898c 100644 --- a/cf/util/testhelpers/matchers/match_func_name_test.go +++ b/cf/util/testhelpers/matchers/match_func_name_test.go @@ -3,7 +3,7 @@ package matchers_test import ( "errors" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" . "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/matchers/match_path_test.go b/cf/util/testhelpers/matchers/match_path_test.go index aaaf2ec90cc..6fca0e941e7 100644 --- a/cf/util/testhelpers/matchers/match_path_test.go +++ b/cf/util/testhelpers/matchers/match_path_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" "errors" . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/matchers/passed_requirements.go b/cf/util/testhelpers/matchers/passed_requirements.go index 0fce7829962..1ed36c190a0 100644 --- a/cf/util/testhelpers/matchers/passed_requirements.go +++ b/cf/util/testhelpers/matchers/passed_requirements.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go b/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go index b234743de44..acab87bfc28 100644 --- a/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go +++ b/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go @@ -4,9 +4,9 @@ package rpcserverfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/plugin" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v9/plugin" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" ) type FakeHandlers struct { @@ -381,15 +381,16 @@ func (fake *FakeHandlers) AccessToken(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{arg1, arg2}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -442,15 +443,16 @@ func (fake *FakeHandlers) ApiEndpoint(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.ApiEndpointStub + fakeReturns := fake.apiEndpointReturns fake.recordInvocation("ApiEndpoint", []interface{}{arg1, arg2}) fake.apiEndpointMutex.Unlock() - if fake.ApiEndpointStub != nil { - return fake.ApiEndpointStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.apiEndpointReturns return fakeReturns.result1 } @@ -503,15 +505,16 @@ func (fake *FakeHandlers) ApiVersion(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.ApiVersionStub + fakeReturns := fake.apiVersionReturns fake.recordInvocation("ApiVersion", []interface{}{arg1, arg2}) fake.apiVersionMutex.Unlock() - if fake.ApiVersionStub != nil { - return fake.ApiVersionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.apiVersionReturns return fakeReturns.result1 } @@ -569,15 +572,16 @@ func (fake *FakeHandlers) CallCoreCommand(arg1 []string, arg2 *bool) error { arg1 []string arg2 *bool }{arg1Copy, arg2}) + stub := fake.CallCoreCommandStub + fakeReturns := fake.callCoreCommandReturns fake.recordInvocation("CallCoreCommand", []interface{}{arg1Copy, arg2}) fake.callCoreCommandMutex.Unlock() - if fake.CallCoreCommandStub != nil { - return fake.CallCoreCommandStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.callCoreCommandReturns return fakeReturns.result1 } @@ -630,15 +634,16 @@ func (fake *FakeHandlers) DisableTerminalOutput(arg1 bool, arg2 *bool) error { arg1 bool arg2 *bool }{arg1, arg2}) + stub := fake.DisableTerminalOutputStub + fakeReturns := fake.disableTerminalOutputReturns fake.recordInvocation("DisableTerminalOutput", []interface{}{arg1, arg2}) fake.disableTerminalOutputMutex.Unlock() - if fake.DisableTerminalOutputStub != nil { - return fake.DisableTerminalOutputStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.disableTerminalOutputReturns return fakeReturns.result1 } @@ -691,15 +696,16 @@ func (fake *FakeHandlers) DopplerEndpoint(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.DopplerEndpointStub + fakeReturns := fake.dopplerEndpointReturns fake.recordInvocation("DopplerEndpoint", []interface{}{arg1, arg2}) fake.dopplerEndpointMutex.Unlock() - if fake.DopplerEndpointStub != nil { - return fake.DopplerEndpointStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.dopplerEndpointReturns return fakeReturns.result1 } @@ -752,15 +758,16 @@ func (fake *FakeHandlers) GetApp(arg1 string, arg2 *plugin_models.GetAppModel) e arg1 string arg2 *plugin_models.GetAppModel }{arg1, arg2}) + stub := fake.GetAppStub + fakeReturns := fake.getAppReturns fake.recordInvocation("GetApp", []interface{}{arg1, arg2}) fake.getAppMutex.Unlock() - if fake.GetAppStub != nil { - return fake.GetAppStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getAppReturns return fakeReturns.result1 } @@ -813,15 +820,16 @@ func (fake *FakeHandlers) GetApps(arg1 string, arg2 *[]plugin_models.GetAppsMode arg1 string arg2 *[]plugin_models.GetAppsModel }{arg1, arg2}) + stub := fake.GetAppsStub + fakeReturns := fake.getAppsReturns fake.recordInvocation("GetApps", []interface{}{arg1, arg2}) fake.getAppsMutex.Unlock() - if fake.GetAppsStub != nil { - return fake.GetAppsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getAppsReturns return fakeReturns.result1 } @@ -874,15 +882,16 @@ func (fake *FakeHandlers) GetCurrentOrg(arg1 string, arg2 *plugin_models.Organiz arg1 string arg2 *plugin_models.Organization }{arg1, arg2}) + stub := fake.GetCurrentOrgStub + fakeReturns := fake.getCurrentOrgReturns fake.recordInvocation("GetCurrentOrg", []interface{}{arg1, arg2}) fake.getCurrentOrgMutex.Unlock() - if fake.GetCurrentOrgStub != nil { - return fake.GetCurrentOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getCurrentOrgReturns return fakeReturns.result1 } @@ -935,15 +944,16 @@ func (fake *FakeHandlers) GetCurrentSpace(arg1 string, arg2 *plugin_models.Space arg1 string arg2 *plugin_models.Space }{arg1, arg2}) + stub := fake.GetCurrentSpaceStub + fakeReturns := fake.getCurrentSpaceReturns fake.recordInvocation("GetCurrentSpace", []interface{}{arg1, arg2}) fake.getCurrentSpaceMutex.Unlock() - if fake.GetCurrentSpaceStub != nil { - return fake.GetCurrentSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getCurrentSpaceReturns return fakeReturns.result1 } @@ -996,15 +1006,16 @@ func (fake *FakeHandlers) GetOrg(arg1 string, arg2 *plugin_models.GetOrg_Model) arg1 string arg2 *plugin_models.GetOrg_Model }{arg1, arg2}) + stub := fake.GetOrgStub + fakeReturns := fake.getOrgReturns fake.recordInvocation("GetOrg", []interface{}{arg1, arg2}) fake.getOrgMutex.Unlock() - if fake.GetOrgStub != nil { - return fake.GetOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrgReturns return fakeReturns.result1 } @@ -1062,15 +1073,16 @@ func (fake *FakeHandlers) GetOrgUsers(arg1 []string, arg2 *[]plugin_models.GetOr arg1 []string arg2 *[]plugin_models.GetOrgUsers_Model }{arg1Copy, arg2}) + stub := fake.GetOrgUsersStub + fakeReturns := fake.getOrgUsersReturns fake.recordInvocation("GetOrgUsers", []interface{}{arg1Copy, arg2}) fake.getOrgUsersMutex.Unlock() - if fake.GetOrgUsersStub != nil { - return fake.GetOrgUsersStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrgUsersReturns return fakeReturns.result1 } @@ -1123,15 +1135,16 @@ func (fake *FakeHandlers) GetOrgs(arg1 string, arg2 *[]plugin_models.GetOrgs_Mod arg1 string arg2 *[]plugin_models.GetOrgs_Model }{arg1, arg2}) + stub := fake.GetOrgsStub + fakeReturns := fake.getOrgsReturns fake.recordInvocation("GetOrgs", []interface{}{arg1, arg2}) fake.getOrgsMutex.Unlock() - if fake.GetOrgsStub != nil { - return fake.GetOrgsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrgsReturns return fakeReturns.result1 } @@ -1184,15 +1197,16 @@ func (fake *FakeHandlers) GetOutputAndReset(arg1 bool, arg2 *[]string) error { arg1 bool arg2 *[]string }{arg1, arg2}) + stub := fake.GetOutputAndResetStub + fakeReturns := fake.getOutputAndResetReturns fake.recordInvocation("GetOutputAndReset", []interface{}{arg1, arg2}) fake.getOutputAndResetMutex.Unlock() - if fake.GetOutputAndResetStub != nil { - return fake.GetOutputAndResetStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getOutputAndResetReturns return fakeReturns.result1 } @@ -1245,15 +1259,16 @@ func (fake *FakeHandlers) GetService(arg1 string, arg2 *plugin_models.GetService arg1 string arg2 *plugin_models.GetService_Model }{arg1, arg2}) + stub := fake.GetServiceStub + fakeReturns := fake.getServiceReturns fake.recordInvocation("GetService", []interface{}{arg1, arg2}) fake.getServiceMutex.Unlock() - if fake.GetServiceStub != nil { - return fake.GetServiceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getServiceReturns return fakeReturns.result1 } @@ -1306,15 +1321,16 @@ func (fake *FakeHandlers) GetServices(arg1 string, arg2 *[]plugin_models.GetServ arg1 string arg2 *[]plugin_models.GetServices_Model }{arg1, arg2}) + stub := fake.GetServicesStub + fakeReturns := fake.getServicesReturns fake.recordInvocation("GetServices", []interface{}{arg1, arg2}) fake.getServicesMutex.Unlock() - if fake.GetServicesStub != nil { - return fake.GetServicesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getServicesReturns return fakeReturns.result1 } @@ -1367,15 +1383,16 @@ func (fake *FakeHandlers) GetSpace(arg1 string, arg2 *plugin_models.GetSpace_Mod arg1 string arg2 *plugin_models.GetSpace_Model }{arg1, arg2}) + stub := fake.GetSpaceStub + fakeReturns := fake.getSpaceReturns fake.recordInvocation("GetSpace", []interface{}{arg1, arg2}) fake.getSpaceMutex.Unlock() - if fake.GetSpaceStub != nil { - return fake.GetSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getSpaceReturns return fakeReturns.result1 } @@ -1433,15 +1450,16 @@ func (fake *FakeHandlers) GetSpaceUsers(arg1 []string, arg2 *[]plugin_models.Get arg1 []string arg2 *[]plugin_models.GetSpaceUsers_Model }{arg1Copy, arg2}) + stub := fake.GetSpaceUsersStub + fakeReturns := fake.getSpaceUsersReturns fake.recordInvocation("GetSpaceUsers", []interface{}{arg1Copy, arg2}) fake.getSpaceUsersMutex.Unlock() - if fake.GetSpaceUsersStub != nil { - return fake.GetSpaceUsersStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getSpaceUsersReturns return fakeReturns.result1 } @@ -1494,15 +1512,16 @@ func (fake *FakeHandlers) GetSpaces(arg1 string, arg2 *[]plugin_models.GetSpaces arg1 string arg2 *[]plugin_models.GetSpaces_Model }{arg1, arg2}) + stub := fake.GetSpacesStub + fakeReturns := fake.getSpacesReturns fake.recordInvocation("GetSpaces", []interface{}{arg1, arg2}) fake.getSpacesMutex.Unlock() - if fake.GetSpacesStub != nil { - return fake.GetSpacesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getSpacesReturns return fakeReturns.result1 } @@ -1555,15 +1574,16 @@ func (fake *FakeHandlers) HasAPIEndpoint(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.HasAPIEndpointStub + fakeReturns := fake.hasAPIEndpointReturns fake.recordInvocation("HasAPIEndpoint", []interface{}{arg1, arg2}) fake.hasAPIEndpointMutex.Unlock() - if fake.HasAPIEndpointStub != nil { - return fake.HasAPIEndpointStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasAPIEndpointReturns return fakeReturns.result1 } @@ -1616,15 +1636,16 @@ func (fake *FakeHandlers) HasOrganization(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.HasOrganizationStub + fakeReturns := fake.hasOrganizationReturns fake.recordInvocation("HasOrganization", []interface{}{arg1, arg2}) fake.hasOrganizationMutex.Unlock() - if fake.HasOrganizationStub != nil { - return fake.HasOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasOrganizationReturns return fakeReturns.result1 } @@ -1677,15 +1698,16 @@ func (fake *FakeHandlers) HasSpace(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.HasSpaceStub + fakeReturns := fake.hasSpaceReturns fake.recordInvocation("HasSpace", []interface{}{arg1, arg2}) fake.hasSpaceMutex.Unlock() - if fake.HasSpaceStub != nil { - return fake.HasSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasSpaceReturns return fakeReturns.result1 } @@ -1738,15 +1760,16 @@ func (fake *FakeHandlers) IsLoggedIn(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{arg1, arg2}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1 } @@ -1799,15 +1822,16 @@ func (fake *FakeHandlers) IsMinCliVersion(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.IsMinCliVersionStub + fakeReturns := fake.isMinCliVersionReturns fake.recordInvocation("IsMinCliVersion", []interface{}{arg1, arg2}) fake.isMinCliVersionMutex.Unlock() - if fake.IsMinCliVersionStub != nil { - return fake.IsMinCliVersionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinCliVersionReturns return fakeReturns.result1 } @@ -1860,15 +1884,16 @@ func (fake *FakeHandlers) IsSSLDisabled(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.IsSSLDisabledStub + fakeReturns := fake.isSSLDisabledReturns fake.recordInvocation("IsSSLDisabled", []interface{}{arg1, arg2}) fake.isSSLDisabledMutex.Unlock() - if fake.IsSSLDisabledStub != nil { - return fake.IsSSLDisabledStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.isSSLDisabledReturns return fakeReturns.result1 } @@ -1921,15 +1946,16 @@ func (fake *FakeHandlers) LoggregatorEndpoint(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.LoggregatorEndpointStub + fakeReturns := fake.loggregatorEndpointReturns fake.recordInvocation("LoggregatorEndpoint", []interface{}{arg1, arg2}) fake.loggregatorEndpointMutex.Unlock() - if fake.LoggregatorEndpointStub != nil { - return fake.LoggregatorEndpointStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.loggregatorEndpointReturns return fakeReturns.result1 } @@ -1982,15 +2008,16 @@ func (fake *FakeHandlers) SetPluginMetadata(arg1 plugin.PluginMetadata, arg2 *bo arg1 plugin.PluginMetadata arg2 *bool }{arg1, arg2}) + stub := fake.SetPluginMetadataStub + fakeReturns := fake.setPluginMetadataReturns fake.recordInvocation("SetPluginMetadata", []interface{}{arg1, arg2}) fake.setPluginMetadataMutex.Unlock() - if fake.SetPluginMetadataStub != nil { - return fake.SetPluginMetadataStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setPluginMetadataReturns return fakeReturns.result1 } @@ -2043,15 +2070,16 @@ func (fake *FakeHandlers) UserEmail(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.UserEmailStub + fakeReturns := fake.userEmailReturns fake.recordInvocation("UserEmail", []interface{}{arg1, arg2}) fake.userEmailMutex.Unlock() - if fake.UserEmailStub != nil { - return fake.UserEmailStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.userEmailReturns return fakeReturns.result1 } @@ -2104,15 +2132,16 @@ func (fake *FakeHandlers) UserGuid(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.UserGuidStub + fakeReturns := fake.userGuidReturns fake.recordInvocation("UserGuid", []interface{}{arg1, arg2}) fake.userGuidMutex.Unlock() - if fake.UserGuidStub != nil { - return fake.UserGuidStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.userGuidReturns return fakeReturns.result1 } @@ -2165,15 +2194,16 @@ func (fake *FakeHandlers) Username(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.UsernameStub + fakeReturns := fake.usernameReturns fake.recordInvocation("Username", []interface{}{arg1, arg2}) fake.usernameMutex.Unlock() - if fake.UsernameStub != nil { - return fake.UsernameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.usernameReturns return fakeReturns.result1 } diff --git a/cf/util/testhelpers/rpcserver/server.go b/cf/util/testhelpers/rpcserver/server.go index 8933195911c..30ef099925e 100644 --- a/cf/util/testhelpers/rpcserver/server.go +++ b/cf/util/testhelpers/rpcserver/server.go @@ -9,8 +9,8 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/plugin" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/plugin" + "code.cloudfoundry.org/cli/v9/plugin/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Handlers diff --git a/cf/util/testhelpers/terminal/ui.go b/cf/util/testhelpers/terminal/ui.go index ec8a0cbd9cd..5979179efad 100644 --- a/cf/util/testhelpers/terminal/ui.go +++ b/cf/util/testhelpers/terminal/ui.go @@ -9,8 +9,8 @@ import ( "os" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - term "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + term "code.cloudfoundry.org/cli/v9/cf/terminal" ) type FakeUI struct { diff --git a/cf/util/utilfakes/fake_sha1checksum.go b/cf/util/utilfakes/fake_sha1checksum.go index 977e7cc7d47..10b9513f400 100644 --- a/cf/util/utilfakes/fake_sha1checksum.go +++ b/cf/util/utilfakes/fake_sha1checksum.go @@ -4,7 +4,7 @@ package utilfakes import ( "sync" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/util" ) type FakeSha1Checksum struct { diff --git a/command/api_version_warning.go b/command/api_version_warning.go index e4bb564f56b..c477f3591ef 100644 --- a/command/api_version_warning.go +++ b/command/api_version_warning.go @@ -1,8 +1,8 @@ package command import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" ) diff --git a/command/api_version_warning_test.go b/command/api_version_warning_test.go index c8cd96b58fb..119938b86ca 100644 --- a/command/api_version_warning_test.go +++ b/command/api_version_warning_test.go @@ -4,11 +4,11 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/commandfakes/fake_config.go b/command/commandfakes/fake_config.go index 2b7f1fe4014..95659976761 100644 --- a/command/commandfakes/fake_config.go +++ b/command/commandfakes/fake_config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeConfig struct { diff --git a/command/commandfakes/fake_shared_actor.go b/command/commandfakes/fake_shared_actor.go index fec3b1b77d3..b9e36cdf574 100644 --- a/command/commandfakes/fake_shared_actor.go +++ b/command/commandfakes/fake_shared_actor.go @@ -4,7 +4,7 @@ package commandfakes import ( "sync" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v9/command" ) type FakeSharedActor struct { @@ -85,15 +85,16 @@ func (fake *FakeSharedActor) CheckTarget(arg1 bool, arg2 bool) error { arg1 bool arg2 bool }{arg1, arg2}) + stub := fake.CheckTargetStub + fakeReturns := fake.checkTargetReturns fake.recordInvocation("CheckTarget", []interface{}{arg1, arg2}) fake.checkTargetMutex.Unlock() - if fake.CheckTargetStub != nil { - return fake.CheckTargetStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.checkTargetReturns return fakeReturns.result1 } @@ -144,15 +145,16 @@ func (fake *FakeSharedActor) IsLoggedIn() bool { ret, specificReturn := fake.isLoggedInReturnsOnCall[len(fake.isLoggedInArgsForCall)] fake.isLoggedInArgsForCall = append(fake.isLoggedInArgsForCall, struct { }{}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1 } @@ -196,15 +198,16 @@ func (fake *FakeSharedActor) IsOrgTargeted() bool { ret, specificReturn := fake.isOrgTargetedReturnsOnCall[len(fake.isOrgTargetedArgsForCall)] fake.isOrgTargetedArgsForCall = append(fake.isOrgTargetedArgsForCall, struct { }{}) + stub := fake.IsOrgTargetedStub + fakeReturns := fake.isOrgTargetedReturns fake.recordInvocation("IsOrgTargeted", []interface{}{}) fake.isOrgTargetedMutex.Unlock() - if fake.IsOrgTargetedStub != nil { - return fake.IsOrgTargetedStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isOrgTargetedReturns return fakeReturns.result1 } @@ -248,15 +251,16 @@ func (fake *FakeSharedActor) IsSpaceTargeted() bool { ret, specificReturn := fake.isSpaceTargetedReturnsOnCall[len(fake.isSpaceTargetedArgsForCall)] fake.isSpaceTargetedArgsForCall = append(fake.isSpaceTargetedArgsForCall, struct { }{}) + stub := fake.IsSpaceTargetedStub + fakeReturns := fake.isSpaceTargetedReturns fake.recordInvocation("IsSpaceTargeted", []interface{}{}) fake.isSpaceTargetedMutex.Unlock() - if fake.IsSpaceTargetedStub != nil { - return fake.IsSpaceTargetedStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isSpaceTargetedReturns return fakeReturns.result1 } @@ -300,15 +304,16 @@ func (fake *FakeSharedActor) RequireCurrentUser() (string, error) { ret, specificReturn := fake.requireCurrentUserReturnsOnCall[len(fake.requireCurrentUserArgsForCall)] fake.requireCurrentUserArgsForCall = append(fake.requireCurrentUserArgsForCall, struct { }{}) + stub := fake.RequireCurrentUserStub + fakeReturns := fake.requireCurrentUserReturns fake.recordInvocation("RequireCurrentUser", []interface{}{}) fake.requireCurrentUserMutex.Unlock() - if fake.RequireCurrentUserStub != nil { - return fake.RequireCurrentUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requireCurrentUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -355,15 +360,16 @@ func (fake *FakeSharedActor) RequireTargetedOrg() (string, error) { ret, specificReturn := fake.requireTargetedOrgReturnsOnCall[len(fake.requireTargetedOrgArgsForCall)] fake.requireTargetedOrgArgsForCall = append(fake.requireTargetedOrgArgsForCall, struct { }{}) + stub := fake.RequireTargetedOrgStub + fakeReturns := fake.requireTargetedOrgReturns fake.recordInvocation("RequireTargetedOrg", []interface{}{}) fake.requireTargetedOrgMutex.Unlock() - if fake.RequireTargetedOrgStub != nil { - return fake.RequireTargetedOrgStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requireTargetedOrgReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/commandfakes/fake_ui.go b/command/commandfakes/fake_ui.go index d91cb625272..a168965e9a5 100644 --- a/command/commandfakes/fake_ui.go +++ b/command/commandfakes/fake_ui.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeUI struct { @@ -742,15 +742,16 @@ func (fake *FakeUI) DisplayJSON(arg1 string, arg2 interface{}) error { arg1 string arg2 interface{} }{arg1, arg2}) + stub := fake.DisplayJSONStub + fakeReturns := fake.displayJSONReturns fake.recordInvocation("DisplayJSON", []interface{}{arg1, arg2}) fake.displayJSONMutex.Unlock() - if fake.DisplayJSONStub != nil { - return fake.DisplayJSONStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONReturns return fakeReturns.result1 } diff --git a/command/common/command_list_v7.go b/command/common/command_list_v7.go index bba46d9fa91..b2b37d569f6 100644 --- a/command/common/command_list_v7.go +++ b/command/common/command_list_v7.go @@ -3,8 +3,8 @@ package common import ( "reflect" - "code.cloudfoundry.org/cli/command/plugin" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/command/plugin" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) var Commands commandList diff --git a/command/common/command_list_v7_test.go b/command/common/command_list_v7_test.go index 23bfe58082e..88c2b05e16f 100644 --- a/command/common/command_list_v7_test.go +++ b/command/common/command_list_v7_test.go @@ -1,7 +1,7 @@ package common_test import ( - . "code.cloudfoundry.org/cli/command/common" + . "code.cloudfoundry.org/cli/v9/command/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/commonfakes/fake_help_actor.go b/command/common/commonfakes/fake_help_actor.go index ac130fb2f4c..8432abeeab9 100644 --- a/command/common/commonfakes/fake_help_actor.go +++ b/command/common/commonfakes/fake_help_actor.go @@ -4,8 +4,8 @@ package commonfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/command/common" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/command/common" ) type FakeHelpActor struct { @@ -45,15 +45,16 @@ func (fake *FakeHelpActor) CommandInfoByName(arg1 interface{}, arg2 string) (sha arg1 interface{} arg2 string }{arg1, arg2}) + stub := fake.CommandInfoByNameStub + fakeReturns := fake.commandInfoByNameReturns fake.recordInvocation("CommandInfoByName", []interface{}{arg1, arg2}) fake.commandInfoByNameMutex.Unlock() - if fake.CommandInfoByNameStub != nil { - return fake.CommandInfoByNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.commandInfoByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -108,15 +109,16 @@ func (fake *FakeHelpActor) CommandInfos(arg1 interface{}) map[string]sharedactio fake.commandInfosArgsForCall = append(fake.commandInfosArgsForCall, struct { arg1 interface{} }{arg1}) + stub := fake.CommandInfosStub + fakeReturns := fake.commandInfosReturns fake.recordInvocation("CommandInfos", []interface{}{arg1}) fake.commandInfosMutex.Unlock() - if fake.CommandInfosStub != nil { - return fake.CommandInfosStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.commandInfosReturns return fakeReturns.result1 } diff --git a/command/common/commonfakes/fake_install_plugin_actor.go b/command/common/commonfakes/fake_install_plugin_actor.go index 3f6de0cf1d0..4877908b2e3 100644 --- a/command/common/commonfakes/fake_install_plugin_actor.go +++ b/command/common/commonfakes/fake_install_plugin_actor.go @@ -4,10 +4,10 @@ package commonfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeInstallPluginActor struct { @@ -155,15 +155,16 @@ func (fake *FakeInstallPluginActor) CreateExecutableCopy(arg1 string, arg2 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateExecutableCopyStub + fakeReturns := fake.createExecutableCopyReturns fake.recordInvocation("CreateExecutableCopy", []interface{}{arg1, arg2}) fake.createExecutableCopyMutex.Unlock() - if fake.CreateExecutableCopyStub != nil { - return fake.CreateExecutableCopyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createExecutableCopyReturns return fakeReturns.result1, fakeReturns.result2 } @@ -220,15 +221,16 @@ func (fake *FakeInstallPluginActor) DownloadExecutableBinaryFromURL(arg1 string, arg2 string arg3 plugin.ProxyReader }{arg1, arg2, arg3}) + stub := fake.DownloadExecutableBinaryFromURLStub + fakeReturns := fake.downloadExecutableBinaryFromURLReturns fake.recordInvocation("DownloadExecutableBinaryFromURL", []interface{}{arg1, arg2, arg3}) fake.downloadExecutableBinaryFromURLMutex.Unlock() - if fake.DownloadExecutableBinaryFromURLStub != nil { - return fake.DownloadExecutableBinaryFromURLStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.downloadExecutableBinaryFromURLReturns return fakeReturns.result1, fakeReturns.result2 } @@ -283,15 +285,16 @@ func (fake *FakeInstallPluginActor) FileExists(arg1 string) bool { fake.fileExistsArgsForCall = append(fake.fileExistsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FileExistsStub + fakeReturns := fake.fileExistsReturns fake.recordInvocation("FileExists", []interface{}{arg1}) fake.fileExistsMutex.Unlock() - if fake.FileExistsStub != nil { - return fake.FileExistsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.fileExistsReturns return fakeReturns.result1 } @@ -345,15 +348,16 @@ func (fake *FakeInstallPluginActor) GetAndValidatePlugin(arg1 pluginaction.Plugi arg2 pluginaction.CommandList arg3 string }{arg1, arg2, arg3}) + stub := fake.GetAndValidatePluginStub + fakeReturns := fake.getAndValidatePluginReturns fake.recordInvocation("GetAndValidatePlugin", []interface{}{arg1, arg2, arg3}) fake.getAndValidatePluginMutex.Unlock() - if fake.GetAndValidatePluginStub != nil { - return fake.GetAndValidatePluginStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAndValidatePluginReturns return fakeReturns.result1, fakeReturns.result2 } @@ -409,15 +413,16 @@ func (fake *FakeInstallPluginActor) GetPlatformString(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetPlatformStringStub + fakeReturns := fake.getPlatformStringReturns fake.recordInvocation("GetPlatformString", []interface{}{arg1, arg2}) fake.getPlatformStringMutex.Unlock() - if fake.GetPlatformStringStub != nil { - return fake.GetPlatformStringStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getPlatformStringReturns return fakeReturns.result1 } @@ -476,15 +481,16 @@ func (fake *FakeInstallPluginActor) GetPluginInfoFromRepositoriesForPlatform(arg arg2 []configv3.PluginRepository arg3 string }{arg1, arg2Copy, arg3}) + stub := fake.GetPluginInfoFromRepositoriesForPlatformStub + fakeReturns := fake.getPluginInfoFromRepositoriesForPlatformReturns fake.recordInvocation("GetPluginInfoFromRepositoriesForPlatform", []interface{}{arg1, arg2Copy, arg3}) fake.getPluginInfoFromRepositoriesForPlatformMutex.Unlock() - if fake.GetPluginInfoFromRepositoriesForPlatformStub != nil { - return fake.GetPluginInfoFromRepositoriesForPlatformStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getPluginInfoFromRepositoriesForPlatformReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -542,15 +548,16 @@ func (fake *FakeInstallPluginActor) GetPluginRepository(arg1 string) (configv3.P fake.getPluginRepositoryArgsForCall = append(fake.getPluginRepositoryArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPluginRepositoryStub + fakeReturns := fake.getPluginRepositoryReturns fake.recordInvocation("GetPluginRepository", []interface{}{arg1}) fake.getPluginRepositoryMutex.Unlock() - if fake.GetPluginRepositoryStub != nil { - return fake.GetPluginRepositoryStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPluginRepositoryReturns return fakeReturns.result1, fakeReturns.result2 } @@ -606,15 +613,16 @@ func (fake *FakeInstallPluginActor) InstallPluginFromPath(arg1 string, arg2 conf arg1 string arg2 configv3.Plugin }{arg1, arg2}) + stub := fake.InstallPluginFromPathStub + fakeReturns := fake.installPluginFromPathReturns fake.recordInvocation("InstallPluginFromPath", []interface{}{arg1, arg2}) fake.installPluginFromPathMutex.Unlock() - if fake.InstallPluginFromPathStub != nil { - return fake.InstallPluginFromPathStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.installPluginFromPathReturns return fakeReturns.result1 } @@ -667,15 +675,16 @@ func (fake *FakeInstallPluginActor) UninstallPlugin(arg1 pluginaction.PluginUnin arg1 pluginaction.PluginUninstaller arg2 string }{arg1, arg2}) + stub := fake.UninstallPluginStub + fakeReturns := fake.uninstallPluginReturns fake.recordInvocation("UninstallPlugin", []interface{}{arg1, arg2}) fake.uninstallPluginMutex.Unlock() - if fake.UninstallPluginStub != nil { - return fake.UninstallPluginStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.uninstallPluginReturns return fakeReturns.result1 } @@ -728,15 +737,16 @@ func (fake *FakeInstallPluginActor) ValidateFileChecksum(arg1 string, arg2 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.ValidateFileChecksumStub + fakeReturns := fake.validateFileChecksumReturns fake.recordInvocation("ValidateFileChecksum", []interface{}{arg1, arg2}) fake.validateFileChecksumMutex.Unlock() - if fake.ValidateFileChecksumStub != nil { - return fake.ValidateFileChecksumStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.validateFileChecksumReturns return fakeReturns.result1 } diff --git a/command/common/help_command.go b/command/common/help_command.go index a7553bb8aa2..213adcf079f 100644 --- a/command/common/help_command.go +++ b/command/common/help_command.go @@ -5,12 +5,12 @@ import ( "math" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/common/internal" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/common/internal" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . HelpActor diff --git a/command/common/install_plugin_command.go b/command/common/install_plugin_command.go index b119bb6d1e5..7ebb070d95b 100644 --- a/command/common/install_plugin_command.go +++ b/command/common/install_plugin_command.go @@ -6,16 +6,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/plugin/shared" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/plugin/shared" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/util/configv3" log "github.com/sirupsen/logrus" ) diff --git a/command/common/install_plugin_command_test.go b/command/common/install_plugin_command_test.go index af2a80b01ea..45b66d16191 100644 --- a/command/common/install_plugin_command_test.go +++ b/command/common/install_plugin_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/common/commonfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/common/commonfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/common/install_plugin_from_repo_command_test.go b/command/common/install_plugin_from_repo_command_test.go index a6d49af0ca4..e9dae85965b 100644 --- a/command/common/install_plugin_from_repo_command_test.go +++ b/command/common/install_plugin_from_repo_command_test.go @@ -8,18 +8,18 @@ import ( "os" "runtime" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/common/commonfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/common/commonfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/common/internal/help_all_display_test.go b/command/common/internal/help_all_display_test.go index 695b5690566..8a4da8d87ff 100644 --- a/command/common/internal/help_all_display_test.go +++ b/command/common/internal/help_all_display_test.go @@ -4,8 +4,8 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/common/internal" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/common/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/internal/help_display.go b/command/common/internal/help_display.go index 55eb2c87480..3f08bc5cce1 100644 --- a/command/common/internal/help_display.go +++ b/command/common/internal/help_display.go @@ -5,9 +5,9 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/sorting" ) type HelpCategory struct { diff --git a/command/common/version_command.go b/command/common/version_command.go index 2b1e2ba8676..bf196f59688 100644 --- a/command/common/version_command.go +++ b/command/common/version_command.go @@ -1,6 +1,6 @@ package common -import "code.cloudfoundry.org/cli/command" +import "code.cloudfoundry.org/cli/v9/command" type VersionCommand struct { usage interface{} `usage:"CF_NAME version\n\n 'cf -v' and 'cf --version' are also accepted."` diff --git a/command/common/version_command_test.go b/command/common/version_command_test.go index 9db08671ad9..b0373073f65 100644 --- a/command/common/version_command_test.go +++ b/command/common/version_command_test.go @@ -1,9 +1,9 @@ package common_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/config.go b/command/config.go index 676223c7923..bbdf7776431 100644 --- a/command/config.go +++ b/command/config.go @@ -3,7 +3,7 @@ package command import ( "time" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/command/flag/app_type_test.go b/command/flag/app_type_test.go index cceaba6bea8..df6067c9a5c 100644 --- a/command/flag/app_type_test.go +++ b/command/flag/app_type_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/binding_name_test.go b/command/flag/binding_name_test.go index 6bba5ef984a..0b3b0ec4312 100644 --- a/command/flag/binding_name_test.go +++ b/command/flag/binding_name_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/buildpack.go b/command/flag/buildpack.go index 4dd9d9330b5..17081b4c963 100644 --- a/command/flag/buildpack.go +++ b/command/flag/buildpack.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" ) type Buildpack struct { diff --git a/command/flag/buildpack_test.go b/command/flag/buildpack_test.go index 2910227b642..2301f26290d 100644 --- a/command/flag/buildpack_test.go +++ b/command/flag/buildpack_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/bytes_with_unlimited.go b/command/flag/bytes_with_unlimited.go index 544378fdf4c..d04766ef66e 100644 --- a/command/flag/bytes_with_unlimited.go +++ b/command/flag/bytes_with_unlimited.go @@ -6,7 +6,7 @@ import ( "strings" "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/bytes_with_unlimited_test.go b/command/flag/bytes_with_unlimited_test.go index 1a52f412164..f583cc2878c 100644 --- a/command/flag/bytes_with_unlimited_test.go +++ b/command/flag/bytes_with_unlimited_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/color_test.go b/command/flag/color_test.go index 2a007ba6207..f202a8092e3 100644 --- a/command/flag/color_test.go +++ b/command/flag/color_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/command.go b/command/flag/command.go index d041895392b..551c6e409f6 100644 --- a/command/flag/command.go +++ b/command/flag/command.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" ) type Command struct { diff --git a/command/flag/command_test.go b/command/flag/command_test.go index 522e43c56fb..5b34059b6a8 100644 --- a/command/flag/command_test.go +++ b/command/flag/command_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/credentials_or_json.go b/command/flag/credentials_or_json.go index af667374f9e..367c5ccb280 100644 --- a/command/flag/credentials_or_json.go +++ b/command/flag/credentials_or_json.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/credentials_or_json_test.go b/command/flag/credentials_or_json_test.go index aff6b28cf1b..5f8da070f4a 100644 --- a/command/flag/credentials_or_json_test.go +++ b/command/flag/credentials_or_json_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/command/flag/deployment_strategy.go b/command/flag/deployment_strategy.go index 47ee1b52ee2..a0d6d1a8768 100644 --- a/command/flag/deployment_strategy.go +++ b/command/flag/deployment_strategy.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" "github.com/jessevdk/go-flags" ) diff --git a/command/flag/deployment_strategy_test.go b/command/flag/deployment_strategy_test.go index 90ac3c0b1d5..5abe614a2de 100644 --- a/command/flag/deployment_strategy_test.go +++ b/command/flag/deployment_strategy_test.go @@ -1,8 +1,8 @@ package flag_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/docker_test.go b/command/flag/docker_test.go index ddfb59c896f..5cc68797308 100644 --- a/command/flag/docker_test.go +++ b/command/flag/docker_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/droplet_test.go b/command/flag/droplet_test.go index 1d3f2562bbd..22b0e28f36f 100644 --- a/command/flag/droplet_test.go +++ b/command/flag/droplet_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/environment_variable_test.go b/command/flag/environment_variable_test.go index 30249af3454..1d7c43562be 100644 --- a/command/flag/environment_variable_test.go +++ b/command/flag/environment_variable_test.go @@ -8,7 +8,7 @@ import ( "os" "strings" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/health_check_type.go b/command/flag/health_check_type.go index 203f36017c5..0fd1dbb6c95 100644 --- a/command/flag/health_check_type.go +++ b/command/flag/health_check_type.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/health_check_type_test.go b/command/flag/health_check_type_test.go index c381233924d..144f06665fc 100644 --- a/command/flag/health_check_type_test.go +++ b/command/flag/health_check_type_test.go @@ -1,8 +1,8 @@ package flag_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/health_check_type_with_deprecated_value_test.go b/command/flag/health_check_type_with_deprecated_value_test.go index 21fbb122385..30b893249a0 100644 --- a/command/flag/health_check_type_with_deprecated_value_test.go +++ b/command/flag/health_check_type_with_deprecated_value_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/instances.go b/command/flag/instances.go index 437042a9034..9db7f73f4d9 100644 --- a/command/flag/instances.go +++ b/command/flag/instances.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/instances_test.go b/command/flag/instances_test.go index 10dd691de6c..a72f467e094 100644 --- a/command/flag/instances_test.go +++ b/command/flag/instances_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/integer_limit.go b/command/flag/integer_limit.go index 1f5c9253414..917d0659189 100644 --- a/command/flag/integer_limit.go +++ b/command/flag/integer_limit.go @@ -3,7 +3,7 @@ package flag import ( "strconv" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/integer_limit_test.go b/command/flag/integer_limit_test.go index 9fae1ecc6b1..f2764fd8a26 100644 --- a/command/flag/integer_limit_test.go +++ b/command/flag/integer_limit_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/locale.go b/command/flag/locale.go index d2cf1871ff0..8b46a46575a 100644 --- a/command/flag/locale.go +++ b/command/flag/locale.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/i18n" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/locale_test.go b/command/flag/locale_test.go index 5209068bdae..094f3599de9 100644 --- a/command/flag/locale_test.go +++ b/command/flag/locale_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/megabytes.go b/command/flag/megabytes.go index edb780c9b7d..42842758490 100644 --- a/command/flag/megabytes.go +++ b/command/flag/megabytes.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/bytefmt" flags "github.com/jessevdk/go-flags" diff --git a/command/flag/megabytes_test.go b/command/flag/megabytes_test.go index 6a43936dd3e..527d7fab850 100644 --- a/command/flag/megabytes_test.go +++ b/command/flag/megabytes_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/megabytes_with_unlimited.go b/command/flag/megabytes_with_unlimited.go index de5595cc99a..81c201e557c 100644 --- a/command/flag/megabytes_with_unlimited.go +++ b/command/flag/megabytes_with_unlimited.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" ) type MegabytesWithUnlimited types.NullInt diff --git a/command/flag/megabytes_with_unlimited_test.go b/command/flag/megabytes_with_unlimited_test.go index cd4550df06b..85b4ff2e017 100644 --- a/command/flag/megabytes_with_unlimited_test.go +++ b/command/flag/megabytes_with_unlimited_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/network_port_test.go b/command/flag/network_port_test.go index 5f709893e92..3b803e070bf 100644 --- a/command/flag/network_port_test.go +++ b/command/flag/network_port_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/network_protocol_test.go b/command/flag/network_protocol_test.go index ae7e99135e1..07f32f65bbd 100644 --- a/command/flag/network_protocol_test.go +++ b/command/flag/network_protocol_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/optional_string.go b/command/flag/optional_string.go index 030abed6316..3de892c2b5c 100644 --- a/command/flag/optional_string.go +++ b/command/flag/optional_string.go @@ -1,6 +1,6 @@ package flag -import "code.cloudfoundry.org/cli/types" +import "code.cloudfoundry.org/cli/v9/types" type OptionalString types.OptionalString diff --git a/command/flag/optional_string_test.go b/command/flag/optional_string_test.go index 971337a7bcc..dcc1b87bd6d 100644 --- a/command/flag/optional_string_test.go +++ b/command/flag/optional_string_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/org_role_test.go b/command/flag/org_role_test.go index 6419d6ef93e..85bf0bea8c5 100644 --- a/command/flag/org_role_test.go +++ b/command/flag/org_role_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/path.go b/command/flag/path.go index 610c2ddccc4..8339018a2d8 100644 --- a/command/flag/path.go +++ b/command/flag/path.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/manifestparser" "github.com/jessevdk/go-flags" ) diff --git a/command/flag/path_test.go b/command/flag/path_test.go index ddbb6f688ed..5739aad7b55 100644 --- a/command/flag/path_test.go +++ b/command/flag/path_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/port.go b/command/flag/port.go index 17d430ed36f..af24fbdf074 100644 --- a/command/flag/port.go +++ b/command/flag/port.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/port_test.go b/command/flag/port_test.go index 3a4c6e182f7..b11fdb35e99 100644 --- a/command/flag/port_test.go +++ b/command/flag/port_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/positive_integer_test.go b/command/flag/positive_integer_test.go index 9154fb9ec99..87ae6193492 100644 --- a/command/flag/positive_integer_test.go +++ b/command/flag/positive_integer_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" ) var _ = Describe("Positive Integer", func() { diff --git a/command/flag/revision.go b/command/flag/revision.go index f800f8f9552..28c600fa033 100644 --- a/command/flag/revision.go +++ b/command/flag/revision.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/revision_test.go b/command/flag/revision_test.go index 9fb898ec140..146ec8813d4 100644 --- a/command/flag/revision_test.go +++ b/command/flag/revision_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/route_path_test.go b/command/flag/route_path_test.go index cbdc440c3f2..5771d0624fb 100644 --- a/command/flag/route_path_test.go +++ b/command/flag/route_path_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/security_group_lifecycle_test.go b/command/flag/security_group_lifecycle_test.go index 1f7a61d075f..c8b82228681 100644 --- a/command/flag/security_group_lifecycle_test.go +++ b/command/flag/security_group_lifecycle_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/space_role_test.go b/command/flag/space_role_test.go index 7a01de22c3b..fb424811279 100644 --- a/command/flag/space_role_test.go +++ b/command/flag/space_role_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/ssh_port_forwarding_test.go b/command/flag/ssh_port_forwarding_test.go index 3d9c79708a0..8bb49e2fc85 100644 --- a/command/flag/ssh_port_forwarding_test.go +++ b/command/flag/ssh_port_forwarding_test.go @@ -3,7 +3,7 @@ package flag_test import ( "fmt" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/command/flag/tags.go b/command/flag/tags.go index 961c94773ca..b557003d3c0 100644 --- a/command/flag/tags.go +++ b/command/flag/tags.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" ) type Tags types.OptionalStringSlice diff --git a/command/flag/tags_test.go b/command/flag/tags_test.go index 71a133cff39..1fce44e95da 100644 --- a/command/flag/tags_test.go +++ b/command/flag/tags_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/timeout.go b/command/flag/timeout.go index 42250a543de..500747d72aa 100644 --- a/command/flag/timeout.go +++ b/command/flag/timeout.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/timeout_test.go b/command/flag/timeout_test.go index 82245063c24..b82eb32e88a 100644 --- a/command/flag/timeout_test.go +++ b/command/flag/timeout_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" ) var _ = Describe("Timeout", func() { diff --git a/command/flag/trimmed_string_test.go b/command/flag/trimmed_string_test.go index c1345e32cbb..08bd8207207 100644 --- a/command/flag/trimmed_string_test.go +++ b/command/flag/trimmed_string_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/minimum_version_check.go b/command/minimum_version_check.go index 9fa7aebf7a2..78ec18ee1d7 100644 --- a/command/minimum_version_check.go +++ b/command/minimum_version_check.go @@ -1,7 +1,7 @@ package command import ( - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" log "github.com/sirupsen/logrus" ) diff --git a/command/minimum_version_check_test.go b/command/minimum_version_check_test.go index 61aaa94450b..f3b8209c5ca 100644 --- a/command/minimum_version_check_test.go +++ b/command/minimum_version_check_test.go @@ -1,9 +1,9 @@ package command_test import ( - . "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/version" + . "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/plugin/add_plugin_repo_command.go b/command/plugin/add_plugin_repo_command.go index 8c699b03a2d..cb40cad0be0 100644 --- a/command/plugin/add_plugin_repo_command.go +++ b/command/plugin/add_plugin_repo_command.go @@ -1,11 +1,11 @@ package plugin import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/plugin/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/plugin/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . AddPluginRepoActor diff --git a/command/plugin/add_plugin_repo_command_test.go b/command/plugin/add_plugin_repo_command_test.go index 1197642d203..c3763cf2955 100644 --- a/command/plugin/add_plugin_repo_command_test.go +++ b/command/plugin/add_plugin_repo_command_test.go @@ -1,11 +1,11 @@ package plugin_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/plugin" - "code.cloudfoundry.org/cli/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/plugin" + "code.cloudfoundry.org/cli/v9/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/plugin/list_plugin_repos_command.go b/command/plugin/list_plugin_repos_command.go index a4f1288fd0a..2e4c4a0074a 100644 --- a/command/plugin/list_plugin_repos_command.go +++ b/command/plugin/list_plugin_repos_command.go @@ -1,8 +1,8 @@ package plugin import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type ListPluginReposCommand struct { diff --git a/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go b/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go index 30a8dac4fc0..acad05c8fa8 100644 --- a/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go +++ b/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go @@ -4,7 +4,7 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/command/plugin" + "code.cloudfoundry.org/cli/v9/command/plugin" ) type FakeAddPluginRepoActor struct { @@ -31,15 +31,16 @@ func (fake *FakeAddPluginRepoActor) AddPluginRepository(arg1 string, arg2 string arg1 string arg2 string }{arg1, arg2}) + stub := fake.AddPluginRepositoryStub + fakeReturns := fake.addPluginRepositoryReturns fake.recordInvocation("AddPluginRepository", []interface{}{arg1, arg2}) fake.addPluginRepositoryMutex.Unlock() - if fake.AddPluginRepositoryStub != nil { - return fake.AddPluginRepositoryStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.addPluginRepositoryReturns return fakeReturns.result1 } diff --git a/command/plugin/pluginfakes/fake_plugins_actor.go b/command/plugin/pluginfakes/fake_plugins_actor.go index d16659bf10b..16cb741a26e 100644 --- a/command/plugin/pluginfakes/fake_plugins_actor.go +++ b/command/plugin/pluginfakes/fake_plugins_actor.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command/plugin" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command/plugin" ) type FakePluginsActor struct { @@ -30,15 +30,16 @@ func (fake *FakePluginsActor) GetOutdatedPlugins() ([]pluginaction.OutdatedPlugi ret, specificReturn := fake.getOutdatedPluginsReturnsOnCall[len(fake.getOutdatedPluginsArgsForCall)] fake.getOutdatedPluginsArgsForCall = append(fake.getOutdatedPluginsArgsForCall, struct { }{}) + stub := fake.GetOutdatedPluginsStub + fakeReturns := fake.getOutdatedPluginsReturns fake.recordInvocation("GetOutdatedPlugins", []interface{}{}) fake.getOutdatedPluginsMutex.Unlock() - if fake.GetOutdatedPluginsStub != nil { - return fake.GetOutdatedPluginsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getOutdatedPluginsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go b/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go index 45ea9092410..3442264e266 100644 --- a/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go +++ b/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command/plugin" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command/plugin" ) type FakeUninstallPluginActor struct { @@ -32,15 +32,16 @@ func (fake *FakeUninstallPluginActor) UninstallPlugin(arg1 pluginaction.PluginUn arg1 pluginaction.PluginUninstaller arg2 string }{arg1, arg2}) + stub := fake.UninstallPluginStub + fakeReturns := fake.uninstallPluginReturns fake.recordInvocation("UninstallPlugin", []interface{}{arg1, arg2}) fake.uninstallPluginMutex.Unlock() - if fake.UninstallPluginStub != nil { - return fake.UninstallPluginStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.uninstallPluginReturns return fakeReturns.result1 } diff --git a/command/plugin/plugins_command.go b/command/plugin/plugins_command.go index 7c1a626c263..a74c995abcc 100644 --- a/command/plugin/plugins_command.go +++ b/command/plugin/plugins_command.go @@ -3,12 +3,12 @@ package plugin import ( "strings" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/plugin/shared" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/plugin/shared" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginsActor diff --git a/command/plugin/plugins_command_test.go b/command/plugin/plugins_command_test.go index 381a51a5659..3e191af60c9 100644 --- a/command/plugin/plugins_command_test.go +++ b/command/plugin/plugins_command_test.go @@ -3,14 +3,14 @@ package plugin_test import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/plugin" - "code.cloudfoundry.org/cli/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/plugin" + "code.cloudfoundry.org/cli/v9/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/plugin/remove_plugin_repo_command.go b/command/plugin/remove_plugin_repo_command.go index db5c6d042c0..1f5a4f95f53 100644 --- a/command/plugin/remove_plugin_repo_command.go +++ b/command/plugin/remove_plugin_repo_command.go @@ -1,9 +1,9 @@ package plugin import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type RemovePluginRepoCommand struct { diff --git a/command/plugin/repo_plugins_command.go b/command/plugin/repo_plugins_command.go index bbc825bddce..4e922727507 100644 --- a/command/plugin/repo_plugins_command.go +++ b/command/plugin/repo_plugins_command.go @@ -1,8 +1,8 @@ package plugin import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type RepoPluginsCommand struct { diff --git a/command/plugin/shared/new_client.go b/command/plugin/shared/new_client.go index 01db4719a85..f30f32e2100 100644 --- a/command/plugin/shared/new_client.go +++ b/command/plugin/shared/new_client.go @@ -1,9 +1,9 @@ package shared import ( - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/wrapper" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v9/command" ) // NewClient creates a new V2 Cloud Controller client and UAA client using the diff --git a/command/plugin/shared/rpc.go b/command/plugin/shared/rpc.go index 0565fc5b002..5a7e4dd66df 100644 --- a/command/plugin/shared/rpc.go +++ b/command/plugin/shared/rpc.go @@ -8,10 +8,10 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/plugin/rpc" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/plugin/rpc" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type Config interface { diff --git a/command/plugin/uninstall_plugin_command.go b/command/plugin/uninstall_plugin_command.go index 05a32d962da..661867376d5 100644 --- a/command/plugin/uninstall_plugin_command.go +++ b/command/plugin/uninstall_plugin_command.go @@ -1,12 +1,12 @@ package plugin import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/plugin/shared" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/plugin/shared" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UninstallPluginActor diff --git a/command/plugin/uninstall_plugin_command_test.go b/command/plugin/uninstall_plugin_command_test.go index ca15844dff2..1e165bcfc54 100644 --- a/command/plugin/uninstall_plugin_command_test.go +++ b/command/plugin/uninstall_plugin_command_test.go @@ -4,13 +4,13 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/plugin" - "code.cloudfoundry.org/cli/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/plugin" + "code.cloudfoundry.org/cli/v9/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/translatableerror/convert_to_translatable_error.go b/command/translatableerror/convert_to_translatable_error.go index f8636a7c5ec..13e9734a806 100644 --- a/command/translatableerror/convert_to_translatable_error.go +++ b/command/translatableerror/convert_to_translatable_error.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/util/clissh/ssherror" - "code.cloudfoundry.org/cli/util/download" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v9/util/download" + "code.cloudfoundry.org/cli/v9/util/manifest" log "github.com/sirupsen/logrus" ) diff --git a/command/translatableerror/convert_to_translatable_error_test.go b/command/translatableerror/convert_to_translatable_error_test.go index 5cb7603b8e3..562f20eb6ae 100644 --- a/command/translatableerror/convert_to_translatable_error_test.go +++ b/command/translatableerror/convert_to_translatable_error_test.go @@ -5,14 +5,14 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/uaa" - . "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/clissh/ssherror" - "code.cloudfoundry.org/cli/util/download" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/uaa" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v9/util/download" + "code.cloudfoundry.org/cli/v9/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/translatableerror/minimum_cf_api_version_not_met_error_test.go b/command/translatableerror/minimum_cf_api_version_not_met_error_test.go index 8d8e06416b5..fe86a817149 100644 --- a/command/translatableerror/minimum_cf_api_version_not_met_error_test.go +++ b/command/translatableerror/minimum_cf_api_version_not_met_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/translatableerror/minimum_cli_version_not_met_error_test.go b/command/translatableerror/minimum_cli_version_not_met_error_test.go index a237531625f..198dc88f377 100644 --- a/command/translatableerror/minimum_cli_version_not_met_error_test.go +++ b/command/translatableerror/minimum_cli_version_not_met_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/translatableerror/minimum_uaa_api_version_not_met_error_test.go b/command/translatableerror/minimum_uaa_api_version_not_met_error_test.go index f79c98834be..586b104466d 100644 --- a/command/translatableerror/minimum_uaa_api_version_not_met_error_test.go +++ b/command/translatableerror/minimum_uaa_api_version_not_met_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/translatableerror/missing_credential_error_test.go b/command/translatableerror/missing_credential_error_test.go index 1353cd4f9ee..b529dba98db 100644 --- a/command/translatableerror/missing_credential_error_test.go +++ b/command/translatableerror/missing_credential_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/translatableerror/service_instance_not_shareable_error_test.go b/command/translatableerror/service_instance_not_shareable_error_test.go index 6394d787ee1..66211bee26e 100644 --- a/command/translatableerror/service_instance_not_shareable_error_test.go +++ b/command/translatableerror/service_instance_not_shareable_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/service_plan_not_found_error_test.go b/command/translatableerror/service_plan_not_found_error_test.go index 84759b66eb0..1711a926a83 100644 --- a/command/translatableerror/service_plan_not_found_error_test.go +++ b/command/translatableerror/service_plan_not_found_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/staging_timeout_error_test.go b/command/translatableerror/staging_timeout_error_test.go index 0ce31dd5f1e..871a340d061 100644 --- a/command/translatableerror/staging_timeout_error_test.go +++ b/command/translatableerror/staging_timeout_error_test.go @@ -6,7 +6,7 @@ import ( "text/template" "time" - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/translatableerror/tip_decorator_error_test.go b/command/translatableerror/tip_decorator_error_test.go index a8792e81093..09bc84e2ddb 100644 --- a/command/translatableerror/tip_decorator_error_test.go +++ b/command/translatableerror/tip_decorator_error_test.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/translatableerror/translatableerrorfakes" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror/translatableerrorfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/translatableerrorfakes/fake_translatable_error.go b/command/translatableerror/translatableerrorfakes/fake_translatable_error.go index f4a97e0aba8..a8465852e8f 100644 --- a/command/translatableerror/translatableerrorfakes/fake_translatable_error.go +++ b/command/translatableerror/translatableerrorfakes/fake_translatable_error.go @@ -4,7 +4,7 @@ package translatableerrorfakes import ( "sync" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type FakeTranslatableError struct { @@ -38,15 +38,16 @@ func (fake *FakeTranslatableError) Error() string { ret, specificReturn := fake.errorReturnsOnCall[len(fake.errorArgsForCall)] fake.errorArgsForCall = append(fake.errorArgsForCall, struct { }{}) + stub := fake.ErrorStub + fakeReturns := fake.errorReturns fake.recordInvocation("Error", []interface{}{}) fake.errorMutex.Unlock() - if fake.ErrorStub != nil { - return fake.ErrorStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.errorReturns return fakeReturns.result1 } @@ -91,15 +92,16 @@ func (fake *FakeTranslatableError) Translate(arg1 func(string, ...interface{}) s fake.translateArgsForCall = append(fake.translateArgsForCall, struct { arg1 func(string, ...interface{}) string }{arg1}) + stub := fake.TranslateStub + fakeReturns := fake.translateReturns fake.recordInvocation("Translate", []interface{}{arg1}) fake.translateMutex.Unlock() - if fake.TranslateStub != nil { - return fake.TranslateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.translateReturns return fakeReturns.result1 } diff --git a/command/translatableerror/translate_test.go b/command/translatableerror/translate_test.go index f548fcd57c1..f2e594ac64e 100644 --- a/command/translatableerror/translate_test.go +++ b/command/translatableerror/translate_test.go @@ -5,7 +5,7 @@ import ( "errors" "text/template" - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/translatableerror/unauthorized_error_test.go b/command/translatableerror/unauthorized_error_test.go index 339d350d1be..86706d6f9f9 100644 --- a/command/translatableerror/unauthorized_error_test.go +++ b/command/translatableerror/unauthorized_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/ui.go b/command/ui.go index 424c71d207a..933ffe1026e 100644 --- a/command/ui.go +++ b/command/ui.go @@ -4,7 +4,7 @@ import ( "io" "time" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) // UI is the interface to STDOUT, STDERR, and STDIN. diff --git a/command/v7/actor.go b/command/v7/actor.go index d75347909ed..8c3df8b462c 100644 --- a/command/v7/actor.go +++ b/command/v7/actor.go @@ -6,15 +6,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - uaa "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + uaa "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" "github.com/SermoDigital/jose/jwt" ) diff --git a/command/v7/add_network_policy_command.go b/command/v7/add_network_policy_command.go index b795bde454a..d0d9baad198 100644 --- a/command/v7/add_network_policy_command.go +++ b/command/v7/add_network_policy_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkingActor diff --git a/command/v7/add_network_policy_command_test.go b/command/v7/add_network_policy_command_test.go index 8f48dae4e3c..229de259401 100644 --- a/command/v7/add_network_policy_command_test.go +++ b/command/v7/add_network_policy_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/allow_space_ssh_command.go b/command/v7/allow_space_ssh_command.go index 38e6f99e56b..0a44bc70f83 100644 --- a/command/v7/allow_space_ssh_command.go +++ b/command/v7/allow_space_ssh_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type AllowSpaceSSHCommand struct { diff --git a/command/v7/allow_space_ssh_command_test.go b/command/v7/allow_space_ssh_command_test.go index 7aa9fe7a31b..a9ceada6745 100644 --- a/command/v7/allow_space_ssh_command_test.go +++ b/command/v7/allow_space_ssh_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/api_command.go b/command/v7/api_command.go index 5127b33bbf5..c60f6ddb8d8 100644 --- a/command/v7/api_command.go +++ b/command/v7/api_command.go @@ -6,10 +6,10 @@ import ( "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type APICommand struct { diff --git a/command/v7/api_command_test.go b/command/v7/api_command_test.go index 1c2e3cae883..87285bb1252 100644 --- a/command/v7/api_command_test.go +++ b/command/v7/api_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/app_command.go b/command/v7/app_command.go index d431a71ff55..a67c5381d30 100644 --- a/command/v7/app_command.go +++ b/command/v7/app_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type AppCommand struct { diff --git a/command/v7/app_command_test.go b/command/v7/app_command_test.go index c64703644a7..0a6f7261e9c 100644 --- a/command/v7/app_command_test.go +++ b/command/v7/app_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/apply_manifest_command.go b/command/v7/apply_manifest_command.go index 71c1b445423..f6e0587f269 100644 --- a/command/v7/apply_manifest_command.go +++ b/command/v7/apply_manifest_command.go @@ -3,13 +3,13 @@ package v7 import ( "os" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" "gopkg.in/yaml.v2" ) diff --git a/command/v7/apply_manifest_command_test.go b/command/v7/apply_manifest_command_test.go index 2ae6bc5ded3..8343cf3bb0e 100644 --- a/command/v7/apply_manifest_command_test.go +++ b/command/v7/apply_manifest_command_test.go @@ -6,18 +6,18 @@ import ( "gopkg.in/yaml.v2" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/manifestparser" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/apps_command.go b/command/v7/apps_command.go index 84d936652bd..72a7def85a3 100644 --- a/command/v7/apps_command.go +++ b/command/v7/apps_command.go @@ -3,8 +3,8 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type AppsCommand struct { diff --git a/command/v7/apps_command_test.go b/command/v7/apps_command_test.go index 4402ab40bd5..e2b23fa3569 100644 --- a/command/v7/apps_command_test.go +++ b/command/v7/apps_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/auth_command.go b/command/v7/auth_command.go index 0d5f70c4702..17366d7fc09 100644 --- a/command/v7/auth_command.go +++ b/command/v7/auth_command.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type AuthCommand struct { diff --git a/command/v7/auth_command_test.go b/command/v7/auth_command_test.go index fc945fc78ab..78e376be259 100644 --- a/command/v7/auth_command_test.go +++ b/command/v7/auth_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/base_command.go b/command/v7/base_command.go index e40bcc26d65..6714be6b73a 100644 --- a/command/v7/base_command.go +++ b/command/v7/base_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/v7/shared" "code.cloudfoundry.org/clock" ) diff --git a/command/v7/bind_route_service_command.go b/command/v7/bind_route_service_command.go index b6e0b2fa867..b1c17cdc86c 100644 --- a/command/v7/bind_route_service_command.go +++ b/command/v7/bind_route_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type BindRouteServiceCommand struct { diff --git a/command/v7/bind_route_service_command_test.go b/command/v7/bind_route_service_command_test.go index fc3a9178c9a..998378d95f8 100644 --- a/command/v7/bind_route_service_command_test.go +++ b/command/v7/bind_route_service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_running_security_group_command.go b/command/v7/bind_running_security_group_command.go index b2fafe89867..9024cd23b09 100644 --- a/command/v7/bind_running_security_group_command.go +++ b/command/v7/bind_running_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type BindRunningSecurityGroupCommand struct { diff --git a/command/v7/bind_running_security_group_command_test.go b/command/v7/bind_running_security_group_command_test.go index 71dbd866cd4..2ac5f38f274 100644 --- a/command/v7/bind_running_security_group_command_test.go +++ b/command/v7/bind_running_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_security_group_command.go b/command/v7/bind_security_group_command.go index 4350d966eb0..66a863c2387 100644 --- a/command/v7/bind_security_group_command.go +++ b/command/v7/bind_security_group_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type BindSecurityGroupCommand struct { diff --git a/command/v7/bind_security_group_command_test.go b/command/v7/bind_security_group_command_test.go index 4d5c612e728..ac4bf27c272 100644 --- a/command/v7/bind_security_group_command_test.go +++ b/command/v7/bind_security_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -276,7 +276,7 @@ var _ = Describe("bind-security-group Command", func() { Expect(testUI.Out).To(Say("Assigning running security group %s to all spaces in org %s as some-user...", cmd.RequiredArgs.SecurityGroupName, cmd.RequiredArgs.OrganizationName)) Expect(testUI.Out).To(Say("No spaces in org %s.", cmd.RequiredArgs.OrganizationName)) Expect(testUI.Out).NotTo(Say("OK")) - Expect(testUI.Out).NotTo(Say(`TIP: If Dynamic ASG's are enabled, changes will automatically apply for running and staging applications. Otherwise, changes will require an app restart \(for running\) or restage \(for staging\) to apply to existing applications\.`)) //TODO Why? + Expect(testUI.Out).NotTo(Say(`TIP: If Dynamic ASG's are enabled, changes will automatically apply for running and staging applications. Otherwise, changes will require an app restart \(for running\) or restage \(for staging\) to apply to existing applications\.`)) // TODO Why? Expect(testUI.Err).To(Say("get security group warning")) Expect(testUI.Err).To(Say("get org warning")) diff --git a/command/v7/bind_service_command.go b/command/v7/bind_service_command.go index 4f4f9e480a9..04ab1a0b1ed 100644 --- a/command/v7/bind_service_command.go +++ b/command/v7/bind_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type BindServiceCommand struct { diff --git a/command/v7/bind_service_command_test.go b/command/v7/bind_service_command_test.go index e8e0306940d..88e30fbe230 100644 --- a/command/v7/bind_service_command_test.go +++ b/command/v7/bind_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_staging_security_group_command.go b/command/v7/bind_staging_security_group_command.go index 0ee5a324052..98bb0ecb29f 100644 --- a/command/v7/bind_staging_security_group_command.go +++ b/command/v7/bind_staging_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type BindStagingSecurityGroupCommand struct { diff --git a/command/v7/bind_staging_security_group_command_test.go b/command/v7/bind_staging_security_group_command_test.go index 6889f808917..f4d40cee612 100644 --- a/command/v7/bind_staging_security_group_command_test.go +++ b/command/v7/bind_staging_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/buildpacks_command.go b/command/v7/buildpacks_command.go index 0aeb3a0a010..4e520fcde3f 100644 --- a/command/v7/buildpacks_command.go +++ b/command/v7/buildpacks_command.go @@ -3,8 +3,8 @@ package v7 import ( "strconv" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type BuildpacksCommand struct { diff --git a/command/v7/buildpacks_command_test.go b/command/v7/buildpacks_command_test.go index 0cb54667243..7ae0441bd74 100644 --- a/command/v7/buildpacks_command_test.go +++ b/command/v7/buildpacks_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/cancel_deployment_command.go b/command/v7/cancel_deployment_command.go index 55998b32a4c..53bec2fa3c1 100644 --- a/command/v7/cancel_deployment_command.go +++ b/command/v7/cancel_deployment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CancelDeploymentCommand struct { diff --git a/command/v7/cancel_deployment_command_test.go b/command/v7/cancel_deployment_command_test.go index 355349c61ab..6d7b8ec7939 100644 --- a/command/v7/cancel_deployment_command_test.go +++ b/command/v7/cancel_deployment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/check_route_command.go b/command/v7/check_route_command.go index 444cd1f4d25..c1f152718f6 100644 --- a/command/v7/check_route_command.go +++ b/command/v7/check_route_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CheckRouteCommand struct { diff --git a/command/v7/check_route_command_test.go b/command/v7/check_route_command_test.go index f338b81c472..84c8c352482 100644 --- a/command/v7/check_route_command_test.go +++ b/command/v7/check_route_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/config_command.go b/command/v7/config_command.go index ae306787c5f..8fc64d04a99 100644 --- a/command/v7/config_command.go +++ b/command/v7/config_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type ConfigCommand struct { diff --git a/command/v7/config_command_test.go b/command/v7/config_command_test.go index dcc61aa6e88..fb5612d8def 100644 --- a/command/v7/config_command_test.go +++ b/command/v7/config_command_test.go @@ -1,13 +1,13 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/continue_deployment_command.go b/command/v7/continue_deployment_command.go index 135cdbe978a..937253e51ec 100644 --- a/command/v7/continue_deployment_command.go +++ b/command/v7/continue_deployment_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type ContinueDeploymentCommand struct { diff --git a/command/v7/continue_deployment_command_test.go b/command/v7/continue_deployment_command_test.go index 66ce4535f91..e60dc83f8f3 100644 --- a/command/v7/continue_deployment_command_test.go +++ b/command/v7/continue_deployment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/copy_source_command.go b/command/v7/copy_source_command.go index c4ae96eeef1..382186c0570 100644 --- a/command/v7/copy_source_command.go +++ b/command/v7/copy_source_command.go @@ -1,14 +1,14 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type CopySourceCommand struct { diff --git a/command/v7/copy_source_command_test.go b/command/v7/copy_source_command_test.go index 9d3787dc6ff..6cc9ebedcf6 100644 --- a/command/v7/copy_source_command_test.go +++ b/command/v7/copy_source_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_app_command.go b/command/v7/create_app_command.go index 9b8a1e35baf..2960348924b 100644 --- a/command/v7/create_app_command.go +++ b/command/v7/create_app_command.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type CreateAppCommand struct { diff --git a/command/v7/create_app_command_test.go b/command/v7/create_app_command_test.go index a1b6cec95fa..90726214dbd 100644 --- a/command/v7/create_app_command_test.go +++ b/command/v7/create_app_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_app_manifest_command.go b/command/v7/create_app_manifest_command.go index 4a8e745f029..aca22da7392 100644 --- a/command/v7/create_app_manifest_command.go +++ b/command/v7/create_app_manifest_command.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type CreateAppManifestCommand struct { diff --git a/command/v7/create_app_manifest_command_test.go b/command/v7/create_app_manifest_command_test.go index eec45881d0c..94694eefd18 100644 --- a/command/v7/create_app_manifest_command_test.go +++ b/command/v7/create_app_manifest_command_test.go @@ -6,14 +6,14 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_buildpack_command.go b/command/v7/create_buildpack_command.go index 9b64dfbab36..294d6eb26dd 100644 --- a/command/v7/create_buildpack_command.go +++ b/command/v7/create_buildpack_command.go @@ -4,14 +4,14 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/download" ) type CreateBuildpackCommand struct { diff --git a/command/v7/create_buildpack_command_test.go b/command/v7/create_buildpack_command_test.go index e8d9556d804..612a45e2822 100644 --- a/command/v7/create_buildpack_command_test.go +++ b/command/v7/create_buildpack_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_isolation_segment_command.go b/command/v7/create_isolation_segment_command.go index 04026ec5edf..f8af3dde071 100644 --- a/command/v7/create_isolation_segment_command.go +++ b/command/v7/create_isolation_segment_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type CreateIsolationSegmentCommand struct { diff --git a/command/v7/create_isolation_segment_command_test.go b/command/v7/create_isolation_segment_command_test.go index 695fbc920ad..32b2d2dc4da 100644 --- a/command/v7/create_isolation_segment_command_test.go +++ b/command/v7/create_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_org_command.go b/command/v7/create_org_command.go index f28156bac8f..bba155a76b4 100644 --- a/command/v7/create_org_command.go +++ b/command/v7/create_org_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateOrgCommand struct { diff --git a/command/v7/create_org_command_test.go b/command/v7/create_org_command_test.go index d2ff5d0de6a..abbf6dbd571 100644 --- a/command/v7/create_org_command_test.go +++ b/command/v7/create_org_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_org_quota_command.go b/command/v7/create_org_quota_command.go index b4597e325aa..f5d6ab0fb59 100644 --- a/command/v7/create_org_quota_command.go +++ b/command/v7/create_org_quota_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) type CreateOrgQuotaCommand struct { diff --git a/command/v7/create_org_quota_command_test.go b/command/v7/create_org_quota_command_test.go index f69371cb0b1..edead36a573 100644 --- a/command/v7/create_org_quota_command_test.go +++ b/command/v7/create_org_quota_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_package_command.go b/command/v7/create_package_command.go index 47f6d2ff284..9b95e9a674a 100644 --- a/command/v7/create_package_command.go +++ b/command/v7/create_package_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type CreatePackageCommand struct { diff --git a/command/v7/create_package_command_test.go b/command/v7/create_package_command_test.go index c80cf76028b..66afbfd69d7 100644 --- a/command/v7/create_package_command_test.go +++ b/command/v7/create_package_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_private_domain_command.go b/command/v7/create_private_domain_command.go index 2a2dfa1624f..2701ca91c47 100644 --- a/command/v7/create_private_domain_command.go +++ b/command/v7/create_private_domain_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreatePrivateDomainCommand struct { diff --git a/command/v7/create_private_domain_command_test.go b/command/v7/create_private_domain_command_test.go index 62c5ab96c7e..67db5bf98cd 100644 --- a/command/v7/create_private_domain_command_test.go +++ b/command/v7/create_private_domain_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_route_command.go b/command/v7/create_route_command.go index 7d6fc07e6bd..f5336d96171 100644 --- a/command/v7/create_route_command.go +++ b/command/v7/create_route_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateRouteCommand struct { diff --git a/command/v7/create_route_command_test.go b/command/v7/create_route_command_test.go index 25e808f69a1..ba03ddf81e3 100644 --- a/command/v7/create_route_command_test.go +++ b/command/v7/create_route_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_security_group_command.go b/command/v7/create_security_group_command.go index 7c1f29c4b76..aa548f647ae 100644 --- a/command/v7/create_security_group_command.go +++ b/command/v7/create_security_group_command.go @@ -3,9 +3,9 @@ package v7 import ( "encoding/json" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateSecurityGroupCommand struct { diff --git a/command/v7/create_security_group_command_test.go b/command/v7/create_security_group_command_test.go index dc7bc65ad5e..753cfb291b7 100644 --- a/command/v7/create_security_group_command_test.go +++ b/command/v7/create_security_group_command_test.go @@ -5,15 +5,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_broker_command.go b/command/v7/create_service_broker_command.go index 9ca76c368a7..72902b8150d 100644 --- a/command/v7/create_service_broker_command.go +++ b/command/v7/create_service_broker_command.go @@ -3,11 +3,11 @@ package v7 import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type CreateServiceBrokerCommand struct { diff --git a/command/v7/create_service_broker_command_test.go b/command/v7/create_service_broker_command_test.go index d1e31d2d7a0..4655fb95d95 100644 --- a/command/v7/create_service_broker_command_test.go +++ b/command/v7/create_service_broker_command_test.go @@ -5,14 +5,14 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_command.go b/command/v7/create_service_command.go index ee10e723bba..6260e844233 100644 --- a/command/v7/create_service_command.go +++ b/command/v7/create_service_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type CreateServiceCommand struct { diff --git a/command/v7/create_service_command_test.go b/command/v7/create_service_command_test.go index a0686309003..f82df8701d9 100644 --- a/command/v7/create_service_command_test.go +++ b/command/v7/create_service_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_key_command.go b/command/v7/create_service_key_command.go index 34bfba0542d..632d22c0e6f 100644 --- a/command/v7/create_service_key_command.go +++ b/command/v7/create_service_key_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type CreateServiceKeyCommand struct { diff --git a/command/v7/create_service_key_command_test.go b/command/v7/create_service_key_command_test.go index 85d26518dae..f5b48cd804c 100644 --- a/command/v7/create_service_key_command_test.go +++ b/command/v7/create_service_key_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_shared_domain_command.go b/command/v7/create_shared_domain_command.go index feb9940e213..e48ec61dd6f 100644 --- a/command/v7/create_shared_domain_command.go +++ b/command/v7/create_shared_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateSharedDomainCommand struct { diff --git a/command/v7/create_shared_domain_command_test.go b/command/v7/create_shared_domain_command_test.go index d39ec8cae1a..9df31c8cbb3 100644 --- a/command/v7/create_shared_domain_command_test.go +++ b/command/v7/create_shared_domain_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_space_command.go b/command/v7/create_space_command.go index dd8b85dd7ba..4ed949383c0 100644 --- a/command/v7/create_space_command.go +++ b/command/v7/create_space_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type CreateSpaceActor interface { diff --git a/command/v7/create_space_command_test.go b/command/v7/create_space_command_test.go index 84f55a7b4f1..7b10eef3f97 100644 --- a/command/v7/create_space_command_test.go +++ b/command/v7/create_space_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_space_quota_command.go b/command/v7/create_space_quota_command.go index 250acde1844..f53ed3b3afe 100644 --- a/command/v7/create_space_quota_command.go +++ b/command/v7/create_space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateSpaceQuotaCommand struct { diff --git a/command/v7/create_space_quota_command_test.go b/command/v7/create_space_quota_command_test.go index 1d6f0314999..88d2b29168a 100644 --- a/command/v7/create_space_quota_command_test.go +++ b/command/v7/create_space_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_user_command.go b/command/v7/create_user_command.go index c3647bc3daf..d77337b7bc1 100644 --- a/command/v7/create_user_command.go +++ b/command/v7/create_user_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type CreateUserCommand struct { diff --git a/command/v7/create_user_command_test.go b/command/v7/create_user_command_test.go index 6f42a724227..d2ee137e54e 100644 --- a/command/v7/create_user_command_test.go +++ b/command/v7/create_user_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_user_provided_service_command.go b/command/v7/create_user_provided_service_command.go index 7b6b5fc27c7..c5d9ec963c0 100644 --- a/command/v7/create_user_provided_service_command.go +++ b/command/v7/create_user_provided_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type CreateUserProvidedServiceCommand struct { diff --git a/command/v7/create_user_provided_service_command_test.go b/command/v7/create_user_provided_service_command_test.go index c63c24c86d6..1d71d765921 100644 --- a/command/v7/create_user_provided_service_command_test.go +++ b/command/v7/create_user_provided_service_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/curl_command.go b/command/v7/curl_command.go index 764c5075254..2e283d82fed 100644 --- a/command/v7/curl_command.go +++ b/command/v7/curl_command.go @@ -4,8 +4,8 @@ import ( "net/http/httputil" "os" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type CurlCommand struct { diff --git a/command/v7/curl_command_test.go b/command/v7/curl_command_test.go index e7fc9fe8a89..01cfad5ecb4 100644 --- a/command/v7/curl_command_test.go +++ b/command/v7/curl_command_test.go @@ -5,12 +5,12 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_buildpack_command.go b/command/v7/delete_buildpack_command.go index c0d0e5f5717..df2de75096a 100644 --- a/command/v7/delete_buildpack_command.go +++ b/command/v7/delete_buildpack_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteBuildpackCommand struct { diff --git a/command/v7/delete_buildpack_command_test.go b/command/v7/delete_buildpack_command_test.go index ccd53b95b5d..67dd82b78d2 100644 --- a/command/v7/delete_buildpack_command_test.go +++ b/command/v7/delete_buildpack_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_command.go b/command/v7/delete_command.go index 23edea0b683..3d0bfc281f5 100644 --- a/command/v7/delete_command.go +++ b/command/v7/delete_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteCommand struct { diff --git a/command/v7/delete_command_test.go b/command/v7/delete_command_test.go index 2b1a256e1b4..0f5a4dd71a7 100644 --- a/command/v7/delete_command_test.go +++ b/command/v7/delete_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_isolation_segment_command.go b/command/v7/delete_isolation_segment_command.go index 4858cf110f3..d230c5f49eb 100644 --- a/command/v7/delete_isolation_segment_command.go +++ b/command/v7/delete_isolation_segment_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteIsolationSegmentCommand struct { diff --git a/command/v7/delete_isolation_segment_command_test.go b/command/v7/delete_isolation_segment_command_test.go index 560cb71281b..220725fa0d5 100644 --- a/command/v7/delete_isolation_segment_command_test.go +++ b/command/v7/delete_isolation_segment_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_org_command.go b/command/v7/delete_org_command.go index 33c38d99a11..2b2109fc3d8 100644 --- a/command/v7/delete_org_command.go +++ b/command/v7/delete_org_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteOrgCommand struct { diff --git a/command/v7/delete_org_command_test.go b/command/v7/delete_org_command_test.go index 70f947c9c7d..670a09abcce 100644 --- a/command/v7/delete_org_command_test.go +++ b/command/v7/delete_org_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_org_quota_command.go b/command/v7/delete_org_quota_command.go index b3199feb326..ce05f7c1d5f 100644 --- a/command/v7/delete_org_quota_command.go +++ b/command/v7/delete_org_quota_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteOrgQuotaCommand struct { diff --git a/command/v7/delete_org_quota_command_test.go b/command/v7/delete_org_quota_command_test.go index 60b2902f7a5..54973116721 100644 --- a/command/v7/delete_org_quota_command_test.go +++ b/command/v7/delete_org_quota_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_orphaned_routes_command_test.go b/command/v7/delete_orphaned_routes_command_test.go index 7cd5e1f7acc..b609abb13ab 100644 --- a/command/v7/delete_orphaned_routes_command_test.go +++ b/command/v7/delete_orphaned_routes_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/delete_private_domain_command.go b/command/v7/delete_private_domain_command.go index 52152a26516..f9ccb53912a 100644 --- a/command/v7/delete_private_domain_command.go +++ b/command/v7/delete_private_domain_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeletePrivateDomainCommand struct { diff --git a/command/v7/delete_private_domain_command_test.go b/command/v7/delete_private_domain_command_test.go index 57bf3c40e73..eb47d2cc5a1 100644 --- a/command/v7/delete_private_domain_command_test.go +++ b/command/v7/delete_private_domain_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_route_command.go b/command/v7/delete_route_command.go index 9b707dc8fba..53175e2647e 100644 --- a/command/v7/delete_route_command.go +++ b/command/v7/delete_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteRouteCommand struct { diff --git a/command/v7/delete_route_command_test.go b/command/v7/delete_route_command_test.go index 7452857ee50..31ff69e20c5 100644 --- a/command/v7/delete_route_command_test.go +++ b/command/v7/delete_route_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/delete_security_group_command.go b/command/v7/delete_security_group_command.go index 6a941bcd45f..4f6b8a6eb62 100644 --- a/command/v7/delete_security_group_command.go +++ b/command/v7/delete_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteSecurityGroupCommand struct { diff --git a/command/v7/delete_security_group_command_test.go b/command/v7/delete_security_group_command_test.go index f9573ace688..2f38acb9838 100644 --- a/command/v7/delete_security_group_command_test.go +++ b/command/v7/delete_security_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_broker_command.go b/command/v7/delete_service_broker_command.go index 3a7206d55f4..79b348bbefb 100644 --- a/command/v7/delete_service_broker_command.go +++ b/command/v7/delete_service_broker_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteServiceBrokerCommand struct { diff --git a/command/v7/delete_service_broker_command_test.go b/command/v7/delete_service_broker_command_test.go index e8beb1216d6..997f4c14e98 100644 --- a/command/v7/delete_service_broker_command_test.go +++ b/command/v7/delete_service_broker_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_command.go b/command/v7/delete_service_command.go index 670d5d8b34a..d5b6e51bb3b 100644 --- a/command/v7/delete_service_command.go +++ b/command/v7/delete_service_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type DeleteServiceCommand struct { diff --git a/command/v7/delete_service_command_test.go b/command/v7/delete_service_command_test.go index d9ff8e58f33..47f98a04a64 100644 --- a/command/v7/delete_service_command_test.go +++ b/command/v7/delete_service_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_key_command.go b/command/v7/delete_service_key_command.go index 52cec6cc8cd..9a3d5d2b92a 100644 --- a/command/v7/delete_service_key_command.go +++ b/command/v7/delete_service_key_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type DeleteServiceKeyCommand struct { diff --git a/command/v7/delete_service_key_command_test.go b/command/v7/delete_service_key_command_test.go index 1e2440635cb..f6067f228c9 100644 --- a/command/v7/delete_service_key_command_test.go +++ b/command/v7/delete_service_key_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_shared_domain_command.go b/command/v7/delete_shared_domain_command.go index f0045f6c0c8..e7d54ee3939 100644 --- a/command/v7/delete_shared_domain_command.go +++ b/command/v7/delete_shared_domain_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type DeleteSharedDomainCommand struct { diff --git a/command/v7/delete_shared_domain_command_test.go b/command/v7/delete_shared_domain_command_test.go index 578fea3e99f..1e0aa184c01 100644 --- a/command/v7/delete_shared_domain_command_test.go +++ b/command/v7/delete_shared_domain_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_space_command.go b/command/v7/delete_space_command.go index efc65de0e2b..eede1fc1bb0 100644 --- a/command/v7/delete_space_command.go +++ b/command/v7/delete_space_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteSpaceCommand struct { diff --git a/command/v7/delete_space_command_test.go b/command/v7/delete_space_command_test.go index 67078fa50d4..e059504e14d 100644 --- a/command/v7/delete_space_command_test.go +++ b/command/v7/delete_space_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_space_quota_command.go b/command/v7/delete_space_quota_command.go index a12b9648a36..d35f947a229 100644 --- a/command/v7/delete_space_quota_command.go +++ b/command/v7/delete_space_quota_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteSpaceQuotaCommand struct { diff --git a/command/v7/delete_space_quota_command_test.go b/command/v7/delete_space_quota_command_test.go index 3100b179245..c8b7d52e005 100644 --- a/command/v7/delete_space_quota_command_test.go +++ b/command/v7/delete_space_quota_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_user_command.go b/command/v7/delete_user_command.go index a4ca2975918..ac6e5cc4fbe 100644 --- a/command/v7/delete_user_command.go +++ b/command/v7/delete_user_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteUserCommand struct { diff --git a/command/v7/delete_user_command_test.go b/command/v7/delete_user_command_test.go index d38ee81e2a8..0292aab0d87 100644 --- a/command/v7/delete_user_command_test.go +++ b/command/v7/delete_user_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disable_feature_flag_command.go b/command/v7/disable_feature_flag_command.go index 6c3e36678ab..92d6e2ae8b1 100644 --- a/command/v7/disable_feature_flag_command.go +++ b/command/v7/disable_feature_flag_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisableFeatureFlagCommand struct { diff --git a/command/v7/disable_feature_flag_command_test.go b/command/v7/disable_feature_flag_command_test.go index 768f1bacf42..905d008d3c8 100644 --- a/command/v7/disable_feature_flag_command_test.go +++ b/command/v7/disable_feature_flag_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/disable_org_isolation_command.go b/command/v7/disable_org_isolation_command.go index a430f0ad058..1f28de762d4 100644 --- a/command/v7/disable_org_isolation_command.go +++ b/command/v7/disable_org_isolation_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisableOrgIsolationCommand struct { diff --git a/command/v7/disable_org_isolation_command_test.go b/command/v7/disable_org_isolation_command_test.go index 88934934a02..7747a49d3b4 100644 --- a/command/v7/disable_org_isolation_command_test.go +++ b/command/v7/disable_org_isolation_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disable_service_access_command.go b/command/v7/disable_service_access_command.go index 5abd3b9359e..b1517a6c847 100644 --- a/command/v7/disable_service_access_command.go +++ b/command/v7/disable_service_access_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisableServiceAccessCommand struct { diff --git a/command/v7/disable_service_access_command_test.go b/command/v7/disable_service_access_command_test.go index e890dbba8b2..66d59d1ab0a 100644 --- a/command/v7/disable_service_access_command_test.go +++ b/command/v7/disable_service_access_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/disable_ssh_command.go b/command/v7/disable_ssh_command.go index 794f0b0f36a..f9decf64332 100644 --- a/command/v7/disable_ssh_command.go +++ b/command/v7/disable_ssh_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisableSSHCommand struct { diff --git a/command/v7/disable_ssh_command_test.go b/command/v7/disable_ssh_command_test.go index de49782edcc..64498e77c30 100644 --- a/command/v7/disable_ssh_command_test.go +++ b/command/v7/disable_ssh_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disallow_space_ssh_command.go b/command/v7/disallow_space_ssh_command.go index 295d3d966de..fa88f89f421 100644 --- a/command/v7/disallow_space_ssh_command.go +++ b/command/v7/disallow_space_ssh_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisallowSpaceSSHCommand struct { diff --git a/command/v7/disallow_space_ssh_command_test.go b/command/v7/disallow_space_ssh_command_test.go index b227e456968..59614b37686 100644 --- a/command/v7/disallow_space_ssh_command_test.go +++ b/command/v7/disallow_space_ssh_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/docker_password_getter_test.go b/command/v7/docker_password_getter_test.go index f649b1a6e94..1aae65aab3f 100644 --- a/command/v7/docker_password_getter_test.go +++ b/command/v7/docker_password_getter_test.go @@ -1,9 +1,9 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/domains_command.go b/command/v7/domains_command.go index 09b59929f59..ddf65c2f134 100644 --- a/command/v7/domains_command.go +++ b/command/v7/domains_command.go @@ -4,9 +4,9 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/sorting" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/sorting" + "code.cloudfoundry.org/cli/v9/util/ui" ) type DomainsCommand struct { diff --git a/command/v7/domains_command_test.go b/command/v7/domains_command_test.go index 6939df7a049..4585b4d696a 100644 --- a/command/v7/domains_command_test.go +++ b/command/v7/domains_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/download_droplet_command.go b/command/v7/download_droplet_command.go index a04e4a94bcc..4bb47d66d9f 100644 --- a/command/v7/download_droplet_command.go +++ b/command/v7/download_droplet_command.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type DownloadDropletCommand struct { diff --git a/command/v7/download_droplet_command_test.go b/command/v7/download_droplet_command_test.go index 3db2c2db9fd..39c58391d39 100644 --- a/command/v7/download_droplet_command_test.go +++ b/command/v7/download_droplet_command_test.go @@ -7,14 +7,14 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/droplets_command.go b/command/v7/droplets_command.go index 2e61020c71e..3e6f78002cd 100644 --- a/command/v7/droplets_command.go +++ b/command/v7/droplets_command.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type DropletsCommand struct { diff --git a/command/v7/droplets_command_test.go b/command/v7/droplets_command_test.go index 1a8497080f7..fba89488cf1 100644 --- a/command/v7/droplets_command_test.go +++ b/command/v7/droplets_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_feature_flag_command.go b/command/v7/enable_feature_flag_command.go index f15945aa8e2..f942cc84922 100644 --- a/command/v7/enable_feature_flag_command.go +++ b/command/v7/enable_feature_flag_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type EnableFeatureFlagCommand struct { diff --git a/command/v7/enable_feature_flag_command_test.go b/command/v7/enable_feature_flag_command_test.go index 95dc6121999..1899f7a0733 100644 --- a/command/v7/enable_feature_flag_command_test.go +++ b/command/v7/enable_feature_flag_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_org_isolation_command.go b/command/v7/enable_org_isolation_command.go index be089ce48c5..5e5d9164b77 100644 --- a/command/v7/enable_org_isolation_command.go +++ b/command/v7/enable_org_isolation_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type EnableOrgIsolationCommand struct { diff --git a/command/v7/enable_org_isolation_command_test.go b/command/v7/enable_org_isolation_command_test.go index b76cb50c7d4..deb27c9e03c 100644 --- a/command/v7/enable_org_isolation_command_test.go +++ b/command/v7/enable_org_isolation_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/enable_service_access_command.go b/command/v7/enable_service_access_command.go index 3246cf9a3e8..bf336f7b20d 100644 --- a/command/v7/enable_service_access_command.go +++ b/command/v7/enable_service_access_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" ) type EnableServiceAccessCommand struct { diff --git a/command/v7/enable_service_access_command_test.go b/command/v7/enable_service_access_command_test.go index fa7c39516ad..a22fb832899 100644 --- a/command/v7/enable_service_access_command_test.go +++ b/command/v7/enable_service_access_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_ssh_command.go b/command/v7/enable_ssh_command.go index dcb8f9044e4..90114f47838 100644 --- a/command/v7/enable_ssh_command.go +++ b/command/v7/enable_ssh_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type EnableSSHCommand struct { diff --git a/command/v7/enable_ssh_command_test.go b/command/v7/enable_ssh_command_test.go index 8ef14a64e96..74c5733fbf1 100644 --- a/command/v7/enable_ssh_command_test.go +++ b/command/v7/enable_ssh_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/env_command.go b/command/v7/env_command.go index 0d924c1473a..735d89261a4 100644 --- a/command/v7/env_command.go +++ b/command/v7/env_command.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" log "github.com/sirupsen/logrus" ) diff --git a/command/v7/env_command_test.go b/command/v7/env_command_test.go index 13ff12e372f..a9147384524 100644 --- a/command/v7/env_command_test.go +++ b/command/v7/env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/events_command.go b/command/v7/events_command.go index bca46d76781..4cc18447006 100644 --- a/command/v7/events_command.go +++ b/command/v7/events_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type EventsCommand struct { diff --git a/command/v7/events_command_test.go b/command/v7/events_command_test.go index a4a3fccb30c..069f67f57a3 100644 --- a/command/v7/events_command_test.go +++ b/command/v7/events_command_test.go @@ -5,16 +5,16 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/feature_flag_command.go b/command/v7/feature_flag_command.go index 4a0db0e2aac..868708690c3 100644 --- a/command/v7/feature_flag_command.go +++ b/command/v7/feature_flag_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FeatureFlagCommand struct { diff --git a/command/v7/feature_flag_command_test.go b/command/v7/feature_flag_command_test.go index 01ada75b2d1..0cf47253e32 100644 --- a/command/v7/feature_flag_command_test.go +++ b/command/v7/feature_flag_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/feature_flags_command.go b/command/v7/feature_flags_command.go index 64c6ce47d03..1bccc80266c 100644 --- a/command/v7/feature_flags_command.go +++ b/command/v7/feature_flags_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FeatureFlagsCommand struct { diff --git a/command/v7/feature_flags_command_test.go b/command/v7/feature_flags_command_test.go index 7d3da5ecd41..f5b0019327e 100644 --- a/command/v7/feature_flags_command_test.go +++ b/command/v7/feature_flags_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/get_health_check_command.go b/command/v7/get_health_check_command.go index 050f6a568de..5f077d13c60 100644 --- a/command/v7/get_health_check_command.go +++ b/command/v7/get_health_check_command.go @@ -3,9 +3,9 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type GetHealthCheckCommand struct { diff --git a/command/v7/get_health_check_command_test.go b/command/v7/get_health_check_command_test.go index 095a2626251..a06963ac702 100644 --- a/command/v7/get_health_check_command_test.go +++ b/command/v7/get_health_check_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/isolation_segments_command.go b/command/v7/isolation_segments_command.go index 8eed00effa0..1351f6d1ecd 100644 --- a/command/v7/isolation_segments_command.go +++ b/command/v7/isolation_segments_command.go @@ -3,7 +3,7 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type IsolationSegmentsCommand struct { diff --git a/command/v7/isolation_segments_command_test.go b/command/v7/isolation_segments_command_test.go index df543567f47..46447a87bda 100644 --- a/command/v7/isolation_segments_command_test.go +++ b/command/v7/isolation_segments_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/label_updater.go b/command/v7/label_updater.go index ce48fcd2854..67b72a41816 100644 --- a/command/v7/label_updater.go +++ b/command/v7/label_updater.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SetLabelActor diff --git a/command/v7/label_updater_test.go b/command/v7/label_updater_test.go index 94843b12d5a..985b100c359 100644 --- a/command/v7/label_updater_test.go +++ b/command/v7/label_updater_test.go @@ -5,14 +5,14 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/labels_command.go b/command/v7/labels_command.go index 1899b43f83c..36af62c8de5 100644 --- a/command/v7/labels_command.go +++ b/command/v7/labels_command.go @@ -5,11 +5,11 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" ) type ResourceType string diff --git a/command/v7/labels_command_test.go b/command/v7/labels_command_test.go index e854d678704..9356dedcd20 100644 --- a/command/v7/labels_command_test.go +++ b/command/v7/labels_command_test.go @@ -5,15 +5,15 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/login_command.go b/command/v7/login_command.go index a98aaf695ac..40466ff178d 100644 --- a/command/v7/login_command.go +++ b/command/v7/login_command.go @@ -6,19 +6,19 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ActorReloader diff --git a/command/v7/login_command_test.go b/command/v7/login_command_test.go index 7b012f44939..a5730fc134e 100644 --- a/command/v7/login_command_test.go +++ b/command/v7/login_command_test.go @@ -5,19 +5,19 @@ import ( "fmt" "io" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/logout_command.go b/command/v7/logout_command.go index 65892c95215..2b054d2d4e0 100644 --- a/command/v7/logout_command.go +++ b/command/v7/logout_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/v7/shared" "code.cloudfoundry.org/clock" ) diff --git a/command/v7/logout_command_test.go b/command/v7/logout_command_test.go index e5abdf28aca..a7381fd5540 100644 --- a/command/v7/logout_command_test.go +++ b/command/v7/logout_command_test.go @@ -1,12 +1,12 @@ package v7_test import ( - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/logs_command.go b/command/v7/logs_command.go index b2506240752..b03449a14b0 100644 --- a/command/v7/logs_command.go +++ b/command/v7/logs_command.go @@ -5,12 +5,12 @@ import ( "os/signal" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" ) type LogsCommand struct { diff --git a/command/v7/logs_command_test.go b/command/v7/logs_command_test.go index 61cf0121764..b389f8c28e8 100644 --- a/command/v7/logs_command_test.go +++ b/command/v7/logs_command_test.go @@ -5,15 +5,15 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -268,7 +268,7 @@ var _ = Describe("logs command", func() { errorStream := make(chan error) go func() { - logStream <- *sharedaction.NewLogMessage("Here are some staging logs!", "OUT", time.Now(), sharedaction.StagingLog, "sourceInstance") //TODO: is it ok to leave staging logs here? + logStream <- *sharedaction.NewLogMessage("Here are some staging logs!", "OUT", time.Now(), sharedaction.StagingLog, "sourceInstance") // TODO: is it ok to leave staging logs here? logStream <- *sharedaction.NewLogMessage("Here are some other staging logs!", "OUT", time.Now(), sharedaction.StagingLog, "sourceInstance") close(logStream) close(errorStream) diff --git a/command/v7/map_route_command.go b/command/v7/map_route_command.go index c9ca6b381ac..f64cbb55bdb 100644 --- a/command/v7/map_route_command.go +++ b/command/v7/map_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type MapRouteCommand struct { diff --git a/command/v7/map_route_command_test.go b/command/v7/map_route_command_test.go index 13e78d31459..aeff2feb31d 100644 --- a/command/v7/map_route_command_test.go +++ b/command/v7/map_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/marketplace_command.go b/command/v7/marketplace_command.go index 47adc8eb88a..1ae4a0737e5 100644 --- a/command/v7/marketplace_command.go +++ b/command/v7/marketplace_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type MarketplaceCommand struct { diff --git a/command/v7/marketplace_command_test.go b/command/v7/marketplace_command_test.go index cf27c435c36..5f4e61e421e 100644 --- a/command/v7/marketplace_command_test.go +++ b/command/v7/marketplace_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/move_route_command.go b/command/v7/move_route_command.go index d9425362b78..9efadedf101 100644 --- a/command/v7/move_route_command.go +++ b/command/v7/move_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type MoveRouteCommand struct { diff --git a/command/v7/move_route_command_test.go b/command/v7/move_route_command_test.go index 9b62af8c8da..7299d2f6e11 100644 --- a/command/v7/move_route_command_test.go +++ b/command/v7/move_route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/network_policies_command.go b/command/v7/network_policies_command.go index 6a8a6e1f1d5..8b6832bcc0c 100644 --- a/command/v7/network_policies_command.go +++ b/command/v7/network_policies_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkPoliciesActor diff --git a/command/v7/network_policies_command_test.go b/command/v7/network_policies_command_test.go index 0e2b8b51537..f386afcc140 100644 --- a/command/v7/network_policies_command_test.go +++ b/command/v7/network_policies_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/oauth_token_command.go b/command/v7/oauth_token_command.go index a5feff234a1..3ef68ec2fb3 100644 --- a/command/v7/oauth_token_command.go +++ b/command/v7/oauth_token_command.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" ) type OauthTokenCommand struct { diff --git a/command/v7/oauth_token_command_test.go b/command/v7/oauth_token_command_test.go index 51eac274dcd..1621b2a0308 100644 --- a/command/v7/oauth_token_command_test.go +++ b/command/v7/oauth_token_command_test.go @@ -3,11 +3,11 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" . "github.com/onsi/ginkgo/v2" diff --git a/command/v7/org_command.go b/command/v7/org_command.go index 0f2a238713c..fe8a9335ffd 100644 --- a/command/v7/org_command.go +++ b/command/v7/org_command.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type OrgCommand struct { diff --git a/command/v7/org_command_test.go b/command/v7/org_command_test.go index 2305d75de95..fda1655f7d4 100644 --- a/command/v7/org_command_test.go +++ b/command/v7/org_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/org_quota_command.go b/command/v7/org_quota_command.go index 5458bb24fb7..ded9fc71b02 100644 --- a/command/v7/org_quota_command.go +++ b/command/v7/org_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type OrgQuotaCommand struct { diff --git a/command/v7/org_quota_command_test.go b/command/v7/org_quota_command_test.go index 6a6b26d0f8f..0aa2c6b2870 100644 --- a/command/v7/org_quota_command_test.go +++ b/command/v7/org_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/org_quotas_command.go b/command/v7/org_quotas_command.go index 2fb561d07f0..b0251d47686 100644 --- a/command/v7/org_quotas_command.go +++ b/command/v7/org_quotas_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type OrgQuotasCommand struct { diff --git a/command/v7/org_quotas_command_test.go b/command/v7/org_quotas_command_test.go index faefb6e9bc5..24db5c7251a 100644 --- a/command/v7/org_quotas_command_test.go +++ b/command/v7/org_quotas_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/org_users_command.go b/command/v7/org_users_command.go index f7af79783b4..736659cf32a 100644 --- a/command/v7/org_users_command.go +++ b/command/v7/org_users_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type OrgUsersCommand struct { diff --git a/command/v7/org_users_command_test.go b/command/v7/org_users_command_test.go index f3bce296942..a77806a0855 100644 --- a/command/v7/org_users_command_test.go +++ b/command/v7/org_users_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/orgs_command.go b/command/v7/orgs_command.go index 92c2cd179b4..d2293eee1e2 100644 --- a/command/v7/orgs_command.go +++ b/command/v7/orgs_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type OrgsCommand struct { diff --git a/command/v7/orgs_command_test.go b/command/v7/orgs_command_test.go index 15ad5a3a8dd..2d089f0a0f5 100644 --- a/command/v7/orgs_command_test.go +++ b/command/v7/orgs_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/packages_command.go b/command/v7/packages_command.go index 2aa01385d7f..c0c372ff3c2 100644 --- a/command/v7/packages_command.go +++ b/command/v7/packages_command.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type PackagesCommand struct { diff --git a/command/v7/packages_command_test.go b/command/v7/packages_command_test.go index e9a1a283c18..eab375f7086 100644 --- a/command/v7/packages_command_test.go +++ b/command/v7/packages_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/passwd_command.go b/command/v7/passwd_command.go index f68baa1cb12..187d57b4979 100644 --- a/command/v7/passwd_command.go +++ b/command/v7/passwd_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type PasswdCommand struct { diff --git a/command/v7/passwd_command_test.go b/command/v7/passwd_command_test.go index 3bc9b12466d..23b67812de8 100644 --- a/command/v7/passwd_command_test.go +++ b/command/v7/passwd_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/purge_service_instance_command.go b/command/v7/purge_service_instance_command.go index fc646e47cf8..7b0a07be3c5 100644 --- a/command/v7/purge_service_instance_command.go +++ b/command/v7/purge_service_instance_command.go @@ -3,8 +3,8 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) const purgeServiceInstanceWarning = "WARNING: This operation assumes that the service broker responsible for this service instance is no longer available or is not responding with a 200 or 410, and the service instance has been deleted, leaving orphan records in Cloud Foundry's database. All knowledge of the service instance will be removed from Cloud Foundry, including service bindings and service keys." diff --git a/command/v7/purge_service_instance_command_test.go b/command/v7/purge_service_instance_command_test.go index 6c455d84d40..c1e60b201b6 100644 --- a/command/v7/purge_service_instance_command_test.go +++ b/command/v7/purge_service_instance_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/purge_service_offering_command.go b/command/v7/purge_service_offering_command.go index a8268c612ab..cb7163e00dc 100644 --- a/command/v7/purge_service_offering_command.go +++ b/command/v7/purge_service_offering_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type PurgeServiceOfferingCommand struct { diff --git a/command/v7/purge_service_offering_command_test.go b/command/v7/purge_service_offering_command_test.go index c52d0335cd4..3536d688ef6 100644 --- a/command/v7/purge_service_offering_command_test.go +++ b/command/v7/purge_service_offering_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/push_command.go b/command/v7/push_command.go index be86db3ebd4..6086283b5a7 100644 --- a/command/v7/push_command.go +++ b/command/v7/push_command.go @@ -10,22 +10,22 @@ import ( log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/manifestparser" - "code.cloudfoundry.org/cli/util/progressbar" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/progressbar" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ProgressBar diff --git a/command/v7/push_command_test.go b/command/v7/push_command_test.go index 1a58b4cfafe..eafa30ae108 100644 --- a/command/v7/push_command_test.go +++ b/command/v7/push_command_test.go @@ -5,23 +5,23 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/manifestparser" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" diff --git a/command/v7/remove_network_policy_command.go b/command/v7/remove_network_policy_command.go index c959bd40678..632f476d4e2 100644 --- a/command/v7/remove_network_policy_command.go +++ b/command/v7/remove_network_policy_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RemoveNetworkPolicyActor diff --git a/command/v7/remove_network_policy_command_test.go b/command/v7/remove_network_policy_command_test.go index 0072802ae59..387ec932876 100644 --- a/command/v7/remove_network_policy_command_test.go +++ b/command/v7/remove_network_policy_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_command.go b/command/v7/rename_command.go index a2bb0b6efe0..3a689342267 100644 --- a/command/v7/rename_command.go +++ b/command/v7/rename_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RenameCommand struct { diff --git a/command/v7/rename_command_test.go b/command/v7/rename_command_test.go index 865eddc1e5a..86051328d4d 100644 --- a/command/v7/rename_command_test.go +++ b/command/v7/rename_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_org_command.go b/command/v7/rename_org_command.go index 628095f80d5..a65c58f636d 100644 --- a/command/v7/rename_org_command.go +++ b/command/v7/rename_org_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RenameOrgCommand struct { diff --git a/command/v7/rename_org_command_test.go b/command/v7/rename_org_command_test.go index 2a1a5a48b05..8a53f76a2fd 100644 --- a/command/v7/rename_org_command_test.go +++ b/command/v7/rename_org_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_service_broker_command.go b/command/v7/rename_service_broker_command.go index 4cd5ad001a8..7bc061185ec 100644 --- a/command/v7/rename_service_broker_command.go +++ b/command/v7/rename_service_broker_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type RenameServiceBrokerCommand struct { diff --git a/command/v7/rename_service_broker_command_test.go b/command/v7/rename_service_broker_command_test.go index 28ff92efb9d..9d38d3ebcec 100644 --- a/command/v7/rename_service_broker_command_test.go +++ b/command/v7/rename_service_broker_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_service_command.go b/command/v7/rename_service_command.go index 8380d564cb0..68036d79380 100644 --- a/command/v7/rename_service_command.go +++ b/command/v7/rename_service_command.go @@ -3,9 +3,9 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type RenameServiceCommand struct { diff --git a/command/v7/rename_service_command_test.go b/command/v7/rename_service_command_test.go index 776f0b70c66..e7d42f6f2ab 100644 --- a/command/v7/rename_service_command_test.go +++ b/command/v7/rename_service_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_space_command.go b/command/v7/rename_space_command.go index cf63ebf7d14..44d76ca186d 100644 --- a/command/v7/rename_space_command.go +++ b/command/v7/rename_space_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RenameSpaceCommand struct { diff --git a/command/v7/rename_space_command_test.go b/command/v7/rename_space_command_test.go index 1dc39eacdde..48a446de860 100644 --- a/command/v7/rename_space_command_test.go +++ b/command/v7/rename_space_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/reset_org_default_isolation_segment_command.go b/command/v7/reset_org_default_isolation_segment_command.go index 26763b4ff45..4d5a066fe68 100644 --- a/command/v7/reset_org_default_isolation_segment_command.go +++ b/command/v7/reset_org_default_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type ResetOrgDefaultIsolationSegmentCommand struct { diff --git a/command/v7/reset_org_default_isolation_segment_command_test.go b/command/v7/reset_org_default_isolation_segment_command_test.go index 9529c3d6e30..af9ba1fadfe 100644 --- a/command/v7/reset_org_default_isolation_segment_command_test.go +++ b/command/v7/reset_org_default_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/reset_space_isolation_segment_command.go b/command/v7/reset_space_isolation_segment_command.go index 4d878135064..4c5e54d6e38 100644 --- a/command/v7/reset_space_isolation_segment_command.go +++ b/command/v7/reset_space_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type ResetSpaceIsolationSegmentCommand struct { diff --git a/command/v7/reset_space_isolation_segment_command_test.go b/command/v7/reset_space_isolation_segment_command_test.go index ee99a5ff94b..c5dea91902c 100644 --- a/command/v7/reset_space_isolation_segment_command_test.go +++ b/command/v7/reset_space_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restage_command.go b/command/v7/restage_command.go index 6fa503b2d81..71000c6878c 100644 --- a/command/v7/restage_command.go +++ b/command/v7/restage_command.go @@ -1,14 +1,14 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type RestageCommand struct { diff --git a/command/v7/restage_command_test.go b/command/v7/restage_command_test.go index 8cddad4ca5e..2fc83519298 100644 --- a/command/v7/restage_command_test.go +++ b/command/v7/restage_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restart_app_instance_command.go b/command/v7/restart_app_instance_command.go index 756f3941022..59abb58690a 100644 --- a/command/v7/restart_app_instance_command.go +++ b/command/v7/restart_app_instance_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RestartAppInstanceCommand struct { diff --git a/command/v7/restart_app_instance_command_test.go b/command/v7/restart_app_instance_command_test.go index ad616d14748..e79f96cd47b 100644 --- a/command/v7/restart_app_instance_command_test.go +++ b/command/v7/restart_app_instance_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restart_command.go b/command/v7/restart_command.go index dfbe9c5e4a2..a8d8101c564 100644 --- a/command/v7/restart_command.go +++ b/command/v7/restart_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type RestartCommand struct { diff --git a/command/v7/restart_command_test.go b/command/v7/restart_command_test.go index 4d4f8e828bd..bcd1e9592ba 100644 --- a/command/v7/restart_command_test.go +++ b/command/v7/restart_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/revision_command.go b/command/v7/revision_command.go index c9e23af5464..cf9667e94e3 100644 --- a/command/v7/revision_command.go +++ b/command/v7/revision_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type RevisionCommand struct { diff --git a/command/v7/revision_command_test.go b/command/v7/revision_command_test.go index 659ec9e8ad6..2f822069205 100644 --- a/command/v7/revision_command_test.go +++ b/command/v7/revision_command_test.go @@ -1,18 +1,18 @@ package v7_test import ( - "errors" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "errors" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/revisions_command.go b/command/v7/revisions_command.go index c9e6373fe22..31c097e3e28 100644 --- a/command/v7/revisions_command.go +++ b/command/v7/revisions_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RevisionsActor diff --git a/command/v7/revisions_command_test.go b/command/v7/revisions_command_test.go index 6af5b8ff3d9..9e88f6bea0c 100644 --- a/command/v7/revisions_command_test.go +++ b/command/v7/revisions_command_test.go @@ -4,16 +4,16 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rollback_command.go b/command/v7/rollback_command.go index 477b75bdeea..9179bbdec56 100644 --- a/command/v7/rollback_command.go +++ b/command/v7/rollback_command.go @@ -3,13 +3,13 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type RollbackCommand struct { diff --git a/command/v7/rollback_command_test.go b/command/v7/rollback_command_test.go index 3218d02a9b6..4b420ba306b 100644 --- a/command/v7/rollback_command_test.go +++ b/command/v7/rollback_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/route_command.go b/command/v7/route_command.go index 1ed64478ee6..8100568cbe0 100644 --- a/command/v7/route_command.go +++ b/command/v7/route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" "strconv" ) diff --git a/command/v7/route_command_test.go b/command/v7/route_command_test.go index 7a101409149..ed9521030c2 100644 --- a/command/v7/route_command_test.go +++ b/command/v7/route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/router_groups_command.go b/command/v7/router_groups_command.go index 924d8b44e08..d89a7b6da55 100644 --- a/command/v7/router_groups_command.go +++ b/command/v7/router_groups_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/util/ui" ) type RouterGroupsCommand struct { diff --git a/command/v7/router_groups_command_test.go b/command/v7/router_groups_command_test.go index 2bf4cc47765..6bf1453c896 100644 --- a/command/v7/router_groups_command_test.go +++ b/command/v7/router_groups_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/routes_command.go b/command/v7/routes_command.go index 437704cdc8f..2220a257093 100644 --- a/command/v7/routes_command.go +++ b/command/v7/routes_command.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type RoutesCommand struct { diff --git a/command/v7/routes_command_test.go b/command/v7/routes_command_test.go index 0ae594bcd6c..0d0edf5c660 100644 --- a/command/v7/routes_command_test.go +++ b/command/v7/routes_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/run_task_command.go b/command/v7/run_task_command.go index a8f6e96b153..f345d40ee39 100644 --- a/command/v7/run_task_command.go +++ b/command/v7/run_task_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type RunTaskCommand struct { diff --git a/command/v7/run_task_command_test.go b/command/v7/run_task_command_test.go index 585e40f4556..1de9b1925f2 100644 --- a/command/v7/run_task_command_test.go +++ b/command/v7/run_task_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/running_environment_variable_group_command.go b/command/v7/running_environment_variable_group_command.go index 9f36b48809e..596a740cfc4 100644 --- a/command/v7/running_environment_variable_group_command.go +++ b/command/v7/running_environment_variable_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/util/ui" ) type RunningEnvironmentVariableGroupCommand struct { diff --git a/command/v7/running_environment_variable_group_command_test.go b/command/v7/running_environment_variable_group_command_test.go index 3378b273f7c..0de38b2dbea 100644 --- a/command/v7/running_environment_variable_group_command_test.go +++ b/command/v7/running_environment_variable_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/running_security_groups_command.go b/command/v7/running_security_groups_command.go index 07969d0e485..14c5d756142 100644 --- a/command/v7/running_security_groups_command.go +++ b/command/v7/running_security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type RunningSecurityGroupsCommand struct { diff --git a/command/v7/running_security_groups_command_test.go b/command/v7/running_security_groups_command_test.go index e0608753189..d789fad8fc3 100644 --- a/command/v7/running_security_groups_command_test.go +++ b/command/v7/running_security_groups_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/scale_command.go b/command/v7/scale_command.go index 99bda380f9f..0af339878e7 100644 --- a/command/v7/scale_command.go +++ b/command/v7/scale_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type ScaleCommand struct { diff --git a/command/v7/scale_command_test.go b/command/v7/scale_command_test.go index 94fc2d3c8a5..e49027876f6 100644 --- a/command/v7/scale_command_test.go +++ b/command/v7/scale_command_test.go @@ -4,18 +4,18 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/security_group_command.go b/command/v7/security_group_command.go index b264d4a0009..719b3306239 100644 --- a/command/v7/security_group_command.go +++ b/command/v7/security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type SecurityGroupCommand struct { diff --git a/command/v7/security_group_command_test.go b/command/v7/security_group_command_test.go index 55520061eed..fff05abcbf7 100644 --- a/command/v7/security_group_command_test.go +++ b/command/v7/security_group_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/security_groups_command.go b/command/v7/security_groups_command.go index b5b1442b794..9f35a5e99c9 100644 --- a/command/v7/security_groups_command.go +++ b/command/v7/security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type SecurityGroupsCommand struct { diff --git a/command/v7/security_groups_command_test.go b/command/v7/security_groups_command_test.go index 978ea302cd5..4b8ab81e934 100644 --- a/command/v7/security_groups_command_test.go +++ b/command/v7/security_groups_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_access_command.go b/command/v7/service_access_command.go index f61fb64ac3f..c9d133181a2 100644 --- a/command/v7/service_access_command.go +++ b/command/v7/service_access_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" ) type ServiceAccessCommand struct { diff --git a/command/v7/service_access_command_test.go b/command/v7/service_access_command_test.go index 174d82b719c..e8b47e56ff7 100644 --- a/command/v7/service_access_command_test.go +++ b/command/v7/service_access_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/service_brokers_command.go b/command/v7/service_brokers_command.go index 4c36910b29b..759b9d3b0ee 100644 --- a/command/v7/service_brokers_command.go +++ b/command/v7/service_brokers_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type ServiceBrokersCommand struct { diff --git a/command/v7/service_brokers_command_test.go b/command/v7/service_brokers_command_test.go index b6d3fe4177b..61bd4f8fe8b 100644 --- a/command/v7/service_brokers_command_test.go +++ b/command/v7/service_brokers_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_command.go b/command/v7/service_command.go index c528d7ae59f..db4e3556d9c 100644 --- a/command/v7/service_command.go +++ b/command/v7/service_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) const indent = " " diff --git a/command/v7/service_command_test.go b/command/v7/service_command_test.go index cddd13ac087..200e4e7c95d 100644 --- a/command/v7/service_command_test.go +++ b/command/v7/service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_key_command.go b/command/v7/service_key_command.go index 9bb96a4007e..140be00ac7d 100644 --- a/command/v7/service_key_command.go +++ b/command/v7/service_key_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type ServiceKeyCommand struct { diff --git a/command/v7/service_key_command_test.go b/command/v7/service_key_command_test.go index ceaa655266b..0ec7d0cc1cc 100644 --- a/command/v7/service_key_command_test.go +++ b/command/v7/service_key_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_keys_command.go b/command/v7/service_keys_command.go index 2d5c7f5affa..2ce91c47614 100644 --- a/command/v7/service_keys_command.go +++ b/command/v7/service_keys_command.go @@ -3,9 +3,9 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type ServiceKeysCommand struct { diff --git a/command/v7/service_keys_command_test.go b/command/v7/service_keys_command_test.go index ebf2cc76e74..4f43977ab36 100644 --- a/command/v7/service_keys_command_test.go +++ b/command/v7/service_keys_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/services_command.go b/command/v7/services_command.go index a8c0df21f6b..07ec97ed5b7 100644 --- a/command/v7/services_command.go +++ b/command/v7/services_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/resources" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" ) type ServicesCommand struct { diff --git a/command/v7/services_command_test.go b/command/v7/services_command_test.go index b952885f8fa..1a09bf0fda6 100644 --- a/command/v7/services_command_test.go +++ b/command/v7/services_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_droplet_command.go b/command/v7/set_droplet_command.go index 4528c1d6492..343927a90cf 100644 --- a/command/v7/set_droplet_command.go +++ b/command/v7/set_droplet_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetDropletCommand struct { diff --git a/command/v7/set_droplet_command_test.go b/command/v7/set_droplet_command_test.go index 3ebbfa8d150..c4bb327d11e 100644 --- a/command/v7/set_droplet_command_test.go +++ b/command/v7/set_droplet_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_env_command.go b/command/v7/set_env_command.go index 2dc01c88a44..be2724dd51c 100644 --- a/command/v7/set_env_command.go +++ b/command/v7/set_env_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetEnvCommand struct { diff --git a/command/v7/set_env_command_test.go b/command/v7/set_env_command_test.go index f301972349e..5d87bc7cb96 100644 --- a/command/v7/set_env_command_test.go +++ b/command/v7/set_env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_health_check_command.go b/command/v7/set_health_check_command.go index 83059b3d2d8..abe0f5a83f0 100644 --- a/command/v7/set_health_check_command.go +++ b/command/v7/set_health_check_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetHealthCheckCommand struct { diff --git a/command/v7/set_health_check_command_test.go b/command/v7/set_health_check_command_test.go index 24ba6d97ebc..22d73e2ef21 100644 --- a/command/v7/set_health_check_command_test.go +++ b/command/v7/set_health_check_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_label_command.go b/command/v7/set_label_command.go index 06522547b4f..cd3dce90569 100644 --- a/command/v7/set_label_command.go +++ b/command/v7/set_label_command.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LabelSetter diff --git a/command/v7/set_label_command_test.go b/command/v7/set_label_command_test.go index 7f730ce581b..9eb2e16b866 100644 --- a/command/v7/set_label_command_test.go +++ b/command/v7/set_label_command_test.go @@ -1,10 +1,10 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/set_org_default_isolation_segment_command.go b/command/v7/set_org_default_isolation_segment_command.go index a19f517fa00..a7ceb39900e 100644 --- a/command/v7/set_org_default_isolation_segment_command.go +++ b/command/v7/set_org_default_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetOrgDefaultIsolationSegmentCommand struct { diff --git a/command/v7/set_org_default_isolation_segment_command_test.go b/command/v7/set_org_default_isolation_segment_command_test.go index 839ec9acb55..4a1b4af4816 100644 --- a/command/v7/set_org_default_isolation_segment_command_test.go +++ b/command/v7/set_org_default_isolation_segment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_org_quota_command.go b/command/v7/set_org_quota_command.go index 2baad4c8efe..36fb0d052fc 100644 --- a/command/v7/set_org_quota_command.go +++ b/command/v7/set_org_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetOrgQuotaCommand struct { diff --git a/command/v7/set_org_quota_command_test.go b/command/v7/set_org_quota_command_test.go index 9e3110cf446..d0381fad73c 100644 --- a/command/v7/set_org_quota_command_test.go +++ b/command/v7/set_org_quota_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" + + . "code.cloudfoundry.org/cli/v9/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_org_role_command.go b/command/v7/set_org_role_command.go index a57ea353999..be5a5ec35de 100644 --- a/command/v7/set_org_role_command.go +++ b/command/v7/set_org_role_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type SetOrgRoleCommand struct { diff --git a/command/v7/set_org_role_command_test.go b/command/v7/set_org_role_command_test.go index 998c06c5f5a..b5475baacc7 100644 --- a/command/v7/set_org_role_command_test.go +++ b/command/v7/set_org_role_command_test.go @@ -1,19 +1,19 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_running_environment_variable_group_command.go b/command/v7/set_running_environment_variable_group_command.go index c305199768d..684c1047fec 100644 --- a/command/v7/set_running_environment_variable_group_command.go +++ b/command/v7/set_running_environment_variable_group_command.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type SetRunningEnvironmentVariableGroupCommand struct { diff --git a/command/v7/set_running_environment_variable_group_command_test.go b/command/v7/set_running_environment_variable_group_command_test.go index 8793636781e..e4814a0ab7e 100644 --- a/command/v7/set_running_environment_variable_group_command_test.go +++ b/command/v7/set_running_environment_variable_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/set_space_isolation_segment_command.go b/command/v7/set_space_isolation_segment_command.go index 53588995591..1a0638abdd9 100644 --- a/command/v7/set_space_isolation_segment_command.go +++ b/command/v7/set_space_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetSpaceIsolationSegmentCommand struct { diff --git a/command/v7/set_space_isolation_segment_command_test.go b/command/v7/set_space_isolation_segment_command_test.go index 26d4fe76987..2cb5c028ae3 100644 --- a/command/v7/set_space_isolation_segment_command_test.go +++ b/command/v7/set_space_isolation_segment_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_space_quota_command.go b/command/v7/set_space_quota_command.go index ab97cfabcd7..10695248fc8 100644 --- a/command/v7/set_space_quota_command.go +++ b/command/v7/set_space_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetSpaceQuotaCommand struct { diff --git a/command/v7/set_space_quota_command_test.go b/command/v7/set_space_quota_command_test.go index 17edd64be77..c142905662c 100644 --- a/command/v7/set_space_quota_command_test.go +++ b/command/v7/set_space_quota_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" + + . "code.cloudfoundry.org/cli/v9/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_space_role_command.go b/command/v7/set_space_role_command.go index 77ba20ced8b..60d6ea16b8d 100644 --- a/command/v7/set_space_role_command.go +++ b/command/v7/set_space_role_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type SetSpaceRoleCommand struct { diff --git a/command/v7/set_space_role_command_test.go b/command/v7/set_space_role_command_test.go index 29613d0de1d..d7e9da1a4bb 100644 --- a/command/v7/set_space_role_command_test.go +++ b/command/v7/set_space_role_command_test.go @@ -1,19 +1,19 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_staging_environment_variable_group_command.go b/command/v7/set_staging_environment_variable_group_command.go index 20cd146d30f..4c6f679bc11 100644 --- a/command/v7/set_staging_environment_variable_group_command.go +++ b/command/v7/set_staging_environment_variable_group_command.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type SetStagingEnvironmentVariableGroupCommand struct { diff --git a/command/v7/set_staging_environment_variable_group_command_test.go b/command/v7/set_staging_environment_variable_group_command_test.go index c036deb9794..610175e8a87 100644 --- a/command/v7/set_staging_environment_variable_group_command_test.go +++ b/command/v7/set_staging_environment_variable_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/share_private_domain_command.go b/command/v7/share_private_domain_command.go index 2ba4f0a8612..75c38d3cd6f 100644 --- a/command/v7/share_private_domain_command.go +++ b/command/v7/share_private_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SharePrivateDomainCommand struct { diff --git a/command/v7/share_private_domain_command_test.go b/command/v7/share_private_domain_command_test.go index fe0741c5e9f..5dba5fa1916 100644 --- a/command/v7/share_private_domain_command_test.go +++ b/command/v7/share_private_domain_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/share_route_command.go b/command/v7/share_route_command.go index 36f07fa27f7..84354e8c316 100644 --- a/command/v7/share_route_command.go +++ b/command/v7/share_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type ShareRouteCommand struct { diff --git a/command/v7/share_route_command_test.go b/command/v7/share_route_command_test.go index e3c53506307..9dd436d4edb 100644 --- a/command/v7/share_route_command_test.go +++ b/command/v7/share_route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/share_service_command.go b/command/v7/share_service_command.go index cf0a8bdd40b..937396759d9 100644 --- a/command/v7/share_service_command.go +++ b/command/v7/share_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) type ShareServiceCommand struct { diff --git a/command/v7/share_service_command_test.go b/command/v7/share_service_command_test.go index 2b2315042ce..9a6edfbfe9f 100644 --- a/command/v7/share_service_command_test.go +++ b/command/v7/share_service_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/util/configv3" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/app_stager.go b/command/v7/shared/app_stager.go index 2aed583033d..338e2f90fb3 100644 --- a/command/v7/shared/app_stager.go +++ b/command/v7/shared/app_stager.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) /* diff --git a/command/v7/shared/app_stager_test.go b/command/v7/shared/app_stager_test.go index 067ddb96310..b516b5a0088 100644 --- a/command/v7/shared/app_stager_test.go +++ b/command/v7/shared/app_stager_test.go @@ -5,17 +5,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/app_summary_displayer.go b/command/v7/shared/app_summary_displayer.go index f7d386a66b1..27840f375ca 100644 --- a/command/v7/shared/app_summary_displayer.go +++ b/command/v7/shared/app_summary_displayer.go @@ -7,11 +7,11 @@ import ( "time" "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" log "github.com/sirupsen/logrus" ) diff --git a/command/v7/shared/app_summary_displayer_test.go b/command/v7/shared/app_summary_displayer_test.go index 833dc595cd3..0407c2ef1de 100644 --- a/command/v7/shared/app_summary_displayer_test.go +++ b/command/v7/shared/app_summary_displayer_test.go @@ -3,13 +3,13 @@ package shared_test import ( "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -694,7 +694,7 @@ var _ = Describe("app summary displayer", func() { When("there is an active deployment", func() { var LastStatusChangeTimeString = "2024-07-29T17:32:29Z" - var dateTimeRegexPattern = `[a-zA-Z]{3}\s\d{2}\s[a-zA-Z]{3}\s\d{2}\:\d{2}\:\d{2}\s[A-Z]{3}\s\d{4}` + var dateTimeRegexPattern = `[a-zA-Z]{3}\s\d{2}\s[a-zA-Z]{3}\s\d{2}\:\d{2}\:\d{2}\s[A-Z]{3,4}\s\d{4}` var maxInFlightDefaultValue = 1 When("the deployment strategy is rolling", func() { diff --git a/command/v7/shared/manifest_diff_displayer.go b/command/v7/shared/manifest_diff_displayer.go index 254a2c9455b..eabd6872eb9 100644 --- a/command/v7/shared/manifest_diff_displayer.go +++ b/command/v7/shared/manifest_diff_displayer.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" "gopkg.in/yaml.v2" ) diff --git a/command/v7/shared/manifest_diff_displayer_test.go b/command/v7/shared/manifest_diff_displayer_test.go index e3f63f77e39..297357e4335 100644 --- a/command/v7/shared/manifest_diff_displayer_test.go +++ b/command/v7/shared/manifest_diff_displayer_test.go @@ -1,9 +1,9 @@ package shared_test import ( - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/new_clients.go b/command/v7/shared/new_clients.go index 4486bd8ffab..48b4bcc6150 100644 --- a/command/v7/shared/new_clients.go +++ b/command/v7/shared/new_clients.go @@ -1,15 +1,15 @@ package shared import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - ccWrapper "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/router" - routingWrapper "code.cloudfoundry.org/cli/api/router/wrapper" - "code.cloudfoundry.org/cli/api/uaa" - uaaWrapper "code.cloudfoundry.org/cli/api/uaa/wrapper" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + ccWrapper "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/router" + routingWrapper "code.cloudfoundry.org/cli/v9/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" + uaaWrapper "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) func GetNewClientsAndConnectToCF(config command.Config, ui command.UI, minVersionV3 string) (*ccv3.Client, *uaa.Client, *router.Client, error) { diff --git a/command/v7/shared/new_clients_test.go b/command/v7/shared/new_clients_test.go index c8c425b4a11..a3a8b967012 100644 --- a/command/v7/shared/new_clients_test.go +++ b/command/v7/shared/new_clients_test.go @@ -4,10 +4,10 @@ import ( "runtime" "time" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/new_networking_client.go b/command/v7/shared/new_networking_client.go index 24057e3df88..b0eaa7c4893 100644 --- a/command/v7/shared/new_networking_client.go +++ b/command/v7/shared/new_networking_client.go @@ -1,11 +1,11 @@ package shared import ( - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/wrapper" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) // NewNetworkingClient creates a new cfnetworking client. diff --git a/command/v7/shared/new_networking_client_test.go b/command/v7/shared/new_networking_client_test.go index b9e0c344c18..b054eaf3905 100644 --- a/command/v7/shared/new_networking_client_test.go +++ b/command/v7/shared/new_networking_client_test.go @@ -1,11 +1,11 @@ package shared_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/ui" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -17,7 +17,7 @@ var _ = Describe("New Clients", func() { binaryName string fakeConfig *commandfakes.FakeConfig testUI *ui.UI - fakeUAAClient *uaa.Client + fakeUAAClient = &uaa.Client{} ) BeforeEach(func() { diff --git a/command/v7/shared/package_displayer.go b/command/v7/shared/package_displayer.go index 615c851102f..da4925a0777 100644 --- a/command/v7/shared/package_displayer.go +++ b/command/v7/shared/package_displayer.go @@ -1,7 +1,7 @@ package shared import ( - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v9/command" ) type PackageDisplayer struct { diff --git a/command/v7/shared/quota_displayer.go b/command/v7/shared/quota_displayer.go index bcb84ddc973..837823e425f 100644 --- a/command/v7/shared/quota_displayer.go +++ b/command/v7/shared/quota_displayer.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" ) const ( diff --git a/command/v7/shared/result_waiter.go b/command/v7/shared/result_waiter.go index f16f5c3668f..6467882aa98 100644 --- a/command/v7/shared/result_waiter.go +++ b/command/v7/shared/result_waiter.go @@ -3,8 +3,8 @@ package shared import ( "fmt" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" ) func WaitForResult(stream chan v7action.PollJobEvent, ui command.UI, waitForCompletion bool) (bool, error) { diff --git a/command/v7/shared/sharedfakes/fake_app_stager.go b/command/v7/shared/sharedfakes/fake_app_stager.go index 8c46eca4039..09bb3654f5a 100644 --- a/command/v7/shared/sharedfakes/fake_app_stager.go +++ b/command/v7/shared/sharedfakes/fake_app_stager.go @@ -4,9 +4,9 @@ package sharedfakes import ( "sync" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeAppStager struct { diff --git a/command/v7/shared/v3_poll_stage.go b/command/v7/shared/v3_poll_stage.go index 1c48365d620..1688ee858cc 100644 --- a/command/v7/shared/v3_poll_stage.go +++ b/command/v7/shared/v3_poll_stage.go @@ -1,11 +1,11 @@ package shared import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" ) func PollStage(dropletStream <-chan resources.Droplet, warningsStream <-chan v7action.Warnings, errStream <-chan error, logStream <-chan sharedaction.LogMessage, logErrStream <-chan error, ui command.UI) (resources.Droplet, error) { diff --git a/command/v7/shared/v3_poll_stage_test.go b/command/v7/shared/v3_poll_stage_test.go index 01483fbcef2..1ed46289bcc 100644 --- a/command/v7/shared/v3_poll_stage_test.go +++ b/command/v7/shared/v3_poll_stage_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/version_checker.go b/command/v7/shared/version_checker.go index 9c3d3f42b9e..835e6889889 100644 --- a/command/v7/shared/version_checker.go +++ b/command/v7/shared/version_checker.go @@ -3,7 +3,7 @@ package shared import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" "github.com/blang/semver/v4" ) diff --git a/command/v7/shared/version_checker_test.go b/command/v7/shared/version_checker_test.go index d82fbf2115f..f15d404cbb9 100644 --- a/command/v7/shared/version_checker_test.go +++ b/command/v7/shared/version_checker_test.go @@ -1,7 +1,7 @@ package shared_test import ( - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/v7/shared" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/space_command.go b/command/v7/space_command.go index cf5d52ea7d3..be77398f0d4 100644 --- a/command/v7/space_command.go +++ b/command/v7/space_command.go @@ -4,10 +4,10 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type SpaceCommand struct { diff --git a/command/v7/space_command_test.go b/command/v7/space_command_test.go index 259ad0232fd..4d0d747965c 100644 --- a/command/v7/space_command_test.go +++ b/command/v7/space_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/space_quota_command.go b/command/v7/space_quota_command.go index 8cbdcc2d45d..12269bd38f4 100644 --- a/command/v7/space_quota_command.go +++ b/command/v7/space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type SpaceQuotaCommand struct { diff --git a/command/v7/space_quota_command_test.go b/command/v7/space_quota_command_test.go index 578b262e27f..57a37a6c688 100644 --- a/command/v7/space_quota_command_test.go +++ b/command/v7/space_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/space_quotas_command.go b/command/v7/space_quotas_command.go index 481cd6c61f5..30ef0fc9d06 100644 --- a/command/v7/space_quotas_command.go +++ b/command/v7/space_quotas_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type SpaceQuotasCommand struct { diff --git a/command/v7/space_quotas_command_test.go b/command/v7/space_quotas_command_test.go index af99700783b..f4b8fc17e9a 100644 --- a/command/v7/space_quotas_command_test.go +++ b/command/v7/space_quotas_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/space_ssh_allowed_command.go b/command/v7/space_ssh_allowed_command.go index eabef97c5ad..9f15becf1e0 100644 --- a/command/v7/space_ssh_allowed_command.go +++ b/command/v7/space_ssh_allowed_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type SpaceSSHAllowedCommand struct { diff --git a/command/v7/space_ssh_allowed_command_test.go b/command/v7/space_ssh_allowed_command_test.go index ba208d631f9..eb61d00926c 100644 --- a/command/v7/space_ssh_allowed_command_test.go +++ b/command/v7/space_ssh_allowed_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/space_users_command.go b/command/v7/space_users_command.go index 149ddb9aa3a..5053a148e95 100644 --- a/command/v7/space_users_command.go +++ b/command/v7/space_users_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type SpaceUsersCommand struct { diff --git a/command/v7/space_users_command_test.go b/command/v7/space_users_command_test.go index b7f18b1e3fe..dc0b7f4e967 100644 --- a/command/v7/space_users_command_test.go +++ b/command/v7/space_users_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/spaces_command.go b/command/v7/spaces_command.go index 430c264dba6..82002bdc040 100644 --- a/command/v7/spaces_command.go +++ b/command/v7/spaces_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type SpacesCommand struct { diff --git a/command/v7/spaces_command_test.go b/command/v7/spaces_command_test.go index 98afb88a885..ede871bab84 100644 --- a/command/v7/spaces_command_test.go +++ b/command/v7/spaces_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/ssh_code_command_test.go b/command/v7/ssh_code_command_test.go index 46dcf5fe599..da3f3f46374 100644 --- a/command/v7/ssh_code_command_test.go +++ b/command/v7/ssh_code_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/ssh_command.go b/command/v7/ssh_command.go index c9caf5d2f64..4c6eedd8587 100644 --- a/command/v7/ssh_command.go +++ b/command/v7/ssh_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/clissh" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedSSHActor diff --git a/command/v7/ssh_command_test.go b/command/v7/ssh_command_test.go index 556e25662e6..4944b9bdd09 100644 --- a/command/v7/ssh_command_test.go +++ b/command/v7/ssh_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/ssh_enabled_command.go b/command/v7/ssh_enabled_command.go index 9ddf1a9f15d..08dbd4683be 100644 --- a/command/v7/ssh_enabled_command.go +++ b/command/v7/ssh_enabled_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SSHEnabledCommand struct { diff --git a/command/v7/ssh_enabled_command_test.go b/command/v7/ssh_enabled_command_test.go index 069b03bdd9d..48d8166a025 100644 --- a/command/v7/ssh_enabled_command_test.go +++ b/command/v7/ssh_enabled_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stack_command.go b/command/v7/stack_command.go index a7ca6add762..fd2cd3777ed 100644 --- a/command/v7/stack_command.go +++ b/command/v7/stack_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type StackCommand struct { diff --git a/command/v7/stack_command_test.go b/command/v7/stack_command_test.go index ad3faaf0707..685e09ae796 100644 --- a/command/v7/stack_command_test.go +++ b/command/v7/stack_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stacks_command.go b/command/v7/stacks_command.go index 0e4b7926331..e125a689ea9 100644 --- a/command/v7/stacks_command.go +++ b/command/v7/stacks_command.go @@ -3,9 +3,9 @@ package v7 import ( "sort" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/sorting" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/sorting" + "code.cloudfoundry.org/cli/v9/util/ui" ) type StacksCommand struct { diff --git a/command/v7/stacks_command_test.go b/command/v7/stacks_command_test.go index a5be967d3f0..f182d57b0e3 100644 --- a/command/v7/stacks_command_test.go +++ b/command/v7/stacks_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/stage_package_command.go b/command/v7/stage_package_command.go index 3406a444c33..e5b4f401f27 100644 --- a/command/v7/stage_package_command.go +++ b/command/v7/stage_package_command.go @@ -4,13 +4,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type StagePackageCommand struct { diff --git a/command/v7/stage_package_command_test.go b/command/v7/stage_package_command_test.go index 7a781d724fd..8be2dc5b77a 100644 --- a/command/v7/stage_package_command_test.go +++ b/command/v7/stage_package_command_test.go @@ -5,18 +5,18 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/staging_environment_variable_group_command.go b/command/v7/staging_environment_variable_group_command.go index 3746e7a458d..d76b80a5c3e 100644 --- a/command/v7/staging_environment_variable_group_command.go +++ b/command/v7/staging_environment_variable_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/util/ui" ) type StagingEnvironmentVariableGroupCommand struct { diff --git a/command/v7/staging_environment_variable_group_command_test.go b/command/v7/staging_environment_variable_group_command_test.go index 4aac5ffaf75..9e9d1ed8263 100644 --- a/command/v7/staging_environment_variable_group_command_test.go +++ b/command/v7/staging_environment_variable_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/staging_security_groups_command.go b/command/v7/staging_security_groups_command.go index 8b4203eb577..02625e7eff5 100644 --- a/command/v7/staging_security_groups_command.go +++ b/command/v7/staging_security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type StagingSecurityGroupsCommand struct { diff --git a/command/v7/staging_security_groups_command_test.go b/command/v7/staging_security_groups_command_test.go index 022f71dafc8..9a7723ab6f2 100644 --- a/command/v7/staging_security_groups_command_test.go +++ b/command/v7/staging_security_groups_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/start_command.go b/command/v7/start_command.go index 3316ab5474e..9a3ca4b3e9f 100644 --- a/command/v7/start_command.go +++ b/command/v7/start_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type StartCommand struct { diff --git a/command/v7/start_command_test.go b/command/v7/start_command_test.go index bc8a1c2759d..c12679734cf 100644 --- a/command/v7/start_command_test.go +++ b/command/v7/start_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stop_command.go b/command/v7/stop_command.go index 514f1ecba58..3b2c43aa607 100644 --- a/command/v7/stop_command.go +++ b/command/v7/stop_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type StopCommand struct { diff --git a/command/v7/stop_command_test.go b/command/v7/stop_command_test.go index 52a3b59e462..8f46898197b 100644 --- a/command/v7/stop_command_test.go +++ b/command/v7/stop_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/target_command.go b/command/v7/target_command.go index 05595ca294a..b0daf6303d7 100644 --- a/command/v7/target_command.go +++ b/command/v7/target_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type TargetCommand struct { diff --git a/command/v7/target_command_test.go b/command/v7/target_command_test.go index 3923e712b7c..222eac1e71b 100644 --- a/command/v7/target_command_test.go +++ b/command/v7/target_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/task_command.go b/command/v7/task_command.go index 44fe05ce3d8..f59c2f10acb 100644 --- a/command/v7/task_command.go +++ b/command/v7/task_command.go @@ -3,8 +3,8 @@ package v7 import ( "strconv" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type TaskCommand struct { diff --git a/command/v7/task_command_test.go b/command/v7/task_command_test.go index 9d2ccdc3e6c..7812d65c3fa 100644 --- a/command/v7/task_command_test.go +++ b/command/v7/task_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/tasks_command.go b/command/v7/tasks_command.go index bf5c7c195ec..9a40d6463e1 100644 --- a/command/v7/tasks_command.go +++ b/command/v7/tasks_command.go @@ -4,9 +4,9 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type TasksCommand struct { diff --git a/command/v7/tasks_command_test.go b/command/v7/tasks_command_test.go index d4d2fb4b4e5..66282e5e45d 100644 --- a/command/v7/tasks_command_test.go +++ b/command/v7/tasks_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/terminate_task_command.go b/command/v7/terminate_task_command.go index 4738b7255af..20bfb176696 100644 --- a/command/v7/terminate_task_command.go +++ b/command/v7/terminate_task_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type TerminateTaskCommand struct { diff --git a/command/v7/terminate_task_command_test.go b/command/v7/terminate_task_command_test.go index d4e52a5ff10..9bad2cb9d43 100644 --- a/command/v7/terminate_task_command_test.go +++ b/command/v7/terminate_task_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_route_service_command.go b/command/v7/unbind_route_service_command.go index d973dc6c48b..ab525bcb307 100644 --- a/command/v7/unbind_route_service_command.go +++ b/command/v7/unbind_route_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type UnbindRouteServiceCommand struct { diff --git a/command/v7/unbind_route_service_command_test.go b/command/v7/unbind_route_service_command_test.go index 36f7524c812..29d76ae3fb4 100644 --- a/command/v7/unbind_route_service_command_test.go +++ b/command/v7/unbind_route_service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_running_group_command_test.go b/command/v7/unbind_running_group_command_test.go index 5cc2476d3d4..d495b2922c9 100644 --- a/command/v7/unbind_running_group_command_test.go +++ b/command/v7/unbind_running_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_running_security_group_command.go b/command/v7/unbind_running_security_group_command.go index fd5ac730f39..2a733896665 100644 --- a/command/v7/unbind_running_security_group_command.go +++ b/command/v7/unbind_running_security_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnbindRunningSecurityGroupCommand struct { diff --git a/command/v7/unbind_security_group.go b/command/v7/unbind_security_group.go index e4a6b00f153..1da8821d6a8 100644 --- a/command/v7/unbind_security_group.go +++ b/command/v7/unbind_security_group.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnbindSecurityGroupCommand struct { diff --git a/command/v7/unbind_security_group_test.go b/command/v7/unbind_security_group_test.go index d5230274033..630a17bd0af 100644 --- a/command/v7/unbind_security_group_test.go +++ b/command/v7/unbind_security_group_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_service_command.go b/command/v7/unbind_service_command.go index 4030d17da40..4389fc8e849 100644 --- a/command/v7/unbind_service_command.go +++ b/command/v7/unbind_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type UnbindServiceCommand struct { diff --git a/command/v7/unbind_service_command_test.go b/command/v7/unbind_service_command_test.go index b050354cc76..64c62b48c9f 100644 --- a/command/v7/unbind_service_command_test.go +++ b/command/v7/unbind_service_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_staging_security_group_command.go b/command/v7/unbind_staging_security_group_command.go index a82f1541f28..bd9dae34a7b 100644 --- a/command/v7/unbind_staging_security_group_command.go +++ b/command/v7/unbind_staging_security_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnbindStagingSecurityGroupCommand struct { diff --git a/command/v7/unbind_staging_security_group_command_test.go b/command/v7/unbind_staging_security_group_command_test.go index 8b52a5dbf6b..c96254a8439 100644 --- a/command/v7/unbind_staging_security_group_command_test.go +++ b/command/v7/unbind_staging_security_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unmap_route_command.go b/command/v7/unmap_route_command.go index d6bc80da0a2..6904783ced6 100644 --- a/command/v7/unmap_route_command.go +++ b/command/v7/unmap_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnmapRouteCommand struct { diff --git a/command/v7/unmap_route_command_test.go b/command/v7/unmap_route_command_test.go index a387f4df09c..3d6c9de4c72 100644 --- a/command/v7/unmap_route_command_test.go +++ b/command/v7/unmap_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/unset_env_command.go b/command/v7/unset_env_command.go index 47243449dda..e997961f039 100644 --- a/command/v7/unset_env_command.go +++ b/command/v7/unset_env_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnsetEnvCommand struct { diff --git a/command/v7/unset_env_command_test.go b/command/v7/unset_env_command_test.go index c9b7ad6d535..4269b567641 100644 --- a/command/v7/unset_env_command_test.go +++ b/command/v7/unset_env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_label_command.go b/command/v7/unset_label_command.go index 0636f7d0097..e164e58c4ae 100644 --- a/command/v7/unset_label_command.go +++ b/command/v7/unset_label_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LabelUnsetter diff --git a/command/v7/unset_label_command_test.go b/command/v7/unset_label_command_test.go index 09e5f7ddae2..c4a27fa4dfd 100644 --- a/command/v7/unset_label_command_test.go +++ b/command/v7/unset_label_command_test.go @@ -1,10 +1,10 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/unset_org_role_command.go b/command/v7/unset_org_role_command.go index c7798f0d174..8b4384ab368 100644 --- a/command/v7/unset_org_role_command.go +++ b/command/v7/unset_org_role_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type UnsetOrgRoleCommand struct { diff --git a/command/v7/unset_org_role_command_test.go b/command/v7/unset_org_role_command_test.go index e79263df0f9..de6072be074 100644 --- a/command/v7/unset_org_role_command_test.go +++ b/command/v7/unset_org_role_command_test.go @@ -1,18 +1,18 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_space_quota_command.go b/command/v7/unset_space_quota_command.go index 39d4f8bd6ef..5dbe2c96885 100644 --- a/command/v7/unset_space_quota_command.go +++ b/command/v7/unset_space_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnsetSpaceQuotaCommand struct { diff --git a/command/v7/unset_space_quota_command_test.go b/command/v7/unset_space_quota_command_test.go index c0b3f1744fb..4b3f38eb057 100644 --- a/command/v7/unset_space_quota_command_test.go +++ b/command/v7/unset_space_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" + + . "code.cloudfoundry.org/cli/v9/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_space_role_command.go b/command/v7/unset_space_role_command.go index 56abfc332fb..c4248f4eff1 100644 --- a/command/v7/unset_space_role_command.go +++ b/command/v7/unset_space_role_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type UnsetSpaceRoleCommand struct { diff --git a/command/v7/unset_space_role_command_test.go b/command/v7/unset_space_role_command_test.go index 0123e3753bf..0fef83e151b 100644 --- a/command/v7/unset_space_role_command_test.go +++ b/command/v7/unset_space_role_command_test.go @@ -1,18 +1,18 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unshare_private_domain_command.go b/command/v7/unshare_private_domain_command.go index d2fe3878251..f93a8142173 100644 --- a/command/v7/unshare_private_domain_command.go +++ b/command/v7/unshare_private_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnsharePrivateDomainCommand struct { diff --git a/command/v7/unshare_private_domain_command_test.go b/command/v7/unshare_private_domain_command_test.go index 04d8ea5e3f7..75c7f31a115 100644 --- a/command/v7/unshare_private_domain_command_test.go +++ b/command/v7/unshare_private_domain_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/unshare_route_command.go b/command/v7/unshare_route_command.go index 982da124f53..e8fa8be35c9 100644 --- a/command/v7/unshare_route_command.go +++ b/command/v7/unshare_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnshareRouteCommand struct { diff --git a/command/v7/unshare_route_command_test.go b/command/v7/unshare_route_command_test.go index 8a8901f7464..6183c7b0a0f 100644 --- a/command/v7/unshare_route_command_test.go +++ b/command/v7/unshare_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unshare_service_command.go b/command/v7/unshare_service_command.go index 73d1d213cbf..3e716391892 100644 --- a/command/v7/unshare_service_command.go +++ b/command/v7/unshare_service_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) type UnshareServiceCommand struct { diff --git a/command/v7/unshare_service_command_test.go b/command/v7/unshare_service_command_test.go index 3c598516457..15b11a15dc7 100644 --- a/command/v7/unshare_service_command_test.go +++ b/command/v7/unshare_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_buildpack_command.go b/command/v7/update_buildpack_command.go index 8b71321d87d..e0551b14622 100644 --- a/command/v7/update_buildpack_command.go +++ b/command/v7/update_buildpack_command.go @@ -4,16 +4,16 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/download" ) type UpdateBuildpackActor interface { diff --git a/command/v7/update_buildpack_command_test.go b/command/v7/update_buildpack_command_test.go index 834baffd403..899983dd3f5 100644 --- a/command/v7/update_buildpack_command_test.go +++ b/command/v7/update_buildpack_command_test.go @@ -3,20 +3,20 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/command/translatableerror" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_destination_command.go b/command/v7/update_destination_command.go index 082b693db3f..b918717c974 100644 --- a/command/v7/update_destination_command.go +++ b/command/v7/update_destination_command.go @@ -3,8 +3,8 @@ package v7 import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UpdateDestinationCommand struct { diff --git a/command/v7/update_destination_command_test.go b/command/v7/update_destination_command_test.go index 2bbf0de17a7..d708c0dc2cf 100644 --- a/command/v7/update_destination_command_test.go +++ b/command/v7/update_destination_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_org_quota_command.go b/command/v7/update_org_quota_command.go index 70124cfc201..3aec18ca71f 100644 --- a/command/v7/update_org_quota_command.go +++ b/command/v7/update_org_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type UpdateOrgQuotaCommand struct { diff --git a/command/v7/update_org_quota_command_test.go b/command/v7/update_org_quota_command_test.go index bfb33016ee7..294e1ab3d2a 100644 --- a/command/v7/update_org_quota_command_test.go +++ b/command/v7/update_org_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_security_group_command.go b/command/v7/update_security_group_command.go index b24f47af389..ffbd31e46b1 100644 --- a/command/v7/update_security_group_command.go +++ b/command/v7/update_security_group_command.go @@ -3,8 +3,8 @@ package v7 import ( "encoding/json" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UpdateSecurityGroupCommand struct { diff --git a/command/v7/update_security_group_command_test.go b/command/v7/update_security_group_command_test.go index 3de0df3ce48..db57214701e 100644 --- a/command/v7/update_security_group_command_test.go +++ b/command/v7/update_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "encoding/json" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_service_broker_command.go b/command/v7/update_service_broker_command.go index 2ff50891032..193f5ca086f 100644 --- a/command/v7/update_service_broker_command.go +++ b/command/v7/update_service_broker_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type UpdateServiceBrokerCommand struct { diff --git a/command/v7/update_service_broker_command_test.go b/command/v7/update_service_broker_command_test.go index 8574a41bbca..8205c114375 100644 --- a/command/v7/update_service_broker_command_test.go +++ b/command/v7/update_service_broker_command_test.go @@ -4,15 +4,15 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_service_command.go b/command/v7/update_service_command.go index 289cec1ed8c..3a54a62f7b9 100644 --- a/command/v7/update_service_command.go +++ b/command/v7/update_service_command.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type UpdateServiceCommand struct { diff --git a/command/v7/update_service_command_test.go b/command/v7/update_service_command_test.go index f9983b42e4a..a9f8e7c2140 100644 --- a/command/v7/update_service_command_test.go +++ b/command/v7/update_service_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_space_quota_command.go b/command/v7/update_space_quota_command.go index 300645c44eb..03511c4aa1f 100644 --- a/command/v7/update_space_quota_command.go +++ b/command/v7/update_space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type UpdateSpaceQuotaCommand struct { diff --git a/command/v7/update_space_quota_command_test.go b/command/v7/update_space_quota_command_test.go index 2f75eae5a9f..8e606824704 100644 --- a/command/v7/update_space_quota_command_test.go +++ b/command/v7/update_space_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_user_provided_service_command.go b/command/v7/update_user_provided_service_command.go index 69184d166e9..2fd2c6c8fdc 100644 --- a/command/v7/update_user_provided_service_command.go +++ b/command/v7/update_user_provided_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type UpdateUserProvidedServiceCommand struct { diff --git a/command/v7/update_user_provided_service_command_test.go b/command/v7/update_user_provided_service_command_test.go index 2630e31bec9..9f9dded7365 100644 --- a/command/v7/update_user_provided_service_command_test.go +++ b/command/v7/update_user_provided_service_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/upgrade_service_command.go b/command/v7/upgrade_service_command.go index 942e91096db..490b6e0d342 100644 --- a/command/v7/upgrade_service_command.go +++ b/command/v7/upgrade_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type UpgradeServiceCommand struct { diff --git a/command/v7/upgrade_service_command_test.go b/command/v7/upgrade_service_command_test.go index fb66c5880f5..0f41ad25f02 100644 --- a/command/v7/upgrade_service_command_test.go +++ b/command/v7/upgrade_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/v7fakes/fake_actor.go b/command/v7/v7fakes/fake_actor.go index 62df07b77aa..9944e0d6b50 100644 --- a/command/v7/v7fakes/fake_actor.go +++ b/command/v7/v7fakes/fake_actor.go @@ -8,16 +8,16 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - constanta "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + constanta "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" "github.com/SermoDigital/jose/jwt" ) diff --git a/command/v7/v7fakes/fake_actor_reloader.go b/command/v7/v7fakes/fake_actor_reloader.go index f5397aaae12..87876729587 100644 --- a/command/v7/v7fakes/fake_actor_reloader.go +++ b/command/v7/v7fakes/fake_actor_reloader.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/command" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/command" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeActorReloader struct { @@ -34,15 +34,16 @@ func (fake *FakeActorReloader) Reload(arg1 command.Config, arg2 command.UI) (v7. arg1 command.Config arg2 command.UI }{arg1, arg2}) + stub := fake.ReloadStub + fakeReturns := fake.reloadReturns fake.recordInvocation("Reload", []interface{}{arg1, arg2}) fake.reloadMutex.Unlock() - if fake.ReloadStub != nil { - return fake.ReloadStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.reloadReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_diff_displayer.go b/command/v7/v7fakes/fake_diff_displayer.go index 79bcd663deb..8287b97c16d 100644 --- a/command/v7/v7fakes/fake_diff_displayer.go +++ b/command/v7/v7fakes/fake_diff_displayer.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/resources" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeDiffDisplayer struct { @@ -37,15 +37,16 @@ func (fake *FakeDiffDisplayer) DisplayDiff(arg1 []byte, arg2 resources.ManifestD arg1 []byte arg2 resources.ManifestDiff }{arg1Copy, arg2}) + stub := fake.DisplayDiffStub + fakeReturns := fake.displayDiffReturns fake.recordInvocation("DisplayDiff", []interface{}{arg1Copy, arg2}) fake.displayDiffMutex.Unlock() - if fake.DisplayDiffStub != nil { - return fake.DisplayDiffStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayDiffReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_label_setter.go b/command/v7/v7fakes/fake_label_setter.go index 21b6cea3a98..36443f1b9bb 100644 --- a/command/v7/v7fakes/fake_label_setter.go +++ b/command/v7/v7fakes/fake_label_setter.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/types" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/types" ) type FakeLabelSetter struct { @@ -32,15 +32,16 @@ func (fake *FakeLabelSetter) Execute(arg1 v7.TargetResource, arg2 map[string]typ arg1 v7.TargetResource arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1, arg2}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_label_unsetter.go b/command/v7/v7fakes/fake_label_unsetter.go index 6b57278a967..48ec32fe771 100644 --- a/command/v7/v7fakes/fake_label_unsetter.go +++ b/command/v7/v7fakes/fake_label_unsetter.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/types" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/types" ) type FakeLabelUnsetter struct { @@ -32,15 +32,16 @@ func (fake *FakeLabelUnsetter) Execute(arg1 v7.TargetResource, arg2 map[string]t arg1 v7.TargetResource arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1, arg2}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_manifest_locator.go b/command/v7/v7fakes/fake_manifest_locator.go index abbbbcfaf48..0e41343c30c 100644 --- a/command/v7/v7fakes/fake_manifest_locator.go +++ b/command/v7/v7fakes/fake_manifest_locator.go @@ -4,7 +4,7 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeManifestLocator struct { @@ -33,15 +33,16 @@ func (fake *FakeManifestLocator) Path(arg1 string) (string, bool, error) { fake.pathArgsForCall = append(fake.pathArgsForCall, struct { arg1 string }{arg1}) + stub := fake.PathStub + fakeReturns := fake.pathReturns fake.recordInvocation("Path", []interface{}{arg1}) fake.pathMutex.Unlock() - if fake.PathStub != nil { - return fake.PathStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pathReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v7/v7fakes/fake_manifest_parser.go b/command/v7/v7fakes/fake_manifest_parser.go index 735c953053f..dff85521ea8 100644 --- a/command/v7/v7fakes/fake_manifest_parser.go +++ b/command/v7/v7fakes/fake_manifest_parser.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/manifestparser" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" ) @@ -74,15 +74,16 @@ func (fake *FakeManifestParser) InterpolateManifest(arg1 string, arg2 []string, arg2 []string arg3 []template.VarKV }{arg1, arg2Copy, arg3Copy}) + stub := fake.InterpolateManifestStub + fakeReturns := fake.interpolateManifestReturns fake.recordInvocation("InterpolateManifest", []interface{}{arg1, arg2Copy, arg3Copy}) fake.interpolateManifestMutex.Unlock() - if fake.InterpolateManifestStub != nil { - return fake.InterpolateManifestStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.interpolateManifestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -137,15 +138,16 @@ func (fake *FakeManifestParser) MarshalManifest(arg1 manifestparser.Manifest) ([ fake.marshalManifestArgsForCall = append(fake.marshalManifestArgsForCall, struct { arg1 manifestparser.Manifest }{arg1}) + stub := fake.MarshalManifestStub + fakeReturns := fake.marshalManifestReturns fake.recordInvocation("MarshalManifest", []interface{}{arg1}) fake.marshalManifestMutex.Unlock() - if fake.MarshalManifestStub != nil { - return fake.MarshalManifestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.marshalManifestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -206,15 +208,16 @@ func (fake *FakeManifestParser) ParseManifest(arg1 string, arg2 []byte) (manifes arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.ParseManifestStub + fakeReturns := fake.parseManifestReturns fake.recordInvocation("ParseManifest", []interface{}{arg1, arg2Copy}) fake.parseManifestMutex.Unlock() - if fake.ParseManifestStub != nil { - return fake.ParseManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.parseManifestReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_network_policies_actor.go b/command/v7/v7fakes/fake_network_policies_actor.go index 79857f0c170..8bcdf225bd5 100644 --- a/command/v7/v7fakes/fake_network_policies_actor.go +++ b/command/v7/v7fakes/fake_network_policies_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeNetworkPoliciesActor struct { @@ -50,15 +50,16 @@ func (fake *FakeNetworkPoliciesActor) NetworkPoliciesBySpace(arg1 string) ([]cfn fake.networkPoliciesBySpaceArgsForCall = append(fake.networkPoliciesBySpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NetworkPoliciesBySpaceStub + fakeReturns := fake.networkPoliciesBySpaceReturns fake.recordInvocation("NetworkPoliciesBySpace", []interface{}{arg1}) fake.networkPoliciesBySpaceMutex.Unlock() - if fake.NetworkPoliciesBySpaceStub != nil { - return fake.NetworkPoliciesBySpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.networkPoliciesBySpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -117,15 +118,16 @@ func (fake *FakeNetworkPoliciesActor) NetworkPoliciesBySpaceAndAppName(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.NetworkPoliciesBySpaceAndAppNameStub + fakeReturns := fake.networkPoliciesBySpaceAndAppNameReturns fake.recordInvocation("NetworkPoliciesBySpaceAndAppName", []interface{}{arg1, arg2}) fake.networkPoliciesBySpaceAndAppNameMutex.Unlock() - if fake.NetworkPoliciesBySpaceAndAppNameStub != nil { - return fake.NetworkPoliciesBySpaceAndAppNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.networkPoliciesBySpaceAndAppNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v7/v7fakes/fake_networking_actor.go b/command/v7/v7fakes/fake_networking_actor.go index bb42ffac9b5..1ca88ae4370 100644 --- a/command/v7/v7fakes/fake_networking_actor.go +++ b/command/v7/v7fakes/fake_networking_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeNetworkingActor struct { @@ -44,15 +44,16 @@ func (fake *FakeNetworkingActor) AddNetworkPolicy(arg1 string, arg2 string, arg3 arg6 int arg7 int }{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) + stub := fake.AddNetworkPolicyStub + fakeReturns := fake.addNetworkPolicyReturns fake.recordInvocation("AddNetworkPolicy", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) fake.addNetworkPolicyMutex.Unlock() - if fake.AddNetworkPolicyStub != nil { - return fake.AddNetworkPolicyStub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.addNetworkPolicyReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_progress_bar.go b/command/v7/v7fakes/fake_progress_bar.go index 9c40495632c..53118843760 100644 --- a/command/v7/v7fakes/fake_progress_bar.go +++ b/command/v7/v7fakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - v7 "code.cloudfoundry.org/cli/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeProgressBar struct { @@ -37,9 +37,10 @@ func (fake *FakeProgressBar) Complete() { fake.completeMutex.Lock() fake.completeArgsForCall = append(fake.completeArgsForCall, struct { }{}) + stub := fake.CompleteStub fake.recordInvocation("Complete", []interface{}{}) fake.completeMutex.Unlock() - if fake.CompleteStub != nil { + if stub != nil { fake.CompleteStub() } } @@ -63,15 +64,16 @@ func (fake *FakeProgressBar) NewProgressBarWrapper(arg1 io.Reader, arg2 int64) i arg1 io.Reader arg2 int64 }{arg1, arg2}) + stub := fake.NewProgressBarWrapperStub + fakeReturns := fake.newProgressBarWrapperReturns fake.recordInvocation("NewProgressBarWrapper", []interface{}{arg1, arg2}) fake.newProgressBarWrapperMutex.Unlock() - if fake.NewProgressBarWrapperStub != nil { - return fake.NewProgressBarWrapperStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newProgressBarWrapperReturns return fakeReturns.result1 } @@ -121,9 +123,10 @@ func (fake *FakeProgressBar) Ready() { fake.readyMutex.Lock() fake.readyArgsForCall = append(fake.readyArgsForCall, struct { }{}) + stub := fake.ReadyStub fake.recordInvocation("Ready", []interface{}{}) fake.readyMutex.Unlock() - if fake.ReadyStub != nil { + if stub != nil { fake.ReadyStub() } } diff --git a/command/v7/v7fakes/fake_push_actor.go b/command/v7/v7fakes/fake_push_actor.go index 95c137b77ba..4187b0adf65 100644 --- a/command/v7/v7fakes/fake_push_actor.go +++ b/command/v7/v7fakes/fake_push_actor.go @@ -4,10 +4,10 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7pushaction" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) type FakePushActor struct { @@ -66,15 +66,16 @@ func (fake *FakePushActor) Actualize(arg1 v7pushaction.PushPlan, arg2 v7pushacti arg1 v7pushaction.PushPlan arg2 v7pushaction.ProgressBar }{arg1, arg2}) + stub := fake.ActualizeStub + fakeReturns := fake.actualizeReturns fake.recordInvocation("Actualize", []interface{}{arg1, arg2}) fake.actualizeMutex.Unlock() - if fake.ActualizeStub != nil { - return fake.ActualizeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.actualizeReturns return fakeReturns.result1 } @@ -129,15 +130,16 @@ func (fake *FakePushActor) CreatePushPlans(arg1 string, arg2 string, arg3 manife arg3 manifestparser.Manifest arg4 v7pushaction.FlagOverrides }{arg1, arg2, arg3, arg4}) + stub := fake.CreatePushPlansStub + fakeReturns := fake.createPushPlansReturns fake.recordInvocation("CreatePushPlans", []interface{}{arg1, arg2, arg3, arg4}) fake.createPushPlansMutex.Unlock() - if fake.CreatePushPlansStub != nil { - return fake.CreatePushPlansStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createPushPlansReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -196,15 +198,16 @@ func (fake *FakePushActor) HandleFlagOverrides(arg1 manifestparser.Manifest, arg arg1 manifestparser.Manifest arg2 v7pushaction.FlagOverrides }{arg1, arg2}) + stub := fake.HandleFlagOverridesStub + fakeReturns := fake.handleFlagOverridesReturns fake.recordInvocation("HandleFlagOverrides", []interface{}{arg1, arg2}) fake.handleFlagOverridesMutex.Unlock() - if fake.HandleFlagOverridesStub != nil { - return fake.HandleFlagOverridesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.handleFlagOverridesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_remove_network_policy_actor.go b/command/v7/v7fakes/fake_remove_network_policy_actor.go index b2ed7ded2e3..9c3a4d61aa8 100644 --- a/command/v7/v7fakes/fake_remove_network_policy_actor.go +++ b/command/v7/v7fakes/fake_remove_network_policy_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeRemoveNetworkPolicyActor struct { @@ -44,15 +44,16 @@ func (fake *FakeRemoveNetworkPolicyActor) RemoveNetworkPolicy(arg1 string, arg2 arg6 int arg7 int }{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) + stub := fake.RemoveNetworkPolicyStub + fakeReturns := fake.removeNetworkPolicyReturns fake.recordInvocation("RemoveNetworkPolicy", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) fake.removeNetworkPolicyMutex.Unlock() - if fake.RemoveNetworkPolicyStub != nil { - return fake.RemoveNetworkPolicyStub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.removeNetworkPolicyReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_revisions_actor.go b/command/v7/v7fakes/fake_revisions_actor.go index 6db96cce2c0..e126f4ea24b 100644 --- a/command/v7/v7fakes/fake_revisions_actor.go +++ b/command/v7/v7fakes/fake_revisions_actor.go @@ -4,9 +4,9 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeRevisionsActor struct { @@ -37,15 +37,16 @@ func (fake *FakeRevisionsActor) GetRevisionsByApplicationNameAndSpace(arg1 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetRevisionsByApplicationNameAndSpaceStub + fakeReturns := fake.getRevisionsByApplicationNameAndSpaceReturns fake.recordInvocation("GetRevisionsByApplicationNameAndSpace", []interface{}{arg1, arg2}) fake.getRevisionsByApplicationNameAndSpaceMutex.Unlock() - if fake.GetRevisionsByApplicationNameAndSpaceStub != nil { - return fake.GetRevisionsByApplicationNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRevisionsByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v7/v7fakes/fake_set_label_actor.go b/command/v7/v7fakes/fake_set_label_actor.go index 8eb74fcb505..143545ae116 100644 --- a/command/v7/v7fakes/fake_set_label_actor.go +++ b/command/v7/v7fakes/fake_set_label_actor.go @@ -4,10 +4,10 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeSetLabelActor struct { @@ -194,15 +194,16 @@ func (fake *FakeSetLabelActor) GetCurrentUser() (configv3.User, error) { ret, specificReturn := fake.getCurrentUserReturnsOnCall[len(fake.getCurrentUserArgsForCall)] fake.getCurrentUserArgsForCall = append(fake.getCurrentUserArgsForCall, struct { }{}) + stub := fake.GetCurrentUserStub + fakeReturns := fake.getCurrentUserReturns fake.recordInvocation("GetCurrentUser", []interface{}{}) fake.getCurrentUserMutex.Unlock() - if fake.GetCurrentUserStub != nil { - return fake.GetCurrentUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getCurrentUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -252,15 +253,16 @@ func (fake *FakeSetLabelActor) UpdateApplicationLabelsByApplicationName(arg1 str arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateApplicationLabelsByApplicationNameStub + fakeReturns := fake.updateApplicationLabelsByApplicationNameReturns fake.recordInvocation("UpdateApplicationLabelsByApplicationName", []interface{}{arg1, arg2, arg3}) fake.updateApplicationLabelsByApplicationNameMutex.Unlock() - if fake.UpdateApplicationLabelsByApplicationNameStub != nil { - return fake.UpdateApplicationLabelsByApplicationNameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateApplicationLabelsByApplicationNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -317,15 +319,16 @@ func (fake *FakeSetLabelActor) UpdateBuildpackLabelsByBuildpackNameAndStack(arg1 arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateBuildpackLabelsByBuildpackNameAndStackStub + fakeReturns := fake.updateBuildpackLabelsByBuildpackNameAndStackReturns fake.recordInvocation("UpdateBuildpackLabelsByBuildpackNameAndStack", []interface{}{arg1, arg2, arg3}) fake.updateBuildpackLabelsByBuildpackNameAndStackMutex.Unlock() - if fake.UpdateBuildpackLabelsByBuildpackNameAndStackStub != nil { - return fake.UpdateBuildpackLabelsByBuildpackNameAndStackStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateBuildpackLabelsByBuildpackNameAndStackReturns return fakeReturns.result1, fakeReturns.result2 } @@ -381,15 +384,16 @@ func (fake *FakeSetLabelActor) UpdateDomainLabelsByDomainName(arg1 string, arg2 arg1 string arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.UpdateDomainLabelsByDomainNameStub + fakeReturns := fake.updateDomainLabelsByDomainNameReturns fake.recordInvocation("UpdateDomainLabelsByDomainName", []interface{}{arg1, arg2}) fake.updateDomainLabelsByDomainNameMutex.Unlock() - if fake.UpdateDomainLabelsByDomainNameStub != nil { - return fake.UpdateDomainLabelsByDomainNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateDomainLabelsByDomainNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -445,15 +449,16 @@ func (fake *FakeSetLabelActor) UpdateOrganizationLabelsByOrganizationName(arg1 s arg1 string arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.UpdateOrganizationLabelsByOrganizationNameStub + fakeReturns := fake.updateOrganizationLabelsByOrganizationNameReturns fake.recordInvocation("UpdateOrganizationLabelsByOrganizationName", []interface{}{arg1, arg2}) fake.updateOrganizationLabelsByOrganizationNameMutex.Unlock() - if fake.UpdateOrganizationLabelsByOrganizationNameStub != nil { - return fake.UpdateOrganizationLabelsByOrganizationNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateOrganizationLabelsByOrganizationNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -510,15 +515,16 @@ func (fake *FakeSetLabelActor) UpdateRouteLabels(arg1 string, arg2 string, arg3 arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateRouteLabelsStub + fakeReturns := fake.updateRouteLabelsReturns fake.recordInvocation("UpdateRouteLabels", []interface{}{arg1, arg2, arg3}) fake.updateRouteLabelsMutex.Unlock() - if fake.UpdateRouteLabelsStub != nil { - return fake.UpdateRouteLabelsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateRouteLabelsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -574,15 +580,16 @@ func (fake *FakeSetLabelActor) UpdateServiceBrokerLabelsByServiceBrokerName(arg1 arg1 string arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.UpdateServiceBrokerLabelsByServiceBrokerNameStub + fakeReturns := fake.updateServiceBrokerLabelsByServiceBrokerNameReturns fake.recordInvocation("UpdateServiceBrokerLabelsByServiceBrokerName", []interface{}{arg1, arg2}) fake.updateServiceBrokerLabelsByServiceBrokerNameMutex.Unlock() - if fake.UpdateServiceBrokerLabelsByServiceBrokerNameStub != nil { - return fake.UpdateServiceBrokerLabelsByServiceBrokerNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceBrokerLabelsByServiceBrokerNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -639,15 +646,16 @@ func (fake *FakeSetLabelActor) UpdateServiceInstanceLabels(arg1 string, arg2 str arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateServiceInstanceLabelsStub + fakeReturns := fake.updateServiceInstanceLabelsReturns fake.recordInvocation("UpdateServiceInstanceLabels", []interface{}{arg1, arg2, arg3}) fake.updateServiceInstanceLabelsMutex.Unlock() - if fake.UpdateServiceInstanceLabelsStub != nil { - return fake.UpdateServiceInstanceLabelsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceInstanceLabelsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -704,15 +712,16 @@ func (fake *FakeSetLabelActor) UpdateServiceOfferingLabels(arg1 string, arg2 str arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateServiceOfferingLabelsStub + fakeReturns := fake.updateServiceOfferingLabelsReturns fake.recordInvocation("UpdateServiceOfferingLabels", []interface{}{arg1, arg2, arg3}) fake.updateServiceOfferingLabelsMutex.Unlock() - if fake.UpdateServiceOfferingLabelsStub != nil { - return fake.UpdateServiceOfferingLabelsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceOfferingLabelsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -770,15 +779,16 @@ func (fake *FakeSetLabelActor) UpdateServicePlanLabels(arg1 string, arg2 string, arg3 string arg4 map[string]types.NullString }{arg1, arg2, arg3, arg4}) + stub := fake.UpdateServicePlanLabelsStub + fakeReturns := fake.updateServicePlanLabelsReturns fake.recordInvocation("UpdateServicePlanLabels", []interface{}{arg1, arg2, arg3, arg4}) fake.updateServicePlanLabelsMutex.Unlock() - if fake.UpdateServicePlanLabelsStub != nil { - return fake.UpdateServicePlanLabelsStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServicePlanLabelsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -835,15 +845,16 @@ func (fake *FakeSetLabelActor) UpdateSpaceLabelsBySpaceName(arg1 string, arg2 st arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateSpaceLabelsBySpaceNameStub + fakeReturns := fake.updateSpaceLabelsBySpaceNameReturns fake.recordInvocation("UpdateSpaceLabelsBySpaceName", []interface{}{arg1, arg2, arg3}) fake.updateSpaceLabelsBySpaceNameMutex.Unlock() - if fake.UpdateSpaceLabelsBySpaceNameStub != nil { - return fake.UpdateSpaceLabelsBySpaceNameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceLabelsBySpaceNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -899,15 +910,16 @@ func (fake *FakeSetLabelActor) UpdateStackLabelsByStackName(arg1 string, arg2 ma arg1 string arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.UpdateStackLabelsByStackNameStub + fakeReturns := fake.updateStackLabelsByStackNameReturns fake.recordInvocation("UpdateStackLabelsByStackName", []interface{}{arg1, arg2}) fake.updateStackLabelsByStackNameMutex.Unlock() - if fake.UpdateStackLabelsByStackNameStub != nil { - return fake.UpdateStackLabelsByStackNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateStackLabelsByStackNameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_shared_sshactor.go b/command/v7/v7fakes/fake_shared_sshactor.go index 0ddf9c40d68..a7756d048bc 100644 --- a/command/v7/v7fakes/fake_shared_sshactor.go +++ b/command/v7/v7fakes/fake_shared_sshactor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeSharedSSHActor struct { @@ -32,15 +32,16 @@ func (fake *FakeSharedSSHActor) ExecuteSecureShell(arg1 sharedaction.SecureShell arg1 sharedaction.SecureShellClient arg2 sharedaction.SSHOptions }{arg1, arg2}) + stub := fake.ExecuteSecureShellStub + fakeReturns := fake.executeSecureShellReturns fake.recordInvocation("ExecuteSecureShell", []interface{}{arg1, arg2}) fake.executeSecureShellMutex.Unlock() - if fake.ExecuteSecureShellStub != nil { - return fake.ExecuteSecureShellStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeSecureShellReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_v7actor_for_push.go b/command/v7/v7fakes/fake_v7actor_for_push.go index e0005d0483d..22407358123 100644 --- a/command/v7/v7fakes/fake_v7actor_for_push.go +++ b/command/v7/v7fakes/fake_v7actor_for_push.go @@ -5,10 +5,10 @@ import ( "context" "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeV7ActorForPush struct { @@ -105,15 +105,16 @@ func (fake *FakeV7ActorForPush) GetApplicationByNameAndSpace(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationByNameAndSpaceStub + fakeReturns := fake.getApplicationByNameAndSpaceReturns fake.recordInvocation("GetApplicationByNameAndSpace", []interface{}{arg1, arg2}) fake.getApplicationByNameAndSpaceMutex.Unlock() - if fake.GetApplicationByNameAndSpaceStub != nil { - return fake.GetApplicationByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -173,15 +174,16 @@ func (fake *FakeV7ActorForPush) GetDetailedAppSummary(arg1 string, arg2 string, arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.GetDetailedAppSummaryStub + fakeReturns := fake.getDetailedAppSummaryReturns fake.recordInvocation("GetDetailedAppSummary", []interface{}{arg1, arg2, arg3}) fake.getDetailedAppSummaryMutex.Unlock() - if fake.GetDetailedAppSummaryStub != nil { - return fake.GetDetailedAppSummaryStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDetailedAppSummaryReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -241,15 +243,16 @@ func (fake *FakeV7ActorForPush) GetStreamingLogsForApplicationByNameAndSpace(arg arg2 string arg3 sharedaction.LogCacheClient }{arg1, arg2, arg3}) + stub := fake.GetStreamingLogsForApplicationByNameAndSpaceStub + fakeReturns := fake.getStreamingLogsForApplicationByNameAndSpaceReturns fake.recordInvocation("GetStreamingLogsForApplicationByNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.getStreamingLogsForApplicationByNameAndSpaceMutex.Unlock() - if fake.GetStreamingLogsForApplicationByNameAndSpaceStub != nil { - return fake.GetStreamingLogsForApplicationByNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4, ret.result5 } - fakeReturns := fake.getStreamingLogsForApplicationByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4, fakeReturns.result5 } @@ -314,15 +317,16 @@ func (fake *FakeV7ActorForPush) RestartApplication(arg1 string, arg2 bool) (v7ac arg1 string arg2 bool }{arg1, arg2}) + stub := fake.RestartApplicationStub + fakeReturns := fake.restartApplicationReturns fake.recordInvocation("RestartApplication", []interface{}{arg1, arg2}) fake.restartApplicationMutex.Unlock() - if fake.RestartApplicationStub != nil { - return fake.RestartApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.restartApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -383,15 +387,16 @@ func (fake *FakeV7ActorForPush) SetSpaceManifest(arg1 string, arg2 []byte) (v7ac arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.SetSpaceManifestStub + fakeReturns := fake.setSpaceManifestReturns fake.recordInvocation("SetSpaceManifest", []interface{}{arg1, arg2Copy}) fake.setSpaceManifestMutex.Unlock() - if fake.SetSpaceManifestStub != nil { - return fake.SetSpaceManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setSpaceManifestReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/fixtures/plugins/alias_conflicts/alias_conflicts.go b/fixtures/plugins/alias_conflicts/alias_conflicts.go index 3ac44ff67d1..1dba396c20c 100644 --- a/fixtures/plugins/alias_conflicts/alias_conflicts.go +++ b/fixtures/plugins/alias_conflicts/alias_conflicts.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type AliasConflicts struct { diff --git a/fixtures/plugins/call_core_cmd/call_core_cmd.go b/fixtures/plugins/call_core_cmd/call_core_cmd.go index 6027c0c3a3c..aee37e1688e 100644 --- a/fixtures/plugins/call_core_cmd/call_core_cmd.go +++ b/fixtures/plugins/call_core_cmd/call_core_cmd.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type CoreCmd struct{} diff --git a/fixtures/plugins/empty_plugin/empty_plugin.go b/fixtures/plugins/empty_plugin/empty_plugin.go index e7d6f971e99..d996baaface 100644 --- a/fixtures/plugins/empty_plugin/empty_plugin.go +++ b/fixtures/plugins/empty_plugin/empty_plugin.go @@ -1,6 +1,6 @@ package main -import "code.cloudfoundry.org/cli/plugin" +import "code.cloudfoundry.org/cli/v9/plugin" type EmptyPlugin struct{} diff --git a/fixtures/plugins/input/input.go b/fixtures/plugins/input/input.go index cefcd4232e5..31def96bc4f 100644 --- a/fixtures/plugins/input/input.go +++ b/fixtures/plugins/input/input.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Input struct { diff --git a/fixtures/plugins/my_say/my_say.go b/fixtures/plugins/my_say/my_say.go index 1859ccd4236..1a3ce03e901 100644 --- a/fixtures/plugins/my_say/my_say.go +++ b/fixtures/plugins/my_say/my_say.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type MySay struct { diff --git a/fixtures/plugins/panics/panics.go b/fixtures/plugins/panics/panics.go index bb76c2a9c7e..d8997e316fe 100644 --- a/fixtures/plugins/panics/panics.go +++ b/fixtures/plugins/panics/panics.go @@ -10,7 +10,7 @@ package main import ( "os" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Panics struct { diff --git a/fixtures/plugins/test_1/test_1.go b/fixtures/plugins/test_1/test_1.go index 2d57bf235c5..681c60d9915 100644 --- a/fixtures/plugins/test_1/test_1.go +++ b/fixtures/plugins/test_1/test_1.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Test1 struct { diff --git a/fixtures/plugins/test_2/test_2.go b/fixtures/plugins/test_2/test_2.go index 3e8abdd5739..70362393c3a 100644 --- a/fixtures/plugins/test_2/test_2.go +++ b/fixtures/plugins/test_2/test_2.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Test2 struct{} diff --git a/fixtures/plugins/test_with_help/test_with_help.go b/fixtures/plugins/test_with_help/test_with_help.go index a5479d68764..51681aaff5b 100644 --- a/fixtures/plugins/test_with_help/test_with_help.go +++ b/fixtures/plugins/test_with_help/test_with_help.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithHelp struct { diff --git a/fixtures/plugins/test_with_orgs/test_with_orgs.go b/fixtures/plugins/test_with_orgs/test_with_orgs.go index 0c34ce337a9..4cf2e0657e3 100644 --- a/fixtures/plugins/test_with_orgs/test_with_orgs.go +++ b/fixtures/plugins/test_with_orgs/test_with_orgs.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithOrgs struct { diff --git a/fixtures/plugins/test_with_orgs_short_name/test_with_orgs_short_name.go b/fixtures/plugins/test_with_orgs_short_name/test_with_orgs_short_name.go index 2f083b77928..890cd92528d 100644 --- a/fixtures/plugins/test_with_orgs_short_name/test_with_orgs_short_name.go +++ b/fixtures/plugins/test_with_orgs_short_name/test_with_orgs_short_name.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithOrgsShortName struct { diff --git a/fixtures/plugins/test_with_push/test_with_push.go b/fixtures/plugins/test_with_push/test_with_push.go index b9ab37900a2..c2be3cc4860 100644 --- a/fixtures/plugins/test_with_push/test_with_push.go +++ b/fixtures/plugins/test_with_push/test_with_push.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithPush struct { diff --git a/fixtures/plugins/test_with_push_short_name/test_with_push_short_name.go b/fixtures/plugins/test_with_push_short_name/test_with_push_short_name.go index 9466fc94bb4..eca78cb83f8 100644 --- a/fixtures/plugins/test_with_push_short_name/test_with_push_short_name.go +++ b/fixtures/plugins/test_with_push_short_name/test_with_push_short_name.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithPushShortName struct { diff --git a/go.mod b/go.mod index 2ed8a5891b4..4c0f4b2585d 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,9 @@ -module code.cloudfoundry.org/cli +module code.cloudfoundry.org/cli/v9 go 1.23.1 require ( code.cloudfoundry.org/bytefmt v0.21.0 - code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6 code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85 code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 code.cloudfoundry.org/clock v1.24.0 @@ -31,6 +30,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0 github.com/moby/term v0.5.0 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d + github.com/onsi/ginkgo v1.16.4 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.1 github.com/pkg/errors v0.9.1 @@ -73,6 +73,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/nxadm/tail v1.4.8 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/rivo/uniseg v0.2.0 // indirect @@ -90,6 +91,7 @@ require ( google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.35.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect diff --git a/go.sum b/go.sum index f461c63b35a..c66f3afe9cc 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ code.cloudfoundry.org/bytefmt v0.21.0 h1:6a4eAhlnMCSXuPP8TMFtqVY4y93EL1FAqmGG5ePBAew= code.cloudfoundry.org/bytefmt v0.21.0/go.mod h1:/OAOT/x29iXD/O+HuUR2cioFu7+3PSLchUWLQMrAmP8= -code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6 h1:Yc9r1p21kEpni9WlG4mwOZw87TB2QlyS9sAEebZ3+ak= -code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6/go.mod h1:u5FovqC5GGAEbFPz+IdjycDA+gIjhUwqxnu0vbHwVeM= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85 h1:jaHWw9opYjKPrDT19uydBBWSxl+g5F4Hv030fqMsalo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85/go.mod h1:R1EiyOAr7lW0l/YkZNqItUNZ01Q/dYUfbTn4X4Z+82M= code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 h1:O+j8afQWaDuxzKGcculsjgHGK+biBTn6iMjgFpBf54c= diff --git a/integration/assets/configurable_plugin/test_plugin.go b/integration/assets/configurable_plugin/test_plugin.go index 428ef6763cd..0e0fffe27ef 100644 --- a/integration/assets/configurable_plugin/test_plugin.go +++ b/integration/assets/configurable_plugin/test_plugin.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" "github.com/blang/semver/v4" ) diff --git a/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go b/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go index 7342ae5a34c..1552459aedc 100644 --- a/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go +++ b/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" "github.com/blang/semver/v4" ) diff --git a/integration/assets/hydrabroker/database/database_suite_test.go b/integration/assets/hydrabroker/database/database_suite_test.go index a22064d8119..6b7d74ae096 100644 --- a/integration/assets/hydrabroker/database/database_suite_test.go +++ b/integration/assets/hydrabroker/database/database_suite_test.go @@ -2,6 +2,9 @@ package database_test import ( "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) func TestDatabase(t *testing.T) { diff --git a/integration/assets/hydrabroker/database/database_test.go b/integration/assets/hydrabroker/database/database_test.go index 0d9fd8daa49..00faebd56e2 100644 --- a/integration/assets/hydrabroker/database/database_test.go +++ b/integration/assets/hydrabroker/database/database_test.go @@ -5,6 +5,8 @@ import ( "sync" . "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Database", func() { diff --git a/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go b/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go index 62605925395..4d20e0df1ca 100644 --- a/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go +++ b/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go @@ -2,6 +2,9 @@ package integrationtest_test import ( "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) func TestIntegrationtest(t *testing.T) { diff --git a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go index db73f73c02b..dbb584d8bd2 100644 --- a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go +++ b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go @@ -15,6 +15,9 @@ import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" uuid2 "github.com/nu7hatch/gouuid" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gstruct" "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) diff --git a/integration/assets/hydrabroker/store/bindings_test.go b/integration/assets/hydrabroker/store/bindings_test.go index fe30b42ef50..e610eca98d9 100644 --- a/integration/assets/hydrabroker/store/bindings_test.go +++ b/integration/assets/hydrabroker/store/bindings_test.go @@ -7,6 +7,8 @@ import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" uuid "github.com/nu7hatch/gouuid" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Bindings", func() { diff --git a/integration/assets/hydrabroker/store/brokers_test.go b/integration/assets/hydrabroker/store/brokers_test.go index d67b3d99850..e83fac907ec 100644 --- a/integration/assets/hydrabroker/store/brokers_test.go +++ b/integration/assets/hydrabroker/store/brokers_test.go @@ -3,6 +3,9 @@ package store_test import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Brokers", func() { diff --git a/integration/assets/hydrabroker/store/instances_test.go b/integration/assets/hydrabroker/store/instances_test.go index 0fb45a2da1f..986c31a0f02 100644 --- a/integration/assets/hydrabroker/store/instances_test.go +++ b/integration/assets/hydrabroker/store/instances_test.go @@ -7,6 +7,9 @@ import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" uuid "github.com/nu7hatch/gouuid" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Instances", func() { diff --git a/integration/assets/hydrabroker/store/store_suite_test.go b/integration/assets/hydrabroker/store/store_suite_test.go index 0851085ea1e..aa685e16a72 100644 --- a/integration/assets/hydrabroker/store/store_suite_test.go +++ b/integration/assets/hydrabroker/store/store_suite_test.go @@ -2,6 +2,9 @@ package store_test import ( "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) func TestStore(t *testing.T) { diff --git a/integration/assets/test_plugin/test_plugin.go b/integration/assets/test_plugin/test_plugin.go index e6182cf10e2..564bad0fcff 100644 --- a/integration/assets/test_plugin/test_plugin.go +++ b/integration/assets/test_plugin/test_plugin.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Test1 struct { diff --git a/integration/assets/test_plugin_fails_metadata/test_plugin.go b/integration/assets/test_plugin_fails_metadata/test_plugin.go index 14ea6c61ee6..528d90d6e32 100644 --- a/integration/assets/test_plugin_fails_metadata/test_plugin.go +++ b/integration/assets/test_plugin_fails_metadata/test_plugin.go @@ -3,7 +3,7 @@ package main import ( "os" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestPluginFailsMetadata struct{} diff --git a/integration/assets/test_plugin_with_command_overrides/test_plugin.go b/integration/assets/test_plugin_with_command_overrides/test_plugin.go index a3c20408b5c..b5664d7afd8 100644 --- a/integration/assets/test_plugin_with_command_overrides/test_plugin.go +++ b/integration/assets/test_plugin_with_command_overrides/test_plugin.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestPluginWithCommandOverrides struct { diff --git a/integration/assets/test_plugin_with_panic/test_plugin.go b/integration/assets/test_plugin_with_panic/test_plugin.go index c8e96c48ca4..4e7abdecb36 100644 --- a/integration/assets/test_plugin_with_panic/test_plugin.go +++ b/integration/assets/test_plugin_with_panic/test_plugin.go @@ -1,6 +1,6 @@ package main -import "code.cloudfoundry.org/cli/plugin" +import "code.cloudfoundry.org/cli/v9/plugin" type TestPluginWithPanic struct { } diff --git a/integration/helpers/app_instance_table_test.go b/integration/helpers/app_instance_table_test.go index ea3f75a2665..43f41bdd597 100644 --- a/integration/helpers/app_instance_table_test.go +++ b/integration/helpers/app_instance_table_test.go @@ -1,7 +1,7 @@ package helpers_test import ( - . "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/helpers/app_test.go b/integration/helpers/app_test.go index facc0321d60..1efca0230b0 100644 --- a/integration/helpers/app_test.go +++ b/integration/helpers/app_test.go @@ -1,7 +1,7 @@ package helpers_test import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/helpers/commonisolated/common_isolated_setup.go b/integration/helpers/commonisolated/common_isolated_setup.go index 6fab7989afc..cca16527a10 100644 --- a/integration/helpers/commonisolated/common_isolated_setup.go +++ b/integration/helpers/commonisolated/common_isolated_setup.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/config.go b/integration/helpers/config.go index a7d63dcc781..d6e76b3edc2 100644 --- a/integration/helpers/config.go +++ b/integration/helpers/config.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/helpers/plugin.go b/integration/helpers/plugin.go index 2f8b1e617ac..b2ad1909b42 100644 --- a/integration/helpers/plugin.go +++ b/integration/helpers/plugin.go @@ -37,7 +37,7 @@ func BuildConfigurablePlugin(pluginType string, name string, version string, plu commandHelps = append(commandHelps, command.Help) } - pluginPath, err := Build(fmt.Sprintf("code.cloudfoundry.org/cli/integration/assets/%s", pluginType), + pluginPath, err := Build(fmt.Sprintf("code.cloudfoundry.org/cli/v9/integration/assets/%s", pluginType), "-o", name, "-ldflags", diff --git a/integration/helpers/plugin_repo.go b/integration/helpers/plugin_repo.go index 105d77e4c52..45c200027a7 100644 --- a/integration/helpers/plugin_repo.go +++ b/integration/helpers/plugin_repo.go @@ -9,8 +9,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/integration/helpers/route.go b/integration/helpers/route.go index d4cad8196ae..da3324da7ad 100644 --- a/integration/helpers/route.go +++ b/integration/helpers/route.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/helpers/security_group.go b/integration/helpers/security_group.go index 3e6dc0903a4..633042a6ebc 100644 --- a/integration/helpers/security_group.go +++ b/integration/helpers/security_group.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/servicebrokerstub/api.go b/integration/helpers/servicebrokerstub/api.go index 6783c28effa..49a6f421c18 100644 --- a/integration/helpers/servicebrokerstub/api.go +++ b/integration/helpers/servicebrokerstub/api.go @@ -3,7 +3,7 @@ package servicebrokerstub import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" ) diff --git a/integration/helpers/servicebrokerstub/app_config.go b/integration/helpers/servicebrokerstub/app_config.go index c4f3911188a..6f566759daa 100644 --- a/integration/helpers/servicebrokerstub/app_config.go +++ b/integration/helpers/servicebrokerstub/app_config.go @@ -8,7 +8,7 @@ import ( "net/http" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/app_deploy.go b/integration/helpers/servicebrokerstub/app_deploy.go index be4c7abcc63..18f7ee02de0 100644 --- a/integration/helpers/servicebrokerstub/app_deploy.go +++ b/integration/helpers/servicebrokerstub/app_deploy.go @@ -11,7 +11,7 @@ import ( "github.com/onsi/ginkgo/v2" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/cf.go b/integration/helpers/servicebrokerstub/cf.go index 5f92a1a8547..de63781e173 100644 --- a/integration/helpers/servicebrokerstub/cf.go +++ b/integration/helpers/servicebrokerstub/cf.go @@ -3,7 +3,7 @@ package servicebrokerstub import ( "encoding/json" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/version.go b/integration/helpers/version.go index 40ff10205fa..4045a052709 100644 --- a/integration/helpers/version.go +++ b/integration/helpers/version.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/actor/versioncheck" + "code.cloudfoundry.org/cli/v9/actor/versioncheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/shared/experimental/experimental_suite_test.go b/integration/shared/experimental/experimental_suite_test.go index 4861802bf13..fd6d0590d3f 100644 --- a/integration/shared/experimental/experimental_suite_test.go +++ b/integration/shared/experimental/experimental_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/shared/global/global_suite_test.go b/integration/shared/global/global_suite_test.go index 11288dbdbfc..e935a06e156 100644 --- a/integration/shared/global/global_suite_test.go +++ b/integration/shared/global/global_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/shared/global/running_environment_variable_group_command_test.go b/integration/shared/global/running_environment_variable_group_command_test.go index 7ccd5fa7d18..4771216e7ed 100644 --- a/integration/shared/global/running_environment_variable_group_command_test.go +++ b/integration/shared/global/running_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/global/staging_environment_variable_group_command_test.go b/integration/shared/global/staging_environment_variable_group_command_test.go index 612822bd839..b55041d517d 100644 --- a/integration/shared/global/staging_environment_variable_group_command_test.go +++ b/integration/shared/global/staging_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/apps_command_test.go b/integration/shared/isolated/apps_command_test.go index 68167ac179d..62b18f7f93d 100644 --- a/integration/shared/isolated/apps_command_test.go +++ b/integration/shared/isolated/apps_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/config_test.go b/integration/shared/isolated/config_test.go index 324989d6b15..8b8b1e2ee43 100644 --- a/integration/shared/isolated/config_test.go +++ b/integration/shared/isolated/config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - helpers "code.cloudfoundry.org/cli/integration/helpers" + helpers "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/error_handling_test.go b/integration/shared/isolated/error_handling_test.go index d3721c32685..56979f590a5 100644 --- a/integration/shared/isolated/error_handling_test.go +++ b/integration/shared/isolated/error_handling_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/internationalization_test.go b/integration/shared/isolated/internationalization_test.go index 8b317d4d4aa..53ef9ed9290 100644 --- a/integration/shared/isolated/internationalization_test.go +++ b/integration/shared/isolated/internationalization_test.go @@ -1,7 +1,7 @@ package isolated import ( - helpers "code.cloudfoundry.org/cli/integration/helpers" + helpers "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/isolated_suite_test.go b/integration/shared/isolated/isolated_suite_test.go index 8a01781a206..5ff88c40ef3 100644 --- a/integration/shared/isolated/isolated_suite_test.go +++ b/integration/shared/isolated/isolated_suite_test.go @@ -3,7 +3,7 @@ package isolated import ( "testing" - "code.cloudfoundry.org/cli/integration/helpers/commonisolated" + "code.cloudfoundry.org/cli/v9/integration/helpers/commonisolated" ) var ( diff --git a/integration/shared/isolated/logs_command_test.go b/integration/shared/isolated/logs_command_test.go index 5929bef7736..316ec9b3e15 100644 --- a/integration/shared/isolated/logs_command_test.go +++ b/integration/shared/isolated/logs_command_test.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/restart_app_instance_command_test.go b/integration/shared/isolated/restart_app_instance_command_test.go index 0e801ea7886..e9d117d4e29 100644 --- a/integration/shared/isolated/restart_app_instance_command_test.go +++ b/integration/shared/isolated/restart_app_instance_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/spaces_command_test.go b/integration/shared/isolated/spaces_command_test.go index 96ccccdc4d9..1aa98ef5757 100644 --- a/integration/shared/isolated/spaces_command_test.go +++ b/integration/shared/isolated/spaces_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/version_command_test.go b/integration/shared/isolated/version_command_test.go index 35da3f34c1a..6e302f07261 100644 --- a/integration/shared/isolated/version_command_test.go +++ b/integration/shared/isolated/version_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" diff --git a/integration/shared/performance/performance_suite_test.go b/integration/shared/performance/performance_suite_test.go index f9b0cad5084..858589535d6 100644 --- a/integration/shared/performance/performance_suite_test.go +++ b/integration/shared/performance/performance_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/shared/plugin/add_plugin_repo_test.go b/integration/shared/plugin/add_plugin_repo_test.go index 41f9ec43d96..941c7eab7b8 100644 --- a/integration/shared/plugin/add_plugin_repo_test.go +++ b/integration/shared/plugin/add_plugin_repo_test.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/api_test.go b/integration/shared/plugin/api_test.go index 8ffb206371f..49767de8fd2 100644 --- a/integration/shared/plugin/api_test.go +++ b/integration/shared/plugin/api_test.go @@ -3,9 +3,9 @@ package plugin import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/help_test.go b/integration/shared/plugin/help_test.go index 73c7bfdd637..35e64f5f721 100644 --- a/integration/shared/plugin/help_test.go +++ b/integration/shared/plugin/help_test.go @@ -1,7 +1,7 @@ package plugin import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/install_plugin_command_test.go b/integration/shared/plugin/install_plugin_command_test.go index db0da47d6c0..8b9268d1e51 100644 --- a/integration/shared/plugin/install_plugin_command_test.go +++ b/integration/shared/plugin/install_plugin_command_test.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -253,7 +253,7 @@ var _ = Describe("install-plugin command", func() { When("the file is not a plugin", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/non_plugin") + pluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/non_plugin") Expect(err).ToNot(HaveOccurred()) }) @@ -268,7 +268,7 @@ var _ = Describe("install-plugin command", func() { When("getting metadata from the plugin errors", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/test_plugin_fails_metadata") + pluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/test_plugin_fails_metadata") Expect(err).ToNot(HaveOccurred()) }) @@ -767,7 +767,7 @@ var _ = Describe("install-plugin command", func() { When("the file is not a plugin", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/non_plugin") + pluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/non_plugin") Expect(err).ToNot(HaveOccurred()) pluginData, err := os.ReadFile(pluginPath) diff --git a/integration/shared/plugin/install_plugin_command_unix_test.go b/integration/shared/plugin/install_plugin_command_unix_test.go index 4deae1aaed2..e1a8249091c 100644 --- a/integration/shared/plugin/install_plugin_command_unix_test.go +++ b/integration/shared/plugin/install_plugin_command_unix_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/install_plugin_from_repo_command_test.go b/integration/shared/plugin/install_plugin_from_repo_command_test.go index 15d707292ac..56c35924ce2 100644 --- a/integration/shared/plugin/install_plugin_from_repo_command_test.go +++ b/integration/shared/plugin/install_plugin_from_repo_command_test.go @@ -4,8 +4,8 @@ import ( "net/http" "runtime" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/logs_test.go b/integration/shared/plugin/logs_test.go index fd7df06f8e3..b943b8a83c9 100644 --- a/integration/shared/plugin/logs_test.go +++ b/integration/shared/plugin/logs_test.go @@ -1,7 +1,7 @@ package plugin import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/plugin_suite_test.go b/integration/shared/plugin/plugin_suite_test.go index 4411dd6fe7d..0a2f928dfdc 100644 --- a/integration/shared/plugin/plugin_suite_test.go +++ b/integration/shared/plugin/plugin_suite_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -44,13 +44,13 @@ var _ = SynchronizedBeforeSuite(func() []byte { helpers.TurnOffColors() var err error - testPluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/test_plugin") + testPluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/test_plugin") Expect(err).ToNot(HaveOccurred()) - overrideTestPluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/test_plugin_with_command_overrides") + overrideTestPluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/test_plugin_with_command_overrides") Expect(err).ToNot(HaveOccurred()) - panicTestPluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/test_plugin_with_panic") + panicTestPluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/test_plugin_with_panic") Expect(err).ToNot(HaveOccurred()) }) diff --git a/integration/shared/plugin/plugins_command_test.go b/integration/shared/plugin/plugins_command_test.go index f02ce4f7c8d..ca9d63a281a 100644 --- a/integration/shared/plugin/plugins_command_test.go +++ b/integration/shared/plugin/plugins_command_test.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/runner_test.go b/integration/shared/plugin/runner_test.go index 0f2bc869334..1cb0a9f9d09 100644 --- a/integration/shared/plugin/runner_test.go +++ b/integration/shared/plugin/runner_test.go @@ -3,7 +3,7 @@ package plugin import ( "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/uninstall_plugin_command_test.go b/integration/shared/plugin/uninstall_plugin_command_test.go index f937e9e842d..8d4889aeda7 100644 --- a/integration/shared/plugin/uninstall_plugin_command_test.go +++ b/integration/shared/plugin/uninstall_plugin_command_test.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/uninstall_plugin_command_unix_test.go b/integration/shared/plugin/uninstall_plugin_command_unix_test.go index 7458c325f6f..da24e813192 100644 --- a/integration/shared/plugin/uninstall_plugin_command_unix_test.go +++ b/integration/shared/plugin/uninstall_plugin_command_unix_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/bind_running_security_group_command_test.go b/integration/v7/global/bind_running_security_group_command_test.go index 081d4407c99..6f50f588127 100644 --- a/integration/v7/global/bind_running_security_group_command_test.go +++ b/integration/v7/global/bind_running_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/bind_security_group_command_test.go b/integration/v7/global/bind_security_group_command_test.go index efba3e4f316..56d9e0e35fc 100644 --- a/integration/v7/global/bind_security_group_command_test.go +++ b/integration/v7/global/bind_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/bind_staging_security_group_command_test.go b/integration/v7/global/bind_staging_security_group_command_test.go index ea120e6e91b..f8e5e2aaf36 100644 --- a/integration/v7/global/bind_staging_security_group_command_test.go +++ b/integration/v7/global/bind_staging_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/create_buildpack_command_test.go b/integration/v7/global/create_buildpack_command_test.go index 474dab02cfd..de37a4cbebf 100644 --- a/integration/v7/global/create_buildpack_command_test.go +++ b/integration/v7/global/create_buildpack_command_test.go @@ -7,7 +7,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/create_security_group_command_test.go b/integration/v7/global/create_security_group_command_test.go index d701ce2a853..544f6880cb4 100644 --- a/integration/v7/global/create_security_group_command_test.go +++ b/integration/v7/global/create_security_group_command_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/delete_buildpack_command_test.go b/integration/v7/global/delete_buildpack_command_test.go index b00775a7ce4..9df0330d6ef 100644 --- a/integration/v7/global/delete_buildpack_command_test.go +++ b/integration/v7/global/delete_buildpack_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/disable_feature_flag_command_test.go b/integration/v7/global/disable_feature_flag_command_test.go index 646f7063b41..c25a386a279 100644 --- a/integration/v7/global/disable_feature_flag_command_test.go +++ b/integration/v7/global/disable_feature_flag_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/enable_feature_flag_command_test.go b/integration/v7/global/enable_feature_flag_command_test.go index fcda96b1789..ceef6de406e 100644 --- a/integration/v7/global/enable_feature_flag_command_test.go +++ b/integration/v7/global/enable_feature_flag_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/env_command_test.go b/integration/v7/global/env_command_test.go index fc547e3c274..b41c55f0435 100644 --- a/integration/v7/global/env_command_test.go +++ b/integration/v7/global/env_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/global_suite_test.go b/integration/v7/global/global_suite_test.go index 11288dbdbfc..e935a06e156 100644 --- a/integration/v7/global/global_suite_test.go +++ b/integration/v7/global/global_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/global/org_quota_command_test.go b/integration/v7/global/org_quota_command_test.go index a24ebc9327a..74b2c8915e2 100644 --- a/integration/v7/global/org_quota_command_test.go +++ b/integration/v7/global/org_quota_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/org_quotas_command_test.go b/integration/v7/global/org_quotas_command_test.go index 28d3c0acae0..c3c7097a6c4 100644 --- a/integration/v7/global/org_quotas_command_test.go +++ b/integration/v7/global/org_quotas_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/running_environment_variable_group_command_test.go b/integration/v7/global/running_environment_variable_group_command_test.go index 6da1c04182d..df261614177 100644 --- a/integration/v7/global/running_environment_variable_group_command_test.go +++ b/integration/v7/global/running_environment_variable_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/running_security_groups_command_test.go b/integration/v7/global/running_security_groups_command_test.go index fe8b1cd267e..c51332ffc5d 100644 --- a/integration/v7/global/running_security_groups_command_test.go +++ b/integration/v7/global/running_security_groups_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/security_group_command_test.go b/integration/v7/global/security_group_command_test.go index 782d05fe036..11482dbcfd6 100644 --- a/integration/v7/global/security_group_command_test.go +++ b/integration/v7/global/security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/set_org_role_command_test.go b/integration/v7/global/set_org_role_command_test.go index 12a5739aed0..f58328a9624 100644 --- a/integration/v7/global/set_org_role_command_test.go +++ b/integration/v7/global/set_org_role_command_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" ) var _ = Describe("set-org-role command", func() { diff --git a/integration/v7/global/set_running_environment_variable_group_command_test.go b/integration/v7/global/set_running_environment_variable_group_command_test.go index eef6f8c5867..f4a4ebd09b3 100644 --- a/integration/v7/global/set_running_environment_variable_group_command_test.go +++ b/integration/v7/global/set_running_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/set_space_role_command_test.go b/integration/v7/global/set_space_role_command_test.go index aa203a6c046..e04bb7a992e 100644 --- a/integration/v7/global/set_space_role_command_test.go +++ b/integration/v7/global/set_space_role_command_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" ) var _ = Describe("set-space-role command", func() { diff --git a/integration/v7/global/set_staging_environment_variable_group_command_test.go b/integration/v7/global/set_staging_environment_variable_group_command_test.go index 05a1e79aa2b..7174e88b134 100644 --- a/integration/v7/global/set_staging_environment_variable_group_command_test.go +++ b/integration/v7/global/set_staging_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/staging_environment_variable_group_command_test.go b/integration/v7/global/staging_environment_variable_group_command_test.go index bb03b84dcf8..d73db666956 100644 --- a/integration/v7/global/staging_environment_variable_group_command_test.go +++ b/integration/v7/global/staging_environment_variable_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/staging_security_groups_command_test.go b/integration/v7/global/staging_security_groups_command_test.go index 280512a3b03..9bfae4e201c 100644 --- a/integration/v7/global/staging_security_groups_command_test.go +++ b/integration/v7/global/staging_security_groups_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/unbind_running_security_group_command_test.go b/integration/v7/global/unbind_running_security_group_command_test.go index ef2c8a4b5fd..f9b76b6935f 100644 --- a/integration/v7/global/unbind_running_security_group_command_test.go +++ b/integration/v7/global/unbind_running_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/unbind_security_group_command_test.go b/integration/v7/global/unbind_security_group_command_test.go index 18af34f653d..5a1cc5a0978 100644 --- a/integration/v7/global/unbind_security_group_command_test.go +++ b/integration/v7/global/unbind_security_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/unbind_staging_security_group_command_test.go b/integration/v7/global/unbind_staging_security_group_command_test.go index 9a28ea277c4..94e6b62d8f3 100644 --- a/integration/v7/global/unbind_staging_security_group_command_test.go +++ b/integration/v7/global/unbind_staging_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/update_buildpack_command_test.go b/integration/v7/global/update_buildpack_command_test.go index 8409fd6c447..9eb212bfb2f 100644 --- a/integration/v7/global/update_buildpack_command_test.go +++ b/integration/v7/global/update_buildpack_command_test.go @@ -7,7 +7,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/update_security_group_command_test.go b/integration/v7/global/update_security_group_command_test.go index 5f86b6710f5..94d9305d44c 100644 --- a/integration/v7/global/update_security_group_command_test.go +++ b/integration/v7/global/update_security_group_command_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/add_network_policy_command_test.go b/integration/v7/isolated/add_network_policy_command_test.go index db2da6cb241..a37118c2b88 100644 --- a/integration/v7/isolated/add_network_policy_command_test.go +++ b/integration/v7/isolated/add_network_policy_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/allow_space_ssh_command_test.go b/integration/v7/isolated/allow_space_ssh_command_test.go index c7fcabe338a..fdcd075cf48 100644 --- a/integration/v7/isolated/allow_space_ssh_command_test.go +++ b/integration/v7/isolated/allow_space_ssh_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/api_command_test.go b/integration/v7/isolated/api_command_test.go index 8496aa903d5..552371b34a1 100644 --- a/integration/v7/isolated/api_command_test.go +++ b/integration/v7/isolated/api_command_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/app_command_test.go b/integration/v7/isolated/app_command_test.go index fa31c654866..d293e0f971b 100644 --- a/integration/v7/isolated/app_command_test.go +++ b/integration/v7/isolated/app_command_test.go @@ -6,8 +6,8 @@ import ( "path" "path/filepath" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/apply_manifest_command_test.go b/integration/v7/isolated/apply_manifest_command_test.go index 82df22e0e7e..68aa7297c72 100644 --- a/integration/v7/isolated/apply_manifest_command_test.go +++ b/integration/v7/isolated/apply_manifest_command_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/apps_command_test.go b/integration/v7/isolated/apps_command_test.go index d7ca99920f4..8032678b0a5 100644 --- a/integration/v7/isolated/apps_command_test.go +++ b/integration/v7/isolated/apps_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/auth_command_test.go b/integration/v7/isolated/auth_command_test.go index 34d5e967aa8..57e1955a144 100644 --- a/integration/v7/isolated/auth_command_test.go +++ b/integration/v7/isolated/auth_command_test.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/bind_route_service_command_test.go b/integration/v7/isolated/bind_route_service_command_test.go index 14ab99f21ec..35c8f42839c 100644 --- a/integration/v7/isolated/bind_route_service_command_test.go +++ b/integration/v7/isolated/bind_route_service_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/bind_service_command_test.go b/integration/v7/isolated/bind_service_command_test.go index 291da26d699..3d3dc7ac2b4 100644 --- a/integration/v7/isolated/bind_service_command_test.go +++ b/integration/v7/isolated/bind_service_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/buildpacks_command_test.go b/integration/v7/isolated/buildpacks_command_test.go index ae357673e2f..00822e67ce7 100644 --- a/integration/v7/isolated/buildpacks_command_test.go +++ b/integration/v7/isolated/buildpacks_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/cancel_deployment_test.go b/integration/v7/isolated/cancel_deployment_test.go index 7a2d1066a86..f49814d9139 100644 --- a/integration/v7/isolated/cancel_deployment_test.go +++ b/integration/v7/isolated/cancel_deployment_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/check_route_command_test.go b/integration/v7/isolated/check_route_command_test.go index 70067930741..a77ceaf2cff 100644 --- a/integration/v7/isolated/check_route_command_test.go +++ b/integration/v7/isolated/check_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/config_command_test.go b/integration/v7/isolated/config_command_test.go index 549af21a49f..7ac858e29e4 100644 --- a/integration/v7/isolated/config_command_test.go +++ b/integration/v7/isolated/config_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/config_test.go b/integration/v7/isolated/config_test.go index 985e3e40808..548086cfc8f 100644 --- a/integration/v7/isolated/config_test.go +++ b/integration/v7/isolated/config_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/isolated/continue_deployment_test.go b/integration/v7/isolated/continue_deployment_test.go index 29f0362363a..6503fca4e31 100644 --- a/integration/v7/isolated/continue_deployment_test.go +++ b/integration/v7/isolated/continue_deployment_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/copy_source_command_test.go b/integration/v7/isolated/copy_source_command_test.go index a073cb64c9a..8cdc2eb0eec 100644 --- a/integration/v7/isolated/copy_source_command_test.go +++ b/integration/v7/isolated/copy_source_command_test.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_app_command_test.go b/integration/v7/isolated/create_app_command_test.go index 680891fe5a8..c7bb75a31e5 100644 --- a/integration/v7/isolated/create_app_command_test.go +++ b/integration/v7/isolated/create_app_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_app_manifest_command_test.go b/integration/v7/isolated/create_app_manifest_command_test.go index 9e6be584d7c..205cea7a650 100644 --- a/integration/v7/isolated/create_app_manifest_command_test.go +++ b/integration/v7/isolated/create_app_manifest_command_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_isolation_segment_command_test.go b/integration/v7/isolated/create_isolation_segment_command_test.go index 5ed9ed9bd4b..9595db4af1c 100644 --- a/integration/v7/isolated/create_isolation_segment_command_test.go +++ b/integration/v7/isolated/create_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_org_command_test.go b/integration/v7/isolated/create_org_command_test.go index 3c6b1e2a14b..af66b302858 100644 --- a/integration/v7/isolated/create_org_command_test.go +++ b/integration/v7/isolated/create_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_org_quota_command_test.go b/integration/v7/isolated/create_org_quota_command_test.go index 833101d40a7..9c0baea347d 100644 --- a/integration/v7/isolated/create_org_quota_command_test.go +++ b/integration/v7/isolated/create_org_quota_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_package_cfignore_test.go b/integration/v7/isolated/create_package_cfignore_test.go index a1ebe0b89c6..97db93dd0c4 100644 --- a/integration/v7/isolated/create_package_cfignore_test.go +++ b/integration/v7/isolated/create_package_cfignore_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_package_command_test.go b/integration/v7/isolated/create_package_command_test.go index 3342faceabd..60c4c339127 100644 --- a/integration/v7/isolated/create_package_command_test.go +++ b/integration/v7/isolated/create_package_command_test.go @@ -4,9 +4,9 @@ import ( "os" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_private_domain_test.go b/integration/v7/isolated/create_private_domain_test.go index 84bb1ff88f9..69f62dbf89c 100644 --- a/integration/v7/isolated/create_private_domain_test.go +++ b/integration/v7/isolated/create_private_domain_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_route_command_test.go b/integration/v7/isolated/create_route_command_test.go index 60e64ba82a6..0e4b1ec5796 100644 --- a/integration/v7/isolated/create_route_command_test.go +++ b/integration/v7/isolated/create_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_broker_command_test.go b/integration/v7/isolated/create_service_broker_command_test.go index 2bd168935b7..ff288566ce7 100644 --- a/integration/v7/isolated/create_service_broker_command_test.go +++ b/integration/v7/isolated/create_service_broker_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "io" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_command_test.go b/integration/v7/isolated/create_service_command_test.go index 3dc0c32206b..a8a3b216f68 100644 --- a/integration/v7/isolated/create_service_command_test.go +++ b/integration/v7/isolated/create_service_command_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_key_command_test.go b/integration/v7/isolated/create_service_key_command_test.go index 32ee8edb2fa..3d03f9da118 100644 --- a/integration/v7/isolated/create_service_key_command_test.go +++ b/integration/v7/isolated/create_service_key_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_shared_domain_test.go b/integration/v7/isolated/create_shared_domain_test.go index c16129dadef..d118ad4a638 100644 --- a/integration/v7/isolated/create_shared_domain_test.go +++ b/integration/v7/isolated/create_shared_domain_test.go @@ -4,8 +4,8 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_space_command_test.go b/integration/v7/isolated/create_space_command_test.go index 7bb6115720a..40ffa796bc8 100644 --- a/integration/v7/isolated/create_space_command_test.go +++ b/integration/v7/isolated/create_space_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_space_quota_command_test.go b/integration/v7/isolated/create_space_quota_command_test.go index 048547566ac..65ba81b7162 100644 --- a/integration/v7/isolated/create_space_quota_command_test.go +++ b/integration/v7/isolated/create_space_quota_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_user_command_test.go b/integration/v7/isolated/create_user_command_test.go index 6cda9958ee9..2f8cba570a3 100644 --- a/integration/v7/isolated/create_user_command_test.go +++ b/integration/v7/isolated/create_user_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/create_user_provided_service_command_test.go b/integration/v7/isolated/create_user_provided_service_command_test.go index 868217ccd49..4f056ab2b56 100644 --- a/integration/v7/isolated/create_user_provided_service_command_test.go +++ b/integration/v7/isolated/create_user_provided_service_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/curl_command_test.go b/integration/v7/isolated/curl_command_test.go index c65a4b864d7..bb8f1fc8edf 100644 --- a/integration/v7/isolated/curl_command_test.go +++ b/integration/v7/isolated/curl_command_test.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_command_test.go b/integration/v7/isolated/delete_command_test.go index 829ab4f2515..8b7cbd9afe5 100644 --- a/integration/v7/isolated/delete_command_test.go +++ b/integration/v7/isolated/delete_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_isolation_segment_command_test.go b/integration/v7/isolated/delete_isolation_segment_command_test.go index d6869e814bb..b0b97c2e425 100644 --- a/integration/v7/isolated/delete_isolation_segment_command_test.go +++ b/integration/v7/isolated/delete_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_org_command_test.go b/integration/v7/isolated/delete_org_command_test.go index f8134fd3d73..8df411c7897 100644 --- a/integration/v7/isolated/delete_org_command_test.go +++ b/integration/v7/isolated/delete_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_org_quota_command_test.go b/integration/v7/isolated/delete_org_quota_command_test.go index c0b613497af..97d1b6fca15 100644 --- a/integration/v7/isolated/delete_org_quota_command_test.go +++ b/integration/v7/isolated/delete_org_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_orphaned_routes_command_test.go b/integration/v7/isolated/delete_orphaned_routes_command_test.go index ca34b582531..c3fba868abc 100644 --- a/integration/v7/isolated/delete_orphaned_routes_command_test.go +++ b/integration/v7/isolated/delete_orphaned_routes_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_private_domain_command_test.go b/integration/v7/isolated/delete_private_domain_command_test.go index af707bd6a9a..c7c7afce7f7 100644 --- a/integration/v7/isolated/delete_private_domain_command_test.go +++ b/integration/v7/isolated/delete_private_domain_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_route_command_test.go b/integration/v7/isolated/delete_route_command_test.go index 74842472685..17c51fd3c9f 100644 --- a/integration/v7/isolated/delete_route_command_test.go +++ b/integration/v7/isolated/delete_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_security_group_command_test.go b/integration/v7/isolated/delete_security_group_command_test.go index 5a902dad8d9..f3876e375d4 100644 --- a/integration/v7/isolated/delete_security_group_command_test.go +++ b/integration/v7/isolated/delete_security_group_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_broker_command_test.go b/integration/v7/isolated/delete_service_broker_command_test.go index a1808622113..c8b9070e7f7 100644 --- a/integration/v7/isolated/delete_service_broker_command_test.go +++ b/integration/v7/isolated/delete_service_broker_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_command_test.go b/integration/v7/isolated/delete_service_command_test.go index 051d886c8ac..17d1c02c7df 100644 --- a/integration/v7/isolated/delete_service_command_test.go +++ b/integration/v7/isolated/delete_service_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_key_command_test.go b/integration/v7/isolated/delete_service_key_command_test.go index c5fdb3d8add..ed0ab423943 100644 --- a/integration/v7/isolated/delete_service_key_command_test.go +++ b/integration/v7/isolated/delete_service_key_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_shared_domain_command_test.go b/integration/v7/isolated/delete_shared_domain_command_test.go index 8740084568c..ef760b9c957 100644 --- a/integration/v7/isolated/delete_shared_domain_command_test.go +++ b/integration/v7/isolated/delete_shared_domain_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_space_command_test.go b/integration/v7/isolated/delete_space_command_test.go index 6538dcb2991..0194bddafde 100644 --- a/integration/v7/isolated/delete_space_command_test.go +++ b/integration/v7/isolated/delete_space_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_space_quota_command_test.go b/integration/v7/isolated/delete_space_quota_command_test.go index bc5d0c884a5..99da198eea6 100644 --- a/integration/v7/isolated/delete_space_quota_command_test.go +++ b/integration/v7/isolated/delete_space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_user_command_test.go b/integration/v7/isolated/delete_user_command_test.go index c5740557daf..73ab73abe72 100644 --- a/integration/v7/isolated/delete_user_command_test.go +++ b/integration/v7/isolated/delete_user_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_org_isolation_command_test.go b/integration/v7/isolated/disable_org_isolation_command_test.go index bb47b2d7571..7b777affce6 100644 --- a/integration/v7/isolated/disable_org_isolation_command_test.go +++ b/integration/v7/isolated/disable_org_isolation_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_service_access_command_test.go b/integration/v7/isolated/disable_service_access_command_test.go index ca78b0bc630..422e418e08d 100644 --- a/integration/v7/isolated/disable_service_access_command_test.go +++ b/integration/v7/isolated/disable_service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_ssh_command_test.go b/integration/v7/isolated/disable_ssh_command_test.go index 9de1ddbbafe..89d213f92b0 100644 --- a/integration/v7/isolated/disable_ssh_command_test.go +++ b/integration/v7/isolated/disable_ssh_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disallow_space_ssh_command_test.go b/integration/v7/isolated/disallow_space_ssh_command_test.go index cc1f3502e36..1d0a56d7081 100644 --- a/integration/v7/isolated/disallow_space_ssh_command_test.go +++ b/integration/v7/isolated/disallow_space_ssh_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/domains_command_test.go b/integration/v7/isolated/domains_command_test.go index 39ec17e2f41..b8f8d94af2f 100644 --- a/integration/v7/isolated/domains_command_test.go +++ b/integration/v7/isolated/domains_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/download_droplet_command_test.go b/integration/v7/isolated/download_droplet_command_test.go index 8fbe350ea71..ed4b4e11fd7 100644 --- a/integration/v7/isolated/download_droplet_command_test.go +++ b/integration/v7/isolated/download_droplet_command_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/droplets_command_test.go b/integration/v7/isolated/droplets_command_test.go index 186700f08b5..60b1a68136c 100644 --- a/integration/v7/isolated/droplets_command_test.go +++ b/integration/v7/isolated/droplets_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_org_isolation_command_test.go b/integration/v7/isolated/enable_org_isolation_command_test.go index 5f8ded92b22..b4f0bfd3f63 100644 --- a/integration/v7/isolated/enable_org_isolation_command_test.go +++ b/integration/v7/isolated/enable_org_isolation_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_service_access_command_test.go b/integration/v7/isolated/enable_service_access_command_test.go index aabff91eb51..38a988d0ef2 100644 --- a/integration/v7/isolated/enable_service_access_command_test.go +++ b/integration/v7/isolated/enable_service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_ssh_command_test.go b/integration/v7/isolated/enable_ssh_command_test.go index 014791f83b6..b88658a97f9 100644 --- a/integration/v7/isolated/enable_ssh_command_test.go +++ b/integration/v7/isolated/enable_ssh_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/error_on_extra_arguments_test.go b/integration/v7/isolated/error_on_extra_arguments_test.go index 712f9036f21..984bfbbec2a 100644 --- a/integration/v7/isolated/error_on_extra_arguments_test.go +++ b/integration/v7/isolated/error_on_extra_arguments_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/events_command_test.go b/integration/v7/isolated/events_command_test.go index 9b6ddb295c5..ef718acb82c 100644 --- a/integration/v7/isolated/events_command_test.go +++ b/integration/v7/isolated/events_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/feature_flag_command_test.go b/integration/v7/isolated/feature_flag_command_test.go index bcec97a4bd6..e1bc1c73266 100644 --- a/integration/v7/isolated/feature_flag_command_test.go +++ b/integration/v7/isolated/feature_flag_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/feature_flags_command_test.go b/integration/v7/isolated/feature_flags_command_test.go index 26f7c7e4c43..d62c8380e4f 100644 --- a/integration/v7/isolated/feature_flags_command_test.go +++ b/integration/v7/isolated/feature_flags_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/get_health_check_command_test.go b/integration/v7/isolated/get_health_check_command_test.go index a1b64a9f566..7db02d1c203 100644 --- a/integration/v7/isolated/get_health_check_command_test.go +++ b/integration/v7/isolated/get_health_check_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/help_command_test.go b/integration/v7/isolated/help_command_test.go index 43991701ea0..c80b9f1abf0 100644 --- a/integration/v7/isolated/help_command_test.go +++ b/integration/v7/isolated/help_command_test.go @@ -4,8 +4,8 @@ import ( "os/exec" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/isolated_suite_test.go b/integration/v7/isolated/isolated_suite_test.go index dc376ee9eff..aaa413d683d 100644 --- a/integration/v7/isolated/isolated_suite_test.go +++ b/integration/v7/isolated/isolated_suite_test.go @@ -3,7 +3,7 @@ package isolated import ( "testing" - "code.cloudfoundry.org/cli/integration/helpers/commonisolated" + "code.cloudfoundry.org/cli/v9/integration/helpers/commonisolated" ) const ( diff --git a/integration/v7/isolated/isolation_segments_command_test.go b/integration/v7/isolated/isolation_segments_command_test.go index bb5243e785a..e75a3573e23 100644 --- a/integration/v7/isolated/isolation_segments_command_test.go +++ b/integration/v7/isolated/isolation_segments_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/labels_command_test.go b/integration/v7/isolated/labels_command_test.go index c8182e00285..4adf09e4ba8 100644 --- a/integration/v7/isolated/labels_command_test.go +++ b/integration/v7/isolated/labels_command_test.go @@ -4,10 +4,10 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/login_command_test.go b/integration/v7/isolated/login_command_test.go index 34081b40051..51190f389f5 100644 --- a/integration/v7/isolated/login_command_test.go +++ b/integration/v7/isolated/login_command_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/logout_command_test.go b/integration/v7/isolated/logout_command_test.go index e275aaed577..2c2ec01a940 100644 --- a/integration/v7/isolated/logout_command_test.go +++ b/integration/v7/isolated/logout_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/logs_command_test.go b/integration/v7/isolated/logs_command_test.go index 241a3c1a9f7..dab0d91dd5a 100644 --- a/integration/v7/isolated/logs_command_test.go +++ b/integration/v7/isolated/logs_command_test.go @@ -6,9 +6,9 @@ import ( "os/exec" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/map_route_command_test.go b/integration/v7/isolated/map_route_command_test.go index a22b82c0c35..a7882a7dcf2 100644 --- a/integration/v7/isolated/map_route_command_test.go +++ b/integration/v7/isolated/map_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/marketplace_command_test.go b/integration/v7/isolated/marketplace_command_test.go index 08567ea41b6..00725df8d5f 100644 --- a/integration/v7/isolated/marketplace_command_test.go +++ b/integration/v7/isolated/marketplace_command_test.go @@ -4,8 +4,8 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -393,7 +393,7 @@ var _ = Describe("marketplace command", func() { // Available - //When("a plan has cost information", func() { + // When("a plan has cost information", func() { // var brokerWithCosts *servicebrokerstub.ServiceBrokerStub // // BeforeEach(func() { @@ -438,7 +438,7 @@ var _ = Describe("marketplace command", func() { // Say(`%s\s+%s\s+%s\s+\n`, brokerWithCosts.Services[0].Plans[3].Name, brokerWithCosts.Services[0].Plans[3].Description, "free"), // )) // }) - //}) + // }) }) }) diff --git a/integration/v7/isolated/move_route_command_test.go b/integration/v7/isolated/move_route_command_test.go index 2ea4a7c6b1f..a2944170639 100644 --- a/integration/v7/isolated/move_route_command_test.go +++ b/integration/v7/isolated/move_route_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/network_policies_command_test.go b/integration/v7/isolated/network_policies_command_test.go index 05469eccd89..3c6b6fe3556 100644 --- a/integration/v7/isolated/network_policies_command_test.go +++ b/integration/v7/isolated/network_policies_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/oauth_client_test.go b/integration/v7/isolated/oauth_client_test.go index 9d7e9ee834b..8e03de5d21c 100644 --- a/integration/v7/isolated/oauth_client_test.go +++ b/integration/v7/isolated/oauth_client_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/oauth_token_command_test.go b/integration/v7/isolated/oauth_token_command_test.go index 8cabb8b142b..4a3d3e2b98f 100644 --- a/integration/v7/isolated/oauth_token_command_test.go +++ b/integration/v7/isolated/oauth_token_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/org_command_test.go b/integration/v7/isolated/org_command_test.go index ddfece678e6..4bbd1dd9fdc 100644 --- a/integration/v7/isolated/org_command_test.go +++ b/integration/v7/isolated/org_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "sort" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/org_users_command_test.go b/integration/v7/isolated/org_users_command_test.go index f013da9db1b..7468449c7bb 100644 --- a/integration/v7/isolated/org_users_command_test.go +++ b/integration/v7/isolated/org_users_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/orgs_command_test.go b/integration/v7/isolated/orgs_command_test.go index db77e0eac99..7380c7a9a43 100644 --- a/integration/v7/isolated/orgs_command_test.go +++ b/integration/v7/isolated/orgs_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/packages_command_test.go b/integration/v7/isolated/packages_command_test.go index f81f6b47dcf..55c264e8ca1 100644 --- a/integration/v7/isolated/packages_command_test.go +++ b/integration/v7/isolated/packages_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/passwd_command_test.go b/integration/v7/isolated/passwd_command_test.go index f5caa3685fd..eb9db7c9973 100644 --- a/integration/v7/isolated/passwd_command_test.go +++ b/integration/v7/isolated/passwd_command_test.go @@ -5,8 +5,8 @@ import ( "io" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/proxy_connection_test.go b/integration/v7/isolated/proxy_connection_test.go index 1c25e4fc26d..df25cb3670d 100644 --- a/integration/v7/isolated/proxy_connection_test.go +++ b/integration/v7/isolated/proxy_connection_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/purge_service_instance_command_test.go b/integration/v7/isolated/purge_service_instance_command_test.go index 60c13a7a742..fb78fec6b9a 100644 --- a/integration/v7/isolated/purge_service_instance_command_test.go +++ b/integration/v7/isolated/purge_service_instance_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/purge_service_offering_command_test.go b/integration/v7/isolated/purge_service_offering_command_test.go index ac09419e92a..227b8a3cc9d 100644 --- a/integration/v7/isolated/purge_service_offering_command_test.go +++ b/integration/v7/isolated/purge_service_offering_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/remove_network_policy_command_test.go b/integration/v7/isolated/remove_network_policy_command_test.go index 22c3871f7a0..fd4fc35979e 100644 --- a/integration/v7/isolated/remove_network_policy_command_test.go +++ b/integration/v7/isolated/remove_network_policy_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_command_test.go b/integration/v7/isolated/rename_command_test.go index 29e5d58eb2e..c2ec53e1c9d 100644 --- a/integration/v7/isolated/rename_command_test.go +++ b/integration/v7/isolated/rename_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_org_command_test.go b/integration/v7/isolated/rename_org_command_test.go index e8bb88ecbb0..ed1f457c0a9 100644 --- a/integration/v7/isolated/rename_org_command_test.go +++ b/integration/v7/isolated/rename_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_service_broker_command_test.go b/integration/v7/isolated/rename_service_broker_command_test.go index bac5aa88f2e..006418abd70 100644 --- a/integration/v7/isolated/rename_service_broker_command_test.go +++ b/integration/v7/isolated/rename_service_broker_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_service_command_test.go b/integration/v7/isolated/rename_service_command_test.go index 235b34840c5..9bcb0f6fa9a 100644 --- a/integration/v7/isolated/rename_service_command_test.go +++ b/integration/v7/isolated/rename_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_space_command_test.go b/integration/v7/isolated/rename_space_command_test.go index 3360df69e44..a8f1ce582a8 100644 --- a/integration/v7/isolated/rename_space_command_test.go +++ b/integration/v7/isolated/rename_space_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/reset_org_default_isolation_segment_command_test.go b/integration/v7/isolated/reset_org_default_isolation_segment_command_test.go index 2cd88a1505d..31548f3dcb0 100644 --- a/integration/v7/isolated/reset_org_default_isolation_segment_command_test.go +++ b/integration/v7/isolated/reset_org_default_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/reset_space_isolation_segment_test.go b/integration/v7/isolated/reset_space_isolation_segment_test.go index effd49f7260..ed6b8622872 100644 --- a/integration/v7/isolated/reset_space_isolation_segment_test.go +++ b/integration/v7/isolated/reset_space_isolation_segment_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/restage_command_test.go b/integration/v7/isolated/restage_command_test.go index 3d88fcad0da..34f42b6124b 100644 --- a/integration/v7/isolated/restage_command_test.go +++ b/integration/v7/isolated/restage_command_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -146,7 +146,7 @@ var _ = Describe("restage command", func() { userName, _ := helpers.GetCredentials() session := helpers.CustomCF(helpers.CFEnv{ EnvVars: map[string]string{"CF_STARTUP_TIMEOUT": "0.1"}, - }, "restage", appName, "--strategy", "rolling", "--max-in-flight", "3") + }, "restage", appName, "--strategy", "rolling") Consistently(session.Err).ShouldNot(Say(`This action will cause app downtime\.`)) Eventually(session).Should(Say(`Restaging app %s in org %s / space %s as %s\.\.\.`, appName, orgName, spaceName, userName)) Eventually(session).Should(Say(`Creating deployment for app %s\.\.\.`, appName)) @@ -157,6 +157,22 @@ var _ = Describe("restage command", func() { Eventually(session).Should(Exit(1)) }) }) + + When("strategy rolling is given with max-in-flight", func() { + It("fails and displays the deployment failure message", func() { + userName, _ := helpers.GetCredentials() + session := helpers.CustomCF(helpers.CFEnv{ + EnvVars: map[string]string{"CF_STARTUP_TIMEOUT": "0.1"}, + }, "restage", appName, "--strategy", "rolling", "--max-in-flight", "3") + Consistently(session.Err).ShouldNot(Say(`This action will cause app downtime\.`)) + Eventually(session).Should(Say(`Restaging app %s in org %s / space %s as %s\.\.\.`, appName, orgName, spaceName, userName)) + Eventually(session).Should(Say(`Creating deployment for app %s\.\.\.`, appName)) + Eventually(session).Should(Say(`Waiting for app to deploy\.\.\.`)) + Eventually(session.Err).Should(Say(`Cannot cancel a deployment with status: FINALIZED and reason: DEPLOYED`)) + Eventually(session).Should(Say("FAILED")) + Eventually(session).Should(Exit(1)) + }) + }) }) When("the app stages and starts properly", func() { diff --git a/integration/v7/isolated/restart_app_instance_command_test.go b/integration/v7/isolated/restart_app_instance_command_test.go index ce1a1f5ebfb..38f7eb2e9ef 100644 --- a/integration/v7/isolated/restart_app_instance_command_test.go +++ b/integration/v7/isolated/restart_app_instance_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/restart_command_test.go b/integration/v7/isolated/restart_command_test.go index f58f5e60abf..32d6e6a0ebb 100644 --- a/integration/v7/isolated/restart_command_test.go +++ b/integration/v7/isolated/restart_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/revision_command_test.go b/integration/v7/isolated/revision_command_test.go index 87b5c19dc4b..e74a8a59e97 100644 --- a/integration/v7/isolated/revision_command_test.go +++ b/integration/v7/isolated/revision_command_test.go @@ -1,14 +1,14 @@ package isolated import ( - "bytes" - "encoding/json" - "fmt" - "os/exec" - "strings" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "bytes" + "encoding/json" + "fmt" + "os/exec" + "strings" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/revisions_command_test.go b/integration/v7/isolated/revisions_command_test.go index bb718f0177c..8a8b736432c 100644 --- a/integration/v7/isolated/revisions_command_test.go +++ b/integration/v7/isolated/revisions_command_test.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rollback_command_test.go b/integration/v7/isolated/rollback_command_test.go index e2bbc7b4f79..c5561012ce5 100644 --- a/integration/v7/isolated/rollback_command_test.go +++ b/integration/v7/isolated/rollback_command_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/route_command_test.go b/integration/v7/isolated/route_command_test.go index 140cd1178ae..4ed6a55ba04 100644 --- a/integration/v7/isolated/route_command_test.go +++ b/integration/v7/isolated/route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/router_groups_command_test.go b/integration/v7/isolated/router_groups_command_test.go index b49a79cf088..8471e4fd78e 100644 --- a/integration/v7/isolated/router_groups_command_test.go +++ b/integration/v7/isolated/router_groups_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/routes_command_test.go b/integration/v7/isolated/routes_command_test.go index 4f5ff25fcd4..7c30d78f3f8 100644 --- a/integration/v7/isolated/routes_command_test.go +++ b/integration/v7/isolated/routes_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/run_task_command_test.go b/integration/v7/isolated/run_task_command_test.go index 6cbbc7a0080..b5dab647723 100644 --- a/integration/v7/isolated/run_task_command_test.go +++ b/integration/v7/isolated/run_task_command_test.go @@ -4,8 +4,8 @@ import ( "fmt" "path" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/scale_command_test.go b/integration/v7/isolated/scale_command_test.go index dbfc9af9cf2..1bdd2b11d23 100644 --- a/integration/v7/isolated/scale_command_test.go +++ b/integration/v7/isolated/scale_command_test.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -312,7 +312,7 @@ var _ = Describe("scale command", func() { _, err := buffer.Write([]byte("y\n")) Expect(err).ToNot(HaveOccurred()) - //Delay to reduce flakiness + // Delay to reduce flakiness time.Sleep(3 * time.Second) session := helpers.CFWithStdin(buffer, "scale", appName, "-i", "2", "-k", "512M", "-m", "60M") @@ -324,7 +324,7 @@ var _ = Describe("scale command", func() { helpers.WaitForAppMemoryToTakeEffect(appName, 0, 0, false, "60M") - //Delay to reduce flakiness + // Delay to reduce flakiness time.Sleep(5 * time.Second) session = helpers.CF("app", appName) diff --git a/integration/v7/isolated/security_groups_command_test.go b/integration/v7/isolated/security_groups_command_test.go index ed2538be128..828f18ca7e5 100644 --- a/integration/v7/isolated/security_groups_command_test.go +++ b/integration/v7/isolated/security_groups_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_access_command_test.go b/integration/v7/isolated/service_access_command_test.go index 3cd24fc51a4..19a27160aec 100644 --- a/integration/v7/isolated/service_access_command_test.go +++ b/integration/v7/isolated/service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_brokers_command_test.go b/integration/v7/isolated/service_brokers_command_test.go index b27126d02f9..5a7a6a3cb0d 100644 --- a/integration/v7/isolated/service_brokers_command_test.go +++ b/integration/v7/isolated/service_brokers_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_command_test.go b/integration/v7/isolated/service_command_test.go index c2f1c340c8a..6bc11c1a6ed 100644 --- a/integration/v7/isolated/service_command_test.go +++ b/integration/v7/isolated/service_command_test.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -171,7 +171,7 @@ var _ = Describe("service command", func() { }) It("displays the bound apps", func() { - //Delay to reduce flakiness + // Delay to reduce flakiness time.Sleep(10 * time.Second) session := helpers.CF(serviceCommand, serviceInstanceName, "-v") Eventually(session).Should(Exit(0)) diff --git a/integration/v7/isolated/service_key_command_test.go b/integration/v7/isolated/service_key_command_test.go index 735eae8ba8f..0dc87059b67 100644 --- a/integration/v7/isolated/service_key_command_test.go +++ b/integration/v7/isolated/service_key_command_test.go @@ -1,12 +1,12 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/gomega/gexec" . "github.com/onsi/gomega/gbytes" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/isolated/service_keys_command_test.go b/integration/v7/isolated/service_keys_command_test.go index 053e0b99cbf..2b520a4f744 100644 --- a/integration/v7/isolated/service_keys_command_test.go +++ b/integration/v7/isolated/service_keys_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/services_command_test.go b/integration/v7/isolated/services_command_test.go index a04819006df..fa13324ea09 100644 --- a/integration/v7/isolated/services_command_test.go +++ b/integration/v7/isolated/services_command_test.go @@ -2,8 +2,8 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_droplet_command_test.go b/integration/v7/isolated/set_droplet_command_test.go index a5db7cbdf74..19670114201 100644 --- a/integration/v7/isolated/set_droplet_command_test.go +++ b/integration/v7/isolated/set_droplet_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_env_command_test.go b/integration/v7/isolated/set_env_command_test.go index 1e3a71fa642..ffd3bce40c5 100644 --- a/integration/v7/isolated/set_env_command_test.go +++ b/integration/v7/isolated/set_env_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_health_check_command_test.go b/integration/v7/isolated/set_health_check_command_test.go index 5d9d48b054a..88da54718f2 100644 --- a/integration/v7/isolated/set_health_check_command_test.go +++ b/integration/v7/isolated/set_health_check_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_label_command_test.go b/integration/v7/isolated/set_label_command_test.go index fac616d7a22..623fd782d08 100644 --- a/integration/v7/isolated/set_label_command_test.go +++ b/integration/v7/isolated/set_label_command_test.go @@ -4,10 +4,10 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_org_default_isolation_segment_command_test.go b/integration/v7/isolated/set_org_default_isolation_segment_command_test.go index 3c00315471d..2bbe4fa13c2 100644 --- a/integration/v7/isolated/set_org_default_isolation_segment_command_test.go +++ b/integration/v7/isolated/set_org_default_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_org_quota_command_test.go b/integration/v7/isolated/set_org_quota_command_test.go index 0288818c69b..98d34797244 100644 --- a/integration/v7/isolated/set_org_quota_command_test.go +++ b/integration/v7/isolated/set_org_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_org_role_command_test.go b/integration/v7/isolated/set_org_role_command_test.go index 60967ccef8e..ac64e821f9a 100644 --- a/integration/v7/isolated/set_org_role_command_test.go +++ b/integration/v7/isolated/set_org_role_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_space_isolation_segment_command_test.go b/integration/v7/isolated/set_space_isolation_segment_command_test.go index 64915b1890a..56885b7c23c 100644 --- a/integration/v7/isolated/set_space_isolation_segment_command_test.go +++ b/integration/v7/isolated/set_space_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_space_quota_command_test.go b/integration/v7/isolated/set_space_quota_command_test.go index 19f2f451c66..514ead410e3 100644 --- a/integration/v7/isolated/set_space_quota_command_test.go +++ b/integration/v7/isolated/set_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_space_role_command_test.go b/integration/v7/isolated/set_space_role_command_test.go index 647345df2fb..9e886037450 100644 --- a/integration/v7/isolated/set_space_role_command_test.go +++ b/integration/v7/isolated/set_space_role_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_private_domain_test.go b/integration/v7/isolated/share_private_domain_test.go index f6c416fdb6b..4ad4454a0b4 100644 --- a/integration/v7/isolated/share_private_domain_test.go +++ b/integration/v7/isolated/share_private_domain_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_route_command_test.go b/integration/v7/isolated/share_route_command_test.go index 5c5e6369916..1cfa3ea9dd2 100644 --- a/integration/v7/isolated/share_route_command_test.go +++ b/integration/v7/isolated/share_route_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_service_command_test.go b/integration/v7/isolated/share_service_command_test.go index 7d0ca44167e..98693616ec4 100644 --- a/integration/v7/isolated/share_service_command_test.go +++ b/integration/v7/isolated/share_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/space_command_test.go b/integration/v7/isolated/space_command_test.go index 86a786222e0..bc9cd85e2e9 100644 --- a/integration/v7/isolated/space_command_test.go +++ b/integration/v7/isolated/space_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_quota_command_test.go b/integration/v7/isolated/space_quota_command_test.go index e2c7094f954..3d97c8845cf 100644 --- a/integration/v7/isolated/space_quota_command_test.go +++ b/integration/v7/isolated/space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_quotas_command_test.go b/integration/v7/isolated/space_quotas_command_test.go index 4953883c6a3..1bee5b4bc0d 100644 --- a/integration/v7/isolated/space_quotas_command_test.go +++ b/integration/v7/isolated/space_quotas_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_ssh_allowed_command_test.go b/integration/v7/isolated/space_ssh_allowed_command_test.go index f2bdc27eb8b..e519887432e 100644 --- a/integration/v7/isolated/space_ssh_allowed_command_test.go +++ b/integration/v7/isolated/space_ssh_allowed_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_users_command_test.go b/integration/v7/isolated/space_users_command_test.go index f2d594aaf24..fc55f01a18c 100644 --- a/integration/v7/isolated/space_users_command_test.go +++ b/integration/v7/isolated/space_users_command_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" ) var _ = Describe("space-users command", func() { diff --git a/integration/v7/isolated/spaces_command_test.go b/integration/v7/isolated/spaces_command_test.go index 540c7da5d0d..6c52d822bc5 100644 --- a/integration/v7/isolated/spaces_command_test.go +++ b/integration/v7/isolated/spaces_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/ssh_code_command_test.go b/integration/v7/isolated/ssh_code_command_test.go index 2866e47d449..4f6ed4211bd 100644 --- a/integration/v7/isolated/ssh_code_command_test.go +++ b/integration/v7/isolated/ssh_code_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/ssh_command_test.go b/integration/v7/isolated/ssh_command_test.go index e7eeefd58a8..557644a8607 100644 --- a/integration/v7/isolated/ssh_command_test.go +++ b/integration/v7/isolated/ssh_command_test.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/ssh_enabled_command_test.go b/integration/v7/isolated/ssh_enabled_command_test.go index 0c920497b87..f3b3ad8be35 100644 --- a/integration/v7/isolated/ssh_enabled_command_test.go +++ b/integration/v7/isolated/ssh_enabled_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stack_command_test.go b/integration/v7/isolated/stack_command_test.go index dde2aadfa4e..f394e5dad02 100644 --- a/integration/v7/isolated/stack_command_test.go +++ b/integration/v7/isolated/stack_command_test.go @@ -4,9 +4,9 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stacks_command_test.go b/integration/v7/isolated/stacks_command_test.go index 3403d3cda63..2f9467040d0 100644 --- a/integration/v7/isolated/stacks_command_test.go +++ b/integration/v7/isolated/stacks_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stage_package_command_test.go b/integration/v7/isolated/stage_package_command_test.go index 51080f94746..e2edc18cc60 100644 --- a/integration/v7/isolated/stage_package_command_test.go +++ b/integration/v7/isolated/stage_package_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/start_command_test.go b/integration/v7/isolated/start_command_test.go index fcb0d942e57..5cb14b3f480 100644 --- a/integration/v7/isolated/start_command_test.go +++ b/integration/v7/isolated/start_command_test.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/stop_command_test.go b/integration/v7/isolated/stop_command_test.go index 698d51a6e1b..fd8955be88d 100644 --- a/integration/v7/isolated/stop_command_test.go +++ b/integration/v7/isolated/stop_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/table_alignment_test.go b/integration/v7/isolated/table_alignment_test.go index 0bd51ca4cd1..34cafe4b0c6 100644 --- a/integration/v7/isolated/table_alignment_test.go +++ b/integration/v7/isolated/table_alignment_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/target_command_test.go b/integration/v7/isolated/target_command_test.go index 24ce9aa0085..fa2b6aaae61 100644 --- a/integration/v7/isolated/target_command_test.go +++ b/integration/v7/isolated/target_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/task_command_test.go b/integration/v7/isolated/task_command_test.go index 079e1acda47..8ee9ab97e07 100644 --- a/integration/v7/isolated/task_command_test.go +++ b/integration/v7/isolated/task_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/tasks_command_test.go b/integration/v7/isolated/tasks_command_test.go index 55b37b2e599..769b6cf5d9a 100644 --- a/integration/v7/isolated/tasks_command_test.go +++ b/integration/v7/isolated/tasks_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/terminate_task_command_test.go b/integration/v7/isolated/terminate_task_command_test.go index 8214016dc13..ff0836db858 100644 --- a/integration/v7/isolated/terminate_task_command_test.go +++ b/integration/v7/isolated/terminate_task_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/token_refresh_test.go b/integration/v7/isolated/token_refresh_test.go index 17bdbf10e6e..2ff4e1369fc 100644 --- a/integration/v7/isolated/token_refresh_test.go +++ b/integration/v7/isolated/token_refresh_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/unbind_route_service_command_test.go b/integration/v7/isolated/unbind_route_service_command_test.go index 7477176f39b..18a29c4b6b5 100644 --- a/integration/v7/isolated/unbind_route_service_command_test.go +++ b/integration/v7/isolated/unbind_route_service_command_test.go @@ -4,9 +4,9 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unbind_service_command_test.go b/integration/v7/isolated/unbind_service_command_test.go index 2ad21289dfa..d6d7c2f710f 100644 --- a/integration/v7/isolated/unbind_service_command_test.go +++ b/integration/v7/isolated/unbind_service_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unmap_route_command_test.go b/integration/v7/isolated/unmap_route_command_test.go index 7143031a98b..4920a81d30d 100644 --- a/integration/v7/isolated/unmap_route_command_test.go +++ b/integration/v7/isolated/unmap_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_env_command_test.go b/integration/v7/isolated/unset_env_command_test.go index b1f1a2ea4a1..b56a0e0c588 100644 --- a/integration/v7/isolated/unset_env_command_test.go +++ b/integration/v7/isolated/unset_env_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_label_command_test.go b/integration/v7/isolated/unset_label_command_test.go index 114e40e60ca..6999188ee80 100644 --- a/integration/v7/isolated/unset_label_command_test.go +++ b/integration/v7/isolated/unset_label_command_test.go @@ -4,9 +4,9 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_org_role_command_test.go b/integration/v7/isolated/unset_org_role_command_test.go index c8710d15e57..8b5da5edb28 100644 --- a/integration/v7/isolated/unset_org_role_command_test.go +++ b/integration/v7/isolated/unset_org_role_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_space_quota_command_test.go b/integration/v7/isolated/unset_space_quota_command_test.go index 54eea9df6d4..90f3dbd7409 100644 --- a/integration/v7/isolated/unset_space_quota_command_test.go +++ b/integration/v7/isolated/unset_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_space_role_command_test.go b/integration/v7/isolated/unset_space_role_command_test.go index c6bd9f09233..03698611549 100644 --- a/integration/v7/isolated/unset_space_role_command_test.go +++ b/integration/v7/isolated/unset_space_role_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_private_domain_test.go b/integration/v7/isolated/unshare_private_domain_test.go index 638cacff0c8..d04ed265526 100644 --- a/integration/v7/isolated/unshare_private_domain_test.go +++ b/integration/v7/isolated/unshare_private_domain_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_route_command_test.go b/integration/v7/isolated/unshare_route_command_test.go index ce745ec5001..581e2f2b875 100644 --- a/integration/v7/isolated/unshare_route_command_test.go +++ b/integration/v7/isolated/unshare_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_service_command_test.go b/integration/v7/isolated/unshare_service_command_test.go index 174576601ab..10af9bcc2ca 100644 --- a/integration/v7/isolated/unshare_service_command_test.go +++ b/integration/v7/isolated/unshare_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_destination_command_test.go b/integration/v7/isolated/update_destination_command_test.go index 0345cacc3bd..ca9a7eedfdf 100644 --- a/integration/v7/isolated/update_destination_command_test.go +++ b/integration/v7/isolated/update_destination_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_org_quota_command_test.go b/integration/v7/isolated/update_org_quota_command_test.go index af05857720d..4c9b12e9ce5 100644 --- a/integration/v7/isolated/update_org_quota_command_test.go +++ b/integration/v7/isolated/update_org_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_service_broker_command_test.go b/integration/v7/isolated/update_service_broker_command_test.go index 04b888a2872..76417dc2ae3 100644 --- a/integration/v7/isolated/update_service_broker_command_test.go +++ b/integration/v7/isolated/update_service_broker_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_service_command_test.go b/integration/v7/isolated/update_service_command_test.go index d569fd2afd1..88a91b62132 100644 --- a/integration/v7/isolated/update_service_command_test.go +++ b/integration/v7/isolated/update_service_command_test.go @@ -4,8 +4,8 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/update_space_quota_command_test.go b/integration/v7/isolated/update_space_quota_command_test.go index e76527be52c..6642b240f0d 100644 --- a/integration/v7/isolated/update_space_quota_command_test.go +++ b/integration/v7/isolated/update_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_user_provided_service_command_test.go b/integration/v7/isolated/update_user_provided_service_command_test.go index 25ac544784e..dc13643e71d 100644 --- a/integration/v7/isolated/update_user_provided_service_command_test.go +++ b/integration/v7/isolated/update_user_provided_service_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/upgrade_service_command_test.go b/integration/v7/isolated/upgrade_service_command_test.go index 9cdc10d8bfe..e3a57c7cb87 100644 --- a/integration/v7/isolated/upgrade_service_command_test.go +++ b/integration/v7/isolated/upgrade_service_command_test.go @@ -4,8 +4,8 @@ import ( "time" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/verbose_flag_test.go b/integration/v7/isolated/verbose_flag_test.go index 3497177a270..82d28cf8c53 100644 --- a/integration/v7/isolated/verbose_flag_test.go +++ b/integration/v7/isolated/verbose_flag_test.go @@ -6,8 +6,8 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -61,7 +61,7 @@ var _ = Describe("Verbose", func() { Eventually(session).Should(Say("REQUEST:")) Eventually(session).Should(Say("POST /oauth/token")) Eventually(session).Should(Say(`User-Agent: cf/[\w.+-]+ \(go\d+\.\d+(\.\d+)?; %s %s\)`, runtime.GOARCH, runtime.GOOS)) - Eventually(session).Should(Say(`\[PRIVATE DATA HIDDEN\]`)) //This is required to test the previous line. If it fails, the previous matcher went too far. + Eventually(session).Should(Say(`\[PRIVATE DATA HIDDEN\]`)) // This is required to test the previous line. If it fails, the previous matcher went too far. Eventually(session).Should(Say("RESPONSE:")) Eventually(session).Should(Say("REQUEST:")) Eventually(session).Should(Say("GET /v3/apps")) diff --git a/integration/v7/push/app_start_timeout_flag_test.go b/integration/v7/push/app_start_timeout_flag_test.go index 0317157618e..23962be5f23 100644 --- a/integration/v7/push/app_start_timeout_flag_test.go +++ b/integration/v7/push/app_start_timeout_flag_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/buildpacks_test.go b/integration/v7/push/buildpacks_test.go index 3a9ab46d746..fcc3288c4c9 100644 --- a/integration/v7/push/buildpacks_test.go +++ b/integration/v7/push/buildpacks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/canary_push_test.go b/integration/v7/push/canary_push_test.go index 58a9e5cf589..69a04d64e81 100644 --- a/integration/v7/push/canary_push_test.go +++ b/integration/v7/push/canary_push_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/cfignore_test.go b/integration/v7/push/cfignore_test.go index 0e676f96dae..15fd602827d 100644 --- a/integration/v7/push/cfignore_test.go +++ b/integration/v7/push/cfignore_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/combination_manifest_and_flag_test.go b/integration/v7/push/combination_manifest_and_flag_test.go index 78410af2962..1b8823ba3e2 100644 --- a/integration/v7/push/combination_manifest_and_flag_test.go +++ b/integration/v7/push/combination_manifest_and_flag_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/disk_flag_test.go b/integration/v7/push/disk_flag_test.go index 7e473fb2960..1e41bc022ec 100644 --- a/integration/v7/push/disk_flag_test.go +++ b/integration/v7/push/disk_flag_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/docker_test.go b/integration/v7/push/docker_test.go index 6cdce941a64..39123dd8bca 100644 --- a/integration/v7/push/docker_test.go +++ b/integration/v7/push/docker_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/droplet_flag_test.go b/integration/v7/push/droplet_flag_test.go index 5eb14a49e68..412e5b98620 100644 --- a/integration/v7/push/droplet_flag_test.go +++ b/integration/v7/push/droplet_flag_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/health_check_test.go b/integration/v7/push/health_check_test.go index 0e60a5ebe6e..ac39a46b205 100644 --- a/integration/v7/push/health_check_test.go +++ b/integration/v7/push/health_check_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -84,7 +84,7 @@ var _ = Describe("push with health check type", func() { session := helpers.CF("get-health-check", appName) Eventually(session).Should(Say("web\\s+http\\s+/third_endpoint.html")) - Eventually(session).Should(Exit(0)) //}) + Eventually(session).Should(Exit(0)) // }) }) }) diff --git a/integration/v7/push/help_test.go b/integration/v7/push/help_test.go index 7503e313a38..cbb7e798844 100644 --- a/integration/v7/push/help_test.go +++ b/integration/v7/push/help_test.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/ignore_app_files_test.go b/integration/v7/push/ignore_app_files_test.go index 877a33f89c0..4efa6f39f46 100644 --- a/integration/v7/push/ignore_app_files_test.go +++ b/integration/v7/push/ignore_app_files_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/input_errors_test.go b/integration/v7/push/input_errors_test.go index 3384ad5b230..8ebf2aaaa35 100644 --- a/integration/v7/push/input_errors_test.go +++ b/integration/v7/push/input_errors_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/instances_flag_test.go b/integration/v7/push/instances_flag_test.go index 000c0aca925..516cfa8f516 100644 --- a/integration/v7/push/instances_flag_test.go +++ b/integration/v7/push/instances_flag_test.go @@ -3,7 +3,7 @@ package push import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/log_rate_limit_flag_test.go b/integration/v7/push/log_rate_limit_flag_test.go index d1be10ef632..0f207bd3153 100644 --- a/integration/v7/push/log_rate_limit_flag_test.go +++ b/integration/v7/push/log_rate_limit_flag_test.go @@ -1,8 +1,8 @@ package push import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/manifest_diff_test.go b/integration/v7/push/manifest_diff_test.go index 00318776a31..1066301f478 100644 --- a/integration/v7/push/manifest_diff_test.go +++ b/integration/v7/push/manifest_diff_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/manifest_location_test.go b/integration/v7/push/manifest_location_test.go index 2564e031d6a..2826879bc3e 100644 --- a/integration/v7/push/manifest_location_test.go +++ b/integration/v7/push/manifest_location_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/manifest_with_app_name_and_no_route_flag_test.go b/integration/v7/push/manifest_with_app_name_and_no_route_flag_test.go index 7390c4cc64b..a1faaf097ed 100644 --- a/integration/v7/push/manifest_with_app_name_and_no_route_flag_test.go +++ b/integration/v7/push/manifest_with_app_name_and_no_route_flag_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/manifest_with_app_name_test.go b/integration/v7/push/manifest_with_app_name_test.go index c26a7d71be6..1a6d6d4fb8d 100644 --- a/integration/v7/push/manifest_with_app_name_test.go +++ b/integration/v7/push/manifest_with_app_name_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/memory_flag_test.go b/integration/v7/push/memory_flag_test.go index 519cb517fe0..b110ab768c1 100644 --- a/integration/v7/push/memory_flag_test.go +++ b/integration/v7/push/memory_flag_test.go @@ -3,7 +3,7 @@ package push import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/name_only_test.go b/integration/v7/push/name_only_test.go index 28fbe161965..7d2fa38264d 100644 --- a/integration/v7/push/name_only_test.go +++ b/integration/v7/push/name_only_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/no_route_test.go b/integration/v7/push/no_route_test.go index a776ee0eb50..1a9952e26ad 100644 --- a/integration/v7/push/no_route_test.go +++ b/integration/v7/push/no_route_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/no_start_test.go b/integration/v7/push/no_start_test.go index e95975427cc..024454f23a6 100644 --- a/integration/v7/push/no_start_test.go +++ b/integration/v7/push/no_start_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/no_wait_test.go b/integration/v7/push/no_wait_test.go index b17fd4fd01b..ec0c85326f8 100644 --- a/integration/v7/push/no_wait_test.go +++ b/integration/v7/push/no_wait_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/path_test.go b/integration/v7/push/path_test.go index 06eebc8b5fe..59ea8b3f169 100644 --- a/integration/v7/push/path_test.go +++ b/integration/v7/push/path_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/push_output_test.go b/integration/v7/push/push_output_test.go index 014f03c1760..5e52f6b22cd 100644 --- a/integration/v7/push/push_output_test.go +++ b/integration/v7/push/push_output_test.go @@ -5,7 +5,7 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/push_suite_test.go b/integration/v7/push/push_suite_test.go index 42423eab717..ace3ca7b67b 100644 --- a/integration/v7/push/push_suite_test.go +++ b/integration/v7/push/push_suite_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/push/random_route_test.go b/integration/v7/push/random_route_test.go index f50d7e4c2a4..997c966e686 100644 --- a/integration/v7/push/random_route_test.go +++ b/integration/v7/push/random_route_test.go @@ -5,7 +5,7 @@ import ( "path" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/resource_matching_test.go b/integration/v7/push/resource_matching_test.go index 9364f9c3424..548a8c1f3cb 100644 --- a/integration/v7/push/resource_matching_test.go +++ b/integration/v7/push/resource_matching_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/rolling_push_test.go b/integration/v7/push/rolling_push_test.go index 98e26aeca78..3dcc7752bcf 100644 --- a/integration/v7/push/rolling_push_test.go +++ b/integration/v7/push/rolling_push_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/simple_manifest_only_test.go b/integration/v7/push/simple_manifest_only_test.go index 3b94b4496cd..d4d57d7a955 100644 --- a/integration/v7/push/simple_manifest_only_test.go +++ b/integration/v7/push/simple_manifest_only_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/stacks_test.go b/integration/v7/push/stacks_test.go index 9fc5a0e378b..4c9a98bce5b 100644 --- a/integration/v7/push/stacks_test.go +++ b/integration/v7/push/stacks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/start_command_test.go b/integration/v7/push/start_command_test.go index efe675f513f..d10a2b24089 100644 --- a/integration/v7/push/start_command_test.go +++ b/integration/v7/push/start_command_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/symlink_resources_test.go b/integration/v7/push/symlink_resources_test.go index f79ef305b2b..65d7a3af4f7 100644 --- a/integration/v7/push/symlink_resources_test.go +++ b/integration/v7/push/symlink_resources_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/symlink_test.go b/integration/v7/push/symlink_test.go index 37339d753fd..7b6bf340555 100644 --- a/integration/v7/push/symlink_test.go +++ b/integration/v7/push/symlink_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/targeting_test.go b/integration/v7/push/targeting_test.go index e109f058eb8..e818154d386 100644 --- a/integration/v7/push/targeting_test.go +++ b/integration/v7/push/targeting_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" ) diff --git a/integration/v7/push/tasks_test.go b/integration/v7/push/tasks_test.go index 319c936eeab..3d3f955ad02 100644 --- a/integration/v7/push/tasks_test.go +++ b/integration/v7/push/tasks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/selfcontained/api_command_test.go b/integration/v7/selfcontained/api_command_test.go index 4d5bee2df0a..99eddef6d55 100644 --- a/integration/v7/selfcontained/api_command_test.go +++ b/integration/v7/selfcontained/api_command_test.go @@ -3,10 +3,10 @@ package selfcontained_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/integration/v7/selfcontained/create_space_command_test.go b/integration/v7/selfcontained/create_space_command_test.go index 5ba5e2324e0..078973944a4 100644 --- a/integration/v7/selfcontained/create_space_command_test.go +++ b/integration/v7/selfcontained/create_space_command_test.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/selfcontained/kubernetes_auth_log_test.go b/integration/v7/selfcontained/kubernetes_auth_log_test.go index 3785de18395..3cd5d1b2149 100644 --- a/integration/v7/selfcontained/kubernetes_auth_log_test.go +++ b/integration/v7/selfcontained/kubernetes_auth_log_test.go @@ -4,15 +4,15 @@ import ( "net/http" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("logclient auth-provider", func() { diff --git a/integration/v7/selfcontained/kubernetes_auth_test.go b/integration/v7/selfcontained/kubernetes_auth_test.go index 44fae9f3a50..25d8860d057 100644 --- a/integration/v7/selfcontained/kubernetes_auth_test.go +++ b/integration/v7/selfcontained/kubernetes_auth_test.go @@ -9,10 +9,10 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("auth-provider", func() { diff --git a/integration/v7/selfcontained/login_command_test.go b/integration/v7/selfcontained/login_command_test.go index 9476df9bff5..d1304e05dbd 100644 --- a/integration/v7/selfcontained/login_command_test.go +++ b/integration/v7/selfcontained/login_command_test.go @@ -12,11 +12,11 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("LoginCommand", func() { diff --git a/integration/v7/selfcontained/logout_command_test.go b/integration/v7/selfcontained/logout_command_test.go index 647273c3899..0b5d52dcb96 100644 --- a/integration/v7/selfcontained/logout_command_test.go +++ b/integration/v7/selfcontained/logout_command_test.go @@ -9,9 +9,9 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("cf logout", func() { diff --git a/integration/v7/selfcontained/selfcontained_suite_test.go b/integration/v7/selfcontained/selfcontained_suite_test.go index f5f1a647105..a60303fbac1 100644 --- a/integration/v7/selfcontained/selfcontained_suite_test.go +++ b/integration/v7/selfcontained/selfcontained_suite_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/util/configv3" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" . "github.com/onsi/ginkgo/v2" diff --git a/main.go b/main.go index 1347aff23b8..fb2f7529b4f 100644 --- a/main.go +++ b/main.go @@ -7,13 +7,13 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/cmd" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/util/command_parser" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/panichandler" - plugin_util "code.cloudfoundry.org/cli/util/plugin" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/cf/cmd" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/util/command_parser" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/panichandler" + plugin_util "code.cloudfoundry.org/cli/v9/util/plugin" + "code.cloudfoundry.org/cli/v9/util/ui" ) func main() { @@ -55,7 +55,7 @@ func main() { case common.ShouldFallbackToLegacy: cmd.Main(os.Getenv("CF_TRACE"), os.Args) - //NOT REACHED, legacy main will exit the process + // NOT REACHED, legacy main will exit the process default: unknownCommandError.Suggest(plugin_util.PluginCommandNames()) diff --git a/plugin/cli_connection.go b/plugin/cli_connection.go index d1a902997d8..2348894ee6f 100644 --- a/plugin/cli_connection.go +++ b/plugin/cli_connection.go @@ -8,7 +8,7 @@ import ( "os" "time" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" ) type cliConnection struct { @@ -110,7 +110,7 @@ func (c *cliConnection) callCliCommand(silently bool, args ...string) ([]string, } func (c *cliConnection) pingCLI() { - //call back to cf saying we have been setup + // call back to cf saying we have been setup var connErr error var conn net.Conn for i := 0; i < 5; i++ { diff --git a/plugin/plugin.go b/plugin/plugin.go index b2f1f8113ac..f7aeadf3adf 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -1,6 +1,6 @@ package plugin -import plugin_models "code.cloudfoundry.org/cli/plugin/models" +import plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" /* * @@ -74,5 +74,5 @@ type Command struct { Name string Alias string HelpText string - UsageDetails Usage //Detail usage to be displayed in `cf help ` + UsageDetails Usage // Detail usage to be displayed in `cf help ` } diff --git a/plugin/plugin_examples/basic_plugin/basic_plugin.go b/plugin/plugin_examples/basic_plugin/basic_plugin.go index b3662d08644..f6941b57976 100644 --- a/plugin/plugin_examples/basic_plugin/basic_plugin.go +++ b/plugin/plugin_examples/basic_plugin/basic_plugin.go @@ -3,11 +3,11 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) // BasicPlugin is the struct implementing the interface defined by the core CLI. It can -// be found at "code.cloudfoundry.org/cli/plugin/plugin.go" +// be found at "code.cloudfoundry.org/cli/v9/plugin/plugin.go" type BasicPlugin struct{} // Run must be implemented by any plugin because it is part of the @@ -77,7 +77,7 @@ func main() { // Any initialization for your plugin can be handled here // // Note: to run the plugin.Start method, we pass in a pointer to the struct - // implementing the interface defined at "code.cloudfoundry.org/cli/plugin/plugin.go" + // implementing the interface defined at "code.cloudfoundry.org/cli/v9/plugin/plugin.go" // // Note: The plugin's main() method is invoked at install time to collect // metadata. The plugin will exit 0 and the Run([]string) method will not be diff --git a/plugin/plugin_examples/echo/echo.go b/plugin/plugin_examples/echo/echo.go index 3a0e8f46215..dc797b9a09a 100644 --- a/plugin/plugin_examples/echo/echo.go +++ b/plugin/plugin_examples/echo/echo.go @@ -11,7 +11,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type PluginDemonstratingParams struct { diff --git a/plugin/plugin_examples/interactive/interactive.go b/plugin/plugin_examples/interactive/interactive.go index 3f45d0983f2..4782c77ac4d 100644 --- a/plugin/plugin_examples/interactive/interactive.go +++ b/plugin/plugin_examples/interactive/interactive.go @@ -9,7 +9,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Interactive struct{} diff --git a/plugin/plugin_examples/multiple_commands/multiple_commands.go b/plugin/plugin_examples/multiple_commands/multiple_commands.go index d74b7026f49..281e75eb34a 100644 --- a/plugin/plugin_examples/multiple_commands/multiple_commands.go +++ b/plugin/plugin_examples/multiple_commands/multiple_commands.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type MultiCmd struct{} diff --git a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go index 888c171d927..a8fe65d07bb 100644 --- a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go +++ b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/plugin" ) type DemoCmd struct{} diff --git a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_suite_test.go b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_suite_test.go index 182bf14c795..05edc46d939 100644 --- a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_suite_test.go +++ b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_suite_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_test.go b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_test.go index 26bf1c7ed4c..eba99410f2e 100644 --- a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_test.go +++ b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_test.go @@ -5,10 +5,10 @@ import ( "errors" "os/exec" - . "code.cloudfoundry.org/cli/plugin/plugin_examples/test_rpc_server_example" + . "code.cloudfoundry.org/cli/v9/plugin/plugin_examples/test_rpc_server_example" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver/rpcserverfakes" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver/rpcserverfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -31,15 +31,15 @@ var _ = Describe("App-Lister", func() { ts, err = rpcserver.NewTestRPCServer(rpcHandlers) Expect(err).NotTo(HaveOccurred()) - //set rpc.CallCoreCommand to a successful call - //rpc.CallCoreCommand is used in both cliConnection.CliCommand() and - //cliConnection.CliWithoutTerminalOutput() + // set rpc.CallCoreCommand to a successful call + // rpc.CallCoreCommand is used in both cliConnection.CliCommand() and + // cliConnection.CliWithoutTerminalOutput() rpcHandlers.CallCoreCommandStub = func(_ []string, retVal *bool) error { *retVal = true return nil } - //set rpc.GetOutputAndReset to return empty string; this is used by CliCommand()/CliWithoutTerminalOutput() + // set rpc.GetOutputAndReset to return empty string; this is used by CliCommand()/CliWithoutTerminalOutput() rpcHandlers.GetOutputAndResetStub = func(_ bool, retVal *[]string) error { *retVal = []string{"{}"} return nil diff --git a/plugin/plugin_shim_test.go b/plugin/plugin_shim_test.go index 04604b9570f..5d6ce036946 100644 --- a/plugin/plugin_shim_test.go +++ b/plugin/plugin_shim_test.go @@ -4,9 +4,9 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver/rpcserverfakes" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver/rpcserverfakes" + "code.cloudfoundry.org/cli/v9/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/plugin/plugin_suite_test.go b/plugin/plugin_suite_test.go index 8c318db9fc4..a37d328a554 100644 --- a/plugin/plugin_suite_test.go +++ b/plugin/plugin_suite_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugin/pluginfakes/fake_cli_connection.go b/plugin/pluginfakes/fake_cli_connection.go index 2c439c1a8cc..dc1c9c5e95b 100644 --- a/plugin/pluginfakes/fake_cli_connection.go +++ b/plugin/pluginfakes/fake_cli_connection.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/plugin" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v9/plugin" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" ) type FakeCliConnection struct { @@ -352,15 +352,16 @@ func (fake *FakeCliConnection) AccessToken() (string, error) { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1, fakeReturns.result2 } @@ -407,15 +408,16 @@ func (fake *FakeCliConnection) ApiEndpoint() (string, error) { ret, specificReturn := fake.apiEndpointReturnsOnCall[len(fake.apiEndpointArgsForCall)] fake.apiEndpointArgsForCall = append(fake.apiEndpointArgsForCall, struct { }{}) + stub := fake.ApiEndpointStub + fakeReturns := fake.apiEndpointReturns fake.recordInvocation("ApiEndpoint", []interface{}{}) fake.apiEndpointMutex.Unlock() - if fake.ApiEndpointStub != nil { - return fake.ApiEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.apiEndpointReturns return fakeReturns.result1, fakeReturns.result2 } @@ -462,15 +464,16 @@ func (fake *FakeCliConnection) ApiVersion() (string, error) { ret, specificReturn := fake.apiVersionReturnsOnCall[len(fake.apiVersionArgsForCall)] fake.apiVersionArgsForCall = append(fake.apiVersionArgsForCall, struct { }{}) + stub := fake.ApiVersionStub + fakeReturns := fake.apiVersionReturns fake.recordInvocation("ApiVersion", []interface{}{}) fake.apiVersionMutex.Unlock() - if fake.ApiVersionStub != nil { - return fake.ApiVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.apiVersionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -518,15 +521,16 @@ func (fake *FakeCliConnection) CliCommand(arg1 ...string) ([]string, error) { fake.cliCommandArgsForCall = append(fake.cliCommandArgsForCall, struct { arg1 []string }{arg1}) + stub := fake.CliCommandStub + fakeReturns := fake.cliCommandReturns fake.recordInvocation("CliCommand", []interface{}{arg1}) fake.cliCommandMutex.Unlock() - if fake.CliCommandStub != nil { - return fake.CliCommandStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.cliCommandReturns return fakeReturns.result1, fakeReturns.result2 } @@ -581,15 +585,16 @@ func (fake *FakeCliConnection) CliCommandWithoutTerminalOutput(arg1 ...string) ( fake.cliCommandWithoutTerminalOutputArgsForCall = append(fake.cliCommandWithoutTerminalOutputArgsForCall, struct { arg1 []string }{arg1}) + stub := fake.CliCommandWithoutTerminalOutputStub + fakeReturns := fake.cliCommandWithoutTerminalOutputReturns fake.recordInvocation("CliCommandWithoutTerminalOutput", []interface{}{arg1}) fake.cliCommandWithoutTerminalOutputMutex.Unlock() - if fake.CliCommandWithoutTerminalOutputStub != nil { - return fake.CliCommandWithoutTerminalOutputStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.cliCommandWithoutTerminalOutputReturns return fakeReturns.result1, fakeReturns.result2 } @@ -643,15 +648,16 @@ func (fake *FakeCliConnection) DopplerEndpoint() (string, error) { ret, specificReturn := fake.dopplerEndpointReturnsOnCall[len(fake.dopplerEndpointArgsForCall)] fake.dopplerEndpointArgsForCall = append(fake.dopplerEndpointArgsForCall, struct { }{}) + stub := fake.DopplerEndpointStub + fakeReturns := fake.dopplerEndpointReturns fake.recordInvocation("DopplerEndpoint", []interface{}{}) fake.dopplerEndpointMutex.Unlock() - if fake.DopplerEndpointStub != nil { - return fake.DopplerEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dopplerEndpointReturns return fakeReturns.result1, fakeReturns.result2 } @@ -699,15 +705,16 @@ func (fake *FakeCliConnection) GetApp(arg1 string) (plugin_models.GetAppModel, e fake.getAppArgsForCall = append(fake.getAppArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetAppStub + fakeReturns := fake.getAppReturns fake.recordInvocation("GetApp", []interface{}{arg1}) fake.getAppMutex.Unlock() - if fake.GetAppStub != nil { - return fake.GetAppStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAppReturns return fakeReturns.result1, fakeReturns.result2 } @@ -761,15 +768,16 @@ func (fake *FakeCliConnection) GetApps() ([]plugin_models.GetAppsModel, error) { ret, specificReturn := fake.getAppsReturnsOnCall[len(fake.getAppsArgsForCall)] fake.getAppsArgsForCall = append(fake.getAppsArgsForCall, struct { }{}) + stub := fake.GetAppsStub + fakeReturns := fake.getAppsReturns fake.recordInvocation("GetApps", []interface{}{}) fake.getAppsMutex.Unlock() - if fake.GetAppsStub != nil { - return fake.GetAppsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAppsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -816,15 +824,16 @@ func (fake *FakeCliConnection) GetCurrentOrg() (plugin_models.Organization, erro ret, specificReturn := fake.getCurrentOrgReturnsOnCall[len(fake.getCurrentOrgArgsForCall)] fake.getCurrentOrgArgsForCall = append(fake.getCurrentOrgArgsForCall, struct { }{}) + stub := fake.GetCurrentOrgStub + fakeReturns := fake.getCurrentOrgReturns fake.recordInvocation("GetCurrentOrg", []interface{}{}) fake.getCurrentOrgMutex.Unlock() - if fake.GetCurrentOrgStub != nil { - return fake.GetCurrentOrgStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getCurrentOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -871,15 +880,16 @@ func (fake *FakeCliConnection) GetCurrentSpace() (plugin_models.Space, error) { ret, specificReturn := fake.getCurrentSpaceReturnsOnCall[len(fake.getCurrentSpaceArgsForCall)] fake.getCurrentSpaceArgsForCall = append(fake.getCurrentSpaceArgsForCall, struct { }{}) + stub := fake.GetCurrentSpaceStub + fakeReturns := fake.getCurrentSpaceReturns fake.recordInvocation("GetCurrentSpace", []interface{}{}) fake.getCurrentSpaceMutex.Unlock() - if fake.GetCurrentSpaceStub != nil { - return fake.GetCurrentSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getCurrentSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -927,15 +937,16 @@ func (fake *FakeCliConnection) GetOrg(arg1 string) (plugin_models.GetOrg_Model, fake.getOrgArgsForCall = append(fake.getOrgArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrgStub + fakeReturns := fake.getOrgReturns fake.recordInvocation("GetOrg", []interface{}{arg1}) fake.getOrgMutex.Unlock() - if fake.GetOrgStub != nil { - return fake.GetOrgStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -991,15 +1002,16 @@ func (fake *FakeCliConnection) GetOrgUsers(arg1 string, arg2 ...string) ([]plugi arg1 string arg2 []string }{arg1, arg2}) + stub := fake.GetOrgUsersStub + fakeReturns := fake.getOrgUsersReturns fake.recordInvocation("GetOrgUsers", []interface{}{arg1, arg2}) fake.getOrgUsersMutex.Unlock() - if fake.GetOrgUsersStub != nil { - return fake.GetOrgUsersStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getOrgUsersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1053,15 +1065,16 @@ func (fake *FakeCliConnection) GetOrgs() ([]plugin_models.GetOrgs_Model, error) ret, specificReturn := fake.getOrgsReturnsOnCall[len(fake.getOrgsArgsForCall)] fake.getOrgsArgsForCall = append(fake.getOrgsArgsForCall, struct { }{}) + stub := fake.GetOrgsStub + fakeReturns := fake.getOrgsReturns fake.recordInvocation("GetOrgs", []interface{}{}) fake.getOrgsMutex.Unlock() - if fake.GetOrgsStub != nil { - return fake.GetOrgsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1109,15 +1122,16 @@ func (fake *FakeCliConnection) GetService(arg1 string) (plugin_models.GetService fake.getServiceArgsForCall = append(fake.getServiceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceStub + fakeReturns := fake.getServiceReturns fake.recordInvocation("GetService", []interface{}{arg1}) fake.getServiceMutex.Unlock() - if fake.GetServiceStub != nil { - return fake.GetServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1171,15 +1185,16 @@ func (fake *FakeCliConnection) GetServices() ([]plugin_models.GetServices_Model, ret, specificReturn := fake.getServicesReturnsOnCall[len(fake.getServicesArgsForCall)] fake.getServicesArgsForCall = append(fake.getServicesArgsForCall, struct { }{}) + stub := fake.GetServicesStub + fakeReturns := fake.getServicesReturns fake.recordInvocation("GetServices", []interface{}{}) fake.getServicesMutex.Unlock() - if fake.GetServicesStub != nil { - return fake.GetServicesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1227,15 +1242,16 @@ func (fake *FakeCliConnection) GetSpace(arg1 string) (plugin_models.GetSpace_Mod fake.getSpaceArgsForCall = append(fake.getSpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceStub + fakeReturns := fake.getSpaceReturns fake.recordInvocation("GetSpace", []interface{}{arg1}) fake.getSpaceMutex.Unlock() - if fake.GetSpaceStub != nil { - return fake.GetSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1291,15 +1307,16 @@ func (fake *FakeCliConnection) GetSpaceUsers(arg1 string, arg2 string) ([]plugin arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSpaceUsersStub + fakeReturns := fake.getSpaceUsersReturns fake.recordInvocation("GetSpaceUsers", []interface{}{arg1, arg2}) fake.getSpaceUsersMutex.Unlock() - if fake.GetSpaceUsersStub != nil { - return fake.GetSpaceUsersStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSpaceUsersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1353,15 +1370,16 @@ func (fake *FakeCliConnection) GetSpaces() ([]plugin_models.GetSpaces_Model, err ret, specificReturn := fake.getSpacesReturnsOnCall[len(fake.getSpacesArgsForCall)] fake.getSpacesArgsForCall = append(fake.getSpacesArgsForCall, struct { }{}) + stub := fake.GetSpacesStub + fakeReturns := fake.getSpacesReturns fake.recordInvocation("GetSpaces", []interface{}{}) fake.getSpacesMutex.Unlock() - if fake.GetSpacesStub != nil { - return fake.GetSpacesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSpacesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1408,15 +1426,16 @@ func (fake *FakeCliConnection) HasAPIEndpoint() (bool, error) { ret, specificReturn := fake.hasAPIEndpointReturnsOnCall[len(fake.hasAPIEndpointArgsForCall)] fake.hasAPIEndpointArgsForCall = append(fake.hasAPIEndpointArgsForCall, struct { }{}) + stub := fake.HasAPIEndpointStub + fakeReturns := fake.hasAPIEndpointReturns fake.recordInvocation("HasAPIEndpoint", []interface{}{}) fake.hasAPIEndpointMutex.Unlock() - if fake.HasAPIEndpointStub != nil { - return fake.HasAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.hasAPIEndpointReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1463,15 +1482,16 @@ func (fake *FakeCliConnection) HasOrganization() (bool, error) { ret, specificReturn := fake.hasOrganizationReturnsOnCall[len(fake.hasOrganizationArgsForCall)] fake.hasOrganizationArgsForCall = append(fake.hasOrganizationArgsForCall, struct { }{}) + stub := fake.HasOrganizationStub + fakeReturns := fake.hasOrganizationReturns fake.recordInvocation("HasOrganization", []interface{}{}) fake.hasOrganizationMutex.Unlock() - if fake.HasOrganizationStub != nil { - return fake.HasOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.hasOrganizationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1518,15 +1538,16 @@ func (fake *FakeCliConnection) HasSpace() (bool, error) { ret, specificReturn := fake.hasSpaceReturnsOnCall[len(fake.hasSpaceArgsForCall)] fake.hasSpaceArgsForCall = append(fake.hasSpaceArgsForCall, struct { }{}) + stub := fake.HasSpaceStub + fakeReturns := fake.hasSpaceReturns fake.recordInvocation("HasSpace", []interface{}{}) fake.hasSpaceMutex.Unlock() - if fake.HasSpaceStub != nil { - return fake.HasSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.hasSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1573,15 +1594,16 @@ func (fake *FakeCliConnection) IsLoggedIn() (bool, error) { ret, specificReturn := fake.isLoggedInReturnsOnCall[len(fake.isLoggedInArgsForCall)] fake.isLoggedInArgsForCall = append(fake.isLoggedInArgsForCall, struct { }{}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1628,15 +1650,16 @@ func (fake *FakeCliConnection) IsSSLDisabled() (bool, error) { ret, specificReturn := fake.isSSLDisabledReturnsOnCall[len(fake.isSSLDisabledArgsForCall)] fake.isSSLDisabledArgsForCall = append(fake.isSSLDisabledArgsForCall, struct { }{}) + stub := fake.IsSSLDisabledStub + fakeReturns := fake.isSSLDisabledReturns fake.recordInvocation("IsSSLDisabled", []interface{}{}) fake.isSSLDisabledMutex.Unlock() - if fake.IsSSLDisabledStub != nil { - return fake.IsSSLDisabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.isSSLDisabledReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1683,15 +1706,16 @@ func (fake *FakeCliConnection) LoggregatorEndpoint() (string, error) { ret, specificReturn := fake.loggregatorEndpointReturnsOnCall[len(fake.loggregatorEndpointArgsForCall)] fake.loggregatorEndpointArgsForCall = append(fake.loggregatorEndpointArgsForCall, struct { }{}) + stub := fake.LoggregatorEndpointStub + fakeReturns := fake.loggregatorEndpointReturns fake.recordInvocation("LoggregatorEndpoint", []interface{}{}) fake.loggregatorEndpointMutex.Unlock() - if fake.LoggregatorEndpointStub != nil { - return fake.LoggregatorEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.loggregatorEndpointReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1738,15 +1762,16 @@ func (fake *FakeCliConnection) UserEmail() (string, error) { ret, specificReturn := fake.userEmailReturnsOnCall[len(fake.userEmailArgsForCall)] fake.userEmailArgsForCall = append(fake.userEmailArgsForCall, struct { }{}) + stub := fake.UserEmailStub + fakeReturns := fake.userEmailReturns fake.recordInvocation("UserEmail", []interface{}{}) fake.userEmailMutex.Unlock() - if fake.UserEmailStub != nil { - return fake.UserEmailStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.userEmailReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1793,15 +1818,16 @@ func (fake *FakeCliConnection) UserGuid() (string, error) { ret, specificReturn := fake.userGuidReturnsOnCall[len(fake.userGuidArgsForCall)] fake.userGuidArgsForCall = append(fake.userGuidArgsForCall, struct { }{}) + stub := fake.UserGuidStub + fakeReturns := fake.userGuidReturns fake.recordInvocation("UserGuid", []interface{}{}) fake.userGuidMutex.Unlock() - if fake.UserGuidStub != nil { - return fake.UserGuidStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.userGuidReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1848,15 +1874,16 @@ func (fake *FakeCliConnection) Username() (string, error) { ret, specificReturn := fake.usernameReturnsOnCall[len(fake.usernameArgsForCall)] fake.usernameArgsForCall = append(fake.usernameArgsForCall, struct { }{}) + stub := fake.UsernameStub + fakeReturns := fake.usernameReturns fake.recordInvocation("Username", []interface{}{}) fake.usernameMutex.Unlock() - if fake.UsernameStub != nil { - return fake.UsernameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.usernameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/plugin/rpc/call_command_registry.go b/plugin/rpc/call_command_registry.go index cb83f95e9d9..f2201cce6d0 100644 --- a/plugin/rpc/call_command_registry.go +++ b/plugin/rpc/call_command_registry.go @@ -3,9 +3,9 @@ package rpc import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CommandRunner diff --git a/plugin/rpc/call_command_registry_test.go b/plugin/rpc/call_command_registry_test.go index 6d21be85aa9..886ed54f3f7 100644 --- a/plugin/rpc/call_command_registry_test.go +++ b/plugin/rpc/call_command_registry_test.go @@ -3,19 +3,19 @@ package rpc_test import ( "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/plugin/rpc" - . "code.cloudfoundry.org/cli/plugin/rpc/fakecommand" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/plugin/rpc" + . "code.cloudfoundry.org/cli/v9/plugin/rpc/fakecommand" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) var _ = Describe("calling commands in commandregistry", func() { - _ = FakeCommand1{} //make sure fake_command is imported and self-registered with init() - _ = FakeCommand3{} //make sure fake_command is imported and self-registered with init() - _ = FakeCommand4{} //make sure fake_command is imported and self-registered with init() + _ = FakeCommand1{} // make sure fake_command is imported and self-registered with init() + _ = FakeCommand3{} // make sure fake_command is imported and self-registered with init() + _ = FakeCommand4{} // make sure fake_command is imported and self-registered with init() var ( ui *terminalfakes.FakeUI diff --git a/plugin/rpc/cli_rpc_server.go b/plugin/rpc/cli_rpc_server.go index 34241693b2c..36cd5c2685e 100644 --- a/plugin/rpc/cli_rpc_server.go +++ b/plugin/rpc/cli_rpc_server.go @@ -11,16 +11,16 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin" - plugin_models "code.cloudfoundry.org/cli/plugin/models" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/trace" ) var dialTimeout = os.Getenv("CF_DIAL_TIMEOUT") @@ -176,12 +176,12 @@ func (cmd *CliRpcCmd) CallCoreCommand(args []string, retVal *bool) error { if cmdRegistry.CommandExists(args[0]) { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator - //set command ui's TeePrinter to be the one used by RpcService, for output to be captured + // set command ui's TeePrinter to be the one used by RpcService, for output to be captured deps.UI = terminal.NewUI(os.Stdin, cmd.stdout, cmd.outputCapture.(*terminal.TeePrinter), cmd.logger) err = cmd.newCmdRunner.Command(args, deps, false) @@ -304,8 +304,8 @@ func (cmd *CliRpcCmd) AccessToken(args string, retVal *string) error { func (cmd *CliRpcCmd) GetApp(appName string, retVal *plugin_models.GetAppModel) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Application = retVal @@ -318,8 +318,8 @@ func (cmd *CliRpcCmd) GetApp(appName string, retVal *plugin_models.GetAppModel) func (cmd *CliRpcCmd) GetApps(_ string, retVal *[]plugin_models.GetAppsModel) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.AppsSummary = retVal @@ -332,8 +332,8 @@ func (cmd *CliRpcCmd) GetApps(_ string, retVal *[]plugin_models.GetAppsModel) er func (cmd *CliRpcCmd) GetOrgs(_ string, retVal *[]plugin_models.GetOrgs_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Organizations = retVal @@ -346,8 +346,8 @@ func (cmd *CliRpcCmd) GetOrgs(_ string, retVal *[]plugin_models.GetOrgs_Model) e func (cmd *CliRpcCmd) GetSpaces(_ string, retVal *[]plugin_models.GetSpaces_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Spaces = retVal @@ -360,9 +360,9 @@ func (cmd *CliRpcCmd) GetSpaces(_ string, retVal *[]plugin_models.GetSpaces_Mode func (cmd *CliRpcCmd) GetServices(_ string, retVal *[]plugin_models.GetServices_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Services = retVal @@ -375,8 +375,8 @@ func (cmd *CliRpcCmd) GetServices(_ string, retVal *[]plugin_models.GetServices_ func (cmd *CliRpcCmd) GetOrgUsers(args []string, retVal *[]plugin_models.GetOrgUsers_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.OrgUsers = retVal @@ -389,8 +389,8 @@ func (cmd *CliRpcCmd) GetOrgUsers(args []string, retVal *[]plugin_models.GetOrgU func (cmd *CliRpcCmd) GetSpaceUsers(args []string, retVal *[]plugin_models.GetSpaceUsers_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.SpaceUsers = retVal @@ -403,8 +403,8 @@ func (cmd *CliRpcCmd) GetSpaceUsers(args []string, retVal *[]plugin_models.GetSp func (cmd *CliRpcCmd) GetOrg(orgName string, retVal *plugin_models.GetOrg_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Organization = retVal @@ -417,8 +417,8 @@ func (cmd *CliRpcCmd) GetOrg(orgName string, retVal *plugin_models.GetOrg_Model) func (cmd *CliRpcCmd) GetSpace(spaceName string, retVal *plugin_models.GetSpace_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Space = retVal @@ -431,8 +431,8 @@ func (cmd *CliRpcCmd) GetSpace(spaceName string, retVal *plugin_models.GetSpace_ func (cmd *CliRpcCmd) GetService(serviceInstance string, retVal *plugin_models.GetService_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Service = retVal diff --git a/plugin/rpc/cli_rpc_server_test.go b/plugin/rpc/cli_rpc_server_test.go index 5f55b1594d3..36ff3f2226d 100644 --- a/plugin/rpc/cli_rpc_server_test.go +++ b/plugin/rpc/cli_rpc_server_test.go @@ -7,25 +7,25 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/plugin" - plugin_models "code.cloudfoundry.org/cli/plugin/models" - . "code.cloudfoundry.org/cli/plugin/rpc" - cmdRunner "code.cloudfoundry.org/cli/plugin/rpc" - . "code.cloudfoundry.org/cli/plugin/rpc/fakecommand" - "code.cloudfoundry.org/cli/plugin/rpc/rpcfakes" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/plugin" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" + . "code.cloudfoundry.org/cli/v9/plugin/rpc" + cmdRunner "code.cloudfoundry.org/cli/v9/plugin/rpc" + . "code.cloudfoundry.org/cli/v9/plugin/rpc/fakecommand" + "code.cloudfoundry.org/cli/v9/plugin/rpc/rpcfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) var _ = Describe("Server", func() { - _ = FakeCommand1{} //make sure fake_command is imported and self-registered with init() + _ = FakeCommand1{} // make sure fake_command is imported and self-registered with init() var ( err error @@ -69,7 +69,7 @@ var _ = Describe("Server", func() { It("shuts down the rpc server", func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) client, err = rpc.Dial("tcp", "127.0.0.1:"+rpcService.Port()) @@ -91,7 +91,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -192,7 +192,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -222,7 +222,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -298,7 +298,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -441,7 +441,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -472,7 +472,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) diff --git a/plugin/rpc/fakecommand/fake_command1.go b/plugin/rpc/fakecommand/fake_command1.go index a154ebde385..016225ae414 100644 --- a/plugin/rpc/fakecommand/fake_command1.go +++ b/plugin/rpc/fakecommand/fake_command1.go @@ -3,10 +3,10 @@ package fakecommand import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type FakeCommand1 struct { diff --git a/plugin/rpc/fakecommand/fake_command2.go b/plugin/rpc/fakecommand/fake_command2.go index d329e6c3c4f..cc69fdb7c3c 100644 --- a/plugin/rpc/fakecommand/fake_command2.go +++ b/plugin/rpc/fakecommand/fake_command2.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type FakeCommand2 struct { diff --git a/plugin/rpc/fakecommand/fake_command3.go b/plugin/rpc/fakecommand/fake_command3.go index b13505d7b29..79b4d552e45 100644 --- a/plugin/rpc/fakecommand/fake_command3.go +++ b/plugin/rpc/fakecommand/fake_command3.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand3 struct { diff --git a/plugin/rpc/fakecommand/fake_command4.go b/plugin/rpc/fakecommand/fake_command4.go index e5b11eb8863..e3dbe6c4b12 100644 --- a/plugin/rpc/fakecommand/fake_command4.go +++ b/plugin/rpc/fakecommand/fake_command4.go @@ -3,9 +3,9 @@ package fakecommand import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) var ErrFakeCommand4 = errors.New("ZOMG command errored") diff --git a/plugin/rpc/rpc_suite_test.go b/plugin/rpc/rpc_suite_test.go index e67a82a6263..5eb21a8ba0e 100644 --- a/plugin/rpc/rpc_suite_test.go +++ b/plugin/rpc/rpc_suite_test.go @@ -1,7 +1,7 @@ package rpc_test import ( - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v9/plugin/rpc" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/plugin/rpc/rpcfakes/fake_command_runner.go b/plugin/rpc/rpcfakes/fake_command_runner.go index fa70fde8646..5994dc6bb77 100644 --- a/plugin/rpc/rpcfakes/fake_command_runner.go +++ b/plugin/rpc/rpcfakes/fake_command_runner.go @@ -4,8 +4,8 @@ package rpcfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type FakeCommandRunner struct { @@ -39,15 +39,16 @@ func (fake *FakeCommandRunner) Command(arg1 []string, arg2 commandregistry.Depen arg2 commandregistry.Dependency arg3 bool }{arg1Copy, arg2, arg3}) + stub := fake.CommandStub + fakeReturns := fake.commandReturns fake.recordInvocation("Command", []interface{}{arg1Copy, arg2, arg3}) fake.commandMutex.Unlock() - if fake.CommandStub != nil { - return fake.CommandStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.commandReturns return fakeReturns.result1 } diff --git a/plugin/rpc/rpcfakes/fake_output_capture.go b/plugin/rpc/rpcfakes/fake_output_capture.go index 9d37d2ef93d..47054488f1c 100644 --- a/plugin/rpc/rpcfakes/fake_output_capture.go +++ b/plugin/rpc/rpcfakes/fake_output_capture.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type FakeOutputCapture struct { @@ -23,9 +23,10 @@ func (fake *FakeOutputCapture) SetOutputBucket(arg1 io.Writer) { fake.setOutputBucketArgsForCall = append(fake.setOutputBucketArgsForCall, struct { arg1 io.Writer }{arg1}) + stub := fake.SetOutputBucketStub fake.recordInvocation("SetOutputBucket", []interface{}{arg1}) fake.setOutputBucketMutex.Unlock() - if fake.SetOutputBucketStub != nil { + if stub != nil { fake.SetOutputBucketStub(arg1) } } diff --git a/plugin/rpc/rpcfakes/fake_terminal_output_switch.go b/plugin/rpc/rpcfakes/fake_terminal_output_switch.go index 58e4cf01e7e..6eebe57cc6b 100644 --- a/plugin/rpc/rpcfakes/fake_terminal_output_switch.go +++ b/plugin/rpc/rpcfakes/fake_terminal_output_switch.go @@ -4,7 +4,7 @@ package rpcfakes import ( "sync" - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type FakeTerminalOutputSwitch struct { @@ -22,9 +22,10 @@ func (fake *FakeTerminalOutputSwitch) DisableTerminalOutput(arg1 bool) { fake.disableTerminalOutputArgsForCall = append(fake.disableTerminalOutputArgsForCall, struct { arg1 bool }{arg1}) + stub := fake.DisableTerminalOutputStub fake.recordInvocation("DisableTerminalOutput", []interface{}{arg1}) fake.disableTerminalOutputMutex.Unlock() - if fake.DisableTerminalOutputStub != nil { + if stub != nil { fake.DisableTerminalOutputStub(arg1) } } diff --git a/plugin/rpc/run_plugin.go b/plugin/rpc/run_plugin.go index 295184628f7..9cfd395a33d 100644 --- a/plugin/rpc/run_plugin.go +++ b/plugin/rpc/run_plugin.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" ) func RunMethodIfExists(rpcService *CliRpcService, args []string, pluginList map[string]pluginconfig.PluginMetadata) bool { diff --git a/plugin/transition/run_plugin_legacy.go b/plugin/transition/run_plugin_legacy.go index ffac5683f3a..4fc629f795c 100644 --- a/plugin/transition/run_plugin_legacy.go +++ b/plugin/transition/run_plugin_legacy.go @@ -3,9 +3,9 @@ package plugin_transition import ( "os" - "code.cloudfoundry.org/cli/cf/cmd" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/cf/cmd" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/util/configv3" ) func RunPlugin(plugin configv3.Plugin, _ command.UI) error { diff --git a/resources/application_resource.go b/resources/application_resource.go index b9794bb81f9..a9d898fa78d 100644 --- a/resources/application_resource.go +++ b/resources/application_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Application represents a Cloud Controller V3 Application. diff --git a/resources/build_resource.go b/resources/build_resource.go index e190de90a6a..241ae1b34c5 100644 --- a/resources/build_resource.go +++ b/resources/build_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Build represent the process of staging an application package. diff --git a/resources/buildpack_resource.go b/resources/buildpack_resource.go index 04d29e271c2..7cf78e85256 100644 --- a/resources/buildpack_resource.go +++ b/resources/buildpack_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/types" ) // Buildpack represents a Cloud Controller V3 buildpack. diff --git a/resources/deployment_resource.go b/resources/deployment_resource.go index 6e5b6cc71a3..f3b98c04975 100644 --- a/resources/deployment_resource.go +++ b/resources/deployment_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type Deployment struct { diff --git a/resources/domain_resource.go b/resources/domain_resource.go index 35dda7d0d7b..1a032a78b01 100644 --- a/resources/domain_resource.go +++ b/resources/domain_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/droplet_resource.go b/resources/droplet_resource.go index 27dc2574f3f..1c9ce9bbf95 100644 --- a/resources/droplet_resource.go +++ b/resources/droplet_resource.go @@ -1,13 +1,13 @@ package resources import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Droplet represents a Cloud Controller droplet's metadata. A droplet is a set of // compiled bits for a given application. type Droplet struct { - //Buildpacks are the detected buildpacks from the staging process. + // Buildpacks are the detected buildpacks from the staging process. Buildpacks []DropletBuildpack `json:"buildpacks,omitempty"` // CreatedAt is the timestamp that the Cloud Controller created the droplet. CreatedAt string `json:"created_at"` diff --git a/resources/environment_variables_resource.go b/resources/environment_variables_resource.go index 357641d2260..c03555f66c5 100644 --- a/resources/environment_variables_resource.go +++ b/resources/environment_variables_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/types" ) type EnvironmentVariables map[string]types.FilteredString diff --git a/resources/last_operation_resource_test.go b/resources/last_operation_resource_test.go index c4325206ccc..91e85ee1b10 100644 --- a/resources/last_operation_resource_test.go +++ b/resources/last_operation_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/resources/metadata_resource.go b/resources/metadata_resource.go index afa1c180323..d8597625864 100644 --- a/resources/metadata_resource.go +++ b/resources/metadata_resource.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/types" +import "code.cloudfoundry.org/cli/v9/types" type Metadata struct { Annotations map[string]types.NullString `json:"annotations,omitempty"` diff --git a/resources/package_resource.go b/resources/package_resource.go index c17e66a5fe7..1bb09d8f03a 100644 --- a/resources/package_resource.go +++ b/resources/package_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Package represents a Cloud Controller V3 Package. diff --git a/resources/process_resource.go b/resources/process_resource.go index afbf20a09a0..0cca65580ce 100644 --- a/resources/process_resource.go +++ b/resources/process_resource.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/types" ) type Process struct { diff --git a/resources/process_resource_test.go b/resources/process_resource_test.go index ff4a36d9780..810a1da4a8a 100644 --- a/resources/process_resource_test.go +++ b/resources/process_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/resources/quota_resource.go b/resources/quota_resource.go index 8a896c14582..15409edd58b 100644 --- a/resources/quota_resource.go +++ b/resources/quota_resource.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" ) type Quota struct { diff --git a/resources/quota_resource_test.go b/resources/quota_resource_test.go index be6c2aeb381..7277013ad62 100644 --- a/resources/quota_resource_test.go +++ b/resources/quota_resource_test.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/relationship_resource.go b/resources/relationship_resource.go index 322fe2a2b4a..f532442e798 100644 --- a/resources/relationship_resource.go +++ b/resources/relationship_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Relationships represent associations between resources. Relationships is a diff --git a/resources/role_resource.go b/resources/role_resource.go index 48963678a61..4beb836c561 100644 --- a/resources/role_resource.go +++ b/resources/role_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // IncludedUsers represent a set of users included on an API response. diff --git a/resources/route_binding.go b/resources/route_binding.go index cb71b99a025..64361b3b4c0 100644 --- a/resources/route_binding.go +++ b/resources/route_binding.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/route_binding_test.go b/resources/route_binding_test.go index 8817335942f..db746f44072 100644 --- a/resources/route_binding_test.go +++ b/resources/route_binding_test.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/resources/route_resource.go b/resources/route_resource.go index 5bf31b49b25..30dcf39ab5a 100644 --- a/resources/route_resource.go +++ b/resources/route_resource.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) type RouteDestinationApp struct { diff --git a/resources/security_group_resource_test.go b/resources/security_group_resource_test.go index b4e5e284f0c..92bad37ad8e 100644 --- a/resources/security_group_resource_test.go +++ b/resources/security_group_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/resources/service_broker_resource_test.go b/resources/service_broker_resource_test.go index 024346b08d3..429e45aba83 100644 --- a/resources/service_broker_resource_test.go +++ b/resources/service_broker_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_credential_binding_resource.go b/resources/service_credential_binding_resource.go index 0cd9bb988d5..da0d7b4126d 100644 --- a/resources/service_credential_binding_resource.go +++ b/resources/service_credential_binding_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_credential_binding_resource_test.go b/resources/service_credential_binding_resource_test.go index bb7c0d27334..d4beb474aaf 100644 --- a/resources/service_credential_binding_resource_test.go +++ b/resources/service_credential_binding_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_instance_resource.go b/resources/service_instance_resource.go index 3259c3e1cfd..35bf656ec34 100644 --- a/resources/service_instance_resource.go +++ b/resources/service_instance_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_instance_resource_test.go b/resources/service_instance_resource_test.go index 2f8beea737f..2f54d64bc14 100644 --- a/resources/service_instance_resource_test.go +++ b/resources/service_instance_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_instance_usage_summary_resource_test.go b/resources/service_instance_usage_summary_resource_test.go index 0f2a3293a5a..ad6c0390276 100644 --- a/resources/service_instance_usage_summary_resource_test.go +++ b/resources/service_instance_usage_summary_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_offering_resource.go b/resources/service_offering_resource.go index dbdc8da59a8..44b5cfd0b8e 100644 --- a/resources/service_offering_resource.go +++ b/resources/service_offering_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_offering_resource_test.go b/resources/service_offering_resource_test.go index 8c699b1655b..a98e580a874 100644 --- a/resources/service_offering_resource_test.go +++ b/resources/service_offering_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_plan_resource_test.go b/resources/service_plan_resource_test.go index fbe932baf30..ec779a06bcf 100644 --- a/resources/service_plan_resource_test.go +++ b/resources/service_plan_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_plan_visibility_resource_test.go b/resources/service_plan_visibility_resource_test.go index 7661b0f9a3a..f9bc44802eb 100644 --- a/resources/service_plan_visibility_resource_test.go +++ b/resources/service_plan_visibility_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/shared_to_spaces_resource_test.go b/resources/shared_to_spaces_resource_test.go index bd976368c2f..dd6e715cd78 100644 --- a/resources/shared_to_spaces_resource_test.go +++ b/resources/shared_to_spaces_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/sidecar_resource.go b/resources/sidecar_resource.go index fc3c53fcea1..c54e981fb5a 100644 --- a/resources/sidecar_resource.go +++ b/resources/sidecar_resource.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/types" +import "code.cloudfoundry.org/cli/v9/types" type Sidecar struct { GUID string `json:"guid"` diff --git a/resources/task_resource.go b/resources/task_resource.go index 6a0184ff865..e49bf7e6c64 100644 --- a/resources/task_resource.go +++ b/resources/task_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Task represents a Cloud Controller V3 Task. diff --git a/types/filtered_interface_test.go b/types/filtered_interface_test.go index 09da42ec708..4b0460f7f6a 100644 --- a/types/filtered_interface_test.go +++ b/types/filtered_interface_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/filtered_string_test.go b/types/filtered_string_test.go index bb0dd23090f..17599a930c5 100644 --- a/types/filtered_string_test.go +++ b/types/filtered_string_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/json_object_test.go b/types/json_object_test.go index 45390c1ef13..bf56fca47dd 100644 --- a/types/json_object_test.go +++ b/types/json_object_test.go @@ -3,7 +3,7 @@ package types_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_bool_test.go b/types/null_bool_test.go index 9e73bcbc917..e6928ae7916 100644 --- a/types/null_bool_test.go +++ b/types/null_bool_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_bytesize_in_mb_test.go b/types/null_bytesize_in_mb_test.go index f713e3d270a..fc93e9ca37d 100644 --- a/types/null_bytesize_in_mb_test.go +++ b/types/null_bytesize_in_mb_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_int_test.go b/types/null_int_test.go index 455a9eec1d6..de3a787693b 100644 --- a/types/null_int_test.go +++ b/types/null_int_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/types" "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/types/null_string_test.go b/types/null_string_test.go index ddeca89c2be..7bf36e29948 100644 --- a/types/null_string_test.go +++ b/types/null_string_test.go @@ -3,7 +3,7 @@ package types_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_uint64_test.go b/types/null_uint64_test.go index 884a69d3113..78e8cfbdda3 100644 --- a/types/null_uint64_test.go +++ b/types/null_uint64_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/optional_boolean_test.go b/types/optional_boolean_test.go index 77ee7627018..d13eb49f27f 100644 --- a/types/optional_boolean_test.go +++ b/types/optional_boolean_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_object_test.go b/types/optional_object_test.go index 6ba1e53dd60..6e9ee709502 100644 --- a/types/optional_object_test.go +++ b/types/optional_object_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_string_slice_test.go b/types/optional_string_slice_test.go index 63e7ca0c39f..ea38c195dbc 100644 --- a/types/optional_string_slice_test.go +++ b/types/optional_string_slice_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_string_test.go b/types/optional_string_test.go index 6539dd72b90..25d74ad48a5 100644 --- a/types/optional_string_test.go +++ b/types/optional_string_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/batcher/batcher.go b/util/batcher/batcher.go index ad5ad47e8d3..794d61adf4e 100644 --- a/util/batcher/batcher.go +++ b/util/batcher/batcher.go @@ -1,6 +1,6 @@ package batcher -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" const BatchSize = 200 diff --git a/util/batcher/batcher_test.go b/util/batcher/batcher_test.go index bf7531a888b..838688bf1cd 100644 --- a/util/batcher/batcher_test.go +++ b/util/batcher/batcher_test.go @@ -3,10 +3,10 @@ package batcher_test import ( "fmt" - "code.cloudfoundry.org/cli/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/checksum_test.go b/util/checksum_test.go index 4dcade05947..2aaa86c3471 100644 --- a/util/checksum_test.go +++ b/util/checksum_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/util" + . "code.cloudfoundry.org/cli/v9/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/clissh/clisshfakes/fake_listener_factory.go b/util/clissh/clisshfakes/fake_listener_factory.go index dbd41adab16..c61db5cdee0 100644 --- a/util/clissh/clisshfakes/fake_listener_factory.go +++ b/util/clissh/clisshfakes/fake_listener_factory.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" ) type FakeListenerFactory struct { @@ -34,15 +34,16 @@ func (fake *FakeListenerFactory) Listen(arg1 string, arg2 string) (net.Listener, arg1 string arg2 string }{arg1, arg2}) + stub := fake.ListenStub + fakeReturns := fake.listenReturns fake.recordInvocation("Listen", []interface{}{arg1, arg2}) fake.listenMutex.Unlock() - if fake.ListenStub != nil { - return fake.ListenStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/util/clissh/clisshfakes/fake_secure_client.go b/util/clissh/clisshfakes/fake_secure_client.go index f4643d96839..63e2d5ba55c 100644 --- a/util/clissh/clisshfakes/fake_secure_client.go +++ b/util/clissh/clisshfakes/fake_secure_client.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" "golang.org/x/crypto/ssh" ) @@ -75,15 +75,16 @@ func (fake *FakeSecureClient) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -127,15 +128,16 @@ func (fake *FakeSecureClient) Conn() ssh.Conn { ret, specificReturn := fake.connReturnsOnCall[len(fake.connArgsForCall)] fake.connArgsForCall = append(fake.connArgsForCall, struct { }{}) + stub := fake.ConnStub + fakeReturns := fake.connReturns fake.recordInvocation("Conn", []interface{}{}) fake.connMutex.Unlock() - if fake.ConnStub != nil { - return fake.ConnStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.connReturns return fakeReturns.result1 } @@ -181,15 +183,16 @@ func (fake *FakeSecureClient) Dial(arg1 string, arg2 string) (net.Conn, error) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.DialStub + fakeReturns := fake.dialReturns fake.recordInvocation("Dial", []interface{}{arg1, arg2}) fake.dialMutex.Unlock() - if fake.DialStub != nil { - return fake.DialStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dialReturns return fakeReturns.result1, fakeReturns.result2 } @@ -243,15 +246,16 @@ func (fake *FakeSecureClient) NewSession() (clissh.SecureSession, error) { ret, specificReturn := fake.newSessionReturnsOnCall[len(fake.newSessionArgsForCall)] fake.newSessionArgsForCall = append(fake.newSessionArgsForCall, struct { }{}) + stub := fake.NewSessionStub + fakeReturns := fake.newSessionReturns fake.recordInvocation("NewSession", []interface{}{}) fake.newSessionMutex.Unlock() - if fake.NewSessionStub != nil { - return fake.NewSessionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.newSessionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -298,15 +302,16 @@ func (fake *FakeSecureClient) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/util/clissh/clisshfakes/fake_secure_dialer.go b/util/clissh/clisshfakes/fake_secure_dialer.go index 18d537a5448..91db8d91329 100644 --- a/util/clissh/clisshfakes/fake_secure_dialer.go +++ b/util/clissh/clisshfakes/fake_secure_dialer.go @@ -4,7 +4,7 @@ package clisshfakes import ( "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" "golang.org/x/crypto/ssh" ) @@ -36,15 +36,16 @@ func (fake *FakeSecureDialer) Dial(arg1 string, arg2 string, arg3 *ssh.ClientCon arg2 string arg3 *ssh.ClientConfig }{arg1, arg2, arg3}) + stub := fake.DialStub + fakeReturns := fake.dialReturns fake.recordInvocation("Dial", []interface{}{arg1, arg2, arg3}) fake.dialMutex.Unlock() - if fake.DialStub != nil { - return fake.DialStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dialReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/util/clissh/clisshfakes/fake_secure_session.go b/util/clissh/clisshfakes/fake_secure_session.go index 9c9f57c01b7..5b0145a8297 100644 --- a/util/clissh/clisshfakes/fake_secure_session.go +++ b/util/clissh/clisshfakes/fake_secure_session.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" "golang.org/x/crypto/ssh" ) @@ -125,15 +125,16 @@ func (fake *FakeSecureSession) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -181,15 +182,16 @@ func (fake *FakeSecureSession) RequestPty(arg1 string, arg2 int, arg3 int, arg4 arg3 int arg4 ssh.TerminalModes }{arg1, arg2, arg3, arg4}) + stub := fake.RequestPtyStub + fakeReturns := fake.requestPtyReturns fake.recordInvocation("RequestPty", []interface{}{arg1, arg2, arg3, arg4}) fake.requestPtyMutex.Unlock() - if fake.RequestPtyStub != nil { - return fake.RequestPtyStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.requestPtyReturns return fakeReturns.result1 } @@ -248,15 +250,16 @@ func (fake *FakeSecureSession) SendRequest(arg1 string, arg2 bool, arg3 []byte) arg2 bool arg3 []byte }{arg1, arg2, arg3Copy}) + stub := fake.SendRequestStub + fakeReturns := fake.sendRequestReturns fake.recordInvocation("SendRequest", []interface{}{arg1, arg2, arg3Copy}) fake.sendRequestMutex.Unlock() - if fake.SendRequestStub != nil { - return fake.SendRequestStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.sendRequestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -310,15 +313,16 @@ func (fake *FakeSecureSession) Shell() error { ret, specificReturn := fake.shellReturnsOnCall[len(fake.shellArgsForCall)] fake.shellArgsForCall = append(fake.shellArgsForCall, struct { }{}) + stub := fake.ShellStub + fakeReturns := fake.shellReturns fake.recordInvocation("Shell", []interface{}{}) fake.shellMutex.Unlock() - if fake.ShellStub != nil { - return fake.ShellStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.shellReturns return fakeReturns.result1 } @@ -363,15 +367,16 @@ func (fake *FakeSecureSession) Start(arg1 string) error { fake.startArgsForCall = append(fake.startArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{arg1}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -422,15 +427,16 @@ func (fake *FakeSecureSession) StderrPipe() (io.Reader, error) { ret, specificReturn := fake.stderrPipeReturnsOnCall[len(fake.stderrPipeArgsForCall)] fake.stderrPipeArgsForCall = append(fake.stderrPipeArgsForCall, struct { }{}) + stub := fake.StderrPipeStub + fakeReturns := fake.stderrPipeReturns fake.recordInvocation("StderrPipe", []interface{}{}) fake.stderrPipeMutex.Unlock() - if fake.StderrPipeStub != nil { - return fake.StderrPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stderrPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -477,15 +483,16 @@ func (fake *FakeSecureSession) StdinPipe() (io.WriteCloser, error) { ret, specificReturn := fake.stdinPipeReturnsOnCall[len(fake.stdinPipeArgsForCall)] fake.stdinPipeArgsForCall = append(fake.stdinPipeArgsForCall, struct { }{}) + stub := fake.StdinPipeStub + fakeReturns := fake.stdinPipeReturns fake.recordInvocation("StdinPipe", []interface{}{}) fake.stdinPipeMutex.Unlock() - if fake.StdinPipeStub != nil { - return fake.StdinPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stdinPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -532,15 +539,16 @@ func (fake *FakeSecureSession) StdoutPipe() (io.Reader, error) { ret, specificReturn := fake.stdoutPipeReturnsOnCall[len(fake.stdoutPipeArgsForCall)] fake.stdoutPipeArgsForCall = append(fake.stdoutPipeArgsForCall, struct { }{}) + stub := fake.StdoutPipeStub + fakeReturns := fake.stdoutPipeReturns fake.recordInvocation("StdoutPipe", []interface{}{}) fake.stdoutPipeMutex.Unlock() - if fake.StdoutPipeStub != nil { - return fake.StdoutPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stdoutPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -587,15 +595,16 @@ func (fake *FakeSecureSession) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/util/clissh/clisshfakes/fake_terminal_helper.go b/util/clissh/clisshfakes/fake_terminal_helper.go index 3128914d983..42e8955f013 100644 --- a/util/clissh/clisshfakes/fake_terminal_helper.go +++ b/util/clissh/clisshfakes/fake_terminal_helper.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" "github.com/moby/term" ) @@ -85,15 +85,16 @@ func (fake *FakeTerminalHelper) GetFdInfo(arg1 interface{}) (uintptr, bool) { fake.getFdInfoArgsForCall = append(fake.getFdInfoArgsForCall, struct { arg1 interface{} }{arg1}) + stub := fake.GetFdInfoStub + fakeReturns := fake.getFdInfoReturns fake.recordInvocation("GetFdInfo", []interface{}{arg1}) fake.getFdInfoMutex.Unlock() - if fake.GetFdInfoStub != nil { - return fake.GetFdInfoStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getFdInfoReturns return fakeReturns.result1, fakeReturns.result2 } @@ -148,15 +149,16 @@ func (fake *FakeTerminalHelper) GetWinsize(arg1 uintptr) (*term.Winsize, error) fake.getWinsizeArgsForCall = append(fake.getWinsizeArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.GetWinsizeStub + fakeReturns := fake.getWinsizeReturns fake.recordInvocation("GetWinsize", []interface{}{arg1}) fake.getWinsizeMutex.Unlock() - if fake.GetWinsizeStub != nil { - return fake.GetWinsizeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getWinsizeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -212,15 +214,16 @@ func (fake *FakeTerminalHelper) RestoreTerminal(arg1 uintptr, arg2 *term.State) arg1 uintptr arg2 *term.State }{arg1, arg2}) + stub := fake.RestoreTerminalStub + fakeReturns := fake.restoreTerminalReturns fake.recordInvocation("RestoreTerminal", []interface{}{arg1, arg2}) fake.restoreTerminalMutex.Unlock() - if fake.RestoreTerminalStub != nil { - return fake.RestoreTerminalStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.restoreTerminalReturns return fakeReturns.result1 } @@ -272,15 +275,16 @@ func (fake *FakeTerminalHelper) SetRawTerminal(arg1 uintptr) (*term.State, error fake.setRawTerminalArgsForCall = append(fake.setRawTerminalArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.SetRawTerminalStub + fakeReturns := fake.setRawTerminalReturns fake.recordInvocation("SetRawTerminal", []interface{}{arg1}) fake.setRawTerminalMutex.Unlock() - if fake.SetRawTerminalStub != nil { - return fake.SetRawTerminalStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setRawTerminalReturns return fakeReturns.result1, fakeReturns.result2 } @@ -334,15 +338,16 @@ func (fake *FakeTerminalHelper) StdStreams() (io.ReadCloser, io.Writer, io.Write ret, specificReturn := fake.stdStreamsReturnsOnCall[len(fake.stdStreamsArgsForCall)] fake.stdStreamsArgsForCall = append(fake.stdStreamsArgsForCall, struct { }{}) + stub := fake.StdStreamsStub + fakeReturns := fake.stdStreamsReturns fake.recordInvocation("StdStreams", []interface{}{}) fake.stdStreamsMutex.Unlock() - if fake.StdStreamsStub != nil { - return fake.StdStreamsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.stdStreamsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/util/clissh/ssh.go b/util/clissh/ssh.go index b4f29212428..a836004d240 100644 --- a/util/clissh/ssh.go +++ b/util/clissh/ssh.go @@ -18,8 +18,8 @@ import ( "syscall" "time" - "code.cloudfoundry.org/cli/cf/ssh/sigwinch" - "code.cloudfoundry.org/cli/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v9/cf/ssh/sigwinch" + "code.cloudfoundry.org/cli/v9/util/clissh/ssherror" "github.com/moby/term" log "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" diff --git a/util/clissh/ssh_test.go b/util/clissh/ssh_test.go index 9cef54c6bc5..b792c9ec861 100644 --- a/util/clissh/ssh_test.go +++ b/util/clissh/ssh_test.go @@ -17,9 +17,9 @@ import ( "syscall" "time" - . "code.cloudfoundry.org/cli/util/clissh" - "code.cloudfoundry.org/cli/util/clissh/clisshfakes" - "code.cloudfoundry.org/cli/util/clissh/ssherror" + . "code.cloudfoundry.org/cli/v9/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh/clisshfakes" + "code.cloudfoundry.org/cli/v9/util/clissh/ssherror" "code.cloudfoundry.org/diego-ssh/server" fake_server "code.cloudfoundry.org/diego-ssh/server/fakes" "code.cloudfoundry.org/diego-ssh/test_helpers" diff --git a/util/command_parser/command_parser.go b/util/command_parser/command_parser.go index 5a847731b62..5124e625655 100644 --- a/util/command_parser/command_parser.go +++ b/util/command_parser/command_parser.go @@ -7,13 +7,13 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/cf/cmd" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/cf/cmd" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/jessevdk/go-flags" log "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" @@ -227,7 +227,7 @@ func (p *CommandParser) parse(args []string, commandList interface{}) (int, erro return 1, nil } else if err == ParseErr { fmt.Println() - p.parse([]string{"help", args[0]}, commandList) //nolint: errcheck + p.parse([]string{"help", args[0]}, commandList) // nolint: errcheck return 1, err } else if exitError, ok := err.(*ssh.ExitError); ok { return exitError.ExitStatus(), nil diff --git a/util/command_parser/command_parser_test.go b/util/command_parser/command_parser_test.go index e12c3735297..8ed667a2738 100644 --- a/util/command_parser/command_parser_test.go +++ b/util/command_parser/command_parser_test.go @@ -3,10 +3,10 @@ package command_parser_test import ( "io" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/util/command_parser" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/util/command_parser" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/command_parser/prevent_extra_args_v7.go b/util/command_parser/prevent_extra_args_v7.go index 1f1800dd2d1..3b4e2e5008f 100644 --- a/util/command_parser/prevent_extra_args_v7.go +++ b/util/command_parser/prevent_extra_args_v7.go @@ -3,7 +3,7 @@ package command_parser import ( "strings" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) func preventExtraArgs(args []string) error { diff --git a/util/command_parser/unknown_command_error.go b/util/command_parser/unknown_command_error.go index 72374f060e3..9bbf7f0f1b2 100644 --- a/util/command_parser/unknown_command_error.go +++ b/util/command_parser/unknown_command_error.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "code.cloudfoundry.org/cli/cf/util/spellcheck" - "code.cloudfoundry.org/cli/command/common" + "code.cloudfoundry.org/cli/v9/cf/util/spellcheck" + "code.cloudfoundry.org/cli/v9/command/common" ) type UnknownCommandError struct { diff --git a/util/configv3/color_test.go b/util/configv3/color_test.go index d3ae227e00a..a74bac43dd7 100644 --- a/util/configv3/color_test.go +++ b/util/configv3/color_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config.go b/util/configv3/config.go index c6afb35ff5d..4b896d6c6a5 100644 --- a/util/configv3/config.go +++ b/util/configv3/config.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strconv" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/version" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserConfig diff --git a/util/configv3/config_suite_test.go b/util/configv3/config_suite_test.go index cb2416295a2..0f1563d70a2 100644 --- a/util/configv3/config_suite_test.go +++ b/util/configv3/config_suite_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config_test.go b/util/configv3/config_test.go index 81418a9e980..5eeb949e8b5 100644 --- a/util/configv3/config_test.go +++ b/util/configv3/config_test.go @@ -3,7 +3,7 @@ package configv3_test import ( "os" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config_unix_test.go b/util/configv3/config_unix_test.go index 1d06e71acc2..4cacfd940f9 100644 --- a/util/configv3/config_unix_test.go +++ b/util/configv3/config_unix_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/config_windows_test.go b/util/configv3/config_windows_test.go index e478e4da39a..09b2742e200 100644 --- a/util/configv3/config_windows_test.go +++ b/util/configv3/config_windows_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/configv3fakes/fake_user_config.go b/util/configv3/configv3fakes/fake_user_config.go index 72198fbd8a0..a67343add6c 100644 --- a/util/configv3/configv3fakes/fake_user_config.go +++ b/util/configv3/configv3fakes/fake_user_config.go @@ -4,7 +4,7 @@ package configv3fakes import ( "sync" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeUserConfig struct { @@ -41,15 +41,16 @@ func (fake *FakeUserConfig) CurrentUser() (configv3.User, error) { ret, specificReturn := fake.currentUserReturnsOnCall[len(fake.currentUserArgsForCall)] fake.currentUserArgsForCall = append(fake.currentUserArgsForCall, struct { }{}) + stub := fake.CurrentUserStub + fakeReturns := fake.currentUserReturns fake.recordInvocation("CurrentUser", []interface{}{}) fake.currentUserMutex.Unlock() - if fake.CurrentUserStub != nil { - return fake.CurrentUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.currentUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -96,15 +97,16 @@ func (fake *FakeUserConfig) CurrentUserName() (string, error) { ret, specificReturn := fake.currentUserNameReturnsOnCall[len(fake.currentUserNameArgsForCall)] fake.currentUserNameArgsForCall = append(fake.currentUserNameArgsForCall, struct { }{}) + stub := fake.CurrentUserNameStub + fakeReturns := fake.currentUserNameReturns fake.recordInvocation("CurrentUserName", []interface{}{}) fake.currentUserNameMutex.Unlock() - if fake.CurrentUserNameStub != nil { - return fake.CurrentUserNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.currentUserNameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/util/configv3/default_user_config_test.go b/util/configv3/default_user_config_test.go index 496de4924d5..f57dc81264d 100644 --- a/util/configv3/default_user_config_test.go +++ b/util/configv3/default_user_config_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/dynamic_user_config_test.go b/util/configv3/dynamic_user_config_test.go index e4d11aaa226..55072183a25 100644 --- a/util/configv3/dynamic_user_config_test.go +++ b/util/configv3/dynamic_user_config_test.go @@ -3,8 +3,8 @@ package configv3_test import ( "errors" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/configv3/configv3fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3/configv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/env_test.go b/util/configv3/env_test.go index 0f7a060f6cd..cee083a84b7 100644 --- a/util/configv3/env_test.go +++ b/util/configv3/env_test.go @@ -3,7 +3,7 @@ package configv3_test import ( "time" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/json_config_test.go b/util/configv3/json_config_test.go index 236579b4280..22bcf1c7f83 100644 --- a/util/configv3/json_config_test.go +++ b/util/configv3/json_config_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/k8s_test.go b/util/configv3/k8s_test.go index 83dbc839cc7..b25b6c9c4a1 100644 --- a/util/configv3/k8s_test.go +++ b/util/configv3/k8s_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("K8s", func() { diff --git a/util/configv3/kubernetes_user_config_test.go b/util/configv3/kubernetes_user_config_test.go index 4e74a2e3442..9b743566058 100644 --- a/util/configv3/kubernetes_user_config_test.go +++ b/util/configv3/kubernetes_user_config_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/load_config.go b/util/configv3/load_config.go index d0a0c8b5026..36075529f82 100644 --- a/util/configv3/load_config.go +++ b/util/configv3/load_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" "golang.org/x/term" ) diff --git a/util/configv3/load_config_test.go b/util/configv3/load_config_test.go index b8321eea92f..19fd1d79276 100644 --- a/util/configv3/load_config_test.go +++ b/util/configv3/load_config_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/locale_test.go b/util/configv3/locale_test.go index 53d2c3b77c8..e4546b77761 100644 --- a/util/configv3/locale_test.go +++ b/util/configv3/locale_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/plugin_repository_test.go b/util/configv3/plugin_repository_test.go index 4ed60b41e41..4ee25a41821 100644 --- a/util/configv3/plugin_repository_test.go +++ b/util/configv3/plugin_repository_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/plugins_config.go b/util/configv3/plugins_config.go index a084b71f563..ef61a4b9830 100644 --- a/util/configv3/plugins_config.go +++ b/util/configv3/plugins_config.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/util" ) const notApplicable = "N/A" diff --git a/util/configv3/plugins_config_test.go b/util/configv3/plugins_config_test.go index 7a5ce1a0d2b..f50b7d494df 100644 --- a/util/configv3/plugins_config_test.go +++ b/util/configv3/plugins_config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "syscall" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/write_config_test.go b/util/configv3/write_config_test.go index 3b8760de7e9..e7f7ad4aed1 100644 --- a/util/configv3/write_config_test.go +++ b/util/configv3/write_config_test.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" "gopkg.in/yaml.v2" . "github.com/onsi/ginkgo/v2" diff --git a/util/download/downloader.go b/util/download/downloader.go index e779e84c6d7..cb0f64982c1 100644 --- a/util/download/downloader.go +++ b/util/download/downloader.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/util" ) type Downloader struct { diff --git a/util/download/downloader_test.go b/util/download/downloader_test.go index 44dbfc550c2..c4dd7f5bc35 100644 --- a/util/download/downloader_test.go +++ b/util/download/downloader_test.go @@ -10,8 +10,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/util/download" - "code.cloudfoundry.org/cli/util/download/downloadfakes" + . "code.cloudfoundry.org/cli/v9/util/download" + "code.cloudfoundry.org/cli/v9/util/download/downloadfakes" ) var _ = Describe("Downloader", func() { diff --git a/util/download/downloadfakes/fake_httpclient.go b/util/download/downloadfakes/fake_httpclient.go index 1d37dec2fd4..6fa4f6c07fd 100644 --- a/util/download/downloadfakes/fake_httpclient.go +++ b/util/download/downloadfakes/fake_httpclient.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v9/util/download" ) type FakeHTTPClient struct { @@ -32,15 +32,16 @@ func (fake *FakeHTTPClient) Get(arg1 string) (*http.Response, error) { fake.getArgsForCall = append(fake.getArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetStub + fakeReturns := fake.getReturns fake.recordInvocation("Get", []interface{}{arg1}) fake.getMutex.Unlock() - if fake.GetStub != nil { - return fake.GetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/util/download/downloadfakes/fake_progress_bar.go b/util/download/downloadfakes/fake_progress_bar.go index c23e09c6012..85b7913565a 100644 --- a/util/download/downloadfakes/fake_progress_bar.go +++ b/util/download/downloadfakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v9/util/download" pb "gopkg.in/cheggaaa/pb.v1" ) @@ -54,9 +54,10 @@ func (fake *FakeProgressBar) Finish() { fake.finishMutex.Lock() fake.finishArgsForCall = append(fake.finishArgsForCall, struct { }{}) + stub := fake.FinishStub fake.recordInvocation("Finish", []interface{}{}) fake.finishMutex.Unlock() - if fake.FinishStub != nil { + if stub != nil { fake.FinishStub() } } @@ -79,15 +80,16 @@ func (fake *FakeProgressBar) NewProxyReader(arg1 io.Reader) *pb.Reader { fake.newProxyReaderArgsForCall = append(fake.newProxyReaderArgsForCall, struct { arg1 io.Reader }{arg1}) + stub := fake.NewProxyReaderStub + fakeReturns := fake.newProxyReaderReturns fake.recordInvocation("NewProxyReader", []interface{}{arg1}) fake.newProxyReaderMutex.Unlock() - if fake.NewProxyReaderStub != nil { - return fake.NewProxyReaderStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newProxyReaderReturns return fakeReturns.result1 } @@ -139,15 +141,16 @@ func (fake *FakeProgressBar) SetTotal(arg1 int) *pb.ProgressBar { fake.setTotalArgsForCall = append(fake.setTotalArgsForCall, struct { arg1 int }{arg1}) + stub := fake.SetTotalStub + fakeReturns := fake.setTotalReturns fake.recordInvocation("SetTotal", []interface{}{arg1}) fake.setTotalMutex.Unlock() - if fake.SetTotalStub != nil { - return fake.SetTotalStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.setTotalReturns return fakeReturns.result1 } @@ -198,15 +201,16 @@ func (fake *FakeProgressBar) Start() *pb.ProgressBar { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } diff --git a/util/extract/extract.go b/util/extract/extract.go index 917960e6543..75a67d52c59 100644 --- a/util/extract/extract.go +++ b/util/extract/extract.go @@ -4,7 +4,7 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/util/unique" + "code.cloudfoundry.org/cli/v9/util/unique" ) type appender func(string) diff --git a/util/extract/extract_test.go b/util/extract/extract_test.go index 035bbefc0ee..e3856ea7582 100644 --- a/util/extract/extract_test.go +++ b/util/extract/extract_test.go @@ -1,7 +1,7 @@ package extract_test import ( - "code.cloudfoundry.org/cli/util/extract" + "code.cloudfoundry.org/cli/v9/util/extract" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/architecture_test.go b/util/generic/architecture_test.go index 1dc8775d3dd..c4e7088034a 100644 --- a/util/generic/architecture_test.go +++ b/util/generic/architecture_test.go @@ -1,7 +1,7 @@ package generic_test import ( - . "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/executable_filename_unix_test.go b/util/generic/executable_filename_unix_test.go index d6700b0456d..f45b8b2f977 100644 --- a/util/generic/executable_filename_unix_test.go +++ b/util/generic/executable_filename_unix_test.go @@ -6,7 +6,7 @@ package generic_test import ( "path/filepath" - . "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/executable_filename_windows_test.go b/util/generic/executable_filename_windows_test.go index 95fd6a4b8d2..8358e65e7e0 100644 --- a/util/generic/executable_filename_windows_test.go +++ b/util/generic/executable_filename_windows_test.go @@ -7,7 +7,7 @@ import ( "fmt" "path/filepath" - . "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/map_test.go b/util/generic/map_test.go index 9b51c82a3d6..686109c0375 100644 --- a/util/generic/map_test.go +++ b/util/generic/map_test.go @@ -1,7 +1,7 @@ package generic_test import ( - . "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/slice_test.go b/util/generic/slice_test.go index 48403e9b3ba..64d706debdd 100644 --- a/util/generic/slice_test.go +++ b/util/generic/slice_test.go @@ -1,7 +1,7 @@ package generic_test import ( - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/lookuptable/name_from_guid_test.go b/util/lookuptable/name_from_guid_test.go index 5e07fe54567..ebc21b69bf8 100644 --- a/util/lookuptable/name_from_guid_test.go +++ b/util/lookuptable/name_from_guid_test.go @@ -1,7 +1,7 @@ package lookuptable_test import ( - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v9/util/lookuptable" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/lookuptable/resource_from_guid.go b/util/lookuptable/resource_from_guid.go index 878a6b93bd4..791b7b6caaa 100644 --- a/util/lookuptable/resource_from_guid.go +++ b/util/lookuptable/resource_from_guid.go @@ -1,6 +1,6 @@ package lookuptable -import "code.cloudfoundry.org/cli/resources" +import "code.cloudfoundry.org/cli/v9/resources" func OrgFromGUID(orgs []resources.Organization) map[string]resources.Organization { result := make(map[string]resources.Organization) diff --git a/util/manifest/application.go b/util/manifest/application.go index b748c1753f0..963831c75be 100644 --- a/util/manifest/application.go +++ b/util/manifest/application.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" ) type Application struct { diff --git a/util/manifest/manifest_test.go b/util/manifest/manifest_test.go index fbbe5f419bc..f6a85f7dc6f 100644 --- a/util/manifest/manifest_test.go +++ b/util/manifest/manifest_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/types" - . "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v9/types" + . "code.cloudfoundry.org/cli/v9/util/manifest" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" diff --git a/util/manifest/manifest_unix_test.go b/util/manifest/manifest_unix_test.go index e4a5db67e55..e598a02776c 100644 --- a/util/manifest/manifest_unix_test.go +++ b/util/manifest/manifest_unix_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v9/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifest/manifest_windows_test.go b/util/manifest/manifest_windows_test.go index d425c419208..ec5dfecc4ef 100644 --- a/util/manifest/manifest_windows_test.go +++ b/util/manifest/manifest_windows_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v9/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/application.go b/util/manifestparser/application.go index 2ce7d936701..0e19ba10180 100644 --- a/util/manifestparser/application.go +++ b/util/manifestparser/application.go @@ -4,7 +4,7 @@ import ( "errors" "reflect" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type Docker struct { diff --git a/util/manifestparser/application_test.go b/util/manifestparser/application_test.go index 3376f264db7..80f1ad4c176 100644 --- a/util/manifestparser/application_test.go +++ b/util/manifestparser/application_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" "gopkg.in/yaml.v2" . "github.com/onsi/ginkgo/v2" diff --git a/util/manifestparser/locator_test.go b/util/manifestparser/locator_test.go index 120a28fa3c2..0413f18de7f 100644 --- a/util/manifestparser/locator_test.go +++ b/util/manifestparser/locator_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/manifest_test.go b/util/manifestparser/manifest_test.go index 0a8fcde3db9..76b0311908b 100644 --- a/util/manifestparser/manifest_test.go +++ b/util/manifestparser/manifest_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" diff --git a/util/manifestparser/parser_test.go b/util/manifestparser/parser_test.go index 6085ec3d862..6141827f81d 100644 --- a/util/manifestparser/parser_test.go +++ b/util/manifestparser/parser_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/process.go b/util/manifestparser/process.go index 07d2c35bc54..a4146d9f39d 100644 --- a/util/manifestparser/process.go +++ b/util/manifestparser/process.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type Process struct { diff --git a/util/manifestparser/process_test.go b/util/manifestparser/process_test.go index 618a7939300..2f2a9680bbf 100644 --- a/util/manifestparser/process_test.go +++ b/util/manifestparser/process_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" diff --git a/util/panichandler/handler.go b/util/panichandler/handler.go index 73e0c1faddb..9451b1e20ca 100644 --- a/util/panichandler/handler.go +++ b/util/panichandler/handler.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/version" ) const maxStackSizeLimit = 1024 * 1024 diff --git a/util/plugin/plugin.go b/util/plugin/plugin.go index b184d598df6..9dbb4982c11 100644 --- a/util/plugin/plugin.go +++ b/util/plugin/plugin.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - plugin_transition "code.cloudfoundry.org/cli/plugin/transition" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + plugin_transition "code.cloudfoundry.org/cli/v9/plugin/transition" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) var ErrFailed = errors.New("command failed") diff --git a/util/railway/railway.go b/util/railway/railway.go index 1564004d39c..0ca22c4a2fb 100644 --- a/util/railway/railway.go +++ b/util/railway/railway.go @@ -1,6 +1,6 @@ package railway -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" type funcWithWarningsAndError = func() (ccv3.Warnings, error) diff --git a/util/railway/railway_test.go b/util/railway/railway_test.go index 3caea2dad72..3c82445ef4f 100644 --- a/util/railway/railway_test.go +++ b/util/railway/railway_test.go @@ -3,8 +3,8 @@ package railway_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/util/railway" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/randomword/generator_test.go b/util/randomword/generator_test.go index 944d4abe51d..236ab24d439 100644 --- a/util/randomword/generator_test.go +++ b/util/randomword/generator_test.go @@ -1,7 +1,7 @@ package randomword_test import ( - . "code.cloudfoundry.org/cli/util/randomword" + . "code.cloudfoundry.org/cli/v9/util/randomword" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/sorting/alphabetic_test.go b/util/sorting/alphabetic_test.go index 14756731ac8..37c84e0983c 100644 --- a/util/sorting/alphabetic_test.go +++ b/util/sorting/alphabetic_test.go @@ -3,7 +3,7 @@ package sorting_test import ( "sort" - . "code.cloudfoundry.org/cli/util/sorting" + . "code.cloudfoundry.org/cli/v9/util/sorting" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/tls_test.go b/util/tls_test.go index 6ca055dda20..695a8c98e89 100644 --- a/util/tls_test.go +++ b/util/tls_test.go @@ -5,7 +5,7 @@ import ( "crypto/x509" "encoding/pem" - . "code.cloudfoundry.org/cli/util" + . "code.cloudfoundry.org/cli/v9/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/ui/config.go b/util/ui/config.go index f17cd6e3802..a37d1f840d2 100644 --- a/util/ui/config.go +++ b/util/ui/config.go @@ -1,6 +1,6 @@ package ui -import "code.cloudfoundry.org/cli/util/configv3" +import "code.cloudfoundry.org/cli/v9/util/configv3" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/util/ui/i18n.go b/util/ui/i18n.go index 559a0e6db22..763db6ed8d7 100644 --- a/util/ui/i18n.go +++ b/util/ui/i18n.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "code.cloudfoundry.org/cli/i18n/resources" + "code.cloudfoundry.org/cli/v9/i18n/resources" log "github.com/sirupsen/logrus" "golang.org/x/text/language" ) diff --git a/util/ui/i18n_test.go b/util/ui/i18n_test.go index 01f85f7d09b..c8acc67729d 100644 --- a/util/ui/i18n_test.go +++ b/util/ui/i18n_test.go @@ -1,8 +1,8 @@ package ui_test import ( - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/log_message_test.go b/util/ui/log_message_test.go index 66790b582c7..e5d2a8fdd4a 100644 --- a/util/ui/log_message_test.go +++ b/util/ui/log_message_test.go @@ -3,9 +3,9 @@ package ui_test import ( "time" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/prompt_test.go b/util/ui/prompt_test.go index 1234e003aa7..93823f3fbf5 100644 --- a/util/ui/prompt_test.go +++ b/util/ui/prompt_test.go @@ -3,9 +3,9 @@ package ui_test import ( "regexp" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/request_logger_file_writer_test.go b/util/ui/request_logger_file_writer_test.go index 40f768f64c4..a5c68cc3846 100644 --- a/util/ui/request_logger_file_writer_test.go +++ b/util/ui/request_logger_file_writer_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/request_logger_terminal_display_test.go b/util/ui/request_logger_terminal_display_test.go index 77b780954f3..88be5802e27 100644 --- a/util/ui/request_logger_terminal_display_test.go +++ b/util/ui/request_logger_terminal_display_test.go @@ -5,7 +5,7 @@ import ( "regexp" "time" - . "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/sanitize_json_test.go b/util/ui/sanitize_json_test.go index 82c48558f61..8e4373d7d6b 100644 --- a/util/ui/sanitize_json_test.go +++ b/util/ui/sanitize_json_test.go @@ -3,7 +3,7 @@ package ui_test import ( "strings" - . "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/table_test.go b/util/ui/table_test.go index aeef5fe9578..172d5f71133 100644 --- a/util/ui/table_test.go +++ b/util/ui/table_test.go @@ -3,9 +3,9 @@ package ui_test import ( "strings" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui.go b/util/ui/ui.go index 435dc4da50d..d3fce4d85f5 100644 --- a/util/ui/ui.go +++ b/util/ui/ui.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" "github.com/fatih/color" runewidth "github.com/mattn/go-runewidth" "github.com/vito/go-interact/interact" diff --git a/util/ui/ui_for_app_test.go b/util/ui/ui_for_app_test.go index 7051f807698..cd53674f11e 100644 --- a/util/ui/ui_for_app_test.go +++ b/util/ui/ui_for_app_test.go @@ -1,9 +1,9 @@ package ui_test import ( - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui_for_push.go b/util/ui/ui_for_push.go index 1cffd9deb51..c657d90b166 100644 --- a/util/ui/ui_for_push.go +++ b/util/ui/ui_for_push.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v9/types" "github.com/fatih/color" ) diff --git a/util/ui/ui_for_push_test.go b/util/ui/ui_for_push_test.go index 92738b8b40e..fc0c61d4e75 100644 --- a/util/ui/ui_for_push_test.go +++ b/util/ui/ui_for_push_test.go @@ -3,10 +3,10 @@ package ui_test import ( "regexp" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui_test.go b/util/ui/ui_test.go index 67fb070dc82..4e26bd7199d 100644 --- a/util/ui/ui_test.go +++ b/util/ui/ui_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/command/translatableerror/translatableerrorfakes" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror/translatableerrorfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui_v7_test.go b/util/ui/ui_v7_test.go index f33445c1a60..212fa962a99 100644 --- a/util/ui/ui_v7_test.go +++ b/util/ui/ui_v7_test.go @@ -1,9 +1,9 @@ package ui_test import ( - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/uifakes/fake_config.go b/util/ui/uifakes/fake_config.go index a4cacace19d..5a5b5e01420 100644 --- a/util/ui/uifakes/fake_config.go +++ b/util/ui/uifakes/fake_config.go @@ -4,8 +4,8 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeConfig struct { diff --git a/util/ui/uifakes/fake_exiter.go b/util/ui/uifakes/fake_exiter.go index ce8d58b6e46..36270067455 100644 --- a/util/ui/uifakes/fake_exiter.go +++ b/util/ui/uifakes/fake_exiter.go @@ -4,7 +4,7 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeExiter struct { diff --git a/util/ui/uifakes/fake_interactor.go b/util/ui/uifakes/fake_interactor.go index 55cc9a8a9c4..79aa3520917 100644 --- a/util/ui/uifakes/fake_interactor.go +++ b/util/ui/uifakes/fake_interactor.go @@ -4,7 +4,7 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/vito/go-interact/interact" ) diff --git a/util/ui/uifakes/fake_log_message.go b/util/ui/uifakes/fake_log_message.go index ec1f175288d..b502a318641 100644 --- a/util/ui/uifakes/fake_log_message.go +++ b/util/ui/uifakes/fake_log_message.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeLogMessage struct { diff --git a/util/ui/uifakes/fake_resolver.go b/util/ui/uifakes/fake_resolver.go index 0bd677edbf7..02c2c43c582 100644 --- a/util/ui/uifakes/fake_resolver.go +++ b/util/ui/uifakes/fake_resolver.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeResolver struct { diff --git a/util/unique/string_slice_test.go b/util/unique/string_slice_test.go index acab41a0ee4..5e61fab9bc7 100644 --- a/util/unique/string_slice_test.go +++ b/util/unique/string_slice_test.go @@ -1,7 +1,7 @@ package unique_test import ( - "code.cloudfoundry.org/cli/util/unique" + "code.cloudfoundry.org/cli/v9/util/unique" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/url_test.go b/util/url_test.go index 2a4cf89d2e8..03a224266a6 100644 --- a/util/url_test.go +++ b/util/url_test.go @@ -1,7 +1,7 @@ package util_test import ( - . "code.cloudfoundry.org/cli/util" + . "code.cloudfoundry.org/cli/v9/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/utilfakes/fake_sha1checksum.go b/util/utilfakes/fake_sha1checksum.go index b26eeb24fdd..fe54d1289ef 100644 --- a/util/utilfakes/fake_sha1checksum.go +++ b/util/utilfakes/fake_sha1checksum.go @@ -4,7 +4,7 @@ package utilfakes import ( "sync" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v9/util" ) type FakeSha1Checksum struct { @@ -46,15 +46,16 @@ func (fake *FakeSha1Checksum) CheckSha1(arg1 string) bool { fake.checkSha1ArgsForCall = append(fake.checkSha1ArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CheckSha1Stub + fakeReturns := fake.checkSha1Returns fake.recordInvocation("CheckSha1", []interface{}{arg1}) fake.checkSha1Mutex.Unlock() - if fake.CheckSha1Stub != nil { - return fake.CheckSha1Stub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.checkSha1Returns return fakeReturns.result1 } @@ -105,15 +106,16 @@ func (fake *FakeSha1Checksum) ComputeFileSha1() ([]byte, error) { ret, specificReturn := fake.computeFileSha1ReturnsOnCall[len(fake.computeFileSha1ArgsForCall)] fake.computeFileSha1ArgsForCall = append(fake.computeFileSha1ArgsForCall, struct { }{}) + stub := fake.ComputeFileSha1Stub + fakeReturns := fake.computeFileSha1Returns fake.recordInvocation("ComputeFileSha1", []interface{}{}) fake.computeFileSha1Mutex.Unlock() - if fake.ComputeFileSha1Stub != nil { - return fake.ComputeFileSha1Stub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.computeFileSha1Returns return fakeReturns.result1, fakeReturns.result2 } @@ -160,9 +162,10 @@ func (fake *FakeSha1Checksum) SetFilePath(arg1 string) { fake.setFilePathArgsForCall = append(fake.setFilePathArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetFilePathStub fake.recordInvocation("SetFilePath", []interface{}{arg1}) fake.setFilePathMutex.Unlock() - if fake.SetFilePathStub != nil { + if stub != nil { fake.SetFilePathStub(arg1) } } diff --git a/version/version_test.go b/version/version_test.go index 2d1c3337403..654e1d894d9 100644 --- a/version/version_test.go +++ b/version/version_test.go @@ -1,7 +1,7 @@ package version_test import ( - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v9/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" )