Reorganized code into packages

Signed-off-by: Damien Le Berrigaud <[email protected]>

bin/build

@@ -2,4 +2,4 @@
 
 set -e
 
-$(dirname $0)/go build -o out/agent main
+$(dirname $0)/go build -o out/agent bosh/main

bin/run

@@ -2,4 +2,4 @@
 
 set -e
 
-$(dirname $0)/go run src/main/agent.go $*
+$(dirname $0)/go run src/bosh/main/agent.go $*

bin/test

@@ -3,19 +3,19 @@
 result=0
 
 echo -e "\n Formatting packages..."
-$(dirname $0)/go fmt agent/...
+$(dirname $0)/go fmt bosh/...
 let "result+=$?"
 
 echo -e "\n Installing package dependencies..."
-$(dirname $0)/go test -i agent/...
+$(dirname $0)/go test -i bosh/...
 let "result+=$?"
 
 echo -e "\n Testing packages:"
-$(dirname $0)/go test agent/... -parallel 4$@
+$(dirname $0)/go test bosh/... -parallel 4$@
 let "result+=$?"
 
 echo -e "\n Vetting packages for potential issues..."
-$(dirname $0)/go vet agent/...
+$(dirname $0)/go vet bosh/...
 let "result+=$?"
 
 echo -e "\n Running build script to confirm everything compiles..."

src/bosh/bootstrap/bootstrap.go

@@ -0,0 +1,57 @@
+package bootstrap
+
+import (
+	"bosh/filesystem"
+	"bosh/infrastructure"
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+const (
+	VCAP_USERNAME = "vcap"
+)
+
+type boostrap struct {
+	fs             filesystem.FileSystem
+	infrastructure infrastructure.Infrastructure
+}
+
+func New(fs filesystem.FileSystem, infrastructure infrastructure.Infrastructure) (b boostrap) {
+	b.fs = fs
+	b.infrastructure = infrastructure
+	return
+}
+
+func (boot boostrap) Run() {
+	publicKey, err := boot.infrastructure.GetPublicKey()
+	if err != nil {
+		failWithError("Error getting public key", err)
+		return
+	}
+
+	homeDir, err := boot.fs.HomeDir(VCAP_USERNAME)
+	if err != nil {
+		failWithError("Error finding home dir for user", err)
+		return
+	}
+
+	sshPath := filepath.Join(homeDir, ".ssh")
+	boot.fs.MkdirAll(sshPath, os.FileMode(0700))
+	boot.fs.Chown(sshPath, VCAP_USERNAME)
+
+	authKeysPath := filepath.Join(sshPath, "authorized_keys")
+	err = boot.fs.WriteToFile(authKeysPath, publicKey)
+	if err != nil {
+		failWithError("Error creating authorized_keys file", err)
+		return
+	}
+
+	boot.fs.Chown(authKeysPath, VCAP_USERNAME)
+	boot.fs.Chmod(authKeysPath, os.FileMode(0600))
+}
+
+func failWithError(message string, err error) {
+	fmt.Fprintf(os.Stderr, "%s: %s", message, err.Error())
+	os.Exit(1)
+}

src/agent/app_test.go → src/bosh/bootstrap/bootstrap_test.go

@@ -1,23 +1,25 @@
-package agent
+package bootstrap
 
 import (
+	testfs "bosh/testhelpers/filesystem"
+	testinf "bosh/testhelpers/infrastructure"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"path/filepath"
-	testagent "testhelpers/agent"
 	"testing"
 )
 
 func TestRunSetsUpSsh(t *testing.T) {
-	fakeFs := &testagent.FakeFileSystem{
+	fakeFs := &testfs.FakeFileSystem{
 		HomeDirHomeDir: "/some/home/dir",
 	}
 
-	fakeInfrastructure := &testagent.FakeInfrastructure{
+	fakeInfrastructure := &testinf.FakeInfrastructure{
 		PublicKey: "some public key",
 	}
 
-	Run(fakeFs, fakeInfrastructure)
+	boot := New(fakeFs, fakeInfrastructure)
+	boot.Run()
 
 	sshDirPath := "/some/home/dir/.ssh"
 	sshDirStat := fakeFs.GetFileTestStat(sshDirPath)

src/agent/file_system.go → src/bosh/filesystem/file_system_interface.go

@@ -1,4 +1,4 @@
-package agent
+package filesystem
 
 import "os"
 

src/agent/os_file_system.go → src/bosh/filesystem/os_file_system.go

@@ -1,4 +1,4 @@
-package agent
+package filesystem
 
 import (
 	"os"

src/agent/os_file_system_test.go → src/bosh/filesystem/os_file_system_test.go

@@ -1,4 +1,4 @@
-package agent
+package filesystem
 
 import (
 	"bytes"

src/agent/aws_infrastructure.go → src/bosh/infrastructure/aws_infrastructure.go

@@ -1,4 +1,4 @@
-package agent
+package infrastructure
 
 import (
 	"fmt"

src/agent/aws_infrastructure_test.go → src/bosh/infrastructure/aws_infrastructure_test.go

@@ -1,4 +1,4 @@
-package agent
+package infrastructure
 
 import (
 	"github.com/stretchr/testify/assert"

src/agent/infrastructure.go → src/bosh/infrastructure/infrastructure_interface.go

@@ -1,4 +1,4 @@
-package agent
+package infrastructure
 
 type Infrastructure interface {
 	GetPublicKey() (publicKey string, err error)

src/bosh/main/agent.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"bosh/bootstrap"
+	"bosh/filesystem"
+	"bosh/infrastructure"
+)
+
+func main() {
+	fs := filesystem.OsFileSystem{}
+	infrastructure := infrastructure.NewAwsInfrastructure("http://169.254.169.254")
+
+	b := bootstrap.New(fs, infrastructure)
+	b.Run()
+}

src/testhelpers/agent/fake_file_system.go → src/bosh/testhelpers/filesystem/fake_file_system.go

@@ -1,19 +1,19 @@
-package agent
+package filesystem
 
 import "os"
 
 type FakeFileSystem struct {
 	Files map[string]*FakeFileStats
 
 	HomeDirUsername string
-	HomeDirHomeDir string
+	HomeDirHomeDir  string
 }
 
 type FakeFileStats struct {
 	FileMode    os.FileMode
-	Username        string
+	Username    string
 	CreatedWith string
-	Content		string
+	Content     string
 }
 
 func (fs *FakeFileSystem) GetFileTestStat(path string) (stats *FakeFileStats) {

src/testhelpers/agent/fake_infrastructure.go → src/bosh/testhelpers/infrastructure/fake_infrastructure.go

@@ -1,4 +1,4 @@
-package agent
+package infrastructure
 
 type FakeInfrastructure struct {
 	PublicKey string