make staticcheck pass

rebuy-de · Mar 13, 2024 · 94c6d6b · 94c6d6b
1 parent f37b43f
commit 94c6d6b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/cmd/buildutil/info.go b/cmd/buildutil/info.go
@@ -289,7 +289,9 @@ func CollectBuildInformation(ctx context.Context, p BuildParameters) (BuildInfo,
 		info.Go.Name = nameMatch[1]
 	}
 
-	cmdutil.Must(e.Err())
+	if e.Err() != nil {
+		return info, e.Err()
+	}
 
 	targetSystems := []SystemInfo{}
 	for _, target := range p.TargetSystems {
@@ -324,7 +326,9 @@ func CollectBuildInformation(ctx context.Context, p BuildParameters) (BuildInfo,
 		pkgs, err := packages.Load(&packages.Config{
 			Context: ctx,
 		}, search)
-		cmdutil.Must(err)
+		if err != nil {
+			return info, err
+		}
 
 		for _, pkg := range pkgs {
 			if pkg.Name != "main" {
@@ -354,7 +358,9 @@ func CollectBuildInformation(ctx context.Context, p BuildParameters) (BuildInfo,
 	}
 
 	testPackages, err := packages.Load(nil, "./...")
-	cmdutil.Must(err)
+	if err != nil {
+		return info, err
+	}
 
 	info.Test.Packages = []string{}
 	info.Test.Files = []string{}

diff --git a/pkg/cmdutil/exit.go b/pkg/cmdutil/exit.go
@@ -35,7 +35,7 @@ func Exit(code int) {
 // function.
 func HandleExit() {
 	if e := recover(); e != nil {
-		if exit, ok := e.(exitCode); ok == true {
+		if exit, ok := e.(exitCode); ok {
 			os.Exit(exit.code)
 		}
 		panic(e) // not an Exit, bubble up

diff --git a/pkg/podutil/conn.go b/pkg/podutil/conn.go
@@ -190,6 +190,9 @@ func (c *Connection) InspectContainer(name string) (*InspectContainerResult, err
 	resp, err := c.request(
 		RequestPath("containers/%s/json", name),
 	)
+	if err != nil {
+		return nil, err
+	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode == http.StatusNotFound {

diff --git a/pkg/redisutil/broadcast.go b/pkg/redisutil/broadcast.go
@@ -68,6 +68,8 @@ func (b *Broadcast[T]) Read(ctx context.Context, id string) (*T, string, error)
 				return nil, id, errors.WithStack(err)
 			}
 
+			//lint:ignore SA4004 We just want to have the first message and
+			//returning withing two loops is easier than checking lengths.
 			return value, sm.ID, nil
 		}
 	}

diff --git a/pkg/typeutil/context.go b/pkg/typeutil/context.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 )
 
-func FromContext[T any](ctx context.Context, key string) *T {
+func FromContext[T any](ctx context.Context, key any) *T {
 	raw := ctx.Value(key)
 	if raw == nil {
 		return nil
@@ -19,15 +19,18 @@ func FromContext[T any](ctx context.Context, key string) *T {
 	return typed
 }
 
-func FromContextSingleton[T any](ctx context.Context) *T {
-	var name *T
-	return FromContext[T](ctx, fmt.Sprintf("singleton::%T", name))
+type singletonKey string
+
+func getSingletonKey[T any]() singletonKey {
+	var dummy *T
+	var name = fmt.Sprintf("%T", dummy)
+	return singletonKey(name)
 }
 
-func ContextWithValue[T any](ctx context.Context, key string, value *T) context.Context {
-	return context.WithValue(ctx, key, value)
+func FromContextSingleton[T any](ctx context.Context) *T {
+	return FromContext[T](ctx, getSingletonKey[T]())
 }
 
 func ContextWithValueSingleton[T any](ctx context.Context, value *T) context.Context {
-	return ContextWithValue(ctx, fmt.Sprintf("singleton::%T", value), value)
+	return context.WithValue(ctx, getSingletonKey[T](), value)
 }