Updated dependencies

deps.txt

@@ -1,6 +1,8 @@
-7bc7ab3 github.com/cloudfoundry/bosh-utils/.git
+a960ab1 github.com/cloudfoundry/bosh-utils/.git
 f44a913 github.com/cppforlife/bosh-cpi-go/.git
-bb93381 github.com/onsi/ginkgo/.git
-c463cd2 github.com/onsi/gomega/.git
-453249f golang.org/x/crypto/.git
-a3f3340 gopkg.in/yaml.v2/.git
+11459a8 github.com/onsi/ginkgo/.git
+283ed65 github.com/onsi/gomega/.git
+2509b14 golang.org/x/crypto/.git
+5561cd9 golang.org/x/net/.git
+c01e476 golang.org/x/text/.git
+eb3733d gopkg.in/yaml.v2/.git

src/github.com/cloudfoundry/bosh-utils/Gopkg.toml

@@ -0,0 +1,41 @@
+required = ["github.com/onsi/ginkgo/ginkgo"]
+
+[[constraint]]
+  name = "github.com/bmatcuk/doublestar"
+  version = "1.0.9"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/charlievieth/fs"
+
+[[constraint]]
+  name = "github.com/jessevdk/go-flags"
+  version = "1.3.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/nu7hatch/gouuid"
+
+[[constraint]]
+  name = "github.com/onsi/ginkgo"
+  version = "1.4.0"
+
+[[constraint]]
+  name = "github.com/onsi/gomega"
+  version = "1.2.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/pivotal-cf/paraphernalia"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/pivotal-golang/clock"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/net"

src/github.com/cloudfoundry/bosh-utils/NOTICE

@@ -1,15 +1,11 @@
-bosh-utils
+Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
 
-Copyright (c) 2015 Pivotal Software, Inc. All Rights Reserved.
+This project contains software that is Copyright (c) 2015 Pivotal Software, Inc.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+This project is licensed to you under the Apache License, Version 2.0 (the "License").
 
-   http://www.apache.org/licenses/LICENSE-2.0
+You may not use this project except in compliance with the License.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+This project may include a number of subcomponents with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms and 
+conditions of the subcomponent's license, as noted in the LICENSE file.

src/github.com/cloudfoundry/bosh-utils/README.md

@@ -1,15 +1,7 @@
 # bosh-utils
 Generic packages extracted from bosh-agent and bosh-init
 
-# Tests
-
-Job            | Status  
-:------------: | -------------
-Unit tests     | ![Resize icon][badge-test-unit] 
-
-[badge-test-unit]: https://main.bosh-ci.cf-app.com/api/v1/teams/main/pipelines/bosh-utils/jobs/test-unit/badge
-
 # Dev Testing
 Make changes to develop and push.
 
