cloudfoundry · jcvrabo · Oct 16, 2024 · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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