chore(mocks): use new counterfeiter directives

Author: njhale

Makefile

@@ -43,7 +43,6 @@ container-codegen:
 	docker rm temp-codegen
 
 generate-fakes:
-	go install -mod=vendor ./vendor/github.com/maxbrunsfeld/counterfeiter/v6
 	go generate ./...
 
 clean:

go.sum

@@ -243,6 +243,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/joefitzgerald/rainbow-reporter v0.1.0 h1:AuMG652zjdzI0YCCnXAqATtRBpGXMcAnrajcaTrSeuo=
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -351,6 +352,7 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sclevine/spec v1.2.0 h1:1Jwdf9jSfDl9NVmt8ndHqbTZ7XCCPbh1jI3hkDBHVYA=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

pkg/appregistry/appregistry_suite_test.go

@@ -0,0 +1,13 @@
+package appregistry
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestAppregistry(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Appregistry Suite")
+}

pkg/appregistry/appregistryfakes/fake_image_appender.go

@@ -1,3 +1,4 @@
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ManifestDownloader
 package appregistry
 
 import (

pkg/appregistry/appregistryfakes/fake_manifest_downloader.go

@@ -1,4 +1,4 @@
-//go:generate counterfeiter command.go CommandRunner
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CommandRunner
 package containertools
 
 import (
@@ -25,8 +25,8 @@ type CommandRunner interface {
 
 // ContainerCommandRunner is configured to select a container cli tool and execute commands with that
 // tooling.
-type ContainerCommandRunner struct{
-	logger *logrus.Entry
+type ContainerCommandRunner struct {
+	logger        *logrus.Entry
 	containerTool string
 }
 
@@ -76,7 +76,7 @@ func (r *ContainerCommandRunner) Pull(image string) error {
 // Build takes a dockerfile and a tag and builds a container image
 func (r *ContainerCommandRunner) Build(dockerfile, tag string) error {
 	args := []string{"build", "-f", dockerfile}
-	
+
 	if tag != "" {
 		args = append(args, "-t", tag)
 	}

pkg/appregistry/manifest_downloader.go

@@ -1,4 +1,4 @@
-//go:generate counterfeiter dockerfilegenerator.go DockerfileGenerator
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DockerfileGenerator
 package containertools
 
 import (
@@ -8,10 +8,10 @@ import (
 )
 
 const (
-	baseImage = "scratch"
+	baseImage                = "scratch"
 	defaultBinarySourceImage = "quay.io/operator-framework/upstream-registry-builder"
-	DefaultDbLocation = "./index.db"
-	DbLocationLabel = "operators.operatorframework.io.index.database.v1"
+	DefaultDbLocation        = "./index.db"
+	DbLocationLabel          = "operators.operatorframework.io.index.database.v1"
 )
 
 // DockerfileGenerator defines functions to generate index dockerfiles

pkg/containertools/command.go

@@ -1,4 +1,4 @@
-//go:generate counterfeiter imagereader.go ImageReader
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ImageReader
 package containertools
 
 import (

pkg/containertools/dockerfilegenerator.go

@@ -1,9 +1,9 @@
-//go:generate counterfeiter labelreader.go LabelReader
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LabelReader
 package containertools
 
 import (
-	"fmt"
 	"encoding/json"
+	"fmt"
 
 	"github.com/sirupsen/logrus"
 )
@@ -14,15 +14,15 @@ type LabelReader interface {
 
 type ImageLabelReader struct {
 	Logger *logrus.Entry
-	Cmd CommandRunner
+	Cmd    CommandRunner
 }
 
 func NewLabelReader(containerTool string, logger *logrus.Entry) LabelReader {
 	cmd := NewCommandRunner(containerTool, logger)
-	
+
 	return ImageLabelReader{
 		Logger: logger,
-		Cmd: cmd,
+		Cmd:    cmd,
 	}
 }
 
@@ -39,7 +39,7 @@ type PodmanImageData struct {
 }
 
 // GetLabelsFromImage takes a container image path as input, pulls that image
-// to the local environment and then inspects it for labels  
+// to the local environment and then inspects it for labels
 func (r ImageLabelReader) GetLabelsFromImage(image string) (map[string]string, error) {
 	err := r.Cmd.Pull(image)
 	if err != nil {