ref(gitreceive): move all gitreceive files under pkg/gitreceive

this prepares to merge all commands under a single go binary

Author: arschles

gitreceive/build.go pkg/gitreceive/build.gogitreceive/build.go renamed to pkg/gitreceive/build.go

@@ -1,4 +1,4 @@
-package main
+package gitreceive
 
 // #!/usr/bin/env bash
 // #
@@ -198,3 +198,7 @@ package main
 // # cleanup
 // cd $REPO_DIR
 // git gc &>/dev/null
+
+func build(conf *Config, newRev string) error {
+	return nil
+}

gitreceive/config.go pkg/gitreceive/config.gogitreceive/config.go renamed to pkg/gitreceive/config.go

@@ -1,10 +1,6 @@
-package main
+package gitreceive
 
-import (
-	"github.com/kelseyhightower/envconfig"
-)
-
-type config struct {
+type Config struct {
 	WorkflowHost       string `envconfig:"deis_workflow_service_host"`
 	WorkflowPort       string `envconfig:"deis_workflow_service_port"`
 	GitHome            string `envconfig:"git_home"`
@@ -16,11 +12,3 @@ type config struct {
 	App                string `envconfing:"app"`
 	Fingerprint        string `envconfing:"fingerprint"`
 }
-
-func getConfig(appName string) (*config, error) {
-	conf := &config{}
-	if err := envconfig(appName, conf); err != nil {
-		return nil, err
-	}
-	return conf, nil
-}

gitreceive/receive.go pkg/gitreceive/receive.gogitreceive/receive.go renamed to pkg/gitreceive/receive.go

@@ -1,7 +1,9 @@
-package main
+package gitreceive
 
 import (
 	"bytes"
+	"encoding/json"
+	"fmt"
 	"net/http"
 )
 
@@ -21,26 +23,32 @@ import (
 //   -d "{\"receive_user\": \"$username\", \"receive_repo\": \"$app\", \"sha\": \"$sha\", \"fingerprint\": \"$fingerprint\", \"ssh_connection\": \"$SSH_CONNECTION\", \"ssh_original_command\": \"$SSH_ORIGINAL_COMMAND\"}" \
 //   --silent "http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v2/hooks/push" >/dev/null
 
-func receive(conf *config, newRev string) error {
+func receive(conf *Config, newRev string) error {
 	urlStr := fmt.Sprintf("http://%s:%s/v2/hooks/push", conf.WorkflowHost, conf.WorkflowPort)
 	bodyMap := map[string]string{
-		"receive_user":         conf.User,
+		"receive_user":         conf.Username,
 		"receive_repo":         conf.App,
 		"sha":                  conf.SHA,
 		"fingerprint":          conf.Fingerprint,
 		"ssh_connection":       conf.SSHConnection,
 		"ssh_original_command": conf.SSHOriginalCommand,
 	}
 	var body bytes.Buffer
-	if err := json.NewEncoder().Encode(&body, bodyMap); err != nil {
+	if err := json.NewEncoder(&body).Encode(bodyMap); err != nil {
 		return err
 	}
 	req, err := http.NewRequest("POST", urlStr, &body)
 	if err != nil {
 		return err
 	}
-	resp, err := http.Do(req)
+
+	// TODO: inspect resp for status code
+	// TODO: use ctxhttp here (https://godoc.org/golang.org/x/net/context/ctxhttp)
+	// resp, err := http.Do(req)
+	_, err = http.DefaultClient.Do(req)
 	if err != nil {
 		return err
 	}
+	// TODO: inspect resp for status code
+	return nil
 }

gitreceive/main.go pkg/gitreceive/run.gogitreceive/main.go renamed to pkg/gitreceive/run.go

@@ -1,11 +1,10 @@
-package main
+package gitreceive
 
 import (
 	"bufio"
 	"fmt"
-	"github.com/helm/helm/log"
-	"io"
 	"os"
+	"strings"
 )
 
 // #!/bin/bash
@@ -41,19 +40,6 @@ import (
 //   fi
 // done
 
-const newline = "\n"
-
-// readLine reads from bio until it reaches a "\n". returns the line, not including the "\n"
-func getLine(bio *bufio.Reader) (string, error) {
-	line, err := bio.ReadString(newline)
-	if err != nil {
-		return "", err
-	}
-	if strings.HasSuffix(line, newline) {
-		return line[0 : len(line)-len(newline)]
-	}
-}
-
 func readLine(line string) (string, string, string, error) {
 	spl := strings.Split(line, " ")
 	if len(spl) != 3 {
@@ -62,22 +48,24 @@ func readLine(line string) (string, string, string, error) {
 	return spl[0], spl[1], spl[2], nil
 }
 
-func main() {
-	conf, err := getConfig("gitreceive")
-	if err != nil {
-		log.Msg("config error [%s]", err)
-		os.Exit(1)
-	}
-	bio := bufio.NewReader(os.Stdin)
-	for line, err := getLine(bio); err != nil; {
-		oldRev, newRev, refName, err := readLine(line)
+func Run(conf *Config) error {
+	scanner := bufio.NewScanner(os.Stdin)
+	for scanner.Scan() {
+		line := scanner.Text()
+		// oldRev, newRev, refName, err := readLine(line)
+		_, newRev, _, err := readLine(line)
+		if err != nil {
+			return err
+		}
 		if err := receive(conf, newRev); err != nil {
-			log.Die("failed on rev %s - push denied", newRev)
-			os.Exit(1)
+			return err
 		}
 		if err := build(conf, newRev); err != nil {
-			log.Die("error building %s [%s]", newRev, err)
-			os.Exit(1)
+			return err
 		}
 	}
+	if err := scanner.Err(); err != nil {
+		return err
+	}
+	return nil
 }