Use go mod

- go mod did not like counterfeiter, we removed it as it is a dev dependency only - added tools import for ginkgo, as this is the new way of vendoring ginkgo [#177060090] Signed-off-by: Joseph Palermo <[email protected]>
qdwl · Feb 23, 2021 · f8971fa · f8971fa
1 parent 360e5c9
commit f8971fa
Show file tree

Hide file tree

Showing 348 changed files with 10,296 additions and 57,467 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/bin/test-integration b/bin/test-integration
@@ -41,9 +41,6 @@ vagrant up "$@"
 
 vagrant ssh-config > $base/tmp/vagrant-config
 
-echo -e "\n Installing ginkgo..."
-$bin/go install ./vendor/github.com/onsi/ginkgo/ginkgo
-
 echo -e "\n Rebuilding agent..."
 vagrant rsync
 vagrant ssh -- "sudo /home/vagrant/go/src/github.com/cloudfoundry/bosh-agent/integration/assets/install-agent.sh"
@@ -55,6 +52,6 @@ focus=""
 if [ ! -z "$BOSH_AGENT_INTEGRATION_FOCUS" ]; then
   focus="-focus=$BOSH_AGENT_INTEGRATION_FOCUS"
 fi
-$bin/env ginkgo "$focus" -race -trace integration
+$bin/env go run github.com/onsi/ginkgo/ginkgo "$focus" -race -trace integration
 
 exit 0
diff --git a/bin/test-integration-windows b/bin/test-integration-windows
@@ -44,14 +44,11 @@ export PRIVATE_KEY_PATH=$tmpfile
 echo -e "\n Running agent integration tests..."
 $bin/env go clean -r github.com/cloudfoundry/bosh-agent/
 
-echo -e "\n Installing ginkgo..."
-$bin/go install ./vendor/github.com/onsi/ginkgo/ginkgo
-
 echo -e "\n Running tests..."
 focus=""
 if [ ! -z "$BOSH_AGENT_INTEGRATION_FOCUS" ]; then
   focus="-focus=$BOSH_AGENT_INTEGRATION_FOCUS"
 fi
-bin/env ginkgo "$focus" -v -race -trace integration/windows/
+bin/env go run github.com/onsi/ginkgo/ginkgo "$focus" -v -race -trace integration/windows/
 
 exit 0
diff --git a/bin/test-unit b/bin/test-unit
@@ -32,9 +32,6 @@ for i in `ls -1` ; do
   fi
 done
 
-echo -e "\n Installing ginkgo..."
-$bin/go install ./vendor/github.com/onsi/ginkgo/ginkgo
-
 echo -e "\n Skipping check for unhandled errors until https://github.com/kisielk/errcheck/issues/75 is resolved"
 # $bin/test-unhandled-errors
 
@@ -45,7 +42,7 @@ echo -e "\n Running build script to confirm everything compiles..."
 $bin/build
 
 echo -e "\n Testing packages..."
-$bin/env ginkgo $WATCH -r $race -skipPackage="integration,vendor" $dir
+$bin/env go run github.com/onsi/ginkgo/ginkgo $WATCH -r $race -skipPackage="integration,vendor" $dir
 
 if [[ ! "$(go version)" =~ go1.8 ]]; then
   echo -e "\n Checking with golint..."

diff --git a/go.mod b/go.mod
@@ -0,0 +1,53 @@
+module github.com/cloudfoundry/bosh-agent
+
+go 1.15
+
+require (
+	code.cloudfoundry.org/clock v1.0.0
+	code.cloudfoundry.org/tlsconfig v0.0.0-20200131000646-bbe0f8da39b3
+	github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect
+	github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d // indirect
+	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/Microsoft/hcsshim v0.8.14
+	github.com/bmatcuk/doublestar v1.3.4 // indirect
+	github.com/charlievieth/fs v0.0.1
+	github.com/cloudfoundry/bosh-davcli v0.0.44
+	github.com/cloudfoundry/bosh-init v0.0.103
+	github.com/cloudfoundry/bosh-utils v0.0.0-20210213100152-d3ba248ff042
+	github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect
+	github.com/cloudfoundry/gosigar v1.1.0
+	github.com/cloudfoundry/socks5-proxy v0.2.0 // indirect
+	github.com/cloudfoundry/yagnats v0.0.0-20191003180638-5cab3e099974
+	github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect
+	github.com/gofrs/uuid v4.0.0+incompatible
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/mock v1.5.0
+	github.com/google/uuid v1.2.0
+	github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20190724205821-6cfae18c12b8
+	github.com/magefile/mage v1.11.0 // indirect
+	github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786 // indirect
+	github.com/masterzen/winrm v0.0.0-20201030141608-56ca5c5f2380
+	github.com/mitchellh/mapstructure v1.4.1
+	github.com/nats-io/jwt v1.2.2 // indirect
+	github.com/nats-io/nats.go v1.10.0
+	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.15.0
+	github.com/onsi/gomega v1.10.5
+	github.com/pivotal-cf/paraphernalia v0.0.0-20180203224945-a64ae2051c20 // indirect
+	github.com/pivotal/go-smtpd v0.0.0-20140108210614-0af6982457e5
+	github.com/pkg/errors v0.9.1
+	github.com/sirupsen/logrus v1.8.0 // indirect
+	github.com/stretchr/testify v1.7.0
+	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
+	go.opencensus.io v0.22.6 // indirect
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
+	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
+	golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d
+	golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43
+	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/tools v0.1.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+)