Skip to content

Commit

Permalink
Add flag sourcer imports from config package.
Browse files Browse the repository at this point in the history
  • Loading branch information
efritz committed Apr 2, 2020
1 parent 66600a7 commit bc39689
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 23 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

This changelog tracks updates to this repository as well as [go-nacelle/config](https://github.com/go-nacelle/config), [go-nacelle/log](https://github.com/go-nacelle/log), [go-nacelle/process](https://github.com/go-nacelle/process), and [go-nacelle/service](https://github.com/go-nacelle/service).

## v1.1.3

- Add `NewFlagSourcer`, `NewFlagTagPrefixer`, and `NewFlagTagSetter` constructors (from [go-nacelle/config](https://github.com/go-nacelle/config)).

## v1.1.2

#### Definition updates
Expand Down
4 changes: 4 additions & 0 deletions boot.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ func NewBootstrapper(
// the associated process runner has completed).
func (bs *Bootstrapper) Boot() int {
baseConfig := NewConfig(bs.configSourcer)
if err := baseConfig.Init(); err != nil {
LogEmergencyError("failed to initialize config (%s)", err)
return 1
}

logger, err := bs.loggingInitFunc(baseConfig)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions config_imports.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ var (
NewDirectorySourcer = config.NewDirectorySourcer
NewEnvSourcer = config.NewEnvSourcer
NewEnvTagPrefixer = config.NewEnvTagPrefixer
NewFlagSourcer = config.NewFlagSourcer
NewFlagTagPrefixer = config.NewFlagTagPrefixer
NewFlagTagSetter = config.NewFlagTagSetter
NewFileSourcer = config.NewFileSourcer
NewFileTagPrefixer = config.NewFileTagPrefixer
NewFileTagSetter = config.NewFileTagSetter
Expand Down
11 changes: 5 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ module github.com/go-nacelle/nacelle
require (
github.com/aphistic/sweet v0.2.0
github.com/aphistic/sweet-junit v0.0.0-20190314030539-8d7e248096c2
github.com/fatih/structtag v1.1.0 // indirect
github.com/go-nacelle/config v1.1.0
github.com/fatih/structtag v1.2.0 // indirect
github.com/go-nacelle/config v1.2.0
github.com/go-nacelle/log v1.1.1
github.com/go-nacelle/process v1.0.0
github.com/go-nacelle/service v1.0.0
github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-isatty v0.0.10 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/onsi/gomega v1.5.0
golang.org/x/sys v0.0.0-20191119195528-f068ffe820e4 // indirect
gopkg.in/yaml.v2 v2.2.7 // indirect
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
)

go 1.13
32 changes: 15 additions & 17 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,17 @@ github.com/efritz/watchdog v0.0.0-20181228234521-84cf7cb74656 h1:xtclV2XiE/m2kws
github.com/efritz/watchdog v0.0.0-20181228234521-84cf7cb74656/go.mod h1:5dIiUx6OFLQeNCjiOSY3ylcJC2yaUxzecH9Ot3ADtn4=
github.com/fatih/structtag v1.0.0 h1:pTHj65+u3RKWYPSGaU290FpI/dXxTaHdVwVwbcPKmEc=
github.com/fatih/structtag v1.0.0/go.mod h1:IKitwq45uXL/yqi5mYghiD3w9H6eTOvI9vnk8tXMphA=
github.com/fatih/structtag v1.1.0 h1:6j4mUV/ES2duvnAzKMFkN6/A5mCaNYPD3xfbAkLLOF8=
github.com/fatih/structtag v1.1.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-nacelle/config v1.0.0 h1:A7ouv042iLlWV1NPldTp8gLSO1SG9J8+8fmB1W2xFcQ=
github.com/go-nacelle/config v1.0.0/go.mod h1:oTfdaiTgNqiEUu0oXsEBxTlO66FtSXNAKbZXsE4BmY0=
github.com/go-nacelle/config v1.1.0 h1:PYWhFef60/ryC+rda9q4V640fx2Y6YDphznWVkA79xg=
github.com/go-nacelle/config v1.1.0/go.mod h1:dMu+mFkZhuyvQszbhNfhBlu1DSU+thCsCyeUycSGfk8=
github.com/go-nacelle/config v1.2.0 h1:VrfkdvKoQ8EauRPEBBQ9YK6Ig3OcuZTdcCofNXHA9IA=
github.com/go-nacelle/config v1.2.0/go.mod h1:dMu+mFkZhuyvQszbhNfhBlu1DSU+thCsCyeUycSGfk8=
github.com/go-nacelle/log v1.0.0/go.mod h1:2bN7vfOSvHTzHWxiTYz+F8/MvustIt/HmARQt67gXz4=
github.com/go-nacelle/log v1.0.1 h1:OC9MXbFYlP5rqfsBPcz18oN3GtDk7jSJ17+obsVYSq0=
github.com/go-nacelle/log v1.0.1/go.mod h1:2bN7vfOSvHTzHWxiTYz+F8/MvustIt/HmARQt67gXz4=
github.com/go-nacelle/log v1.1.0 h1:LOdo2GYWhZUW9hAsrseoRDEI8vfh75Gf1jquMhwS1ro=
github.com/go-nacelle/log v1.1.0/go.mod h1:QgxuTSxqEPzHqL66tpY2j8t/s4dDOwszQJL2hMKyzdI=
github.com/go-nacelle/log v1.1.1 h1:2a3Kfnfdwg9RiyZKJIvz9HsHn92PDGEjhSiW5Z1e5wQ=
github.com/go-nacelle/log v1.1.1/go.mod h1:QgxuTSxqEPzHqL66tpY2j8t/s4dDOwszQJL2hMKyzdI=
github.com/go-nacelle/process v1.0.0 h1:2582kC2Exy7M+x8Xgp9EXx6CZ9Ugw1lESFgVp+YI3n8=
Expand All @@ -62,6 +58,7 @@ github.com/go-nacelle/service v1.0.0/go.mod h1:JHLisFWKRjLlGdg17Jrm+rtUEXdDnPtT7
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
Expand All @@ -78,15 +75,15 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-zglob v0.0.1 h1:xsEx/XUoVlI6yXjqBK062zYhRTZltCNmYPx6v+8DNaY=
github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo=
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
Expand Down Expand Up @@ -143,9 +140,10 @@ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191119195528-f068ffe820e4 h1:FjhQftcbpdYXneEYSWZO7+6Bu+Bi1A8VPvGYWOIzIbw=
golang.org/x/sys v0.0.0-20191119195528-f068ffe820e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
Expand All @@ -163,5 +161,5 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 comments on commit bc39689

Please sign in to comment.