ref(*): beginning rewrite for all of builder to Go

Author: arschles

boot.go

@@ -1,13 +1,32 @@
 package main
 
 import (
+	"log"
 	"os"
 	"runtime"
 
+	"github.com/arschles/builder/fetcher"
 	"github.com/deis/builder/pkg"
+	"github.com/kelseyhightower/envconfig"
 )
 
-func main() {
+func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
+}
+
+type Config struct {
+	FetcherPort int    `envconfig:"fetcher_port"`
+	SSHHostIP   string `envconfig:"ssh_host_ip"`
+	SSHHostPort int    `envconfig:"ssh_host_port"`
+}
+
+func main() {
+	var conf Config
+	if err := envconfig.Process("builder", &config); err != nil {
+		log.Fatalf("error fetching config [%s]", err)
+		os.Exit(1)
+	}
+	log.Printf("starting fetcher on port %d", conf.FetcherPort)
+	go fetcher.Serve(conf.FetcherPort)
 	os.Exit(pkg.Run("boot"))
 }

fetcher/fetcher.go

@@ -1,4 +1,4 @@
-package main
+package fetcher
 
 import (
 	"fmt"
@@ -18,19 +18,18 @@ const (
 	cmdstring     = "/tmp/builder/build.sh"
 )
 
-func main() {
+// Serve will start the fetcher server and block until it stops. Since it blocks, it's a best practice to execute this func in a goroutine.
+func Serve(port int) {
 	rtr := mux.NewRouter()
 	rtr.HandleFunc("/git/home/{name}/tar", getTar).Methods("GET")
 	rtr.HandleFunc("/git/home/{name}/slug", getSlug).Methods("GET")
 	rtr.HandleFunc("/git/home/health", health).Methods("GET")
 	rtr.HandleFunc("/git/home/{name}/push", putSlug).Methods("PUT")
-	http.Handle("/", rtr)
-	log.Println("Listening... on 3000")
-	http.ListenAndServe(":3000", nil)
+	hostStr := fmt.Sprintf(":%d", port)
+	http.ListenAndServe(hostStr, rtr)
 }
 
 func getTar(w http.ResponseWriter, r *http.Request) {
-	fmt.Println("Hello, world! gettar")
 	params := mux.Vars(r)
 	name := strings.Split(params["name"], ":")[0]
 	dat, err := ioutil.ReadFile(appdirectory + name + ".git/" + name + ".tar.gz")
@@ -45,7 +44,6 @@ func health(w http.ResponseWriter, r *http.Request) {
 }
 
 func getSlug(w http.ResponseWriter, r *http.Request) {
-	fmt.Println("Hello, world! getslug")
 	params := mux.Vars(r)
 	name := params["name"]
 	dat, err := ioutil.ReadFile(slugdirectory + name + "/slug.tgz")
@@ -56,7 +54,6 @@ func getSlug(w http.ResponseWriter, r *http.Request) {
 }
 
 func putSlug(w http.ResponseWriter, r *http.Request) {
-	fmt.Println("Hello, world! putslug")
 	params := mux.Vars(r)
 	name := params["name"]
 	log.Println(name)

glide.yaml

@@ -1,5 +1,7 @@
+parent: null
 package: main
 import:
+- package: github.com/kelseyhightower/envconfig
 - package: github.com/coreos/go-etcd
   subpackages:
   - /etcd

pkg/builder.go

@@ -4,6 +4,8 @@
 package pkg
 
 import (
+	"fmt"
+
 	"github.com/Masterminds/cookoo"
 	clog "github.com/Masterminds/cookoo/log"
 	"github.com/deis/builder/pkg/sshd"
@@ -26,7 +28,7 @@ const (
 // Git.
 //
 // Run returns on of the Status* status code constants.
-func Run(cmd string) int {
+func Run(sshHostIP string, sshHostPort int, cmd string) int {
 	reg, router, ocxt := cookoo.Cookoo()
 	log.SetFlags(0) // Time is captured elsewhere.
 
@@ -45,17 +47,7 @@ func Run(cmd string) int {
 		return StatusLocalError
 	}
 
-	// Set up the SSH service.
-	ip := os.Getenv("SSH_HOST_IP")
-	if ip == "" {
-		ip = "0.0.0.0"
-	}
-	port := os.Getenv("SSH_HOST_PORT")
-	if port == "" {
-		port = "2223"
-	}
-
-	cxt.Put(sshd.Address, ip+":"+port)
+	cxt.Put(sshd.Address, fmt.Sprintf("%s:%d", sshHostIP, sshHostPort))
 
 	// Supply route names for handling various internal routing. While this
 	// isn't necessary for Cookoo, it makes it easy for us to mock these