merge cfnetworking updates from main

cloudfoundry · Jan 6, 2025 · 4b2d312 · 4b2d312
1 parent 6d5bbf7
commit 4b2d312
Show file tree

Hide file tree

Showing 30 changed files with 531 additions and 273 deletions.
diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go
@@ -4,12 +4,12 @@ import (
 	"errors"
 	"fmt"
 
+	"code.cloudfoundry.org/cli/v8/api/cfnetworking/cfnetv1"
 	"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3"
 	"code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant"
 	"code.cloudfoundry.org/cli/v8/resources"
 	"code.cloudfoundry.org/cli/v8/util/batcher"
 
-	"code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1"
 	"code.cloudfoundry.org/cli/v8/actor/actionerror"
 	. "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction"
 	"code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction/cfnetworkingactionfakes"

diff --git a/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go b/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go
@@ -7,7 +7,7 @@ import (
 
 	. "code.cloudfoundry.org/cli/v8/api/cfnetworking/cfnetv1"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/ghttp"
 )

diff --git a/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go b/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go
diff --git a/api/cfnetworking/cfnetv1/cfvnetv1.go 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/connection_wrapper.go b/api/cfnetworking/cfnetv1/connection_wrapper.go
@@ -2,10 +2,10 @@ package cfnetv1
 
 import "code.cloudfoundry.org/cli/v8/api/cfnetworking"
 
-//go:generate counterfeiter . ConnectionWrapper
-
 // 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

diff --git a/api/cfnetworking/cfnetv1/policy.go b/api/cfnetworking/cfnetv1/policy.go
@@ -37,7 +37,7 @@ type PolicyDestination struct {
 }
 
 // CreatePolicies will create the network policy with the given parameters.
-func (client Client) CreatePolicies(policies []Policy) error {
+func (client *Client) CreatePolicies(policies []Policy) error {
 	rawJSON, err := json.Marshal(PolicyList{Policies: policies})
 	if err != nil {
 		return err
@@ -55,7 +55,7 @@ func (client Client) CreatePolicies(policies []Policy) error {
 }
 
 // ListPolicies will list the policies with the app guids in either the source or destination.
-func (client Client) ListPolicies(appGUIDs ...string) ([]Policy, error) {
+func (client *Client) ListPolicies(appGUIDs ...string) ([]Policy, error) {
 	var request *cfnetworking.Request
 	var err error
 	if len(appGUIDs) == 0 {
@@ -91,7 +91,7 @@ func (client Client) ListPolicies(appGUIDs ...string) ([]Policy, error) {
 }
 
 // RemovePolicies will remove the network policy with the given parameters.
-func (client Client) RemovePolicies(policies []Policy) error {
+func (client *Client) RemovePolicies(policies []Policy) error {
 	rawJSON, err := json.Marshal(PolicyList{Policies: policies})
 	if err != nil {
 		return err

diff --git a/api/cfnetworking/cfnetv1/policy_test.go b/api/cfnetworking/cfnetv1/policy_test.go
@@ -3,9 +3,9 @@ package cfnetv1_test
 import (
 	"net/http"
 
-	. "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1"
-	"code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/networkerror"
-	. "github.com/onsi/ginkgo"
+	. "code.cloudfoundry.org/cli/v8/api/cfnetworking/cfnetv1"
+	"code.cloudfoundry.org/cli/v8/api/cfnetworking/networkerror"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/ghttp"
 )

diff --git a/api/cfnetworking/cfnetworking.go 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
@@ -5,7 +5,7 @@ import (
 	"log"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/ghttp"
 )

diff --git a/api/cfnetworking/cfnetworkingfakes/fake_connection.go b/api/cfnetworking/cfnetworkingfakes/fake_connection.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package cfnetv1

		//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate