merge status-Retry branch into master

Author: halacs

Makefile

@@ -1,8 +1,8 @@
 DIST=dist/
 APPNAME=halsecur
 
-GOLANGCILINT_VERSION=v2.5.0
-GOSEC_VERSION=v2.22.9
+GOLANGCILINT_VERSION=v2.7.2
+GOSEC_VERSION=v2.22.11
 VULNCHECK_VERSION=latest
 
 all: clean build

README.md

@@ -28,7 +28,7 @@ Usage:
   halsecur [command]
 
 Available Commands:
-  Logout      
+  logout      
   completion  Generate the autocompletion script for the specified shell
   discover    Discover Hörmann BiSecur gateways on the local network
   get-name    Queries the name of the Hörmann BiSecur gateway

cli/bisecur/consts.go

@@ -4,5 +4,4 @@ import "time"
 
 const (
 	TokenExpirationTime = 30 * time.Minute
-	retryCount          = 3
 )

cli/bisecur/getName.go

@@ -2,6 +2,7 @@ package bisecur
 
 import (
 	"bisecur/cli"
+	"bisecur/cli/utils"
 	"bisecur/sdk"
 )
 
@@ -20,7 +21,7 @@ func GetName(localMac, mac [6]byte, host string, port int, token uint32) (string
 	}()
 
 	var name string
-	err = Retry(func() error {
+	err = utils.Retry(utils.RetryCount, func() error {
 		var err2 error
 		name, err2 = client.GetName()
 		return err2

cli/bisecur/groups/list.go

@@ -2,7 +2,7 @@ package groups
 
 import (
 	"bisecur/cli"
-	"bisecur/cli/bisecur"
+	"bisecur/cli/utils"
 	"bisecur/sdk"
 )
 
@@ -21,7 +21,7 @@ func ListGroups(localMac [6]byte, mac [6]byte, host string, port int, token uint
 	}()
 
 	var groups *sdk.Groups
-	err = bisecur.Retry(func() error {
+	err = utils.Retry(utils.RetryCount, func() error {
 		var err2 error
 		groups, err2 = client.GetGroups()
 		return err2

cli/bisecur/login.go

@@ -20,9 +20,5 @@ func Login(localMac [6]byte, mac [6]byte, host string, port int, username string
 	}()
 
 	err = client.Login(username, password)
-	if err != nil {
-		return 0, err
-	}
-
-	return client.GetToken(), nil
+	return client.GetToken(), err
 }

cli/bisecur/logout.go

@@ -3,12 +3,11 @@ package bisecur
 import (
 	"bisecur/cli"
 	"bisecur/sdk"
-	"fmt"
 )
 
 func Logout(localMac [6]byte, mac [6]byte, host string, port int, token uint32) error {
 	if token == 0 {
-		return fmt.Errorf("invalid token value: 0x%X", token)
+		return nil //fmt.Errorf("invalid token value: 0x%X. Logout request ignored", token)
 	}
 
 	client := sdk.NewClient(cli.Log, localMac, mac, host, port, token)
@@ -24,7 +23,7 @@ func Logout(localMac [6]byte, mac [6]byte, host string, port int, token uint32)
 		}
 	}()
 
-	client.SetToken(token)
+	client.SetToken(0) // clear token in local client instance
 
 	err = client.Logout()
 	if err != nil {

cli/bisecur/password.go

@@ -2,6 +2,7 @@ package bisecur
 
 import (
 	"bisecur/cli"
+	"bisecur/cli/utils"
 	"bisecur/sdk"
 )
 
@@ -19,7 +20,7 @@ func UserPasswordChange(localMac [6]byte, mac [6]byte, host string, port int, to
 		}
 	}()
 
-	err = Retry(func() error {
+	err = utils.Retry(utils.RetryCount, func() error {
 		err2 := client.PasswordChange(userId, newPassword)
 		return err2
 	})

cli/bisecur/state.go

@@ -2,6 +2,7 @@ package bisecur
 
 import (
 	"bisecur/cli"
+	"bisecur/cli/utils"
 	"bisecur/sdk"
 	"bisecur/sdk/payload"
 )
@@ -21,14 +22,14 @@ func GetStatus(localMac [6]byte, mac [6]byte, host string, port int, devicePort
 	}()
 
 	var status *payload.HmGetTransitionResponse
-	err = Retry(func() error {
+	err = utils.Retry(utils.RetryCount, func() error {
 		var err2 error
 		status, err2 = client.GetTransition(devicePort)
 		return err2
 	})
 
 	if err != nil {
-		return nil, err
+		return status, err
 	}
 
 	return status, nil
@@ -48,7 +49,7 @@ func SetState(localMac [6]byte, mac [6]byte, host string, port int, devicePort b
 		}
 	}()
 
-	err = Retry(func() error {
+	err = utils.Retry(utils.RetryCount, func() error {
 		err2 := client.SetState(devicePort)
 		return err2
 	})

cli/bisecur/users/add.go

@@ -2,7 +2,7 @@ package users
 
 import (
 	"bisecur/cli"
-	"bisecur/cli/bisecur"
+	"bisecur/cli/utils"
 	"bisecur/sdk"
 )
 
@@ -21,7 +21,7 @@ func UserAdd(localMac [6]byte, mac [6]byte, host string, port int, token uint32,
 	}()
 
 	var userId byte
-	err = bisecur.Retry(func() error {
+	err = utils.Retry(utils.RetryCount, func() error {
 		var err2 error
 		userId, err2 = client.AddUser(userName, password)
 		return err2