Skip to content

Commit

Permalink
Update package names and paths for new repository
Browse files Browse the repository at this point in the history
* Move bosh-agent-rc script to Tools/ directory because src/ will not be
  used anymore

Signed-off-by: Adam Stegman <[email protected]>
  • Loading branch information
caleb miles authored and Adam Stegman committed Jul 24, 2014
1 parent 48d31d5 commit 6f46ff9
Show file tree
Hide file tree
Showing 443 changed files with 993 additions and 993 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ gobin/*
*.coverprofile

*.sublime-workspace
*.sw*

.idea/workspace.xml
.idea/tasks.xml
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,25 @@ Note: This guide assumes a few things:
- You have gcc (or an equivalent)
- You can install packages (brew, apt-get, or equivalent)

Clone and set up the BOSH repository:
Clone and set up the BOSH Agent repository:

- `git clone git@github.com:cloudfoundry/bosh.git` (this may take a while as the BOSH repo is very large)
- `cd bosh/go_agent`
- `go get -d github.com/cloudfoundry/bosh-agent`
- `cd $GOPATH/src/github.com/cloudfoundry/bosh-agent`

From here on out we assume you're working in `~/workspace/bosh/go_agent`
From here on out we assume you're working in `$GOPATH/src/github.com/cloudfoundry/bosh-agent`

- `git checkout develop` (you should always work on the develop branch, never master)
- `git submodule update --init --recursive`

Get Golang and its dependencies (Mac example, replace with your package manager of choice):

- `brew update`
- `brew install go`
- `brew install hg` (Go needs mercurial for the `go get` command)

Set up Go for BOSH Agent development:
Install tools used by the BOSH Agent test suite:

- `export GOPATH=$GOPATH:$HOME/workspace/bosh/go_agent` (you may want to add this to your bash start up scripts)
- `go get code.google.com/p/go.tools/cmd/vet` (the vet tool is used during the test suite)
- `go get code.google.com/p/go.tools/cmd/vet`
- `go get github.com/golang/lint/golint`

You should now be able to run the tests for the Go Agent:

Expand All @@ -85,7 +84,7 @@ At this point all the tests should be passing. If you encounter any issues, plea

Set up the Go Agent project in IntelliJ:

- Open the ~/workspace/bosh/go_agent project in IntelliJ.
- Open the ~/workspace/bosh-agent project in IntelliJ.
- Set the Go SDK as the Project SDK: File -> Project Structure -> Project in left sidebar -> Set the Go SDK go1.2 SDK under Project SDK
- Set the Go SDK as the Modules SDK: Modules in left sidebar -> Dependencies tab -> Set the Go SDK for the Module SDK -> Apply, OK

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions src/bosh/agent/action/apply.go → agent/action/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package action
import (
"errors"

boshappl "bosh/agent/applier"
boshas "bosh/agent/applier/applyspec"
bosherr "bosh/errors"
boshsettings "bosh/settings"
boshappl "github.com/cloudfoundry/bosh-agent/agent/applier"
boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
boshsettings "github.com/cloudfoundry/bosh-agent/settings"
)

type ApplyAction struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
boshas "bosh/agent/applier/applyspec"
fakeas "bosh/agent/applier/applyspec/fakes"
fakeappl "bosh/agent/applier/fakes"
boshsettings "bosh/settings"
fakesettings "bosh/settings/fakes"
. "github.com/cloudfoundry/bosh-agent/agent/action"
boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec"
fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes"
fakeappl "github.com/cloudfoundry/bosh-agent/agent/applier/fakes"
boshsettings "github.com/cloudfoundry/bosh-agent/settings"
fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes"
)

func init() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package action
import (
"errors"

boshtask "bosh/agent/task"
bosherr "bosh/errors"
boshtask "github.com/cloudfoundry/bosh-agent/agent/task"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
)

type CancelTaskAction struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
boshtask "bosh/agent/task"
faketask "bosh/agent/task/fakes"
. "github.com/cloudfoundry/bosh-agent/agent/action"
boshtask "github.com/cloudfoundry/bosh-agent/agent/task"
faketask "github.com/cloudfoundry/bosh-agent/agent/task/fakes"
)

var _ = Describe("CancelTaskAction", func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package action
import (
"errors"

boshmodels "bosh/agent/applier/models"
boshcomp "bosh/agent/compiler"
bosherr "bosh/errors"
boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models"
boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
)

type CompilePackageAction struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
boshmodels "bosh/agent/applier/models"
boshcomp "bosh/agent/compiler"
fakecomp "bosh/agent/compiler/fakes"
. "github.com/cloudfoundry/bosh-agent/agent/action"
boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models"
boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler"
fakecomp "github.com/cloudfoundry/bosh-agent/agent/compiler/fakes"
)

func getCompileActionArguments() (blobID, sha1, name, version string, deps boshcomp.Dependencies) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package action

import (
boshappl "bosh/agent/applier"
boshas "bosh/agent/applier/applyspec"
boshcomp "bosh/agent/compiler"
boshdrain "bosh/agent/drain"
boshtask "bosh/agent/task"
boshblob "bosh/blobstore"
bosherr "bosh/errors"
boshjobsuper "bosh/jobsupervisor"
boshlog "bosh/logger"
boshnotif "bosh/notification"
boshplatform "bosh/platform"
boshntp "bosh/platform/ntp"
boshsettings "bosh/settings"
boshappl "github.com/cloudfoundry/bosh-agent/agent/applier"
boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec"
boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler"
boshdrain "github.com/cloudfoundry/bosh-agent/agent/drain"
boshtask "github.com/cloudfoundry/bosh-agent/agent/task"
boshblob "github.com/cloudfoundry/bosh-agent/blobstore"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor"
boshlog "github.com/cloudfoundry/bosh-agent/logger"
boshnotif "github.com/cloudfoundry/bosh-agent/notification"
boshplatform "github.com/cloudfoundry/bosh-agent/platform"
boshntp "github.com/cloudfoundry/bosh-agent/platform/ntp"
boshsettings "github.com/cloudfoundry/bosh-agent/settings"
)

type concreteFactory struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
fakeas "bosh/agent/applier/applyspec/fakes"
fakeappl "bosh/agent/applier/fakes"
fakecomp "bosh/agent/compiler/fakes"
boshdrain "bosh/agent/drain"
faketask "bosh/agent/task/fakes"
fakeblobstore "bosh/blobstore/fakes"
fakejobsuper "bosh/jobsupervisor/fakes"
boshlog "bosh/logger"
fakenotif "bosh/notification/fakes"
fakeplatform "bosh/platform/fakes"
boshntp "bosh/platform/ntp"
fakesettings "bosh/settings/fakes"
. "github.com/cloudfoundry/bosh-agent/agent/action"
fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes"
fakeappl "github.com/cloudfoundry/bosh-agent/agent/applier/fakes"
fakecomp "github.com/cloudfoundry/bosh-agent/agent/compiler/fakes"
boshdrain "github.com/cloudfoundry/bosh-agent/agent/drain"
faketask "github.com/cloudfoundry/bosh-agent/agent/task/fakes"
fakeblobstore "github.com/cloudfoundry/bosh-agent/blobstore/fakes"
fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes"
boshlog "github.com/cloudfoundry/bosh-agent/logger"
fakenotif "github.com/cloudfoundry/bosh-agent/notification/fakes"
fakeplatform "github.com/cloudfoundry/bosh-agent/platform/fakes"
boshntp "github.com/cloudfoundry/bosh-agent/platform/ntp"
fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes"
)

var _ = Describe("concreteFactory", func() {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
. "github.com/cloudfoundry/bosh-agent/agent/action"
)

func init() {
Expand Down
10 changes: 5 additions & 5 deletions src/bosh/agent/action/drain.go → agent/action/drain.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package action
import (
"errors"

boshas "bosh/agent/applier/applyspec"
boshdrain "bosh/agent/drain"
bosherr "bosh/errors"
boshjobsuper "bosh/jobsupervisor"
boshnotif "bosh/notification"
boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec"
boshdrain "github.com/cloudfoundry/bosh-agent/agent/drain"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor"
boshnotif "github.com/cloudfoundry/bosh-agent/notification"
)

type DrainAction struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
boshas "bosh/agent/applier/applyspec"
fakeas "bosh/agent/applier/applyspec/fakes"
boshdrain "bosh/agent/drain"
fakedrain "bosh/agent/drain/fakes"
fakejobsuper "bosh/jobsupervisor/fakes"
fakenotif "bosh/notification/fakes"
. "github.com/cloudfoundry/bosh-agent/agent/action"
boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec"
fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes"
boshdrain "github.com/cloudfoundry/bosh-agent/agent/drain"
fakedrain "github.com/cloudfoundry/bosh-agent/agent/drain/fakes"
fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes"
fakenotif "github.com/cloudfoundry/bosh-agent/notification/fakes"
)

func init() {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"

boshaction "bosh/agent/action"
boshaction "github.com/cloudfoundry/bosh-agent/agent/action"
)

type FakeFactory struct {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fakes

import (
boshaction "bosh/agent/action"
boshaction "github.com/cloudfoundry/bosh-agent/agent/action"
)

type FakeRunner struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"errors"
"path/filepath"

boshblob "bosh/blobstore"
bosherr "bosh/errors"
boshcmd "bosh/platform/commands"
boshdirs "bosh/settings/directories"
boshblob "github.com/cloudfoundry/bosh-agent/blobstore"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
boshcmd "github.com/cloudfoundry/bosh-agent/platform/commands"
boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories"
)

type FetchLogsAction struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
boshassert "bosh/assert"
fakeblobstore "bosh/blobstore/fakes"
fakecmd "bosh/platform/commands/fakes"
boshdirs "bosh/settings/directories"
. "github.com/cloudfoundry/bosh-agent/agent/action"
boshassert "github.com/cloudfoundry/bosh-agent/assert"
fakeblobstore "github.com/cloudfoundry/bosh-agent/blobstore/fakes"
fakecmd "github.com/cloudfoundry/bosh-agent/platform/commands/fakes"
boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories"
)

var _ = Describe("FetchLogsAction", func() {
Expand Down
12 changes: 6 additions & 6 deletions src/bosh/agent/action/get_state.go → agent/action/get_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package action
import (
"errors"

boshas "bosh/agent/applier/applyspec"
bosherr "bosh/errors"
boshjobsuper "bosh/jobsupervisor"
boshntp "bosh/platform/ntp"
boshvitals "bosh/platform/vitals"
boshsettings "bosh/settings"
boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor"
boshntp "github.com/cloudfoundry/bosh-agent/platform/ntp"
boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals"
boshsettings "github.com/cloudfoundry/bosh-agent/settings"
)

type GetStateAction struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
boshas "bosh/agent/applier/applyspec"
fakeas "bosh/agent/applier/applyspec/fakes"
boshassert "bosh/assert"
fakejobsuper "bosh/jobsupervisor/fakes"
boshntp "bosh/platform/ntp"
fakentp "bosh/platform/ntp/fakes"
boshvitals "bosh/platform/vitals"
fakevitals "bosh/platform/vitals/fakes"
boshsettings "bosh/settings"
fakesettings "bosh/settings/fakes"
. "github.com/cloudfoundry/bosh-agent/agent/action"
boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec"
fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes"
boshassert "github.com/cloudfoundry/bosh-agent/assert"
fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes"
boshntp "github.com/cloudfoundry/bosh-agent/platform/ntp"
fakentp "github.com/cloudfoundry/bosh-agent/platform/ntp/fakes"
boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals"
fakevitals "github.com/cloudfoundry/bosh-agent/platform/vitals/fakes"
boshsettings "github.com/cloudfoundry/bosh-agent/settings"
fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes"
)

var _ = Describe("GetState", func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package action
import (
"errors"

boshtask "bosh/agent/task"
bosherr "bosh/errors"
boshtask "github.com/cloudfoundry/bosh-agent/agent/task"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
)

type GetTaskAction struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "bosh/agent/action"
boshtask "bosh/agent/task"
faketask "bosh/agent/task/fakes"
boshassert "bosh/assert"
. "github.com/cloudfoundry/bosh-agent/agent/action"
boshtask "github.com/cloudfoundry/bosh-agent/agent/task"
faketask "github.com/cloudfoundry/bosh-agent/agent/task/fakes"
boshassert "github.com/cloudfoundry/bosh-agent/assert"
)

var _ = Describe("GetTask", func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package action
import (
"errors"

bosherr "bosh/errors"
boshlog "bosh/logger"
boshplatform "bosh/platform"
boshsettings "bosh/settings"
bosherr "github.com/cloudfoundry/bosh-agent/errors"
boshlog "github.com/cloudfoundry/bosh-agent/logger"
boshplatform "github.com/cloudfoundry/bosh-agent/platform"
boshsettings "github.com/cloudfoundry/bosh-agent/settings"
)

type ListDiskAction struct {
Expand Down
Loading

0 comments on commit 6f46ff9

Please sign in to comment.