Merge pull request #474 from twhiston/remove_default_config

remove the need for config init function

circle.yml

@@ -5,7 +5,7 @@ machine:
 dependencies:
   pre:
     - sudo rm -rf /usr/local/go
-    - sudo curl -L https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz > /tmp/go.tar.gz
+    - sudo curl -L https://storage.googleapis.com/golang/go1.10.linux-amd64.tar.gz > /tmp/go.tar.gz
     - sudo tar -C /usr/local -xzf /tmp/go.tar.gz
     - git submodule update --init --recursive
     - npm i -g less pug-cli
@@ -21,7 +21,7 @@ dependencies:
 
 test:
   pre:
-    - cd $CPATH && go run cli/main.go --migrate
+    - cd $CPATH && go run cli/main.go --migrate -config config.json
 
   override:
     - cd $CPATH && go vet ./...

cli/main.go

@@ -21,6 +21,7 @@ import (
 )
 
 func main() {
+	util.ConfigInit()
 	if util.InteractiveSetup {
 		os.Exit(doSetup())
 	}

make.sh

@@ -63,7 +63,7 @@ HEREDOC
 	github-release release --draft -u ansible-semaphore -r semaphore -t "v$VERSION" -d "## Special thanks to\n\n## Installation\n\nFollow [wiki/Installation](https://github.com/ansible-semaphore/semaphore/wiki/Installation)\n\n## Changelog"
 fi
 
-go-bindata $BINDATA_ARGS config.json db/migrations/ $(find public/* -type d -print)
+go-bindata $BINDATA_ARGS db/migrations/ $(find public/* -type d -print)
 
 if [ "$1" == "ci_test" ]; then
 	exit 0

util/config.go

@@ -81,20 +81,24 @@ func NewConfig() *configType {
 	return &configType{}
 }
 
-func init() {
+func ConfigInit() {
 	flag.BoolVar(&InteractiveSetup, "setup", false, "perform interactive setup")
 	flag.BoolVar(&Migration, "migrate", false, "execute migrations")
 	flag.BoolVar(&Upgrade, "upgrade", false, "upgrade semaphore")
 	path := flag.String("config", "", "config path")
 
-	var pwd string
-	flag.StringVar(&pwd, "hash", "", "generate hash of given password")
+	var unhashedPwd string
+	flag.StringVar(&unhashedPwd, "hash", "", "generate hash of given password")
 
 	var printConfig bool
 	flag.BoolVar(&printConfig, "printConfig", false, "print example configuration")
 
 	flag.Parse()
 
+	if InteractiveSetup {
+		return
+	}
+
 	if printConfig {
 		cfg := &configType{
 			MySQL: mySQLConfig{
@@ -113,8 +117,8 @@ func init() {
 		os.Exit(0)
 	}
 
-	if len(pwd) > 0 {
-		password, _ := bcrypt.GenerateFromPassword([]byte(pwd), 11)
+	if len(unhashedPwd) > 0 {
+		password, _ := bcrypt.GenerateFromPassword([]byte(unhashedPwd), 11)
 		fmt.Println("Generated password: ", string(password))
 
 		os.Exit(0)
@@ -132,16 +136,8 @@ func init() {
 			panic(err)
 		}
 	} else {
-		configFile, err := Asset("config.json")
-		if err != nil {
 			fmt.Println("Cannot Find configuration! Use -c parameter to point to a JSON file generated by -setup.\n\n Hint: have you run `-setup` ?")
 			os.Exit(1)
-		}
-
-		if err := json.Unmarshal(configFile, &Config); err != nil {
-			fmt.Println("Could not decode configuration!")
-			panic(err)
-		}
 	}
 
 	if len(os.Getenv("PORT")) > 0 {