Skip to content

Commit

Permalink
Update imports to use new git repo path
Browse files Browse the repository at this point in the history
[#129478097]

Signed-off-by: Zachary Auerbach <[email protected]>
  • Loading branch information
tjvman authored and zaksoup committed Aug 31, 2016
1 parent 9447a38 commit 8b12da8
Show file tree
Hide file tree
Showing 588 changed files with 1,656 additions and 1,656 deletions.
4 changes: 2 additions & 2 deletions acceptance/lifecycle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"strings"
"text/template"

. "github.com/cloudfoundry/bosh-init/acceptance"
. "github.com/cloudfoundry/bosh-cli/acceptance"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

bitestutils "github.com/cloudfoundry/bosh-init/testutils"
bitestutils "github.com/cloudfoundry/bosh-cli/testutils"
boshlog "github.com/cloudfoundry/bosh-utils/logger"
boshsys "github.com/cloudfoundry/bosh-utils/system"
)
Expand Down
2 changes: 1 addition & 1 deletion bin/build
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -e

bin=$(dirname $0)

$bin/go build -o $bin/../out/bosh github.com/cloudfoundry/bosh-init
$bin/go build -o $bin/../out/bosh github.com/cloudfoundry/bosh-cli
2 changes: 1 addition & 1 deletion bin/clean
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ set -e
bin=$(dirname $0)

echo -e "\n Cleaning..."
$bin/env go clean -r github.com/cloudfoundry/bosh-init/
$bin/env go clean -r github.com/cloudfoundry/bosh-cli/
2 changes: 1 addition & 1 deletion bin/gen-fakes
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ counterfeiter ssh Session

counterfeiter ui/task Reporter

go fmt github.com/cloudfoundry/bosh-init/...
go fmt github.com/cloudfoundry/bosh-cli/...

2 changes: 1 addition & 1 deletion bin/govet
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set -e

bin=$(dirname $0)

$bin/go vet `go list ./... | grep -v "github.com/cloudfoundry/bosh-init/vendor" | xargs`
$bin/go vet `go list ./... | grep -v "github.com/cloudfoundry/bosh-cli/vendor" | xargs`

echo -e "\n All good"
4 changes: 2 additions & 2 deletions bin/mockgen
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e
bin=$(dirname $0)

rootPackage=github.com/cloudfoundry/bosh-init
rootPackage=github.com/cloudfoundry/bosh-cli

