Skip to content

Commit cf09c22

Browse files
committed
Updated vendor
Signed-off-by: Vishal Rana <[email protected]>
1 parent a7020e0 commit cf09c22

File tree

80 files changed

+6528
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+6528
-570
lines changed

Gopkg.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959

6060
[[constraint]]
6161
name = "github.com/labstack/gommon"
62-
version = "0.2.4"
62+
version = "0.2.5"
6363

6464
[[constraint]]
6565
name = "github.com/labstack/labstack-go"
6666
version = "0.22.1"
6767

6868
[[constraint]]
6969
name = "github.com/labstack/tunnel"
70-
version = "0.1.3"
70+
version = "0.2.6"
7171

7272
[[constraint]]
7373
branch = "master"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
IMAGE = labstack/armor
2-
VERSION = 0.4.7
2+
VERSION = 0.4.8
33

44
run:
55
go run cmd/armor/main.go

armor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ type (
9292
)
9393

9494
const (
95-
Version = "0.4.7"
95+
Version = "0.4.8"
9696
Website = "https://armor.labstack.com"
9797
)
9898

backend/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func Start() {
3939
key := "armor"
4040
err = kv.Put(key, []byte("bar"), &store.WriteOptions{IsDir: true})
4141
if err != nil {
42-
fmt.Errorf("Something went wrong when initializing key %v", key)
42+
fmt.Errorf("Something went wrong when initializing key: %v", key)
4343
}
4444

4545
stopCh := make(chan struct{})

cmd/root.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ func initConfig() {
8989
// Home dir
9090
homeDir, err := homedir.Dir()
9191
if err != nil {
92-
logger.Fatalf("Failed to find the home directory %v", err)
92+
logger.Fatalf("Failed to find the home directory: %v", err)
9393
}
9494
a.HomeDir = filepath.Join(homeDir, ".armor")
9595
if err = os.MkdirAll(a.HomeDir, 0755); err != nil {
96-
logger.Fatalf("Failed to create config directory %v", err)
96+
logger.Fatalf("Failed to create config directory: %v", err)
9797
}
9898

9999
// Config
@@ -104,7 +104,7 @@ func initConfig() {
104104
data = []byte(fmt.Sprintf(defaultConfig, net.JoinHostPort("", port), root))
105105
}
106106
if err = yaml.Unmarshal(data, a); err != nil {
107-
logger.Fatalf("Failed to parse the config file %v", err)
107+
logger.Fatalf("Failed to parse the config file: %v", err)
108108
}
109109

110110
// Defaults
@@ -139,7 +139,7 @@ func initConfig() {
139139
a.Store = store.NewPostgres(a.Postgres.URI)
140140
} else {
141141
if a.Store, err = store.NewStorm(a.Storm.URI); err != nil {
142-
logger.Fatalf("Failed to connect to storm %v", err)
142+
logger.Fatalf("Failed to connect to storm: %v", err)
143143
}
144144
}
145145
defer a.Store.Close()

http.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,15 @@ func (a *Armor) NewHTTP() (h *HTTP) {
8181
}
8282

8383
func (h *HTTP) CreateTunnel() {
84-
t := &tunnel.Tunnel{
84+
c := &tunnel.Config{
85+
Host: "labstack.me:22",
8586
Protocol: "http",
8687
RemoteHost: "0.0.0.0",
8788
RemotePort: 80,
8889
HideBanner: true,
8990
}
90-
t.TargetHost, t.TargetPort, _ = tutil.SplitHostPort(h.armor.Address)
91-
t.Create()
91+
c.TargetHost, c.TargetPort, _ = tutil.SplitHostPort(h.armor.Address)
92+
tunnel.Create(c)
9293
}
9394

9495
func (h *HTTP) Start() error {

plugin/proxy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type (
2626
func (t Target) ProxyTarget() (target *middleware.ProxyTarget, err error) {
2727
u, err := url.Parse(t.URL)
2828
if err != nil {
29-
return nil, fmt.Errorf("not able to parse proxy url=%s, error=%v", t.URL, err)
29+
return nil, fmt.Errorf("not able to parse proxy: url=%s, error=%v", t.URL, err)
3030
}
3131
return &middleware.ProxyTarget{
3232
Name: t.Name,

vendor/github.com/coreos/etcd/cmd/functional

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/etcd/version/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)