fix(vulnerability): returning remediated vulnerabilities

cmd/call_cached_check/check.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 SAP SE or an SAP affiliate company and Greenhouse contributors
+// SPDX-FileCopyrightText: 2026 SAP SE or an SAP affiliate company and Greenhouse contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // This is a helper command intended for use within Heureka.
@@ -29,6 +29,27 @@ type result struct {
 	want, got string
 }
 
+// extractFuncName unwraps expressions like wrappers and returns the underlying function name.
+func extractFuncName(expr ast.Expr) (string, bool) {
+	switch fn := expr.(type) {
+	case *ast.Ident:
+		return fn.Name, true
+
+	case *ast.SelectorExpr:
+		return fn.Sel.Name, true
+
+	case *ast.CallExpr:
+		// Assume the actual function is the last argument
+		if len(fn.Args) == 0 {
+			return "", false
+		}
+
+		return extractFuncName(fn.Args[len(fn.Args)-1])
+	}
+
+	return "", false
+}
+
 func main() {
 	dir := flag.String("dir", ".", "directory to scan (walked recursively)")
 
@@ -79,14 +100,15 @@ func main() {
 
 			if len(call.Args) < 4 {
 				mismatches = append(mismatches, result{
-					pos:  fset.Position(call.Lparen), // position of '(' for the call
+					pos:  fset.Position(call.Lparen),
 					want: "at least 4 arguments",
 					got:  fmt.Sprintf("%d arguments", len(call.Args)),
 				})
 
 				return true
 			}
 
+			// 3rd argument: function name string
 			cacheFuncNameArg := call.Args[2]
 
 			strLit, ok := cacheFuncNameArg.(*ast.BasicLit)
@@ -104,18 +126,12 @@ func main() {
 
 			cacheFunc := call.Args[3]
 
-			var funcName string
-
-			switch fn := cacheFunc.(type) {
-			case *ast.Ident:
-				funcName = fn.Name
-			case *ast.SelectorExpr:
-				funcName = fn.Sel.Name
-			default:
+			funcName, ok := extractFuncName(cacheFunc)
+			if !ok {
 				mismatches = append(mismatches, result{
 					pos:  fset.Position(cacheFunc.Pos()),
-					want: "unknown type",
-					got:  fmt.Sprintf("%T", fn),
+					want: "callable function",
+					got:  fmt.Sprintf("%T", cacheFunc),
 				})
 
 				return true
@@ -140,7 +156,7 @@ func main() {
 	}
 
 	for _, m := range mismatches {
-		fmt.Fprintf(os.Stderr, "%s: mismatch – want %q, got %q\n",
+		fmt.Fprintf(os.Stderr, "%s: mismatch - want %q, got %q\n",
 			m.pos, m.want, m.got)
 	}
 

cmd/context_wrapper/wrap.go

@@ -0,0 +1,79 @@
+// SPDX-FileCopyrightText: 2026 SAP SE or an SAP affiliate company and Greenhouse contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"text/template"
+)
+
+const maxArgs = 10
+
+const tpl = `
+{{range .}}
+func WrapContext{{.N}}[{{.TypeParams}}, R any](
+	ctx context.Context,
+	f func(context.Context, {{.ArgsTypes}}) (R, error),
+) func({{.ArgsTypes}}) (R, error) {
+	return func({{.ArgsWithNames}}) (R, error) {
+		return f(ctx, {{.ArgsNames}})
+	}
+}
+{{end}}
+`
+
+type Data struct {
+	N             int
+	TypeParams    string
+	ArgsTypes     string
+	ArgsWithNames string
+	ArgsNames     string
+}
+
+//nolint:errcheck
+func main() {
+	var data []Data
+
+	for n := 1; n <= maxArgs; n++ {
+		var typeParams, argsTypes, argsWithNames, argsNames string
+
+		for i := 1; i <= n; i++ {
+			if i > 1 {
+				typeParams += ", "
+				argsTypes += ", "
+				argsWithNames += ", "
+				argsNames += ", "
+			}
+
+			typeParams += fmt.Sprintf("A%d any", i)
+			argsTypes += fmt.Sprintf("A%d", i)
+			argsWithNames += fmt.Sprintf("a%d A%d", i, i)
+			argsNames += fmt.Sprintf("a%d", i)
+		}
+
+		data = append(data, Data{
+			N:             n,
+			TypeParams:    typeParams,
+			ArgsTypes:     argsTypes,
+			ArgsWithNames: argsWithNames,
+			ArgsNames:     argsNames,
+		})
+	}
+
+	f, err := os.Create("context_wrapper_gen.go")
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+
+	fmt.Fprintln(f, "// Code generated by go generate; DO NOT EDIT.")
+	fmt.Fprintln(f, "package cache")
+	fmt.Fprintln(f, "import \"context\"")
+
+	t := template.Must(template.New("").Parse(tpl))
+	if err := t.Execute(f, data); err != nil {
+		panic(err)
+	}
+}

internal/api/graphql/graph/baseResolver/component.go

@@ -140,7 +140,7 @@ func ComponentCcrnBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, err := app.ListComponentCcrns(f, opt)
+	names, err := app.ListComponentCcrns(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("ComponentCcrnBaseReolver", err.Error())
 	}
@@ -211,7 +211,7 @@ func ComponentIssueCountsBaseResolver(
 
 	var severityCounts model.SeverityCounts
 
-	counts, err := app.GetComponentVulnerabilityCounts(f)
+	counts, err := app.GetComponentVulnerabilityCounts(ctx, f)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}

internal/api/graphql/graph/baseResolver/component_instance.go

@@ -337,7 +337,7 @@ func ContextBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, err := app.ListContexts(f, opt)
+	names, err := app.ListContexts(ctx, f, opt)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}
@@ -357,7 +357,7 @@ func ContextBaseResolver(
 }
 
 func ComponentInstanceFilterBaseResolver(
-	appCall func(filter *entity.ComponentInstanceFilter, options *entity.ListOptions) ([]string, error),
+	appCall func(ctx context.Context, filter *entity.ComponentInstanceFilter, options *entity.ListOptions) ([]string, error),
 	ctx context.Context,
 	filter *model.ComponentInstanceFilter,
 	filterDisplay *string,
@@ -390,7 +390,7 @@ func ComponentInstanceFilterBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, err := appCall(f, opt)
+	names, err := appCall(ctx, f, opt)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}

internal/api/graphql/graph/baseResolver/image.go

@@ -84,7 +84,7 @@ func ImageBaseResolver(
 			Repository:  filter.Repository,
 		}
 
-		counts, err := app.GetComponentVulnerabilityCounts(icFilter)
+		counts, err := app.GetComponentVulnerabilityCounts(ctx, icFilter)
 		if err != nil {
 			return nil, NewResolverError("ImageBaseResolver", err.Error())
 		}

internal/api/graphql/graph/baseResolver/image_version.go

@@ -134,7 +134,7 @@ func ImageVersionBaseResolver(
 			ComponentVersionId: cvIds,
 		}
 
-		counts, err := app.GetIssueSeverityCounts(icFilter)
+		counts, err := app.GetIssueSeverityCounts(ctx, icFilter)
 		if err != nil {
 			return nil, NewResolverError("ImageVersionBaseResolver", err.Error())
 		}

internal/api/graphql/graph/baseResolver/issue.go

@@ -53,7 +53,7 @@ func SingleIssueBaseResolver(
 
 	opt := &entity.IssueListOptions{}
 
-	issues, err := app.ListIssues(f, opt)
+	issues, err := app.ListIssues(ctx, f, opt)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}
@@ -175,7 +175,7 @@ func IssueBaseResolver(
 		}
 	}
 
-	issues, err := app.ListIssues(f, opt)
+	issues, err := app.ListIssues(ctx, f, opt)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}
@@ -267,7 +267,7 @@ func IssueNameBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, err := app.ListIssueNames(f, opt)
+	names, err := app.ListIssueNames(ctx, f, opt)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}
@@ -370,7 +370,7 @@ func IssueCountsBaseResolver(
 		Unique:             unique,
 	}
 
-	counts, err := app.GetIssueSeverityCounts(f)
+	counts, err := app.GetIssueSeverityCounts(ctx, f)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}

