merge cfnetworking updates from main and regenerate fakes with new pa…

…ckage version
cloudfoundry · Jan 6, 2025 · 3fcb422 · 3fcb422
1 parent 43edf81
commit 3fcb422
Show file tree

Hide file tree

Showing 293 changed files with 10,435 additions and 4,708 deletions.
diff --git a/.github/license/CF_NOTICE b/.github/license/CF_NOTICE
@@ -18,7 +18,7 @@ This product includes software from https://github.com/code.cloudfoundry.org/cli
 Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
 and is licensed under the Apache License, Version 2.0.
 
-This product includes software from https://github.com/code.cloudfoundry.org/cli/v7/tree/main/vendor/code.cloudfoundry.org/cfnetworking-cli-api that is:
+This product includes software from https://github.com/code.cloudfoundry.org/cli/v7/tree/main/vendor/code.cloudfoundry.org/cli/v7/api that is:
 Copyright (c) 2016-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
 and is licensed under the Apache License, Version 2.0.
 

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/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/v7/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,8 +1,8 @@
 package cfnetworkingaction
 
 import (
-	"code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1"
 	"code.cloudfoundry.org/cli/v7/actor/actionerror"
+	"code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1"
 	"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3"
 	"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant"
 	"code.cloudfoundry.org/cli/v7/resources"

diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go
@@ -9,10 +9,10 @@ import (
 	"code.cloudfoundry.org/cli/v7/resources"
 	"code.cloudfoundry.org/cli/v7/util/batcher"
 
-	"code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1"
 	"code.cloudfoundry.org/cli/v7/actor/actionerror"
 	. "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction"
 	"code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction/cfnetworkingactionfakes"
+	"code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1"
 	. "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
diff --git a/actor/pluginaction/pluginactionfakes/fake_config.go b/actor/pluginaction/pluginactionfakes/fake_config.go