Merge pull request #10 from NETWAYS/configurable_timeout

Make timeout configurable

Author: RincewindsHat

.golangci.yml

@@ -3,13 +3,6 @@ run:
 
 linters:
   disable-all: false
-  enable:
-    - funlen
-    - dogsled
-    - dupl
-    - lll
-    - whitespace
-    - wsl
   presets:
     - bugs
     - unused

api.go

@@ -18,15 +18,15 @@ type RestAPI struct {
 	Client *http.Client
 }
 
-func (a RestAPI) ExecuteCheck(command string, arguments map[string]interface{}) (*APICheckResult, error) {
+func (a RestAPI) ExecuteCheck(command string, arguments map[string]interface{}, timeout uint32) (*APICheckResult, error) { //nolint:lll
 	// Build body
 	body, err := json.Marshal(arguments)
 	if err != nil {
 		return nil, fmt.Errorf("could not build JSON body: %w", err)
 	}
 
 	// With timeout
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
 	defer cancel()
 
 	// Build request

config.go

@@ -4,9 +4,10 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
-	flag "github.com/spf13/pflag"
 	"net/http"
 	"os"
+
+	flag "github.com/spf13/pflag"
 )
 
 const (
@@ -15,6 +16,7 @@ const (
 )
 
 type Config struct {
+	Timeout      uint32
 	API          string
 	Command      string
 	Arguments    map[string]interface{}
@@ -50,6 +52,7 @@ func (c *Config) BuildFlags(fs *flag.FlagSet) {
 	fs.BoolVar(&c.Insecure, "insecure", c.Insecure, "Ignore any certificate checks")
 	fs.BoolVar(&c.Debug, "debug", c.Debug, "Enable debug logging")
 	fs.BoolVar(&c.PrintVersion, "version", false, "Print program version")
+	fs.Uint32Var(&c.Timeout, "timeout", 10, "Powershell connector timeout")
 }
 
 // ParseConfigFromFlags to be called to parse CLI arguments and return the built Config struct.

main.go

@@ -3,10 +3,11 @@ package main
 import (
 	"errors"
 	"fmt"
+	"os"
+
 	"github.com/NETWAYS/go-check"
 	log "github.com/sirupsen/logrus"
 	flag "github.com/spf13/pflag"
-	"os"
 )
 
 const License = `
@@ -43,7 +44,7 @@ func main() {
 
 	api := RestAPI{URL: config.API, Client: config.NewClient()}
 
-	result, err := api.ExecuteCheck(config.Command, config.Arguments)
+	result, err := api.ExecuteCheck(config.Command, config.Arguments, config.Timeout)
 	if err != nil {
 		check.ExitError(err)
 	}