-The CI pipeline [here] (https://main.bosh-ci.cf-app.com/teams/main/pipelines/bosh-utils) will promote to master once the tests pass.
+The CI pipeline [here] (https://main.bosh-ci.cf-app.com/teams/main/pipelines/bosh-utils) will promote to master once the tests pass. Note the pipeline is not publicly accessible.

src/github.com/cloudfoundry/bosh-utils/bin/build

@@ -7,16 +7,16 @@ bin=$(dirname $0)
 goversion=`$bin/go version | awk '{print $3}'`
 
 if [ "$goversion" ==  "devel" ]; then
-  echo "Using 'devel' version, make sure it's go1.5.1 or greater"
+  echo "Using 'devel' version, make sure it's go1.7.3 or greater"
 else
   MINOR=`echo $goversion | cut -f2 -d.`
   if [ $MINOR -lt 5 ]; then
-    echo "Currently using go version $goversion, must be using go1.5.1 or greater"
+    echo "Currently using go version $goversion, must be using go1.7.3 or greater"
     exit 1
   fi
 fi
 
-if [[ "$GOOS" == 'linux' ]]; then
+if [[ "$GOOS" == 'linux' ]] && [[ "$GOARCH" == 'amd64' ]]; then
   export GOTOOLDIR=$(go env GOROOT)/pkg/linux_amd64
 fi
 

src/github.com/cloudfoundry/bosh-utils/bin/test

@@ -5,7 +5,7 @@ set -e
 bin=$(dirname $0)
 
 echo "Formatting packages..."
-go fmt github.com/cloudfoundry/bosh-utils/...
+go fmt $(go list github.com/cloudfoundry/bosh-utils/... | grep -v vendor)
 
 $bin/install-ginkgo
 $bin/test-unit

src/github.com/cloudfoundry/bosh-utils/bin/test-unit

@@ -3,4 +3,4 @@
 set -e
 
 echo -e "\n Testing packages..."
-ginkgo -r $race -trace -skipPackage="vendor" $@
+ginkgo -r -race -trace -skipPackage="vendor" $@

src/github.com/cloudfoundry/bosh-utils/blobstore/blob_manager_test.go

@@ -3,6 +3,7 @@ package blobstore_test
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -26,10 +27,12 @@ var _ = Describe("Blob Manager", func() {
 	)
 
 	BeforeEach(func() {
+		var err error
 		logger = boshlog.NewLogger(boshlog.LevelNone)
 		fs = boshsys.NewOsFileSystem(logger)
 		blobId = "105d33ae-655c-493d-bf9f-1df5cf3ca847"
-		basePath = os.TempDir()
+		basePath, err = ioutil.TempDir("", "blobstore")
+		Expect(err).NotTo(HaveOccurred())
 		blobPath = filepath.Join(basePath, blobId)
 		toWrite = bytes.NewReader([]byte("new data"))
 	})
@@ -46,6 +49,7 @@ var _ = Describe("Blob Manager", func() {
 		fs.WriteFileString(blobPath, "some data")
 
 		readOnlyFile, err, _ := blobManager.Fetch(blobId)
+		Expect(err).NotTo(HaveOccurred())
 		defer fs.RemoveAll(readOnlyFile.Name())
 
 		Expect(err).ToNot(HaveOccurred())

src/github.com/cloudfoundry/bosh-utils/blobstore/retryable_blobstore.go

@@ -27,7 +27,7 @@ func (b retryableBlobstore) Get(blobID string, fingerprint boshcrypto.Digest) (s
 	var fileName string
 	var lastErr error
 
-	for i := 0; i < b.maxTries; i++ {
+	for i := 1; i <= b.maxTries; i++ {
 		fileName, lastErr = b.blobstore.Get(blobID, fingerprint)
 		if lastErr == nil {
 			return fileName, nil
@@ -51,7 +51,7 @@ func (b retryableBlobstore) Delete(blobID string) error {
 func (b retryableBlobstore) Create(fileName string) (string, boshcrypto.MultipleDigest, error) {
 	var lastErr error
 
-	for i := 0; i < b.maxTries; i++ {
+	for i := 1; i <= b.maxTries; i++ {
 		blobID, digest, thisErr := b.blobstore.Create(fileName)
 		if thisErr == nil {
 			return blobID, digest, nil

src/github.com/cloudfoundry/bosh-utils/ci/configure.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+fly -t production set-pipeline -p bosh-utils -c ci/pipeline.yml \
+	--load-vars-from <(lpass show -G "bosh-utils concourse secrets" --notes)

src/github.com/cloudfoundry/bosh-utils/ci/docker/bosh-utils/install-go.sh

@@ -3,7 +3,7 @@
 set -ex
 
 GOROOT=/usr/local/go
-GO_ARCHIVE_URL=https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz
+GO_ARCHIVE_URL=https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz
 GO_ARCHIVE=$(basename $GO_ARCHIVE_URL)
 
 echo "Downloading go..."

src/github.com/cloudfoundry/bosh-utils/ci/docker/deps-golang

@@ -1,3 +1,3 @@
-GO_VERSION=1.7.1
-GO_ARCHIVE_SHA256=43ad621c9b014cde8db17393dc108378d37bc853aa351a6c74bf6432c1bbd182
+GO_VERSION=1.8.3
+GO_ARCHIVE_SHA256=1862f4c3d3907e59b04a757cfda0ea7aa9ef39274af99a784f5be843c80c6772
 GO_ARCHIVE_URL=https://storage.googleapis.com/golang/go$GO_VERSION.linux-amd64.tar.gz