fix(conf): strip newlines from builder key (#425)

Joshua-Anderson · web-flow · commit 933c1247161b · 2016-09-09T15:43:56.000-07:00
diff --git a/pkg/conf/config.go b/pkg/conf/config.go
@@ -3,6 +3,7 @@ package conf
 import (
 	"fmt"
 	"io/ioutil"
+	"strings"
 
 	"github.com/deis/builder/pkg/sys"
 	"github.com/kelseyhightower/envconfig"
@@ -40,7 +41,7 @@ func GetBuilderKey() (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("couldn't get builder key from %s (%s)", builderKeyLocation, err)
 	}
-	builderKey := string(builderKeyBytes)
+	builderKey := strings.Trim(string(builderKeyBytes), "\n")
 	return builderKey, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package conf`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"io/ioutil"`
	`6`	`+ "strings"`
`6`	`7`
`7`	`8`	`"github.com/deis/builder/pkg/sys"`
`8`	`9`	`"github.com/kelseyhightower/envconfig"`
`@@ -40,7 +41,7 @@ func GetBuilderKey() (string, error) {`
`40`	`41`	`if err != nil {`
`41`	`42`	`return "", fmt.Errorf("couldn't get builder key from %s (%s)", builderKeyLocation, err)`
`42`	`43`	`}`
`43`		`- builderKey := string(builderKeyBytes)`
	`44`	`+ builderKey := strings.Trim(string(builderKeyBytes), "\n")`
`44`	`45`	`return builderKey, nil`
`45`	`46`	`}`
`46`	`47`