Bumped v0.5.1

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

Makefile

@@ -1,5 +1,5 @@
 IMAGE = labstack/tunnel
-VERSION = 0.5.0
+VERSION = 0.5.1
 
 publish:
 	git tag v$(VERSION)
@@ -8,6 +8,5 @@ publish:
 	docker build -t $(IMAGE):$(VERSION) -t $(IMAGE) .
 	docker push $(IMAGE):$(VERSION)
 	docker push $(IMAGE):latest
-	rm tunnel
 
 .PHONY: publish 

daemon/connection.go

@@ -4,6 +4,7 @@ import (
   "bufio"
   "fmt"
   "github.com/labstack/gommon/log"
+  "github.com/pkg/errors"
   "github.com/spf13/viper"
   "io"
   "net"
@@ -33,7 +34,9 @@ type (
     stopChan      chan bool
     errorChan     chan error
     retries       time.Duration
+    ID            string `json:"id"`
     Name          string `json:"name"`
+    Random        bool   `json:"random"`
     User          string
     Host          string
     TargetAddress string `json:"target_address"`
@@ -100,7 +103,7 @@ func (s *Server) newConnection(req *ConnectRequest) (c *Connection, err error) {
   if c.Configuration.Protocol != ProtocolHTTPS {
     c.RemotePort = 0
   }
-  if err = c.create(); err != nil {
+  if err = c.save(); err != nil {
     return
   }
   c.User += ",name=" + c.Name
@@ -285,36 +288,49 @@ func (c *Connection) stop() {
   }
 }
 
+func (c *Connection) save() error {
+  if c.ID == "" {
+    return c.create()
+  }
+  return c.update()
+}
+
 func (c *Connection) create() error {
   e := new(Error)
-  _, err := c.server.resty.R().
+  res, err := c.server.resty.R().
     SetBody(c).
     SetResult(c).
     SetError(e).
     Post("/connections")
-  return err
+  if err != nil {
+    return err
+  } else if res.IsError() {
+    return errors.Errorf("failed to create a connection: error=%s", e.Message)
+  }
+  return nil
 }
 
-func (c *Connection) update() {
+func (c *Connection) update() error {
   e := new(Error)
   res, err := c.server.resty.R().
     SetBody(c).
     SetResult(c).
     SetError(e).
-    Put("/connections/" + c.Name)
+    Put("/connections/" + c.ID)
   if err != nil {
-    log.Error(err)
+    return err
   } else if res.IsError() {
-    log.Errorf("failed to update the connection: name=%s, error=%s", c.Name, e.Message)
+    return errors.Errorf("failed to update the connection: name=%s, error=%s", c.Name, e.Message)
   }
+  return nil
 }
 
 func (c *Connection) delete() error {
   log.Warnf("removing connection %s", c.Name)
   e := new(Error)
   res, err := c.server.resty.R().
     SetError(e).
-    Delete("/connections/" + c.Name)
+    Delete("/connections/" + c.ID)
   if err != nil {
     return err
   } else if res.IsError() {

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/mattn/go-runewidth v0.0.5 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b
+	github.com/pkg/errors v0.8.0
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.5.0
 	golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf

go.sum

@@ -98,6 +98,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=