Skip to content

Commit 73b6364

Browse files
ClivernClivern
authored
Merge pull request #57 from Clivern/feature/support-tls
Support TLS & Switch to spf13/viper
2 parents 53bf53f + 12c74c4 commit 73b6364

25 files changed

+242
-137
lines changed

‎README.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ app:
2828
port: 8080
2929
domain: example.com
3030
secret: sWUhHRcs4Aqa0MEnYwbuQln3EW8CZ0oD
31+
tls:
32+
status: off
33+
pemPath: cert/server.pem
34+
keyPath: cert/server.key
3135

3236
log:
3337
level: info
@@ -333,7 +337,7 @@ Socket("ws://localhost:8080/ws/$ID/$TOKEN");
333337

334338
[![Build Status](https://travis-ci.org/Clivern/Beaver.svg?branch=master)](https://travis-ci.org/Clivern/Beaver)
335339
[![GitHub license](https://img.shields.io/github/license/Clivern/Beaver.svg)](https://github.com/Clivern/Beaver/blob/master/LICENSE)
336-
[![Version](https://img.shields.io/badge/Version-1.1.2-red.svg)](https://github.com/Clivern/Beaver/releases)
340+
[![Version](https://img.shields.io/badge/Version-1.2.0-red.svg)](https://github.com/Clivern/Beaver/releases)
337341
[![Go Report Card](https://goreportcard.com/badge/github.com/Clivern/Beaver)](https://goreportcard.com/report/github.com/Clivern/Beaver)
338342

339343
## For contributors
@@ -368,6 +372,13 @@ Then Create a PR with the master branch.
368372

369373
## Changelog
370374

375+
* Version 1.2.0:
376+
```
377+
Support TLS.
378+
Upgrade dependencies.
379+
Switch to spf13/viper.
380+
```
381+
371382
* Version 1.1.2:
372383
```
373384
Update Docs.

‎beaver.go‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/clivern/beaver/internal/app/middleware"
1313
"github.com/clivern/beaver/internal/pkg/utils"
1414
"github.com/gin-gonic/gin"
15-
"github.com/micro/go-config"
15+
"github.com/spf13/viper"
1616
"io"
1717
"net/http"
1818
"os"
@@ -30,7 +30,9 @@ func main() {
3030
flag.StringVar(&configFile, "config", "config.dist.yml", "config")
3131
flag.Parse()
3232

33-
err := config.LoadFile(configFile)
33+
viper.SetConfigFile(configFile)
34+
35+
err := viper.ReadInConfig()
3436

3537
if err != nil {
3638
panic(fmt.Sprintf(
@@ -50,12 +52,10 @@ func main() {
5052
return
5153
}
5254

53-
os.Setenv("PORT", strconv.Itoa(config.Get("app", "port").Int(8080)))
54-
55-
if config.Get("app", "mode").String("dev") == "prod" {
55+
if viper.GetString("app.mode") == "prod" {
5656
gin.SetMode(gin.ReleaseMode)
5757
gin.DisableConsoleColor()
58-
f, _ := os.Create(fmt.Sprintf("%s/gin.log", config.Get("log", "path").String("var/logs")))
58+
f, _ := os.Create(fmt.Sprintf("%s/gin.log", viper.GetString("log.path")))
5959
gin.DefaultWriter = io.MultiWriter(f)
6060
}
6161

@@ -127,5 +127,15 @@ func main() {
127127

128128
go socket.HandleMessages()
129129

130-
r.Run()
130+
if viper.GetBool("app.tls.status") {
131+
r.RunTLS(
132+
fmt.Sprintf(":%s", strconv.Itoa(viper.GetInt("app.port"))),
133+
viper.GetString("app.tls.pemPath"),
134+
viper.GetString("app.tls.keyPath"),
135+
)
136+
} else {
137+
r.Run(
138+
fmt.Sprintf(":%s", strconv.Itoa(viper.GetInt("app.port"))),
139+
)
140+
}
131141
}

‎config.travis.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ app:
33
port: 8080
44
domain: example.com
55
secret: sWUhHRcs4Aqa0MEnYwbuQln3EW8CZ0oD
6+
tls:
7+
status: off
8+
pemPath: cert/server.pem
9+
keyPath: cert/server.key
610

711
log:
812
level: info

‎config.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ app:
33
port: 8080
44
domain: example.com
55
secret: sWUhHRcs4Aqa0MEnYwbuQln3EW8CZ0oD
6+
tls:
7+
status: off
8+
pemPath: cert/server.pem
9+
keyPath: cert/server.key
610

711
log:
812
level: info

‎go.mod‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
module github.com/clivern/beaver
22

33
require (
4-
github.com/BurntSushi/toml v0.3.1
5-
github.com/bitly/go-simplejson v0.5.0
6-
github.com/dgrijalva/jwt-go v0.0.0-20180921172315-3af4c746e1c2
7-
github.com/fsnotify/fsnotify v1.4.7
8-
github.com/ghodss/yaml v1.0.0
9-
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7
4+
github.com/BurntSushi/toml v0.3.1 // indirect
5+
github.com/dgrijalva/jwt-go v3.2.0+incompatible
6+
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
107
github.com/gin-gonic/gin v1.3.0
11-
github.com/go-redis/redis v6.14.2+incompatible
12-
github.com/golang/protobuf v1.2.0
13-
github.com/google/logger v0.0.0-20181112113803-324a7c096a0d
14-
github.com/gorilla/websocket v0.0.0-20181206070239-95ba29eb981b
15-
github.com/hashicorp/hcl v1.0.0
16-
github.com/imdario/mergo v0.3.6
17-
github.com/json-iterator/go v1.1.5
18-
github.com/mattn/go-isatty v0.0.4
19-
github.com/micro/go-config v0.13.1
20-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
21-
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742
8+
github.com/go-redis/redis v6.15.2+incompatible
9+
github.com/golang/protobuf v1.3.1 // indirect
10+
github.com/google/logger v1.0.1
11+
github.com/gorilla/websocket v1.4.0
12+
github.com/json-iterator/go v1.1.6 // indirect
13+
github.com/mattn/go-isatty v0.0.7 // indirect
14+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
15+
github.com/modern-go/reflect2 v1.0.1 // indirect
2216
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32
23-
github.com/satori/go.uuid v0.0.0-20181028125025-b2ce2384e17b
24-
github.com/ugorji/go v1.1.1
25-
golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6
26-
gopkg.in/go-playground/validator.v8 v8.18.2
27-
gopkg.in/yaml.v2 v2.2.2
17+
github.com/onsi/ginkgo v1.8.0 // indirect
18+
github.com/onsi/gomega v1.5.0 // indirect
19+
github.com/satori/go.uuid v1.2.0
20+
github.com/spf13/viper v1.3.2
21+
golang.org/x/net v0.0.0-20190313220215-9f648a60d977 // indirect
22+
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
23+
gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
2824
)

‎go.sum‎

Lines changed: 78 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,96 @@
11
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
22
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3-
github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
4-
github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
3+
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
4+
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
5+
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
6+
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
7+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
58
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6-
github.com/dgrijalva/jwt-go v0.0.0-20180921172315-3af4c746e1c2 h1:xhptajUY6xeFJmfsrpVPxXxH0i2JxobVCBDn0iShbkU=
7-
github.com/dgrijalva/jwt-go v0.0.0-20180921172315-3af4c746e1c2/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
9+
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
10+
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
811
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
912
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
10-
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
11-
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
12-
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 h1:AzN37oI0cOS+cougNAV9szl6CVoj2RYwzS3DpUQNtlY=
13-
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
13+
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g=
14+
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
1415
github.com/gin-gonic/gin v1.3.0 h1:kCmZyPklC0gVdL728E6Aj20uYBJV93nj/TkwBTKhFbs=
1516
github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
16-
github.com/go-redis/redis v6.14.2+incompatible h1:UE9pLhzmWf+xHNmZsoccjXosPicuiNaInPgym8nzfg0=
17-
github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
18-
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
17+
github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4=
18+
github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
1919
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
20-
github.com/google/logger v0.0.0-20181112113803-324a7c096a0d h1:1YC9w0bRU6LRB8JEapVhbfB2Iiewl2NsX39p8uxrKbk=
21-
github.com/google/logger v0.0.0-20181112113803-324a7c096a0d/go.mod h1:tQN+I/DyBt051hEHNEzPgIeyy/GD1WJaKbqPScoDKdY=
22-
github.com/gorilla/websocket v0.0.0-20181206070239-95ba29eb981b h1:SCMPL/pS3OPUJDW7FpTje/+eIJEhdBLxaG2iUl3Gkcw=
23-
github.com/gorilla/websocket v0.0.0-20181206070239-95ba29eb981b/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
20+
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
21+
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
22+
github.com/google/logger v1.0.1 h1:Jtq7/44yDwUXMaLTYgXFC31zpm6Oku7OI/k4//yVANQ=
23+
github.com/google/logger v1.0.1/go.mod h1:w7O8nrRr0xufejBlQMI83MXqRusvREoJdaAxV+CoAB4=
24+
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
25+
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
2426
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
2527
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
26-
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
27-
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
28-
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
29-
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
30-
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
31-
github.com/micro/go-config v0.13.1 h1:xuiOe3F6QjBOr4dRu6VNfZo7/yfck8coXBFyEL+YxCk=
32-
github.com/micro/go-config v0.13.1/go.mod h1:fVecLls1kW+EJsrlkJYqUmVoJa1epSHhsPMDXppELx0=
28+
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
29+
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
30+
github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
31+
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
32+
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
33+
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
34+
github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
35+
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
36+
github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
37+
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
38+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
3339
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
34-
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
40+
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
41+
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
3542
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
3643
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
37-
github.com/satori/go.uuid v0.0.0-20181028125025-b2ce2384e17b h1:8O/3dJ2dGfuLVN0bo2B0IdkG0L8cjpmFJ4r8eRQBCi8=
38-
github.com/satori/go.uuid v0.0.0-20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
39-
github.com/ugorji/go v1.1.1 h1:gmervu+jDMvXTbcHQ0pd2wee85nEoE0BsVyEuzkfK8w=
40-
github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
41-
golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6 h1:IcgEB62HYgAhX0Nd/QrVgZlxlcyxbGQHElLUhW2X4Fo=
42-
golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
44+
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
45+
github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
46+
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
47+
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
48+
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
49+
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
50+
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
51+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
52+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
53+
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
54+
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
55+
github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
56+
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
57+
github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
58+
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
59+
github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
60+
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
61+
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
62+
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
63+
github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
64+
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
65+
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
66+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
67+
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648=
68+
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
69+
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
70+
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
71+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
72+
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
73+
golang.org/x/net v0.0.0-20190313220215-9f648a60d977 h1:actzWV6iWn3GLqN8dZjzsB+CLt+gaV2+wsxroxiQI8I=
74+
golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
75+
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
76+
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
77+
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
78+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
79+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
80+
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
81+
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
82+
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
83+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
84+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4385
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
86+
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
87+
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
88+
gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
89+
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
4490
gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
4591
gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
92+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
93+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
94+
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
4695
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
4796
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎internal/app/api/channel_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package api
66

77
import (
88
"fmt"
9-
"github.com/micro/go-config"
109
"github.com/nbio/st"
10+
"github.com/spf13/viper"
1111
"os"
1212
"strconv"
1313
"testing"
@@ -19,7 +19,9 @@ func init() {
1919
basePath := fmt.Sprintf("%s/src/github.com/clivern/beaver", os.Getenv("GOPATH"))
2020
configFile := fmt.Sprintf("%s/%s", basePath, "config.test.yml")
2121

22-
err := config.LoadFile(configFile)
22+
viper.SetConfigFile(configFile)
23+
24+
err := viper.ReadInConfig()
2325

2426
if err != nil {
2527
panic(fmt.Sprintf(
@@ -30,7 +32,7 @@ func init() {
3032
}
3133

3234
os.Setenv("BeaverBasePath", fmt.Sprintf("%s/", basePath))
33-
os.Setenv("PORT", strconv.Itoa(config.Get("app", "port").Int(8080)))
35+
os.Setenv("PORT", strconv.Itoa(viper.GetInt("app.port")))
3436
}
3537

3638
// TestChannelAPI test cases

‎internal/app/api/client_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package api
66

77
import (
88
"fmt"
9-
"github.com/micro/go-config"
109
"github.com/nbio/st"
10+
"github.com/spf13/viper"
1111
"os"
1212
"strconv"
1313
"testing"
@@ -19,7 +19,9 @@ func init() {
1919
basePath := fmt.Sprintf("%s/src/github.com/clivern/beaver", os.Getenv("GOPATH"))
2020
configFile := fmt.Sprintf("%s/%s", basePath, "config.test.yml")
2121

22-
err := config.LoadFile(configFile)
22+
viper.SetConfigFile(configFile)
23+
24+
err := viper.ReadInConfig()
2325

2426
if err != nil {
2527
panic(fmt.Sprintf(
@@ -30,7 +32,7 @@ func init() {
3032
}
3133

3234
os.Setenv("BeaverBasePath", fmt.Sprintf("%s/", basePath))
33-
os.Setenv("PORT", strconv.Itoa(config.Get("app", "port").Int(8080)))
35+
os.Setenv("PORT", strconv.Itoa(viper.GetInt("app.port")))
3436
}
3537

3638
// TestClientAPI test cases

‎internal/app/api/config_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package api
66

77
import (
88
"fmt"
9-
"github.com/micro/go-config"
109
"github.com/nbio/st"
10+
"github.com/spf13/viper"
1111
"os"
1212
"strconv"
1313
"testing"
@@ -18,7 +18,9 @@ func init() {
1818
basePath := fmt.Sprintf("%s/src/github.com/clivern/beaver", os.Getenv("GOPATH"))
1919
configFile := fmt.Sprintf("%s/%s", basePath, "config.test.yml")
2020

21-
err := config.LoadFile(configFile)
21+
viper.SetConfigFile(configFile)
22+
23+
err := viper.ReadInConfig()
2224

2325
if err != nil {
2426
panic(fmt.Sprintf(
@@ -29,7 +31,7 @@ func init() {
2931
}
3032

3133
os.Setenv("BeaverBasePath", fmt.Sprintf("%s/", basePath))
32-
os.Setenv("PORT", strconv.Itoa(config.Get("app", "port").Int(8080)))
34+
os.Setenv("PORT", strconv.Itoa(viper.GetInt("app.port")))
3335
}
3436

3537
// TestConfigAPI test cases

0 commit comments

Comments
 (0)