fix fork sync

jcvrabo · jcvrabo · commit 2686526d2aa1 · 2025-10-29T00:15:14.000+01:00
diff --git a/actor/v7pushaction/handle_deployment_scale_flag_overrides.go b/actor/v7pushaction/handle_deployment_scale_flag_overrides.go
@@ -1,7 +1,7 @@
 package v7pushaction
 
 import (
-	"code.cloudfoundry.org/cli/util/manifestparser"
+	"code.cloudfoundry.org/cli/v8/util/manifestparser"
 )
 
 func (actor Actor) HandleDeploymentScaleFlagOverrides(
diff --git a/actor/v7pushaction/handle_deployment_scale_flag_overrides_test.go b/actor/v7pushaction/handle_deployment_scale_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/v8/actor/v7pushaction"
+	"code.cloudfoundry.org/cli/v8/util/manifestparser"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/api/cloudcontroller/ccv3/root.go b/api/cloudcontroller/ccv3/root.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/v8/api/cloudcontroller"
+	"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror"
+	"code.cloudfoundry.org/cli/v8/resources"
 )
 
 type RootLinks struct {
diff --git a/api/cloudcontroller/ccv3/root_test.go b/api/cloudcontroller/ccv3/root_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/v8/api/cloudcontroller/ccerror"
+	. "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/api/cloudcontroller/wrapper/trace_request.go b/api/cloudcontroller/wrapper/trace_request.go
@@ -1,8 +1,8 @@
 package wrapper
 
 import (
-	"code.cloudfoundry.org/cli/api/cloudcontroller"
-	"code.cloudfoundry.org/cli/api/shared"
+	"code.cloudfoundry.org/cli/v8/api/cloudcontroller"
+	"code.cloudfoundry.org/cli/v8/api/shared"
 )
 
 // CCTraceHeaderRequest is a wrapper that adds b3 trace headers to requests.
diff --git a/api/cloudcontroller/wrapper/trace_request_test.go b/api/cloudcontroller/wrapper/trace_request_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"net/http"
 
-	"code.cloudfoundry.org/cli/api/cloudcontroller"
-	"code.cloudfoundry.org/cli/api/cloudcontroller/cloudcontrollerfakes"
-	. "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper"
+	"code.cloudfoundry.org/cli/v8/api/cloudcontroller"
+	"code.cloudfoundry.org/cli/v8/api/cloudcontroller/cloudcontrollerfakes"
+	. "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/api/router/wrapper/trace_request.go b/api/router/wrapper/trace_request.go
@@ -1,8 +1,8 @@
 package wrapper
 
 import (
-	"code.cloudfoundry.org/cli/api/router"
-	"code.cloudfoundry.org/cli/api/shared"
+	"code.cloudfoundry.org/cli/v8/api/router"
+	"code.cloudfoundry.org/cli/v8/api/shared"
 )
 
 // RoutingTraceHeaderRequest is a wrapper that adds b3 trace headers to requests.
diff --git a/api/router/wrapper/trace_request_test.go b/api/router/wrapper/trace_request_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"net/http"
 
-	"code.cloudfoundry.org/cli/api/router"
-	"code.cloudfoundry.org/cli/api/router/routerfakes"
-	. "code.cloudfoundry.org/cli/api/router/wrapper"
+	"code.cloudfoundry.org/cli/v8/api/router"
+	"code.cloudfoundry.org/cli/v8/api/router/routerfakes"
+	. "code.cloudfoundry.org/cli/v8/api/router/wrapper"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/api/shared/trace_headers.go b/api/shared/trace_headers.go
@@ -3,7 +3,7 @@ package shared
 import (
 	"net/http"
 
-	"code.cloudfoundry.org/cli/util/trace"
+	"code.cloudfoundry.org/cli/v8/util/trace"
 )
 
 const (
diff --git a/api/shared/trace_headers_test.go b/api/shared/trace_headers_test.go
@@ -3,7 +3,7 @@ package shared_test
 import (
 	"net/http"
 
-	. "code.cloudfoundry.org/cli/api/shared"
+	. "code.cloudfoundry.org/cli/v8/api/shared"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/api/uaa/wrapper/trace_request.go b/api/uaa/wrapper/trace_request.go
@@ -3,8 +3,8 @@ package wrapper
 import (
 	"net/http"
 
-	"code.cloudfoundry.org/cli/api/shared"
-	"code.cloudfoundry.org/cli/api/uaa"
+	"code.cloudfoundry.org/cli/v8/api/shared"
+	"code.cloudfoundry.org/cli/v8/api/uaa"
 )
 
 // UAATraceHeaderRequest is a wrapper that adds b3 trace headers to requests.
diff --git a/api/uaa/wrapper/trace_request_test.go b/api/uaa/wrapper/trace_request_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"net/http"
 
-	"code.cloudfoundry.org/cli/api/uaa"
-	"code.cloudfoundry.org/cli/api/uaa/uaafakes"
-	. "code.cloudfoundry.org/cli/api/uaa/wrapper"
+	"code.cloudfoundry.org/cli/v8/api/uaa"
+	"code.cloudfoundry.org/cli/v8/api/uaa/uaafakes"
+	. "code.cloudfoundry.org/cli/v8/api/uaa/wrapper"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/go.sum b/go.sum
diff --git a/util/configv3/env.go b/util/configv3/env.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"code.cloudfoundry.org/cli/util/trace"
+	"code.cloudfoundry.org/cli/v8/util/trace"
 )
 
 // EnvOverride represents all the environment variables read by the CF CLI
diff --git a/util/trace/trace_test.go b/util/trace/trace_test.go
@@ -1,7 +1,7 @@
 package trace_test
 
 import (
-	"code.cloudfoundry.org/cli/util/trace"
+	"code.cloudfoundry.org/cli/v8/util/trace"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package v7pushaction`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "code.cloudfoundry.org/cli/util/manifestparser"`
	`4`	`+ "code.cloudfoundry.org/cli/v8/util/manifestparser"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func (actor Actor) HandleDeploymentScaleFlagOverrides(`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package wrapper`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "code.cloudfoundry.org/cli/api/cloudcontroller"`
`5`		`- "code.cloudfoundry.org/cli/api/shared"`
	`4`	`+ "code.cloudfoundry.org/cli/v8/api/cloudcontroller"`
	`5`	`+ "code.cloudfoundry.org/cli/v8/api/shared"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// CCTraceHeaderRequest is a wrapper that adds b3 trace headers to requests.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package shared`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
`5`	`5`
`6`		`- "code.cloudfoundry.org/cli/util/trace"`
	`6`	`+ "code.cloudfoundry.org/cli/v8/util/trace"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`const (`