srcFiles=(
config/LegacyDeploymentStateMigrator
Expand Down Expand Up @@ -38,7 +38,7 @@ for srcFile in ${srcFiles[*]}; do
mkdir -p $srcDir/mocks
echo $bin/env mockgen -package mocks -destination $destFile $rootPackage/$package $class
$bin/env mockgen -package mocks -destination $destFile $rootPackage/$package $class
sed -i "" -e "s%github.com/cloudfoundry/bosh-init/vendor/%%" $destFile
sed -i "" -e "s%github.com/cloudfoundry/bosh-cli/vendor/%%" $destFile
$bin/go fmt $destFile
done

Expand Down
2 changes: 1 addition & 1 deletion bin/test-prepare
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
bin=$(dirname $0)

echo -e "\n Formatting packages..."
$bin/go fmt $($bin/go list github.com/cloudfoundry/bosh-init/... | grep -v /vendor/)
$bin/go fmt $($bin/go list github.com/cloudfoundry/bosh-cli/... | grep -v /vendor/)

echo -e "\n Vetting packages for potential issues..."
$bin/govet
Expand Down
6 changes: 3 additions & 3 deletions bin/test-unhandled-errors
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ echo ""
go get github.com/kisielk/errcheck

packages_to_check=$(go list ./... \
| grep -v "github.com/cloudfoundry/bosh-init/acceptance" \
| grep -v "github.com/cloudfoundry/bosh-init/integration" \
| grep -v "github.com/cloudfoundry/bosh-init/vendor" \
| grep -v "github.com/cloudfoundry/bosh-cli/acceptance" \
| grep -v "github.com/cloudfoundry/bosh-cli/integration" \
| grep -v "github.com/cloudfoundry/bosh-cli/vendor" \
| xargs
)

Expand Down
4 changes: 2 additions & 2 deletions bin/test-unit
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

bin=$(dirname $0)

reformatted_packages="$($bin/go fmt $($bin/go list github.com/cloudfoundry/bosh-init/... | grep -v /vendor/))"
reformatted_packages="$($bin/go fmt $($bin/go list github.com/cloudfoundry/bosh-cli/... | grep -v /vendor/))"

if [[ $reformatted_packages = *[![:space:]]* ]]; then
echo "go fmt reformatted the following packages, please format and run again:"
Expand All @@ -16,4 +16,4 @@ echo -e "\n Running unit tests..."
$bin/env ginkgo -r $race -trace -skipPackage="acceptance,integration,vendor" $@

echo -e "\n Building docs example..."
$bin/go build -o $bin/../out/example github.com/cloudfoundry/bosh-init/docs/
$bin/go build -o $bin/../out/example github.com/cloudfoundry/bosh-cli/docs/
2 changes: 1 addition & 1 deletion blobstore/blobstore_factory_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package blobstore_test

import (
. "github.com/cloudfoundry/bosh-init/blobstore"
. "github.com/cloudfoundry/bosh-cli/blobstore"

"net/http"

Expand Down
2 changes: 1 addition & 1 deletion blobstore/blobstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io/ioutil"
"strings"

. "github.com/cloudfoundry/bosh-cli/blobstore"
fakeboshdavcli "github.com/cloudfoundry/bosh-davcli/client/fakes"
. "github.com/cloudfoundry/bosh-init/blobstore"
boshlog "github.com/cloudfoundry/bosh-utils/logger"
fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
fakeuuid "github.com/cloudfoundry/bosh-utils/uuid/fakes"
Expand Down
2 changes: 1 addition & 1 deletion blobstore/fakes/fake_blobstore_factory.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fakes

import (
biblobstore "github.com/cloudfoundry/bosh-init/blobstore"
biblobstore "github.com/cloudfoundry/bosh-cli/blobstore"
)

type FakeBlobstoreFactory struct {
Expand Down
2 changes: 1 addition & 1 deletion blobstore/local_blob_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package blobstore_test

import (
. "github.com/cloudfoundry/bosh-init/blobstore"
. "github.com/cloudfoundry/bosh-cli/blobstore"

"bytes"

Expand Down
4 changes: 2 additions & 2 deletions blobstore/mocks/mocks.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Automatically generated by MockGen. DO NOT EDIT!
// Source: github.com/cloudfoundry/bosh-init/blobstore (interfaces: Factory,Blobstore)
// Source: github.com/cloudfoundry/bosh-cli/blobstore (interfaces: Factory,Blobstore)

package mocks

import (
blobstore "github.com/cloudfoundry/bosh-init/blobstore"
blobstore "github.com/cloudfoundry/bosh-cli/blobstore"
gomock "github.com/golang/mock/gomock"
http "net/http"
)
Expand Down
2 changes: 1 addition & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ resources:
- name: bosh-cli
type: git
source:
uri: https://github.com/cloudfoundry/bosh-init
uri: https://github.com/cloudfoundry/bosh-cli
branch: cli

- name: bosh-warden-cpi-release
Expand Down
2 changes: 1 addition & 1 deletion ci/run-acceptance-with-vm-in-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ echo "Running ci/run-acceptance-with-vm-in-container.sh"
echo "ENV:"
echo `env`

BOSH_INIT_CLI_DIR=/home/ubuntu/go/src/github.com/cloudfoundry/bosh-init
BOSH_INIT_CLI_DIR=/home/ubuntu/go/src/github.com/cloudfoundry/bosh-cli

#inside the docker container
BOSH_INIT_PRIVATE_KEY_DIR=/home/ubuntu/private_keys
Expand Down
4 changes: 2 additions & 2 deletions ci/tasks/build-darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image: docker:///bosh/init

inputs:
- name: bosh-cli
path: gopath/src/github.com/cloudfoundry/bosh-init
path: gopath/src/github.com/cloudfoundry/bosh-cli
- name: version-semver

outputs:
Expand All @@ -17,4 +17,4 @@ params:
BOSHIO_BEARER_TOKEN: replace_me

run:
path: gopath/src/github.com/cloudfoundry/bosh-init/ci/tasks/build.sh
path: gopath/src/github.com/cloudfoundry/bosh-cli/ci/tasks/build.sh
4 changes: 2 additions & 2 deletions ci/tasks/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image: docker:///bosh/init

inputs:
- name: bosh-cli
path: gopath/src/github.com/cloudfoundry/bosh-init
path: gopath/src/github.com/cloudfoundry/bosh-cli
- name: version-semver

outputs:
Expand All @@ -17,4 +17,4 @@ params:
BOSHIO_BEARER_TOKEN: replace_me

run:
path: gopath/src/github.com/cloudfoundry/bosh-init/ci/tasks/build.sh
path: gopath/src/github.com/cloudfoundry/bosh-cli/ci/tasks/build.sh
2 changes: 1 addition & 1 deletion ci/tasks/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ semver=`cat version-semver/number`
timestamp=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
filename="bosh-cli-${semver}-${GOOS}-${GOARCH}"

cd gopath/src/github.com/cloudfoundry/bosh-init
cd gopath/src/github.com/cloudfoundry/bosh-cli

git_rev=`git rev-parse --short HEAD`
version="${semver}-${git_rev}-${timestamp}"
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/test-acceptance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ set -x

export BOSH_LITE_PRIVATE_KEY=$tmpfile

cd $GOPATH/src/github.com/cloudfoundry/bosh-init
cd $GOPATH/src/github.com/cloudfoundry/bosh-cli
base=$PWD ./bin/test-acceptance-with-vm --provider=aws
4 changes: 2 additions & 2 deletions ci/tasks/test-acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ image: docker:///bosh/init

inputs:
- name: bosh-cli
path: gopath/src/github.com/cloudfoundry/bosh-init
path: gopath/src/github.com/cloudfoundry/bosh-cli
- name: bosh-warden-cpi-release
path: cpi-release

run:
path: gopath/src/github.com/cloudfoundry/bosh-init/ci/tasks/test-acceptance.sh
path: gopath/src/github.com/cloudfoundry/bosh-cli/ci/tasks/test-acceptance.sh

params:
BOSH_AWS_ACCESS_KEY_ID: replace-me
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/test-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -e -x
export PATH=/usr/local/ruby/bin:/usr/local/go/bin:$PATH
export GOPATH=$(pwd)/gopath

cd gopath/src/github.com/cloudfoundry/bosh-init
cd gopath/src/github.com/cloudfoundry/bosh-cli
bin/clean
bin/install-ginkgo
bin/test-integration
4 changes: 2 additions & 2 deletions ci/tasks/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image: docker:///bosh/init

inputs:
- name: bosh-cli
path: gopath/src/github.com/cloudfoundry/bosh-init
path: gopath/src/github.com/cloudfoundry/bosh-cli

run:
path: gopath/src/github.com/cloudfoundry/bosh-init/ci/tasks/test-integration.sh
path: gopath/src/github.com/cloudfoundry/bosh-cli/ci/tasks/test-integration.sh
2 changes: 1 addition & 1 deletion ci/tasks/test-unit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source ~/.bashrc
export PATH=/usr/local/ruby/bin:/usr/local/go/bin:$PATH
export GOPATH=$(pwd)/gopath

cd gopath/src/github.com/cloudfoundry/bosh-init
cd gopath/src/github.com/cloudfoundry/bosh-cli
bin/clean
bin/install-ginkgo
bin/test-prepare
Expand Down
4 changes: 2 additions & 2 deletions ci/tasks/test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image: docker:///bosh/init

inputs:
- name: bosh-cli
path: gopath/src/github.com/cloudfoundry/bosh-init
path: gopath/src/github.com/cloudfoundry/bosh-cli

run:
path: gopath/src/github.com/cloudfoundry/bosh-init/ci/tasks/test-unit.sh
path: gopath/src/github.com/cloudfoundry/bosh-cli/ci/tasks/test-unit.sh
4 changes: 2 additions & 2 deletions cloud/cloud_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

fakebicloud "github.com/cloudfoundry/bosh-init/cloud/fakes"
fakebicloud "github.com/cloudfoundry/bosh-cli/cloud/fakes"

. "github.com/cloudfoundry/bosh-init/cloud"
. "github.com/cloudfoundry/bosh-cli/cloud"
)

var _ = Describe("Cloud", func() {
Expand Down
2 changes: 1 addition & 1 deletion cloud/cpi_cmd_runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"io/ioutil"

. "github.com/cloudfoundry/bosh-init/cloud"
. "github.com/cloudfoundry/bosh-cli/cloud"
boshlog "github.com/cloudfoundry/bosh-utils/logger"
fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
. "github.com/onsi/ginkgo"
Expand Down
2 changes: 1 addition & 1 deletion cloud/factory.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cloud

import (
biinstall "github.com/cloudfoundry/bosh-init/installation"
biinstall "github.com/cloudfoundry/bosh-cli/installation"
bosherr "github.com/cloudfoundry/bosh-utils/errors"
boshlog "github.com/cloudfoundry/bosh-utils/logger"
boshsys "github.com/cloudfoundry/bosh-utils/system"
Expand Down
2 changes: 1 addition & 1 deletion cloud/fakes/fake_cloud.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fakes

import (
"github.com/cloudfoundry/bosh-init/cloud"
"github.com/cloudfoundry/bosh-cli/cloud"
biproperty "github.com/cloudfoundry/bosh-utils/property"
)

Expand Down
2 changes: 1 addition & 1 deletion cloud/fakes/fake_cpi_cmd_runner.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fakes

import (
bicloud "github.com/cloudfoundry/bosh-init/cloud"
bicloud "github.com/cloudfoundry/bosh-cli/cloud"
)

type FakeCPICmdRunner struct {
Expand Down
6 changes: 3 additions & 3 deletions cloud/mocks/mocks.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Automatically generated by MockGen. DO NOT EDIT!
// Source: github.com/cloudfoundry/bosh-init/cloud (interfaces: Cloud,Factory)
// Source: github.com/cloudfoundry/bosh-cli/cloud (interfaces: Cloud,Factory)

package mocks

import (
cloud "github.com/cloudfoundry/bosh-init/cloud"
installation "github.com/cloudfoundry/bosh-init/installation"
cloud "github.com/cloudfoundry/bosh-cli/cloud"
installation "github.com/cloudfoundry/bosh-cli/installation"
property "github.com/cloudfoundry/bosh-utils/property"
gomock "github.com/golang/mock/gomock"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/add_blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"os"

boshreldir "github.com/cloudfoundry/bosh-init/releasedir"
boshui "github.com/cloudfoundry/bosh-init/ui"
boshreldir "github.com/cloudfoundry/bosh-cli/releasedir"
boshui "github.com/cloudfoundry/bosh-cli/ui"
bosherr "github.com/cloudfoundry/bosh-utils/errors"
boshsys "github.com/cloudfoundry/bosh-utils/system"
)
Expand Down
8 changes: 4 additions & 4 deletions cmd/add_blob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package cmd_test
import (
"errors"

fakeui "github.com/cloudfoundry/bosh-init/ui/fakes"
fakeui "github.com/cloudfoundry/bosh-cli/ui/fakes"
fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "github.com/cloudfoundry/bosh-init/cmd"
boshreldir "github.com/cloudfoundry/bosh-init/releasedir"
fakereldir "github.com/cloudfoundry/bosh-init/releasedir/fakes"
. "github.com/cloudfoundry/bosh-cli/cmd"
boshreldir "github.com/cloudfoundry/bosh-cli/releasedir"
fakereldir "github.com/cloudfoundry/bosh-cli/releasedir/fakes"
)

var _ = Describe("AddBlobCmd", func() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/basic_deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
boshuuid "github.com/cloudfoundry/bosh-utils/uuid"
"github.com/pivotal-golang/clock"

bicrypto "github.com/cloudfoundry/bosh-init/crypto"
boshui "github.com/cloudfoundry/bosh-init/ui"
bicrypto "github.com/cloudfoundry/bosh-cli/crypto"
boshui "github.com/cloudfoundry/bosh-cli/ui"
)

type BasicDeps struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/basic_login_strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
bosherr "github.com/cloudfoundry/bosh-utils/errors"

cmdconf "github.com/cloudfoundry/bosh-init/cmd/config"
boshui "github.com/cloudfoundry/bosh-init/ui"
cmdconf "github.com/cloudfoundry/bosh-cli/cmd/config"
boshui "github.com/cloudfoundry/bosh-cli/ui"
)

type BasicLoginStrategy struct {
Expand Down
12 changes: 6 additions & 6 deletions cmd/basic_login_strategy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "github.com/cloudfoundry/bosh-init/cmd"
cmdconf "github.com/cloudfoundry/bosh-init/cmd/config"
fakecmdconf "github.com/cloudfoundry/bosh-init/cmd/config/fakes"
fakecmd "github.com/cloudfoundry/bosh-init/cmd/fakes"
fakedir "github.com/cloudfoundry/bosh-init/director/fakes"
fakeui "github.com/cloudfoundry/bosh-init/ui/fakes"
. "github.com/cloudfoundry/bosh-cli/cmd"
cmdconf "github.com/cloudfoundry/bosh-cli/cmd/config"
fakecmdconf "github.com/cloudfoundry/bosh-cli/cmd/config/fakes"
fakecmd "github.com/cloudfoundry/bosh-cli/cmd/fakes"
fakedir "github.com/cloudfoundry/bosh-cli/director/fakes"
fakeui "github.com/cloudfoundry/bosh-cli/ui/fakes"
)

var _ = Describe("BasicLoginStrategy", func() {
Expand Down
Loading

0 comments on commit 8b12da8

Please sign in to comment.