fix(build.go,config.go,receive.go,run.go): remove SHA from config

because it’s fetched from stdin, not the env

Author: arschles

pkg/gitreceive/build.go

@@ -29,7 +29,7 @@ func (e errGitShaTooShort) Error() string {
 	return fmt.Sprintf("git sha %s was too short", e.sha)
 }
 
-func build(conf *Config, etcdClient *etcd.Client) error {
+func build(conf *Config, etcdClient *etcd.Client, gitSha string) error {
 	// TODO: replace etcd usage here with something else. See https://github.com/deis/builder/issues/81
 	builderKey, err := getBuilderKey(etcdClient)
 	if err != nil {
@@ -111,11 +111,10 @@ func build(conf *Config, etcdClient *etcd.Client) error {
 	// SHORT_SHA=${GIT_SHA:0:8}
 	// APP_NAME="${REPO%.*}"
 	repo := conf.Repository
-	gitSha := conf.SHA
 	if len(gitSha) <= shortShaIdx {
 		return errGitShaTooShort{sha: gitSha}
 	}
-	shortSha := conf.SHA[0:8]
+	shortSha := gitSha[0:8]
 	appName := conf.App()
 	//
 	// cd $(dirname $0) # ensure we are in the root dir
@@ -456,7 +455,7 @@ func build(conf *Config, etcdClient *etcd.Client) error {
 	log.Info("Launching...")
 
 	buildHook := &pkg.BuildHook{
-		Sha:         conf.SHA,
+		Sha:         gitSha,
 		ReceiveUser: conf.Username,
 		ReceiveRepo: conf.Repository,
 		Image:       imageName,

pkg/gitreceive/config.go

@@ -15,7 +15,6 @@ type Config struct {
 	SSHConnection      string `envconfig:"SSH_CONNECTION" required:"true"`
 	SSHOriginalCommand string `envconfig:"SSH_ORIGINAL_COMMAND" required:"true"`
 	Repository         string `envconfig:"REPOSITORY" required:"true"`
-	SHA                string `envconfig:"SHA" required:"true"`
 	Username           string `envconfig:"USERNAME" required:"true"`
 	Fingerprint        string `envconfig:"FINGERPRINT" required:"true"`
 	PodNamespace       string `envconfig:"POD_NAMESPACE" required:"true"`

pkg/gitreceive/receive.go

@@ -34,12 +34,12 @@ func (e errInvalidHTTPStatusCode) Error() string {
 	return fmt.Sprintf("expected status code %d, got %d", e.expected, e.actual)
 }
 
-func receive(conf *Config, newRev string) error {
+func receive(conf *Config, gitSha string) error {
 	urlStr := fmt.Sprintf("http://%s:%s/v2/hooks/push", conf.WorkflowHost, conf.WorkflowPort)
 	bodyMap := map[string]string{
 		"receive_user":         conf.Username,
 		"receive_repo":         conf.App(),
-		"sha":                  conf.SHA,
+		"sha":                  gitSha,
 		"fingerprint":          conf.Fingerprint,
 		"ssh_connection":       conf.SSHConnection,
 		"ssh_original_command": conf.SSHOriginalCommand,

pkg/gitreceive/run.go

@@ -69,7 +69,7 @@ func Run(conf *Config) error {
 		if err := receive(conf, newRev); err != nil {
 			return err
 		}
-		if err := build(conf, etcdClient); err != nil {
+		if err := build(conf, etcdClient, newRev); err != nil {
 			return err
 		}
 	}