removes duplicate pivotal-golang/yaml package

- this package is a fork of yaml.v2 and was seemingly made
to do a PR that has now been merged
- also removed pivotal-golang s3cli and bumped it to
a newer version pointing at cloudfoundry/bosh-s3cli
- vito/go-interact got in my way (due to it having an
invalid canonical import. This was fixed on master
and thus I bumped it.
- got rid of two tests that were actually testing the
functionality of go-interact and not our library itself

Gopkg.toml

@@ -13,10 +13,14 @@ required = ["github.com/onsi/ginkgo/ginkgo", "github.com/maxbrunsfeld/counterfei
   branch = "master"
   name = "github.com/cloudfoundry/bosh-davcli"
 
+[[constraint]]
+  name = "github.com/cloudfoundry/bosh-s3cli"
+  version = "v0.0.64"
+
 [[constraint]]
   name = "github.com/cloudfoundry/bosh-agent"
   revision = "a74fc7069b604abe84f1ddd899f58ae1e6b1f8ee"
 
 [[constraint]]
   name = "github.com/vito/go-interact"
-  revision = "c5733929fb71999ab2f1cfd57fdab195965994de"
+  revision = "60caa86f173a89ef7a479fa400cc50faf6a2e369"

cmd/repack_stemcell.go

@@ -5,7 +5,7 @@ import (
 	boshui "github.com/cloudfoundry/bosh-cli/ui"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
-	"github.com/pivotal-golang/yaml"
+	"gopkg.in/yaml.v2"
 )
 
 type RepackStemcellCmd struct {

config/legacy_deployment_state_migrator.go

@@ -1,10 +1,11 @@
 package config
 
 import (
-	"github.com/pivotal-golang/yaml"
 	"path/filepath"
 	"regexp"
 
+	"gopkg.in/yaml.v2"
+
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"

releasedir/s3_blobstore.go

@@ -5,11 +5,11 @@ import (
 	"encoding/json"
 	"os"
 
+	s3client "github.com/cloudfoundry/bosh-s3cli/client"
+	s3config "github.com/cloudfoundry/bosh-s3cli/config"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
 	boshuuid "github.com/cloudfoundry/bosh-utils/uuid"
-	s3client "github.com/pivotal-golang/s3cli/client"
-	s3config "github.com/pivotal-golang/s3cli/config"
 )
 
 type S3Blobstore struct {

stemcell/reader.go

@@ -1,9 +1,10 @@
 package stemcell
 
 import (
-	"github.com/pivotal-golang/yaml"
 	"path/filepath"
 
+	"gopkg.in/yaml.v2"
+
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshcmd "github.com/cloudfoundry/bosh-utils/fileutil"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"

ui/ui_test.go

@@ -3,7 +3,6 @@ package ui_test
 import (
 	"bytes"
 	"io"
-	"os"
 
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	. "github.com/onsi/ginkgo"
@@ -218,50 +217,4 @@ note2
 			Expect(func() { ui.Flush() }).ToNot(Panic())
 		})
 	})
-
-	Describe("AskForText", func() {
-		It("allows empty and non-empty text input", func() {
-			r, w, err := os.Pipe()
-			Expect(err).ToNot(HaveOccurred())
-
-			os.Stdin = r
-
-			_, err = w.Write([]byte("\ntest\n"))
-			Expect(err).ToNot(HaveOccurred())
-
-			err = w.Close()
-			Expect(err).ToNot(HaveOccurred())
-
-			text, err := ui.AskForText("ask-test")
-			Expect(err).ToNot(HaveOccurred())
-			Expect(text).To(Equal(""))
-
-			text, err = ui.AskForText("ask-test2")
-			Expect(err).ToNot(HaveOccurred())
-			Expect(text).To(Equal("test"))
-		})
-	})
-
-	Describe("AskForPassword", func() {
-		It("allows empty and non-empty password input", func() {
-			r, w, err := os.Pipe()
-			Expect(err).ToNot(HaveOccurred())
-
-			os.Stdin = r
-
-			_, err = w.Write([]byte("\npassword\n"))
-			Expect(err).ToNot(HaveOccurred())
-
-			err = w.Close()
-			Expect(err).ToNot(HaveOccurred())
-
-			text, err := ui.AskForPassword("ask-test")
-			Expect(err).ToNot(HaveOccurred())
-			Expect(text).To(Equal(""))
-
-			text, err = ui.AskForPassword("ask-test2")
-			Expect(err).ToNot(HaveOccurred())
-			Expect(text).To(Equal("password"))
-		})
-	})
 })