Merge branch 'v7'

actor/cfnetworkingaction/cloud_controller_client.go

@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/cli/resources"
 )
 
-//go:generate counterfeiter . CloudControllerClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient
 
 type CloudControllerClient interface {
 	GetApplicationByNameAndSpace(appName string, spaceGUID string) (resources.Application, ccv3.Warnings, error)

actor/cfnetworkingaction/networking_client.go

@@ -2,7 +2,7 @@ package cfnetworkingaction
 
 import "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1"
 
-//go:generate counterfeiter . NetworkingClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkingClient
 
 type NetworkingClient interface {
 	CreatePolicies(policies []cfnetv1.Policy) error

actor/pluginaction/config.go

@@ -2,7 +2,7 @@ package pluginaction
 
 import "code.cloudfoundry.org/cli/util/configv3"
 
-//go:generate counterfeiter . Config
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config
 
 // Config is a way of getting basic CF configuration
 type Config interface {

actor/pluginaction/install.go

@@ -16,13 +16,13 @@ import (
 	"code.cloudfoundry.org/gofileutils/fileutils"
 )
 
-//go:generate counterfeiter . PluginMetadata
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginMetadata
 
 type PluginMetadata interface {
 	GetMetadata(pluginPath string) (configv3.Plugin, error)
 }
 
-//go:generate counterfeiter . CommandList
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CommandList
 
 type CommandList interface {
 	HasCommand(string) bool

actor/pluginaction/plugin_client.go

@@ -2,7 +2,7 @@ package pluginaction
 
 import "code.cloudfoundry.org/cli/api/plugin"
 
-//go:generate counterfeiter . PluginClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginClient
 
 type PluginClient interface {
 	GetPluginRepository(repositoryURL string) (plugin.PluginRepository, error)

actor/pluginaction/uninstall.go

@@ -8,7 +8,7 @@ import (
 	"code.cloudfoundry.org/cli/actor/actionerror"
 )
 
-//go:generate counterfeiter . PluginUninstaller
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginUninstaller
 
 type PluginUninstaller interface {
 	Run(pluginPath string, command string) error

actor/pushaction/progress_bar.go

@@ -2,7 +2,7 @@ package pushaction
 
 import "io"
 
-//go:generate counterfeiter . ProgressBar
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ProgressBar
 
 type ProgressBar interface {
 	NewProgressBarWrapper(reader io.Reader, sizeOfFile int64) io.Reader

actor/pushaction/random_word_generator.go

@@ -1,6 +1,6 @@
 package pushaction
 
-//go:generate counterfeiter . RandomWordGenerator
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RandomWordGenerator
 
 // RandomWordGenerator returns random words.
 type RandomWordGenerator interface {

actor/pushaction/shared_actor.go

@@ -6,8 +6,8 @@ import (
 	"code.cloudfoundry.org/cli/actor/sharedaction"
 )
 
-//go:generate counterfeiter io.ReadCloser
-//go:generate counterfeiter . SharedActor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.ReadCloser
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedActor
 
 type SharedActor interface {
 	GatherArchiveResources(archivePath string) ([]sharedaction.Resource, error)

actor/pushaction/v2_actor.go

@@ -6,7 +6,7 @@ import (
 	"code.cloudfoundry.org/cli/actor/v2action"
 )
 
-//go:generate counterfeiter . V2Actor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V2Actor
 
 type V2Actor interface {
 	MapRouteToApplication(routeGUID string, appGUID string) (v2action.Warnings, error)

actor/pushaction/v3_actor.go

@@ -7,7 +7,7 @@ import (
 	"code.cloudfoundry.org/cli/actor/v3action"
 )
 
-//go:generate counterfeiter . V3Actor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V3Actor
 
 type V3Actor interface {
 	CloudControllerAPIVersion() string

actor/sharedaction/config.go

@@ -1,6 +1,6 @@
 package sharedaction
 
-//go:generate counterfeiter . Config
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config
 
 // Config a way of getting basic CF configuration
 type Config interface {

actor/sharedaction/log_cache_client.go

@@ -8,7 +8,7 @@ import (
 	"code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2"
 )
 
-//go:generate counterfeiter . LogCacheClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LogCacheClient
 
 // LogCacheClient is a client for getting logs.
 type LogCacheClient interface {

actor/sharedaction/secure_shell_client.go

@@ -2,7 +2,7 @@ package sharedaction
 
 import "code.cloudfoundry.org/cli/util/clissh"
 
-//go:generate counterfeiter . SecureShellClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecureShellClient
 
 type SecureShellClient interface {
 	Connect(username string, passcode string, sshEndpoint string, sshHostKeyFingerprint string, skipHostValidation bool) error

actor/v2action/buildpack.go

@@ -25,13 +25,13 @@ func (buildpack Buildpack) NoStack() bool {
 	return len(buildpack.Stack) == 0
 }
 
-//go:generate counterfeiter . Downloader
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Downloader
 
 type Downloader interface {
 	Download(url string, tmpDirPath string) (string, error)
 }
 
-//go:generate counterfeiter . SimpleProgressBar
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SimpleProgressBar
 
 type SimpleProgressBar interface {
 	Initialize(path string) (io.Reader, int64, error)

actor/v2action/cloud_controller_client.go

@@ -6,7 +6,7 @@ import (
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv2"
 )
 
-//go:generate counterfeiter . CloudControllerClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient
 
 // CloudControllerClient is a Cloud Controller V2 client.
 type CloudControllerClient interface {

actor/v2action/config.go

@@ -6,7 +6,7 @@ import (
 	"code.cloudfoundry.org/cli/util/configv3"
 )
 
-//go:generate counterfeiter . Config
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config
 
 type Config interface {
 	AccessToken() string

actor/v2action/noaa_client.go

@@ -2,7 +2,7 @@ package v2action
 
 import "github.com/cloudfoundry/sonde-go/events"
 
-//go:generate counterfeiter . NOAAClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NOAAClient
 
 // NOAAClient is a client for getting logs.
 type NOAAClient interface {

actor/v2action/router_client.go

@@ -2,7 +2,7 @@ package v2action
 
 import "code.cloudfoundry.org/cli/api/router"
 
-//go:generate counterfeiter . RouterClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouterClient
 
 // RouterClient is a Router API client.
 type RouterClient interface {

actor/v2action/uaa_client.go

@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/cli/api/uaa/constant"
 )
 
-//go:generate counterfeiter . UAAClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient
 
 type UAAClient interface {
 	Authenticate(credentials map[string]string, origin string, grantType constant.GrantType) (string, string, error)

actor/v2v3action/v2_actor.go

@@ -2,7 +2,7 @@ package v2v3action
 
 import "code.cloudfoundry.org/cli/actor/v2action"
 
-//go:generate counterfeiter . V2Actor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V2Actor
 
 type V2Actor interface {
 	ManifestV2Actor

actor/v2v3action/v3_actor.go

@@ -4,7 +4,7 @@ import (
 	"code.cloudfoundry.org/cli/actor/v3action"
 )
 
-//go:generate counterfeiter . V3Actor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V3Actor
 
 type V3Actor interface {
 	ManifestV3Actor

actor/v3action/application_manifest.go

@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccerror"
 )
 
-//go:generate counterfeiter . ManifestParser
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ManifestParser
 
 type ManifestParser interface {
 	AppNames() []string

actor/v3action/cloud_controller_client.go

@@ -7,7 +7,7 @@ import (
 	"code.cloudfoundry.org/cli/resources"
 )
 
-//go:generate counterfeiter . CloudControllerClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient
 
 // CloudControllerClient is the interface to the cloud controller V3 API.
 type CloudControllerClient interface {

actor/v3action/config.go

@@ -6,7 +6,7 @@ import (
 	"code.cloudfoundry.org/cli/util/configv3"
 )
 
-//go:generate counterfeiter . Config
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config
 
 type Config interface {
 	AccessToken() string

actor/v3action/noaa_client.go

@@ -2,7 +2,7 @@ package v3action
 
 import "github.com/cloudfoundry/sonde-go/events"
 
-//go:generate counterfeiter . NOAAClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NOAAClient
 
 // NOAAClient is a client for getting logs.
 type NOAAClient interface {

actor/v3action/shared_actor.go

@@ -2,7 +2,7 @@ package v3action
 
 import "code.cloudfoundry.org/cli/actor/sharedaction"
 
-//go:generate counterfeiter . SharedActor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedActor
 
 type SharedActor interface {
 	GatherArchiveResources(archivePath string) ([]sharedaction.Resource, error)

actor/v3action/ssh_actor.go

@@ -2,7 +2,7 @@ package v3action
 
 import "code.cloudfoundry.org/cli/actor/sharedaction"
 
-//go:generate counterfeiter . SSHActor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHActor
 
 type SSHActor interface {
 	ExecuteSecureShell(sshOptions sharedaction.SSHOptions) error

actor/v3action/uaa_client.go

@@ -2,7 +2,7 @@ package v3action
 
 import "code.cloudfoundry.org/cli/api/uaa/constant"
 
-//go:generate counterfeiter . UAAClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient
 
 type UAAClient interface {
 	Authenticate(credentials map[string]string, origin string, grantType constant.GrantType) (string, string, error)

actor/v7action/application_manifest.go

@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccerror"
 )
 
-//go:generate counterfeiter . ManifestParser
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ManifestParser
 
 type ManifestParser interface {
 	AppNames() []string

actor/v7action/buildpack.go

@@ -15,7 +15,7 @@ import (
 
 type JobURL ccv3.JobURL
 
-//go:generate counterfeiter . Downloader
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Downloader
 
 type Downloader interface {
 	Download(url string, tmpDirPath string) (string, error)

actor/v7action/cloud_controller_client.go

@@ -10,7 +10,7 @@ import (
 	"code.cloudfoundry.org/cli/types"
 )
 
-//go:generate counterfeiter . CloudControllerClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient
 
 // CloudControllerClient is the interface to the cloud controller V3 API.
 type CloudControllerClient interface {

actor/v7action/config.go

@@ -6,7 +6,7 @@ import (
 	"code.cloudfoundry.org/cli/util/configv3"
 )
 
-//go:generate counterfeiter . Config
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config
 
 type Config interface {
 	AccessToken() string

actor/v7action/progress_bar.go

@@ -8,7 +8,7 @@ import (
 	"gopkg.in/cheggaaa/pb.v1"
 )
 
-//go:generate counterfeiter . SimpleProgressBar
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SimpleProgressBar
 
 type SimpleProgressBar interface {
 	Initialize(path string) (io.Reader, int64, error)

actor/v7action/routing_client.go

@@ -2,7 +2,7 @@ package v7action
 
 import "code.cloudfoundry.org/cli/api/router"
 
-//go:generate counterfeiter . RoutingClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RoutingClient
 
 type RoutingClient interface {
 	GetRouterGroups() ([]router.RouterGroup, error)

actor/v7action/shared_actor.go

@@ -2,7 +2,7 @@ package v7action
 
 import "code.cloudfoundry.org/cli/actor/sharedaction"
 
-//go:generate counterfeiter . SharedActor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedActor
 
 type SharedActor interface {
 	GatherArchiveResources(archivePath string) ([]sharedaction.Resource, error)

actor/v7action/ssh_actor.go

@@ -2,7 +2,7 @@ package v7action
 
 import "code.cloudfoundry.org/cli/actor/sharedaction"
 
-//go:generate counterfeiter . SSHActor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHActor
 
 type SSHActor interface {
 	ExecuteSecureShell(sshOptions sharedaction.SSHOptions) error

actor/v7action/uaa_client.go

@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/cli/api/uaa/constant"
 )
 
-//go:generate counterfeiter . UAAClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient
 
 type UAAClient interface {
 	Authenticate(credentials map[string]string, origin string, grantType constant.GrantType) (string, string, error)

actor/v7pushaction/progress_bar.go

@@ -2,7 +2,7 @@ package v7pushaction
 
 import "io"
 
-//go:generate counterfeiter . ProgressBar
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ProgressBar
 
 type ProgressBar interface {
 	NewProgressBarWrapper(reader io.Reader, sizeOfFile int64) io.Reader

actor/v7pushaction/shared_actor.go

@@ -6,8 +6,8 @@ import (
 	"code.cloudfoundry.org/cli/actor/sharedaction"
 )
 
-//go:generate counterfeiter io.ReadCloser
-//go:generate counterfeiter . SharedActor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.ReadCloser
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedActor
 
 type SharedActor interface {
 	GatherArchiveResources(archivePath string) ([]sharedaction.Resource, error)

actor/v7pushaction/v2_actor.go

@@ -4,7 +4,7 @@ import (
 	"code.cloudfoundry.org/cli/actor/v2action"
 )
 
-//go:generate counterfeiter . V2Actor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V2Actor
 
 type V2Actor interface {
 	MapRouteToApplication(routeGUID string, appGUID string) (v2action.Warnings, error)

actor/v7pushaction/v7_actor.go

@@ -8,7 +8,7 @@ import (
 	"code.cloudfoundry.org/cli/resources"
 )
 
-//go:generate counterfeiter . V7Actor
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V7Actor
 
 type V7Actor interface {
 	CreateApplicationDroplet(appGUID string) (resources.Droplet, v7action.Warnings, error)