fix(build.go,config.go,receive.go): accept fewer config vars

Author: arschles

pkg/gitreceive/build.go

@@ -116,7 +116,7 @@ func build(conf *Config, etcdClient *etcd.Client) error {
 		return errGitShaTooShort{sha: gitSha}
 	}
 	shortSha := conf.SHA[0:8]
-	appName := conf.App
+	appName := conf.App()
 	//
 	// cd $(dirname $0) # ensure we are in the root dir
 	//
@@ -436,8 +436,8 @@ func build(conf *Config, etcdClient *etcd.Client) error {
 	//
 
 	// Ensure that the app config can be gotten from workflow. We don't do anything with this information
-	if _, err := getAppConfig(conf, builderKey, conf.Username, conf.App); err != nil {
-		return fmt.Errorf("getting app config for %s (%s)", conf.App, err)
+	if _, err := getAppConfig(conf, builderKey, conf.Username, appName); err != nil {
+		return fmt.Errorf("getting app config for %s (%s)", appName, err)
 	}
 
 	// # use Procfile if provided, otherwise try default process types from ./release
@@ -459,7 +459,7 @@ func build(conf *Config, etcdClient *etcd.Client) error {
 		Sha:         conf.SHA,
 		ReceiveUser: conf.Username,
 		ReceiveRepo: conf.Repository,
-		Image:       conf.ImageName,
+		Image:       imageName,
 		Procfile:    procType,
 		Dockerfile:  strings.Title(fmt.Sprintf("%t", usingDockerfile)),
 	}

pkg/gitreceive/config.go

@@ -1,5 +1,9 @@
 package gitreceive
 
+import (
+	"strings"
+)
+
 type Config struct {
 	// k8s service discovery env vars
 	WorkflowHost string `envconfig:"deis_workflow_service_host"`
@@ -13,7 +17,14 @@ type Config struct {
 	Repository         string `envconfig:"repository"`
 	SHA                string `envconfing:"sha"`
 	Username           string `envconfig:"username"`
-	App                string `envconfing:"app"`
 	Fingerprint        string `envconfing:"fingerprint"`
 	PodNamespace       string `envconfig:"pod_namespace"`
 }
+
+func (c Config) App() string {
+	li := strings.LastIndex(c.Repository, ".")
+	if li == -1 {
+		return c.Repository
+	}
+	return c.Repository[0:li]
+}

pkg/gitreceive/receive.go

@@ -38,7 +38,7 @@ 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.Username,
-		"receive_repo":         conf.App,
+		"receive_repo":         conf.App(),
 		"sha":                  conf.SHA,
 		"fingerprint":          conf.Fingerprint,
 		"ssh_connection":       conf.SSHConnection,