internal/api/graphql/graph/baseResolver/issue_repository.go

@@ -37,7 +37,7 @@ func SingleIssueRepositoryBaseResolver(
 
 	opt := &entity.ListOptions{}
 
-	issueRepositories, err := app.ListIssueRepositories(f, opt)
+	issueRepositories, err := app.ListIssueRepositories(ctx, f, opt)
 	// error while fetching
 	if err != nil {
 		return nil, NewResolverError("SingleIssueRepositoryBaseResolver", err.Error())
@@ -113,7 +113,7 @@ func IssueRepositoryBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	issueRepositories, err := app.ListIssueRepositories(f, opt)
+	issueRepositories, err := app.ListIssueRepositories(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("IssueRepositoryBaseResolver", err.Error())
 	}

internal/api/graphql/graph/baseResolver/issue_variant.go

@@ -36,7 +36,7 @@ func SingleIssueVariantBaseResolver(
 
 	opt := &entity.ListOptions{}
 
-	variants, err := app.ListIssueVariants(f, opt)
+	variants, err := app.ListIssueVariants(ctx, f, opt)
 	// error while fetching
 	if err != nil {
 		return nil, NewResolverError("SingleIssueVariantBaseResolver", err.Error())
@@ -117,7 +117,7 @@ func IssueVariantBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	variants, err := app.ListIssueVariants(f, opt)
+	variants, err := app.ListIssueVariants(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("IssueVariantBaseResolver", err.Error())
 	}
@@ -195,7 +195,7 @@ func EffectiveIssueVariantBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	variants, err := app.ListEffectiveIssueVariants(f, opt)
+	variants, err := app.ListEffectiveIssueVariants(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("EffectiveIssueVariantBaseResolver", err.Error())
 	}

internal/api/graphql/graph/baseResolver/patch.go

@@ -65,7 +65,7 @@ func PatchBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	patches, err := app.ListPatches(f, opt)
+	patches, err := app.ListPatches(ctx, f, opt)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}

internal/api/graphql/graph/baseResolver/remediation.go

@@ -84,7 +84,7 @@ func RemediationBaseResolver(
 		)
 	}
 
-	remediations, err := app.ListRemediations(f, opt)
+	remediations, err := app.ListRemediations(ctx, f, opt)
 	if err != nil {
 		return nil, ToGraphQLError(err)
 	}

internal/api/graphql/graph/baseResolver/service.go

@@ -248,7 +248,7 @@ func ServiceRegionBaseResolver(
 }
 
 func ServiceFilterBaseResolver(
-	appCall func(filter *entity.ServiceFilter, opt *entity.ListOptions) ([]string, error),
+	appCall func(ctx context.Context, filter *entity.ServiceFilter, opt *entity.ListOptions) ([]string, error),
 	ctx context.Context,
 	filter *model.ServiceFilter,
 	filterDisplay *string,
@@ -274,7 +274,7 @@ func ServiceFilterBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, err := appCall(f, opt)
+	names, err := appCall(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("ServiceFilterBaseResolver", err.Error())
 	}

internal/api/graphql/graph/baseResolver/support_group.go

@@ -146,7 +146,7 @@ func SupportGroupCcrnBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, err := app.ListSupportGroupCcrns(f, opt)
+	names, err := app.ListSupportGroupCcrns(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("SupportGroupCcrnBaseResolver", err.Error())
 	}

internal/api/graphql/graph/baseResolver/user.go

@@ -169,7 +169,7 @@ func UserNameBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, err := app.ListUserNames(f, opt)
+	names, err := app.ListUserNames(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("UserNameBaseResolver", err.Error())
 	}
@@ -211,7 +211,7 @@ func UniqueUserIDBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, err := app.ListUniqueUserIDs(f, opt)
+	names, err := app.ListUniqueUserIDs(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("UniqueUserIDBaseResolver", err.Error())
 	}
@@ -253,7 +253,7 @@ func UserNameWithIdBaseResolver(
 
 	opt := GetListOptions(requestedFields)
 
-	names, ids, err := app.ListUserNamesAndIds(f, opt)
+	names, ids, err := app.ListUserNamesAndIds(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("UserNameWithIdBaseResolver", err.Error())
 	}

internal/api/graphql/graph/baseResolver/vulnerability.go

@@ -76,12 +76,13 @@ func VulnerabilityBaseResolver(app app.Heureka, ctx context.Context,
 		By:        entity.IssueVariantRating,
 		Direction: entity.OrderDirectionDesc,
 	})
+
 	opt.Order = append(opt.Order, entity.Order{
 		By:        entity.IssuePrimaryName,
 		Direction: entity.OrderDirectionAsc,
 	})
 
-	issues, err := app.ListIssues(f, opt)
+	issues, err := app.ListIssues(ctx, f, opt)
 	if err != nil {
 		return nil, NewResolverError("VulnerabilityBaseResolver", err.Error())
 	}