Adjust govet findings

echocat · Jan 15, 2025 · ef2893a · ef2893a
1 parent 6aa70ea
commit ef2893a
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 21 deletions.
diff --git a/access/permission.go b/access/permission.go
@@ -2,9 +2,11 @@ package access
 
 import (
 	"encoding/json"
-	"github.com/echocat/caretakerd/errors"
+	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/echocat/caretakerd/errors"
 )
 
 // Permission represents the service's/node's permissions in caretakerd.
@@ -64,7 +66,7 @@ func (instance *Permission) Set(value string) error {
 				return nil
 			}
 		}
-		return errors.New("Illegal permission: " + value)
+		return fmt.Errorf("illegal permission type: %v", value)
 	}
 	lowerValue := strings.ToLower(value)
 	for _, candidate := range AllPermissions {
@@ -73,7 +75,7 @@ func (instance *Permission) Set(value string) error {
 			return nil
 		}
 	}
-	return errors.New("Illegal permission: " + value)
+	return fmt.Errorf("illegal permission type: %v", value)
 }
 
 // MarshalYAML is used until yaml marshalling. Do not call directly.

diff --git a/access/type.go b/access/type.go
@@ -2,9 +2,11 @@ package access
 
 import (
 	"encoding/json"
-	"github.com/echocat/caretakerd/errors"
+	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/echocat/caretakerd/errors"
 )
 
 // Type indicates the validation type for the access of a service/node to caretakerd.
@@ -73,7 +75,7 @@ func (instance *Type) Set(value string) error {
 				return nil
 			}
 		}
-		return errors.New("Illegal access type: " + value)
+		return fmt.Errorf("illegal access type: %v", value)
 	}
 	lowerValue := strings.ToLower(value)
 	for _, candidate := range AllTypes {
@@ -82,7 +84,7 @@ func (instance *Type) Set(value string) error {
 			return nil
 		}
 	}
-	return errors.New("Illegal access type: " + value)
+	return fmt.Errorf("illegal permission type: %v", value)
 }
 
 // MarshalYAML is used until yaml marshalling. Do not call this method directly.

diff --git a/keyStore/type.go b/keyStore/type.go
@@ -2,9 +2,11 @@ package keyStore
 
 import (
 	"encoding/json"
-	"github.com/echocat/caretakerd/errors"
+	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/echocat/caretakerd/errors"
 )
 
 // # Description
@@ -68,7 +70,7 @@ func (instance *Type) Set(value string) error {
 				return nil
 			}
 		}
-		return errors.New("Illegal keyStore type: " + value)
+		return fmt.Errorf("illegal keyStore type: %v", value)
 	}
 	lowerValue := strings.ToLower(value)
 	for _, candidate := range AllTypes {
@@ -77,7 +79,7 @@ func (instance *Type) Set(value string) error {
 			return nil
 		}
 	}
-	return errors.New("Illegal keyStore type: " + value)
+	return fmt.Errorf("illegal keyStore type: %v", value)
 }
 
 // MarshalYAML is used until yaml marshalling. Do not call this method directly.

diff --git a/logger/level.go b/logger/level.go
@@ -2,7 +2,7 @@ package logger
 
 import (
 	"encoding/json"
-	"github.com/echocat/caretakerd/errors"
+	"fmt"
 	"strconv"
 	"strings"
 )
@@ -87,7 +87,7 @@ func (instance *Level) Set(value string) error {
 				return nil
 			}
 		}
-		return errors.New("Illegal level: " + value)
+		return fmt.Errorf("illegal level: %v", value)
 	}
 	lowerValue := strings.ToLower(value)
 	switch lowerValue {
@@ -104,7 +104,7 @@ func (instance *Level) Set(value string) error {
 			return nil
 		}
 	}
-	return errors.New("Illegal level: " + value)
+	return fmt.Errorf("illegal level: %v", value)
 }
 
 // IsIndicatingProblem returns "true" if this level indicates a problem.

diff --git a/service/status.go b/service/status.go
@@ -2,9 +2,11 @@ package service
 
 import (
 	"encoding/json"
-	"github.com/echocat/caretakerd/errors"
+	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/echocat/caretakerd/errors"
 )
 
 // Status represents a status of a service execution.
@@ -73,7 +75,7 @@ func (instance *Status) Set(value string) error {
 				return nil
 			}
 		}
-		return errors.New("Illegal status: " + value)
+		return fmt.Errorf("illegal status: %v", value)
 	}
 	lowerValue := strings.ToLower(value)
 	for _, candidate := range AllStatus {
@@ -82,7 +84,7 @@ func (instance *Status) Set(value string) error {
 			return nil
 		}
 	}
-	return errors.New("Illegal status: " + value)
+	return fmt.Errorf("illegal status: %v", value)
 }
 
 // MarshalJSON is used until json marshalling. Do not call this method directly.

diff --git a/service/type.go b/service/type.go
@@ -2,9 +2,11 @@ package service
 
 import (
 	"encoding/json"
-	"github.com/echocat/caretakerd/errors"
+	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/echocat/caretakerd/errors"
 )
 
 // # Description
@@ -76,7 +78,7 @@ func (instance *Type) Set(value string) error {
 				return nil
 			}
 		}
-		return errors.New("Illegal type: " + value)
+		return fmt.Errorf("illegal type: %v", value)
 	}
 	lowerValue := strings.ToLower(value)
 	for _, candidate := range AllTypes {
@@ -85,7 +87,7 @@ func (instance *Type) Set(value string) error {
 			return nil
 		}
 	}
-	return errors.New("Illegal type: " + value)
+	return fmt.Errorf("illegal type: %v", value)
 }
 
 // MarshalYAML is used until yaml marshalling. Do not call this method directly.

diff --git a/values/signalTarget.go b/values/signalTarget.go
@@ -2,9 +2,11 @@ package values
 
 import (
 	"encoding/json"
-	"github.com/echocat/caretakerd/errors"
+	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/echocat/caretakerd/errors"
 )
 
 // SignalTarget defines who have to receives a signal.
@@ -62,7 +64,7 @@ func (instance *SignalTarget) Set(value string) error {
 				return nil
 			}
 		}
-		return errors.New("Illegal signal target: " + value)
+		return fmt.Errorf("illegal signal target: %v", value)
 	}
 	lowerValue := strings.ToLower(value)
 	for _, candidate := range AllSignalTargets {
@@ -71,7 +73,7 @@ func (instance *SignalTarget) Set(value string) error {
 			return nil
 		}
 	}
-	return errors.New("Illegal signal target: " + value)
+	return fmt.Errorf("illegal signal target: %v", value)
 }
 
 // MarshalYAML is used until yaml marshalling. Do not call this method directly.