Skip to content

Commit 239f453

Browse files
rkosterrkoster
committed
fix: replace v9 module paths with v8 in new route policy files
New files introduced by the cherry-pick retained v9 import paths since they had no merge conflicts during cherry-pick. Replace all code.cloudfoundry.org/cli/v9/ references with v8/ so the module builds correctly on the v8 branch.
1 parent f981a63 commit 239f453

16 files changed

Lines changed: 72 additions & 72 deletions

‎actor/v7action/route_policy.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package v7action
22

33
import (
4-
"code.cloudfoundry.org/cli/v9/actor/actionerror"
5-
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3"
6-
"code.cloudfoundry.org/cli/v9/resources"
4+
"code.cloudfoundry.org/cli/v8/actor/actionerror"
5+
"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3"
6+
"code.cloudfoundry.org/cli/v8/resources"
77
)
88

99
func (actor Actor) AddRoutePolicy(domainName, source, hostname, path string) (Warnings, error) {

‎actor/v7action/route_policy_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package v7action_test
33
import (
44
"errors"
55

6-
"code.cloudfoundry.org/cli/v9/actor/actionerror"
7-
. "code.cloudfoundry.org/cli/v9/actor/v7action"
8-
"code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes"
9-
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3"
10-
"code.cloudfoundry.org/cli/v9/resources"
11-
"code.cloudfoundry.org/cli/v9/types"
6+
"code.cloudfoundry.org/cli/v8/actor/actionerror"
7+
. "code.cloudfoundry.org/cli/v8/actor/v7action"
8+
"code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes"
9+
"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3"
10+
"code.cloudfoundry.org/cli/v8/resources"
11+
"code.cloudfoundry.org/cli/v8/types"
1212
. "github.com/onsi/ginkgo/v2"
1313
. "github.com/onsi/gomega"
1414
)

‎api/cloudcontroller/ccv3/route_policy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package ccv3
22

33
import (
4-
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal"
5-
"code.cloudfoundry.org/cli/v9/resources"
4+
"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal"
5+
"code.cloudfoundry.org/cli/v8/resources"
66
)
77

88
// CreateRoutePolicy creates a route policy for a route

‎api/cloudcontroller/ccv3/route_policy_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package ccv3_test
33
import (
44
"errors"
55

6-
. "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3"
7-
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes"
8-
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal"
9-
"code.cloudfoundry.org/cli/v9/resources"
6+
. "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3"
7+
"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes"
8+
"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal"
9+
"code.cloudfoundry.org/cli/v8/resources"
1010
. "github.com/onsi/ginkgo/v2"
1111
. "github.com/onsi/gomega"
1212
)

‎api/cloudcontroller/ccversion/minimum_version_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ccversion_test
33
import (
44
"testing"
55

6-
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion"
6+
"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion"
77
)
88

99
// TestMinVersionRoutePoliciesIsNotPlaceholder will keep failing until

‎command/v7/add_route_policy_command.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package v7
33
import (
44
"fmt"
55

6-
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion"
7-
"code.cloudfoundry.org/cli/v9/command"
8-
"code.cloudfoundry.org/cli/v9/command/flag"
6+
"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion"
7+
"code.cloudfoundry.org/cli/v8/command"
8+
"code.cloudfoundry.org/cli/v8/command/flag"
99
)
1010

1111
type AddRoutePolicyCommand struct {

‎command/v7/add_route_policy_command_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package v7_test
33
import (
44
"errors"
55

6-
"code.cloudfoundry.org/cli/v9/actor/actionerror"
7-
"code.cloudfoundry.org/cli/v9/actor/v7action"
8-
"code.cloudfoundry.org/cli/v9/command/commandfakes"
9-
"code.cloudfoundry.org/cli/v9/command/flag"
10-
"code.cloudfoundry.org/cli/v9/command/translatableerror"
11-
. "code.cloudfoundry.org/cli/v9/command/v7"
12-
"code.cloudfoundry.org/cli/v9/command/v7/v7fakes"
13-
"code.cloudfoundry.org/cli/v9/util/configv3"
14-
"code.cloudfoundry.org/cli/v9/util/ui"
6+
"code.cloudfoundry.org/cli/v8/actor/actionerror"
7+
"code.cloudfoundry.org/cli/v8/actor/v7action"
8+
"code.cloudfoundry.org/cli/v8/command/commandfakes"
9+
"code.cloudfoundry.org/cli/v8/command/flag"
10+
"code.cloudfoundry.org/cli/v8/command/translatableerror"
11+
. "code.cloudfoundry.org/cli/v8/command/v7"
12+
"code.cloudfoundry.org/cli/v8/command/v7/v7fakes"
13+
"code.cloudfoundry.org/cli/v8/util/configv3"
14+
"code.cloudfoundry.org/cli/v8/util/ui"
1515
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
. "github.com/onsi/gomega/gbytes"

‎command/v7/enforce_route_policies_shared_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package v7_test
22

33
import (
4-
ccversionPkg "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion"
5-
translatablerrorPkg "code.cloudfoundry.org/cli/v9/command/translatableerror"
6-
uiPkg "code.cloudfoundry.org/cli/v9/util/ui"
4+
ccversionPkg "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion"
5+
translatablerrorPkg "code.cloudfoundry.org/cli/v8/command/translatableerror"
6+
uiPkg "code.cloudfoundry.org/cli/v8/util/ui"
77

88
. "github.com/onsi/ginkgo/v2"
99
. "github.com/onsi/gomega"

‎command/v7/remove_route_policy_command.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package v7
22

33
import (
4-
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion"
5-
"code.cloudfoundry.org/cli/v9/command"
6-
"code.cloudfoundry.org/cli/v9/command/flag"
4+
"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion"
5+
"code.cloudfoundry.org/cli/v8/command"
6+
"code.cloudfoundry.org/cli/v8/command/flag"
77
)
88

99
type RemoveRoutePolicyCommand struct {

‎command/v7/remove_route_policy_command_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package v7_test
33
import (
44
"errors"
55

6-
"code.cloudfoundry.org/cli/v9/actor/actionerror"
7-
"code.cloudfoundry.org/cli/v9/actor/v7action"
8-
"code.cloudfoundry.org/cli/v9/command/commandfakes"
9-
"code.cloudfoundry.org/cli/v9/command/flag"
10-
"code.cloudfoundry.org/cli/v9/command/translatableerror"
11-
. "code.cloudfoundry.org/cli/v9/command/v7"
12-
"code.cloudfoundry.org/cli/v9/command/v7/v7fakes"
13-
"code.cloudfoundry.org/cli/v9/util/configv3"
14-
"code.cloudfoundry.org/cli/v9/util/ui"
6+
"code.cloudfoundry.org/cli/v8/actor/actionerror"
7+
"code.cloudfoundry.org/cli/v8/actor/v7action"
8+
"code.cloudfoundry.org/cli/v8/command/commandfakes"
9+
"code.cloudfoundry.org/cli/v8/command/flag"
10+
"code.cloudfoundry.org/cli/v8/command/translatableerror"
11+
. "code.cloudfoundry.org/cli/v8/command/v7"
12+
"code.cloudfoundry.org/cli/v8/command/v7/v7fakes"
13+
"code.cloudfoundry.org/cli/v8/util/configv3"
14+
"code.cloudfoundry.org/cli/v8/util/ui"
1515
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
. "github.com/onsi/gomega/gbytes"

0 commit comments

Comments
 (0)