Merge pull request #26 from yoshidan/master

Support os environment for database.yml

Author: kanataxa

config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"io/ioutil"
+	"os"
 
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
@@ -148,8 +149,9 @@ func Load(configPath string) (*Config, error) {
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
+	content := []byte(os.ExpandEnv(string(yamlFile)))
 	config := &Config{DistributedTransaction: true}
-	if err := yaml.Unmarshal(yamlFile, &config); err != nil {
+	if err := yaml.Unmarshal(content, &config); err != nil {
 		return nil, errors.WithStack(err)
 	}
 	globalConfig = config

glide.lock

@@ -4,7 +4,7 @@ import:
 - package: github.com/jessevdk/go-flags
 - package: github.com/sergi/go-diff
 - package: github.com/blastrain/vitess-sqlparser
-  version: 1003c43917a3ddbe167e102b99020cefacdd7e0c
+  version: a139afbb1abad0805ea6a4e2c0fd4e513a3e0939
 - package: github.com/pkg/errors
 - package: gopkg.in/yaml.v2
 - package: github.com/mattn/go-sqlite3