Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore/bump go kong #45

Merged
merged 4 commits into from
Aug 12, 2019
Merged

Chore/bump go kong #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b84bb57
chore(deps) bump up go-kong to v0.6.2
hbagdi Aug 9, 2019
db4a167
fix: add missing interval field from unhealthy active healthchecks
hbagdi Aug 9, 2019
b1318d3
fix: do not inject path by default in service for TCP support
hbagdi Aug 9, 2019
a8bff88
chore(ci) disable GOPROXY due to non-SIV module incompatiblity
hbagdi Aug 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: go
env:
global:
- GO111MODULE=on
- GOPROXY=https://proxy.golang.org
# - GOPROXY=https://proxy.golang.org

go:
- "1.12"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require (
github.com/fatih/color v1.7.0
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
github.com/hashicorp/go-memdb v0.0.0-20181108192425-032f93b25bec
github.com/hbagdi/go-kong v0.5.0
github.com/hbagdi/go-kong v0.6.2
github.com/imdario/mergo v0.3.7
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/blang/semver v3.6.1+incompatible h1:RmA4CjDkwiAdjCfRQH6UZRp45n/uV30JiSkad6Acn/8=
github.com/blang/semver v3.6.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -23,8 +23,8 @@ github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCO
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hbagdi/go-kong v0.5.0 h1:1NVoG8VwoaEB9ix+mcE1s6y/IZEvjpWHoX+mzA+kQxM=
github.com/hbagdi/go-kong v0.5.0/go.mod h1:JtNYtCEZoh6+Jr5qiZkccn2cUQuEIoBEdusM2uIrBeQ=
github.com/hbagdi/go-kong v0.6.2 h1:+vM9kxNILxl/oakZXhu7E7GPBauyQVj3tNqy0a5Jvxw=
github.com/hbagdi/go-kong v0.6.2/go.mod h1:ImU3ST7LxYb4klSCO3Xu/JmBt5ucnlTqpXuVPMoUTf8=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
Expand Down
2 changes: 1 addition & 1 deletion utils/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ var (
Port: kong.Int(80),
Retries: kong.Int(5),
Protocol: kong.String("http"),
Path: kong.String("/"),
ConnectTimeout: kong.Int(60000),
WriteTimeout: kong.Int(60000),
ReadTimeout: kong.Int(60000),
Expand Down Expand Up @@ -39,6 +38,7 @@ var (
HTTPFailures: kong.Int(0),
TCPFailures: kong.Int(0),
Timeouts: kong.Int(0),
Interval: kong.Int(0),
HTTPStatuses: []int{429, 404, 500, 501, 502, 503, 504, 505},
},
},
Expand Down
3 changes: 2 additions & 1 deletion utils/defaulter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ func TestServiceSetTest(t *testing.T) {
Port: kong.Int(80),
Retries: kong.Int(5),
Protocol: kong.String("http"),
Path: kong.String("/"),
ConnectTimeout: kong.Int(60000),
WriteTimeout: kong.Int(42),
ReadTimeout: kong.Int(60000),
Expand Down Expand Up @@ -258,6 +257,7 @@ func TestUpstreamSetTest(t *testing.T) {
TCPFailures: kong.Int(0),
Timeouts: kong.Int(0),
HTTPStatuses: []int{429, 404, 500, 501, 502, 503, 504, 505},
Interval: kong.Int(0),
},
},
Passive: &kong.PassiveHealthcheck{
Expand Down Expand Up @@ -312,6 +312,7 @@ func TestUpstreamSetTest(t *testing.T) {
TCPFailures: kong.Int(0),
Timeouts: kong.Int(0),
HTTPStatuses: []int{429, 404, 500, 501, 502, 503, 504, 505},
Interval: kong.Int(0),
},
},
Passive: &kong.PassiveHealthcheck{
Expand Down