Skip to content

Commit d6d5c02

Browse files
vishrvishr
committed
Bumped v0.5.12
Signed-off-by: Vishal Rana <[email protected]>
1 parent 5acffe0 commit d6d5c02

File tree

5 files changed

+338
-330
lines changed

5 files changed

+338
-330
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
IMAGE = labstack/tunnel
2-
VERSION = 0.5.11
2+
VERSION = 0.5.12
33

44
publish:
55
git tag v$(VERSION)

‎cmd/ping.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package cmd
22

33
import (
4-
"github.com/spf13/cobra"
5-
"github.com/spf13/viper"
64
"net"
75
"time"
6+
7+
"github.com/spf13/cobra"
8+
"github.com/spf13/viper"
89
)
910

1011
var pingCmd = &cobra.Command{
1112
Use: "ping",
1213
Short: "Ping remote host",
1314
Run: func(cmd *cobra.Command, args []string) {
14-
host := net.JoinHostPort(viper.GetString("hostname"), "22222")
15+
host := net.JoinHostPort(viper.GetString("hostname"), "22")
1516
conn, err := net.DialTimeout("tcp", host, 5*time.Second)
1617
if err != nil {
1718
exit(err)

‎cmd/root.go

+83-82
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,106 @@
11
package cmd
22

33
import (
4-
"errors"
5-
"fmt"
6-
"github.com/labstack/tunnel-client/daemon"
7-
"github.com/spf13/cobra"
8-
"net"
9-
"os"
10-
"path/filepath"
11-
"strings"
4+
"errors"
5+
"fmt"
6+
"net"
7+
"os"
8+
"path/filepath"
9+
"strings"
1210

13-
"github.com/mitchellh/go-homedir"
14-
"github.com/spf13/viper"
11+
"github.com/labstack/tunnel-client/daemon"
12+
"github.com/spf13/cobra"
13+
14+
"github.com/mitchellh/go-homedir"
15+
"github.com/spf13/viper"
1516
)
1617

1718
var configuration string
1819
var protocol string
1920
var rootCmd = &cobra.Command{
20-
Use: "tunnel [address]",
21-
Short: "Tunnel lets you expose local servers to the internet securely",
22-
Long: "Signup @ https://tunnel.labstack.com to get an api key and get started",
23-
Args: func(cmd *cobra.Command, args []string) error {
24-
if len(args) < 1 {
25-
return errors.New("requires a target address")
26-
}
27-
return nil
28-
},
29-
Run: func(cmd *cobra.Command, args []string) {
30-
s.Start()
31-
startDaemon()
32-
c, err := getClient()
33-
if err != nil {
34-
exit(err)
35-
}
36-
defer c.Close()
37-
rep := new(daemon.ConnectReply)
38-
addr := args[0]
39-
_, _, err = net.SplitHostPort(addr)
40-
if err != nil && strings.Contains(err.Error(), "missing port") {
41-
addr = ":" + addr
42-
}
43-
err = c.Call("Server.Connect", &daemon.ConnectRequest{
44-
Configuration: configuration,
45-
Address: addr,
46-
Protocol: daemon.Protocol(protocol),
47-
}, rep)
48-
if err != nil {
49-
exit(err)
50-
}
51-
s.Stop()
52-
psRPC()
53-
},
21+
Use: "tunnel [address]",
22+
Short: "Tunnel lets you expose local servers to the internet securely",
23+
Long: "Signup @ https://tunnel.labstack.com to get an api key and get started",
24+
Args: func(cmd *cobra.Command, args []string) error {
25+
if len(args) < 1 {
26+
return errors.New("requires a target address")
27+
}
28+
return nil
29+
},
30+
Run: func(cmd *cobra.Command, args []string) {
31+
s.Start()
32+
startDaemon()
33+
c, err := getClient()
34+
if err != nil {
35+
exit(err)
36+
}
37+
defer c.Close()
38+
rep := new(daemon.ConnectReply)
39+
addr := args[0]
40+
_, _, err = net.SplitHostPort(addr)
41+
if err != nil && strings.Contains(err.Error(), "missing port") {
42+
addr = ":" + addr
43+
}
44+
err = c.Call("Server.Connect", &daemon.ConnectRequest{
45+
Configuration: configuration,
46+
Address: addr,
47+
Protocol: daemon.Protocol(protocol),
48+
}, rep)
49+
if err != nil {
50+
exit(err)
51+
}
52+
s.Stop()
53+
psRPC()
54+
},
5455
}
5556

5657
func Execute() {
57-
if err := rootCmd.Execute(); err != nil {
58-
exit(err)
59-
}
58+
if err := rootCmd.Execute(); err != nil {
59+
exit(err)
60+
}
6061
}
6162

6263
func init() {
63-
cobra.OnInitialize(initialize)
64+
cobra.OnInitialize(initialize)
6465
}
6566

6667
func initialize() {
67-
// Create directories
68-
dir, err := homedir.Dir()
69-
if err != nil {
70-
fmt.Printf("failed to find the home directory: %v", err)
71-
}
72-
root := filepath.Join(dir, ".tunnel")
73-
if err = os.MkdirAll(root, 0755); err != nil {
74-
fmt.Printf("failed to create root directory: %v", err)
75-
}
76-
if _, err := os.OpenFile(filepath.Join(root, "config.yaml"), os.O_RDONLY|os.O_CREATE, 0644); err != nil {
77-
fmt.Printf("failed to create config file: %v", err)
78-
}
68+
// Create directories
69+
dir, err := homedir.Dir()
70+
if err != nil {
71+
fmt.Printf("failed to find the home directory: %v", err)
72+
}
73+
root := filepath.Join(dir, ".tunnel")
74+
if err = os.MkdirAll(root, 0755); err != nil {
75+
fmt.Printf("failed to create root directory: %v", err)
76+
}
77+
if _, err := os.OpenFile(filepath.Join(root, "config.yaml"), os.O_RDONLY|os.O_CREATE, 0644); err != nil {
78+
fmt.Printf("failed to create config file: %v", err)
79+
}
7980

80-
// Config
81-
viper.AutomaticEnv()
82-
viper.Set("root", root)
83-
viper.Set("log_file", filepath.Join(root, "daemon.log"))
84-
viper.Set("daemon_pid", filepath.Join(root, "daemon.pid"))
85-
viper.Set("daemon_addr", filepath.Join(root, "daemon.addr"))
86-
viper.Set("hostname", "labstack.me")
87-
viper.Set("api_url", "https://tunnel.labstack.com/api/v1")
88-
if dev := viper.GetString("DC") == "dev"; dev {
89-
viper.Set("host", "labstack.d:22222")
90-
viper.Set("api_url", "http://tunnel.labstack.d/api/v1")
91-
viper.SetConfigName("config.dev")
92-
} else {
93-
viper.SetConfigName("config")
94-
}
95-
viper.AddConfigPath(root)
96-
viper.ReadInConfig()
97-
viper.WatchConfig()
81+
// Config
82+
viper.AutomaticEnv()
83+
viper.Set("root", root)
84+
viper.Set("log_file", filepath.Join(root, "daemon.log"))
85+
viper.Set("daemon_pid", filepath.Join(root, "daemon.pid"))
86+
viper.Set("daemon_addr", filepath.Join(root, "daemon.addr"))
87+
viper.Set("hostname", "labstack.me")
88+
viper.Set("api_url", "https://tunnel.labstack.com/api/v1")
89+
if dev := viper.GetString("DC") == "dev"; dev {
90+
viper.Set("host", "labstack.d:22")
91+
viper.Set("api_url", "http://tunnel.labstack.d/api/v1")
92+
viper.SetConfigName("config.dev")
93+
} else {
94+
viper.SetConfigName("config")
95+
}
96+
viper.AddConfigPath(root)
97+
viper.ReadInConfig()
98+
viper.WatchConfig()
9899
}
99100

100101
func init() {
101-
rootCmd.PersistentFlags().StringVarP(&configuration, "configuration", "c", "",
102-
"configuration name from the console")
103-
rootCmd.PersistentFlags().StringVarP(&protocol, "protocol", "p", daemon.ProtocolHTTP,
104-
"connection protocol (http, tcp, tls)")
102+
rootCmd.PersistentFlags().StringVarP(&configuration, "configuration", "c", "",
103+
"configuration name from the console")
104+
rootCmd.PersistentFlags().StringVarP(&protocol, "protocol", "p", daemon.ProtocolHTTP,
105+
"connection protocol (http, tcp, tls)")
105106
}

‎cmd/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
const (
10-
version = "v0.5.11"
10+
version = "v0.5.12"
1111
)
1212

1313
var versionCmd = &cobra.Command{

0 commit comments

Comments
 (0)