From a58eb17609f62eec8c6e1a087d6c76f950ae999b Mon Sep 17 00:00:00 2001 From: Youssef Bel Mekki <38552193+ybelMekk@users.noreply.github.com> Date: Thu, 19 Nov 2026 14:33:11 +0100 Subject: [PATCH 1/3] refactor(vulnerabilities)!: remove history and MTTF BREAKING CHANGE: Remove imageVulnerabilityHistory and vulnerabilityFixHistory from GraphQL. Deploy the Console removal before this API change. --- integration_tests/vulnerabilities.lua | 50 -- .../graph/gengql/applications.generated.go | 192 ------ internal/graph/gengql/jobs.generated.go | 192 ------ internal/graph/gengql/root_.generated.go | 622 ++++-------------- internal/graph/gengql/schema.generated.go | 162 ----- internal/graph/gengql/teams.generated.go | 191 ------ .../graph/gengql/vulnerability.generated.go | 545 --------------- internal/graph/schema/vulnerability.graphqls | 96 --- internal/graph/vulnerability.resolvers.go | 35 - internal/vulnerability/models.go | 23 - internal/vulnerability/queries.go | 220 ------- 11 files changed, 132 insertions(+), 2196 deletions(-) diff --git a/integration_tests/vulnerabilities.lua b/integration_tests/vulnerabilities.lua index e58a90b23..3193c9ed3 100644 --- a/integration_tests/vulnerabilities.lua +++ b/integration_tests/vulnerabilities.lua @@ -2,56 +2,6 @@ Helper.readK8sResources("k8s_resources/vulnerability") local team = Team.new("slug-1", "purpose", "#channel") local user = User.new("authenticated", "authenticated@example.com", "some-id") -Test.gql("List vulnerability history for image", function(t) - t.addHeader("x-user-email", user:email()) - t.query(string.format([[ - { - team(slug: "%s") { - environment(name: "%s") { - workload(name: "%s") { - imageVulnerabilityHistory(from: "%s") { - samples { - summary { - riskScore - total - critical - high - medium - low - unassigned - countsBySeverity { - critical - high - medium - low - unassigned - } - } - date - } - } - } - } - } - } - ]], team:slug(), "dev", "app-with-vulnerabilities", os.date("%Y-%m-%d"))) - - t.check { - data = { - team = { - environment = { - workload = { - imageVulnerabilityHistory = { samples = { - { date = NotNull(), summary = { total = NotNull(), riskScore = NotNull(), critical = NotNull(), high = NotNull(), medium = NotNull(), low = NotNull(), unassigned = NotNull(), countsBySeverity = { critical = NotNull(), high = NotNull(), medium = NotNull(), low = NotNull(), unassigned = NotNull() } } }, - } }, - }, - }, - }, - }, - } -end) - - Test.gql("List vulnerability summaries for team", function(t) t.addHeader("x-user-email", user:email()) t.query(string.format([[ diff --git a/internal/graph/gengql/applications.generated.go b/internal/graph/gengql/applications.generated.go index 812f35494..a37166c56 100644 --- a/internal/graph/gengql/applications.generated.go +++ b/internal/graph/gengql/applications.generated.go @@ -19,7 +19,6 @@ import ( "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" - "github.com/nais/api/internal/graph/scalar" "github.com/nais/api/internal/issue" "github.com/nais/api/internal/kubernetes/event" "github.com/nais/api/internal/persistence/bigquery" @@ -33,7 +32,6 @@ import ( "github.com/nais/api/internal/slug" "github.com/nais/api/internal/team" "github.com/nais/api/internal/utilization" - "github.com/nais/api/internal/vulnerability" "github.com/nais/api/internal/workload" "github.com/nais/api/internal/workload/application" "github.com/nais/api/internal/workload/config" @@ -75,8 +73,6 @@ type ApplicationResolver interface { SQLInstances(ctx context.Context, obj *application.Application, orderBy *sqlinstance.SQLInstanceOrder) (*pagination.Connection[*sqlinstance.SQLInstance], error) Utilization(ctx context.Context, obj *application.Application) (*utilization.WorkloadUtilization, error) Valkeys(ctx context.Context, obj *application.Application, orderBy *valkey.ValkeyOrder) (*pagination.FacetableConnection[*valkey.Valkey, *valkey.ValkeyFilter], error) - ImageVulnerabilityHistory(ctx context.Context, obj *application.Application, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) - VulnerabilityFixHistory(ctx context.Context, obj *application.Application, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) Events(ctx context.Context, obj *application.Application, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) (*pagination.Connection[event.WorkloadEvent], error) } type ApplicationConnectionResolver interface { @@ -315,20 +311,6 @@ func (ec *executionContext) field_Application_events_args(ctx context.Context, r return args, nil } -func (ec *executionContext) field_Application_imageVulnerabilityHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { - var err error - args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", - func(ctx context.Context, v any) (scalar.Date, error) { - return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) - }) - if err != nil { - return nil, err - } - args["from"] = arg0 - return args, nil -} - func (ec *executionContext) field_Application_instances_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -539,20 +521,6 @@ func (ec *executionContext) field_Application_valkeys_args(ctx context.Context, return args, nil } -func (ec *executionContext) field_Application_vulnerabilityFixHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { - var err error - args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", - func(ctx context.Context, v any) (scalar.Date, error) { - return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) - }) - if err != nil { - return nil, err - } - args["from"] = arg0 - return args, nil -} - // endregion ***************************** args.gotpl ***************************** // region ************************** directives.gotpl ************************** @@ -1684,94 +1652,6 @@ func (ec *executionContext) fieldContext_Application_valkeys(ctx context.Context return fc, nil } -func (ec *executionContext) _Application_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField, obj *application.Application) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_Application_imageVulnerabilityHistory(ctx, field) - }, - func(ctx context.Context) (any, error) { - fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Application().ImageVulnerabilityHistory(ctx, obj, fc.Args["from"].(scalar.Date)) - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { - return ec.marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_Application_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Application", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_ImageVulnerabilityHistory(ctx, field) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Application_imageVulnerabilityHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - -func (ec *executionContext) _Application_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField, obj *application.Application) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_Application_vulnerabilityFixHistory(ctx, field) - }, - func(ctx context.Context) (any, error) { - fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Application().VulnerabilityFixHistory(ctx, obj, fc.Args["from"].(scalar.Date)) - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { - return ec.marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_Application_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Application", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_VulnerabilityFixHistory(ctx, field) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Application_vulnerabilityFixHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - func (ec *executionContext) _Application_events(ctx context.Context, field graphql.CollectedField, obj *application.Application) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5917,78 +5797,6 @@ func (ec *executionContext) _Application(ctx context.Context, sel ast.SelectionS continue } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - case "imageVulnerabilityHistory": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Application_imageVulnerabilityHistory(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue - } - - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - case "vulnerabilityFixHistory": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Application_vulnerabilityFixHistory(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue - } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "events": field := field diff --git a/internal/graph/gengql/jobs.generated.go b/internal/graph/gengql/jobs.generated.go index cf1fe4018..5b823c513 100644 --- a/internal/graph/gengql/jobs.generated.go +++ b/internal/graph/gengql/jobs.generated.go @@ -19,7 +19,6 @@ import ( "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" - "github.com/nais/api/internal/graph/scalar" "github.com/nais/api/internal/issue" "github.com/nais/api/internal/kubernetes/event" "github.com/nais/api/internal/persistence/bigquery" @@ -32,7 +31,6 @@ import ( "github.com/nais/api/internal/serviceaccount" "github.com/nais/api/internal/slug" "github.com/nais/api/internal/team" - "github.com/nais/api/internal/vulnerability" "github.com/nais/api/internal/workload" "github.com/nais/api/internal/workload/config" "github.com/nais/api/internal/workload/job" @@ -76,8 +74,6 @@ type JobResolver interface { ServiceAccount(ctx context.Context, obj *job.Job) (*serviceaccount.ServiceAccount, error) SQLInstances(ctx context.Context, obj *job.Job, orderBy *sqlinstance.SQLInstanceOrder) (*pagination.Connection[*sqlinstance.SQLInstance], error) Valkeys(ctx context.Context, obj *job.Job, orderBy *valkey.ValkeyOrder) (*pagination.FacetableConnection[*valkey.Valkey, *valkey.ValkeyFilter], error) - ImageVulnerabilityHistory(ctx context.Context, obj *job.Job, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) - VulnerabilityFixHistory(ctx context.Context, obj *job.Job, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) Events(ctx context.Context, obj *job.Job, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) (*pagination.Connection[event.WorkloadEvent], error) } type JobConnectionResolver interface { @@ -332,20 +328,6 @@ func (ec *executionContext) field_Job_events_args(ctx context.Context, rawArgs m return args, nil } -func (ec *executionContext) field_Job_imageVulnerabilityHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { - var err error - args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", - func(ctx context.Context, v any) (scalar.Date, error) { - return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) - }) - if err != nil { - return nil, err - } - args["from"] = arg0 - return args, nil -} - func (ec *executionContext) field_Job_issues_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -556,20 +538,6 @@ func (ec *executionContext) field_Job_valkeys_args(ctx context.Context, rawArgs return args, nil } -func (ec *executionContext) field_Job_vulnerabilityFixHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { - var err error - args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", - func(ctx context.Context, v any) (scalar.Date, error) { - return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) - }) - if err != nil { - return nil, err - } - args["from"] = arg0 - return args, nil -} - // endregion ***************************** args.gotpl ***************************** // region ************************** directives.gotpl ************************** @@ -1715,94 +1683,6 @@ func (ec *executionContext) fieldContext_Job_valkeys(ctx context.Context, field return fc, nil } -func (ec *executionContext) _Job_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField, obj *job.Job) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_Job_imageVulnerabilityHistory(ctx, field) - }, - func(ctx context.Context) (any, error) { - fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Job().ImageVulnerabilityHistory(ctx, obj, fc.Args["from"].(scalar.Date)) - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { - return ec.marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_Job_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Job", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_ImageVulnerabilityHistory(ctx, field) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Job_imageVulnerabilityHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - -func (ec *executionContext) _Job_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField, obj *job.Job) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_Job_vulnerabilityFixHistory(ctx, field) - }, - func(ctx context.Context) (any, error) { - fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Job().VulnerabilityFixHistory(ctx, obj, fc.Args["from"].(scalar.Date)) - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { - return ec.marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_Job_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Job", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_VulnerabilityFixHistory(ctx, field) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Job_vulnerabilityFixHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - func (ec *executionContext) _Job_events(ctx context.Context, field graphql.CollectedField, obj *job.Job) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -6005,78 +5885,6 @@ func (ec *executionContext) _Job(ctx context.Context, sel ast.SelectionSet, obj continue } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - case "imageVulnerabilityHistory": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Job_imageVulnerabilityHistory(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue - } - - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - case "vulnerabilityFixHistory": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Job_vulnerabilityFixHistory(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue - } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "events": field := field diff --git a/internal/graph/gengql/root_.generated.go b/internal/graph/gengql/root_.generated.go index 4afd394a6..192c5a710 100644 --- a/internal/graph/gengql/root_.generated.go +++ b/internal/graph/gengql/root_.generated.go @@ -247,41 +247,39 @@ type ComplexityRoot struct { } Application struct { - ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int - AuthIntegrations func(childComplexity int) int - BigQueryDatasets func(childComplexity int, orderBy *bigquery.BigQueryDatasetOrder) int - Buckets func(childComplexity int, orderBy *bucket.BucketOrder) int - Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Cost func(childComplexity int) int - DeletionStartedAt func(childComplexity int) int - Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Events func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) int - History func(childComplexity int) int - ID func(childComplexity int) int - Image func(childComplexity int) int - ImageVulnerabilityHistory func(childComplexity int, from scalar.Date) int - Ingresses func(childComplexity int) int - InstanceGroups func(childComplexity int) int - Instances func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) int - KafkaTopicAcls func(childComplexity int, orderBy *kafkatopic.KafkaTopicACLOrder) int - Labels func(childComplexity int) int - LogDestinations func(childComplexity int) int - Manifest func(childComplexity int) int - Name func(childComplexity int) int - NetworkPolicy func(childComplexity int) int - OpenSearch func(childComplexity int) int - Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Resources func(childComplexity int) int - SQLInstances func(childComplexity int, orderBy *sqlinstance.SQLInstanceOrder) int - Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - ServiceAccount func(childComplexity int) int - State func(childComplexity int) int - Team func(childComplexity int) int - TeamEnvironment func(childComplexity int) int - Utilization func(childComplexity int) int - Valkeys func(childComplexity int, orderBy *valkey.ValkeyOrder) int - VulnerabilityFixHistory func(childComplexity int, from scalar.Date) int + ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int + AuthIntegrations func(childComplexity int) int + BigQueryDatasets func(childComplexity int, orderBy *bigquery.BigQueryDatasetOrder) int + Buckets func(childComplexity int, orderBy *bucket.BucketOrder) int + Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Cost func(childComplexity int) int + DeletionStartedAt func(childComplexity int) int + Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Events func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) int + History func(childComplexity int) int + ID func(childComplexity int) int + Image func(childComplexity int) int + Ingresses func(childComplexity int) int + InstanceGroups func(childComplexity int) int + Instances func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) int + KafkaTopicAcls func(childComplexity int, orderBy *kafkatopic.KafkaTopicACLOrder) int + Labels func(childComplexity int) int + LogDestinations func(childComplexity int) int + Manifest func(childComplexity int) int + Name func(childComplexity int) int + NetworkPolicy func(childComplexity int) int + OpenSearch func(childComplexity int) int + Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Resources func(childComplexity int) int + SQLInstances func(childComplexity int, orderBy *sqlinstance.SQLInstanceOrder) int + Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + ServiceAccount func(childComplexity int) int + State func(childComplexity int) int + Team func(childComplexity int) int + TeamEnvironment func(childComplexity int) int + Utilization func(childComplexity int) int + Valkeys func(childComplexity int, orderBy *valkey.ValkeyOrder) int } ApplicationConnection struct { @@ -1153,15 +1151,6 @@ type ComplexityRoot struct { PackageTypes func(childComplexity int) int } - ImageVulnerabilityHistory struct { - Samples func(childComplexity int) int - } - - ImageVulnerabilitySample struct { - Date func(childComplexity int) int - Summary func(childComplexity int) int - } - ImageVulnerabilitySummary struct { CountsByPriority func(childComplexity int) int CountsBySeverity func(childComplexity int) int @@ -1287,38 +1276,36 @@ type ComplexityRoot struct { } Job struct { - ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int - AuthIntegrations func(childComplexity int) int - BigQueryDatasets func(childComplexity int, orderBy *bigquery.BigQueryDatasetOrder) int - Buckets func(childComplexity int, orderBy *bucket.BucketOrder) int - Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Cost func(childComplexity int) int - DeletionStartedAt func(childComplexity int) int - Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Events func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) int - ID func(childComplexity int) int - Image func(childComplexity int) int - ImageVulnerabilityHistory func(childComplexity int, from scalar.Date) int - Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) int - KafkaTopicAcls func(childComplexity int, orderBy *kafkatopic.KafkaTopicACLOrder) int - Labels func(childComplexity int) int - LogDestinations func(childComplexity int) int - Manifest func(childComplexity int) int - Name func(childComplexity int) int - NetworkPolicy func(childComplexity int) int - OpenSearch func(childComplexity int) int - Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Resources func(childComplexity int) int - Runs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - SQLInstances func(childComplexity int, orderBy *sqlinstance.SQLInstanceOrder) int - Schedule func(childComplexity int) int - Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - ServiceAccount func(childComplexity int) int - State func(childComplexity int) int - Team func(childComplexity int) int - TeamEnvironment func(childComplexity int) int - Valkeys func(childComplexity int, orderBy *valkey.ValkeyOrder) int - VulnerabilityFixHistory func(childComplexity int, from scalar.Date) int + ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int + AuthIntegrations func(childComplexity int) int + BigQueryDatasets func(childComplexity int, orderBy *bigquery.BigQueryDatasetOrder) int + Buckets func(childComplexity int, orderBy *bucket.BucketOrder) int + Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Cost func(childComplexity int) int + DeletionStartedAt func(childComplexity int) int + Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Events func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) int + ID func(childComplexity int) int + Image func(childComplexity int) int + Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) int + KafkaTopicAcls func(childComplexity int, orderBy *kafkatopic.KafkaTopicACLOrder) int + Labels func(childComplexity int) int + LogDestinations func(childComplexity int) int + Manifest func(childComplexity int) int + Name func(childComplexity int) int + NetworkPolicy func(childComplexity int) int + OpenSearch func(childComplexity int) int + Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Resources func(childComplexity int) int + Runs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + SQLInstances func(childComplexity int, orderBy *sqlinstance.SQLInstanceOrder) int + Schedule func(childComplexity int) int + Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + ServiceAccount func(childComplexity int) int + State func(childComplexity int) int + Team func(childComplexity int) int + TeamEnvironment func(childComplexity int) int + Valkeys func(childComplexity int, orderBy *valkey.ValkeyOrder) int } JobConnection struct { @@ -2257,36 +2244,34 @@ type ComplexityRoot struct { } Query struct { - ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.TenantActivityLogFilter) int - CVE func(childComplexity int, identifier string) int - CostMonthlySummary func(childComplexity int, from scalar.Date, to scalar.Date) int - CurrentUnitPrices func(childComplexity int) int - Cves func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.CVEOrder, filter *vulnerability.CVEFilter) int - Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *deployment.DeploymentOrder, filter *deployment.DeploymentFilter) int - Environment func(childComplexity int, name string) int - Environments func(childComplexity int, orderBy *environment.EnvironmentOrder) int - Features func(childComplexity int) int - GlobalWebhooks func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - ImageVulnerabilityHistory func(childComplexity int, from scalar.Date) int - Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.TenantIssueFilter) int - Me func(childComplexity int) int - Node func(childComplexity int, id ident.Ident) int - Reconcilers func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Roles func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *authz.RoleFilter) int - Search func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter search.SearchFilter) int - ServiceAccount func(childComplexity int, id ident.Ident) int - ServiceAccounts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Team func(childComplexity int, slug slug.Slug) int - Teams func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *team.TeamOrder, filter *team.TeamFilter) int - TeamsUtilization func(childComplexity int, resourceType utilization.UtilizationResourceType) int - UnleashReleaseChannels func(childComplexity int) int - User func(childComplexity int, email *string) int - UserSyncLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Users func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *user.UserOrder) int - VulnerabilityFixHistory func(childComplexity int, from scalar.Date) int - VulnerabilitySummaries func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *vulnerability.TenantVulnerabilitySummaryFilter, orderBy *vulnerability.VulnerabilitySummaryOrder) int - VulnerabilitySummary func(childComplexity int, filter *vulnerability.TenantVulnerabilitySummaryFilter) int - WebhookEventTypes func(childComplexity int) int + ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.TenantActivityLogFilter) int + CVE func(childComplexity int, identifier string) int + CostMonthlySummary func(childComplexity int, from scalar.Date, to scalar.Date) int + CurrentUnitPrices func(childComplexity int) int + Cves func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.CVEOrder, filter *vulnerability.CVEFilter) int + Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *deployment.DeploymentOrder, filter *deployment.DeploymentFilter) int + Environment func(childComplexity int, name string) int + Environments func(childComplexity int, orderBy *environment.EnvironmentOrder) int + Features func(childComplexity int) int + GlobalWebhooks func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.TenantIssueFilter) int + Me func(childComplexity int) int + Node func(childComplexity int, id ident.Ident) int + Reconcilers func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Roles func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *authz.RoleFilter) int + Search func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter search.SearchFilter) int + ServiceAccount func(childComplexity int, id ident.Ident) int + ServiceAccounts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Team func(childComplexity int, slug slug.Slug) int + Teams func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *team.TeamOrder, filter *team.TeamFilter) int + TeamsUtilization func(childComplexity int, resourceType utilization.UtilizationResourceType) int + UnleashReleaseChannels func(childComplexity int) int + User func(childComplexity int, email *string) int + UserSyncLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Users func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *user.UserOrder) int + VulnerabilitySummaries func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *vulnerability.TenantVulnerabilitySummaryFilter, orderBy *vulnerability.VulnerabilitySummaryOrder) int + VulnerabilitySummary func(childComplexity int, filter *vulnerability.TenantVulnerabilitySummaryFilter) int + WebhookEventTypes func(childComplexity int) int } Reconciler struct { @@ -3110,49 +3095,47 @@ type ComplexityRoot struct { } Team struct { - ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int - Alerts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *alerts.AlertOrder, filter *alerts.TeamAlertsFilter) int - Applications func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *application.ApplicationOrder, filter *application.TeamApplicationsFilter) int - BigQueryDatasets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bigquery.BigQueryDatasetOrder, filter *bigquery.BigQueryDatasetFilter) int - Buckets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bucket.BucketOrder, filter *bucket.BucketFilter) int - Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *config.ConfigOrder, filter *config.ConfigFilter) int - Cost func(childComplexity int) int - DeleteKey func(childComplexity int, key string) int - DeletionInProgress func(childComplexity int) int - DeploymentKey func(childComplexity int) int - Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Environment func(childComplexity int, name string) int - Environments func(childComplexity int) int - ExternalResources func(childComplexity int) int - ID func(childComplexity int) int - ImageVulnerabilityHistory func(childComplexity int, from scalar.Date) int - InventoryCounts func(childComplexity int) int - Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.IssueFilter) int - Jobs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *job.JobOrder, filter *job.TeamJobsFilter) int - KafkaTopics func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *kafkatopic.KafkaTopicOrder, filter *kafkatopic.KafkaTopicFilter) int - LastSuccessfulSync func(childComplexity int) int - Member func(childComplexity int, email string) int - Members func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *team.TeamMemberOrder) int - OpenSearches func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *opensearch.OpenSearchOrder, filter *opensearch.OpenSearchFilter) int - Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *postgres.TeamPostgresFilter) int - Purpose func(childComplexity int) int - Repositories func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *repository.RepositoryOrder, filter *repository.TeamRepositoryFilter) int - SQLInstances func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *sqlinstance.SQLInstanceOrder, filter *sqlinstance.SQLInstanceFilter) int - Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *secret.SecretOrder, filter *secret.SecretFilter) int - ServiceAccounts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - ServiceUtilization func(childComplexity int) int - SlackChannel func(childComplexity int) int - Slug func(childComplexity int) int - Unleash func(childComplexity int) int - Valkeys func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *valkey.ValkeyOrder, filter *valkey.ValkeyFilter) int - ViewerIsMember func(childComplexity int) int - ViewerIsOwner func(childComplexity int) int - VulnerabilityFixHistory func(childComplexity int, from scalar.Date) int - VulnerabilitySummaries func(childComplexity int, filter *vulnerability.TeamVulnerabilitySummaryFilter, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.VulnerabilitySummaryOrder) int - VulnerabilitySummary func(childComplexity int, filter *vulnerability.TeamVulnerabilitySummaryFilter) int - Webhooks func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - WorkloadUtilization func(childComplexity int, resourceType utilization.UtilizationResourceType) int - Workloads func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *workload.WorkloadOrder, filter *workload.TeamWorkloadsFilter) int + ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int + Alerts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *alerts.AlertOrder, filter *alerts.TeamAlertsFilter) int + Applications func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *application.ApplicationOrder, filter *application.TeamApplicationsFilter) int + BigQueryDatasets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bigquery.BigQueryDatasetOrder, filter *bigquery.BigQueryDatasetFilter) int + Buckets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bucket.BucketOrder, filter *bucket.BucketFilter) int + Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *config.ConfigOrder, filter *config.ConfigFilter) int + Cost func(childComplexity int) int + DeleteKey func(childComplexity int, key string) int + DeletionInProgress func(childComplexity int) int + DeploymentKey func(childComplexity int) int + Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Environment func(childComplexity int, name string) int + Environments func(childComplexity int) int + ExternalResources func(childComplexity int) int + ID func(childComplexity int) int + InventoryCounts func(childComplexity int) int + Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.IssueFilter) int + Jobs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *job.JobOrder, filter *job.TeamJobsFilter) int + KafkaTopics func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *kafkatopic.KafkaTopicOrder, filter *kafkatopic.KafkaTopicFilter) int + LastSuccessfulSync func(childComplexity int) int + Member func(childComplexity int, email string) int + Members func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *team.TeamMemberOrder) int + OpenSearches func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *opensearch.OpenSearchOrder, filter *opensearch.OpenSearchFilter) int + Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *postgres.TeamPostgresFilter) int + Purpose func(childComplexity int) int + Repositories func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *repository.RepositoryOrder, filter *repository.TeamRepositoryFilter) int + SQLInstances func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *sqlinstance.SQLInstanceOrder, filter *sqlinstance.SQLInstanceFilter) int + Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *secret.SecretOrder, filter *secret.SecretFilter) int + ServiceAccounts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + ServiceUtilization func(childComplexity int) int + SlackChannel func(childComplexity int) int + Slug func(childComplexity int) int + Unleash func(childComplexity int) int + Valkeys func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *valkey.ValkeyOrder, filter *valkey.ValkeyFilter) int + ViewerIsMember func(childComplexity int) int + ViewerIsOwner func(childComplexity int) int + VulnerabilitySummaries func(childComplexity int, filter *vulnerability.TeamVulnerabilitySummaryFilter, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.VulnerabilitySummaryOrder) int + VulnerabilitySummary func(childComplexity int, filter *vulnerability.TeamVulnerabilitySummaryFilter) int + Webhooks func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + WorkloadUtilization func(childComplexity int, resourceType utilization.UtilizationResourceType) int + Workloads func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *workload.WorkloadOrder, filter *workload.TeamWorkloadsFilter) int } TeamCDN struct { @@ -4021,20 +4004,6 @@ type ComplexityRoot struct { Severity func(childComplexity int) int } - VulnerabilityFixHistory struct { - Samples func(childComplexity int) int - } - - VulnerabilityFixSample struct { - Date func(childComplexity int) int - Days func(childComplexity int) int - FirstFixedAt func(childComplexity int) int - FixedCount func(childComplexity int) int - LastFixedAt func(childComplexity int) int - Severity func(childComplexity int) int - TotalWorkloads func(childComplexity int) int - } - VulnerabilityRemediation struct { FixVersion func(childComplexity int) int LatestVersion func(childComplexity int) int @@ -4708,18 +4677,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Application.Image(childComplexity), true - case "Application.imageVulnerabilityHistory": - if e.ComplexityRoot.Application.ImageVulnerabilityHistory == nil { - break - } - - args, err := ec.field_Application_imageVulnerabilityHistory_args(ctx, rawArgs) - if err != nil { - return 0, false - } - - return e.ComplexityRoot.Application.ImageVulnerabilityHistory(childComplexity, args["from"].(scalar.Date)), true - case "Application.ingresses": if e.ComplexityRoot.Application.Ingresses == nil { break @@ -4902,18 +4859,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Application.Valkeys(childComplexity, args["orderBy"].(*valkey.ValkeyOrder)), true - case "Application.vulnerabilityFixHistory": - if e.ComplexityRoot.Application.VulnerabilityFixHistory == nil { - break - } - - args, err := ec.field_Application_vulnerabilityFixHistory_args(ctx, rawArgs) - if err != nil { - return 0, false - } - - return e.ComplexityRoot.Application.VulnerabilityFixHistory(childComplexity, args["from"].(scalar.Date)), true - case "ApplicationConnection.edges": if e.ComplexityRoot.ApplicationConnection.Edges == nil { break @@ -8337,27 +8282,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ImageVulnerabilityFacets.PackageTypes(childComplexity), true - case "ImageVulnerabilityHistory.samples": - if e.ComplexityRoot.ImageVulnerabilityHistory.Samples == nil { - break - } - - return e.ComplexityRoot.ImageVulnerabilityHistory.Samples(childComplexity), true - - case "ImageVulnerabilitySample.date": - if e.ComplexityRoot.ImageVulnerabilitySample.Date == nil { - break - } - - return e.ComplexityRoot.ImageVulnerabilitySample.Date(childComplexity), true - - case "ImageVulnerabilitySample.summary": - if e.ComplexityRoot.ImageVulnerabilitySample.Summary == nil { - break - } - - return e.ComplexityRoot.ImageVulnerabilitySample.Summary(childComplexity), true - case "ImageVulnerabilitySummary.countsByPriority": if e.ComplexityRoot.ImageVulnerabilitySummary.CountsByPriority == nil { break @@ -8955,18 +8879,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Job.Image(childComplexity), true - case "Job.imageVulnerabilityHistory": - if e.ComplexityRoot.Job.ImageVulnerabilityHistory == nil { - break - } - - args, err := ec.field_Job_imageVulnerabilityHistory_args(ctx, rawArgs) - if err != nil { - return 0, false - } - - return e.ComplexityRoot.Job.ImageVulnerabilityHistory(childComplexity, args["from"].(scalar.Date)), true - case "Job.issues": if e.ComplexityRoot.Job.Issues == nil { break @@ -9135,18 +9047,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Job.Valkeys(childComplexity, args["orderBy"].(*valkey.ValkeyOrder)), true - case "Job.vulnerabilityFixHistory": - if e.ComplexityRoot.Job.VulnerabilityFixHistory == nil { - break - } - - args, err := ec.field_Job_vulnerabilityFixHistory_args(ctx, rawArgs) - if err != nil { - return 0, false - } - - return e.ComplexityRoot.Job.VulnerabilityFixHistory(childComplexity, args["from"].(scalar.Date)), true - case "JobConnection.edges": if e.ComplexityRoot.JobConnection.Edges == nil { break @@ -13818,18 +13718,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Query.GlobalWebhooks(childComplexity, args["first"].(*int), args["after"].(*pagination.Cursor), args["last"].(*int), args["before"].(*pagination.Cursor)), true - case "Query.imageVulnerabilityHistory": - if e.ComplexityRoot.Query.ImageVulnerabilityHistory == nil { - break - } - - args, err := ec.field_Query_imageVulnerabilityHistory_args(ctx, rawArgs) - if err != nil { - return 0, false - } - - return e.ComplexityRoot.Query.ImageVulnerabilityHistory(childComplexity, args["from"].(scalar.Date)), true - case "Query.issues": if e.ComplexityRoot.Query.Issues == nil { break @@ -14000,18 +13888,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Query.Users(childComplexity, args["first"].(*int), args["after"].(*pagination.Cursor), args["last"].(*int), args["before"].(*pagination.Cursor), args["orderBy"].(*user.UserOrder)), true - case "Query.vulnerabilityFixHistory": - if e.ComplexityRoot.Query.VulnerabilityFixHistory == nil { - break - } - - args, err := ec.field_Query_vulnerabilityFixHistory_args(ctx, rawArgs) - if err != nil { - return 0, false - } - - return e.ComplexityRoot.Query.VulnerabilityFixHistory(childComplexity, args["from"].(scalar.Date)), true - case "Query.vulnerabilitySummaries": if e.ComplexityRoot.Query.VulnerabilitySummaries == nil { break @@ -17719,18 +17595,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Team.ID(childComplexity), true - case "Team.imageVulnerabilityHistory": - if e.ComplexityRoot.Team.ImageVulnerabilityHistory == nil { - break - } - - args, err := ec.field_Team_imageVulnerabilityHistory_args(ctx, rawArgs) - if err != nil { - return 0, false - } - - return e.ComplexityRoot.Team.ImageVulnerabilityHistory(childComplexity, args["from"].(scalar.Date)), true - case "Team.inventoryCounts": if e.ComplexityRoot.Team.InventoryCounts == nil { break @@ -17938,18 +17802,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Team.ViewerIsOwner(childComplexity), true - case "Team.vulnerabilityFixHistory": - if e.ComplexityRoot.Team.VulnerabilityFixHistory == nil { - break - } - - args, err := ec.field_Team_vulnerabilityFixHistory_args(ctx, rawArgs) - if err != nil { - return 0, false - } - - return e.ComplexityRoot.Team.VulnerabilityFixHistory(childComplexity, args["from"].(scalar.Date)), true - case "Team.vulnerabilitySummaries": if e.ComplexityRoot.Team.VulnerabilitySummaries == nil { break @@ -21625,62 +21477,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.VulnerabilityActivityLogEntryData.Severity(childComplexity), true - case "VulnerabilityFixHistory.samples": - if e.ComplexityRoot.VulnerabilityFixHistory.Samples == nil { - break - } - - return e.ComplexityRoot.VulnerabilityFixHistory.Samples(childComplexity), true - - case "VulnerabilityFixSample.date": - if e.ComplexityRoot.VulnerabilityFixSample.Date == nil { - break - } - - return e.ComplexityRoot.VulnerabilityFixSample.Date(childComplexity), true - - case "VulnerabilityFixSample.days": - if e.ComplexityRoot.VulnerabilityFixSample.Days == nil { - break - } - - return e.ComplexityRoot.VulnerabilityFixSample.Days(childComplexity), true - - case "VulnerabilityFixSample.firstFixedAt": - if e.ComplexityRoot.VulnerabilityFixSample.FirstFixedAt == nil { - break - } - - return e.ComplexityRoot.VulnerabilityFixSample.FirstFixedAt(childComplexity), true - - case "VulnerabilityFixSample.fixedCount": - if e.ComplexityRoot.VulnerabilityFixSample.FixedCount == nil { - break - } - - return e.ComplexityRoot.VulnerabilityFixSample.FixedCount(childComplexity), true - - case "VulnerabilityFixSample.lastFixedAt": - if e.ComplexityRoot.VulnerabilityFixSample.LastFixedAt == nil { - break - } - - return e.ComplexityRoot.VulnerabilityFixSample.LastFixedAt(childComplexity), true - - case "VulnerabilityFixSample.severity": - if e.ComplexityRoot.VulnerabilityFixSample.Severity == nil { - break - } - - return e.ComplexityRoot.VulnerabilityFixSample.Severity(childComplexity), true - - case "VulnerabilityFixSample.totalWorkloads": - if e.ComplexityRoot.VulnerabilityFixSample.TotalWorkloads == nil { - break - } - - return e.ComplexityRoot.VulnerabilityFixSample.TotalWorkloads(childComplexity), true - case "VulnerabilityRemediation.fixVersion": if e.ComplexityRoot.VulnerabilityRemediation.FixVersion == nil { break @@ -36727,12 +36523,6 @@ extend enum ActivityLogActivityType { } extend type Query { - "Get the vulnerability summary history for all teams." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - "Get the vulnerability summary for the tenant." vulnerabilitySummary( "Filter the aggregate." @@ -36760,9 +36550,6 @@ extend type Query { orderBy: VulnerabilitySummaryOrder ): WorkloadVulnerabilitySummaryConnection! - "Get the mean time to fix history for all teams." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! - "Get a specific CVE by its identifier." cve(identifier: String!): CVE! @@ -36819,17 +36606,6 @@ enum CVEOrderField { PRIORITY } -extend interface Workload { - "Get the vulnerability summary history for workload." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - - "Get the mean time to fix history for a workload." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! -} - extend enum TeamOrderField { "The accumulated risk score of the teams workloads." RISK_SCORE @@ -36849,44 +36625,6 @@ extend enum TeamOrderField { KNOWN_EXPLOITED_VULNERABILITIES } -extend type Application { - "Get the vulnerability summary history for application." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - - "Get the mean time to fix history for an application." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! -} - -extend type Job { - "Get the vulnerability summary history for job." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - - "Get the mean time to fix history for a job." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! -} - -extend type Team { - "Get the vulnerability summary history for team." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - - "Get the mean time to fix history for a team." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! -} - -type ImageVulnerabilityHistory { - "Vulnerability summary samples." - samples: [ImageVulnerabilitySample!]! -} - """ SBOM metadata for a container image, including pipeline status and processing information. This type is accessed through ContainerImage.sbom. @@ -37198,14 +36936,6 @@ type ImageVulnerabilityFacets { packageTypes: [StringFacetItem!]! } -type ImageVulnerabilitySample { - "The historic image vulnerability summary" - summary: ImageVulnerabilitySummary! - - "Timestamp of the vulnerability summary." - date: Time! -} - type ContainerImageWorkloadReferenceConnection { "Information to aid in pagination." pageInfo: PageInfo! @@ -37877,36 +37607,6 @@ extend enum ActivityLogActivityType { VULNERABILITY_UPDATED } -"Trend of mean time to fix vulnerabilities grouped by severity." -type VulnerabilityFixHistory { - "Mean time to fix samples." - samples: [VulnerabilityFixSample!]! -} - -"One MTTR sample for a severity at a point in time." -type VulnerabilityFixSample { - "Severity of vulnerabilities in this sample." - severity: ImageVulnerabilitySeverity! - - "Snapshot date of the sample." - date: Time! - - "Mean time to fix in days." - days: Int! - - "Number of vulnerabilities fixed in this sample." - fixedCount: Int! - - "Earliest time a vulnerability was fixed in this sample." - firstFixedAt: Time - - "Latest time a vulnerability was fixed in this sample." - lastFixedAt: Time - - "Total number of workloads with this severity of vulnerabilities." - totalWorkloads: Int! -} - "The SBOM pipeline status for an image or workload." enum SBOMStatus { "SBOM generation is in progress." @@ -39281,10 +38981,6 @@ func (ec *executionContext) childFields_Application(ctx context.Context, field g return ec.fieldContext_Application_utilization(ctx, field) case "valkeys": return ec.fieldContext_Application_valkeys(ctx, field) - case "imageVulnerabilityHistory": - return ec.fieldContext_Application_imageVulnerabilityHistory(ctx, field) - case "vulnerabilityFixHistory": - return ec.fieldContext_Application_vulnerabilityFixHistory(ctx, field) case "events": return ec.fieldContext_Application_events(ctx, field) } @@ -40597,24 +40293,6 @@ func (ec *executionContext) childFields_ImageVulnerabilityFacets(ctx context.Con return nil, fmt.Errorf("no field named %q was found under type ImageVulnerabilityFacets", field.Name) } -func (ec *executionContext) childFields_ImageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "samples": - return ec.fieldContext_ImageVulnerabilityHistory_samples(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type ImageVulnerabilityHistory", field.Name) -} - -func (ec *executionContext) childFields_ImageVulnerabilitySample(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "summary": - return ec.fieldContext_ImageVulnerabilitySample_summary(ctx, field) - case "date": - return ec.fieldContext_ImageVulnerabilitySample_date(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type ImageVulnerabilitySample", field.Name) -} - func (ec *executionContext) childFields_ImageVulnerabilitySummary(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { switch field.Name { case "total": @@ -40907,10 +40585,6 @@ func (ec *executionContext) childFields_Job(ctx context.Context, field graphql.C return ec.fieldContext_Job_sqlInstances(ctx, field) case "valkeys": return ec.fieldContext_Job_valkeys(ctx, field) - case "imageVulnerabilityHistory": - return ec.fieldContext_Job_imageVulnerabilityHistory(ctx, field) - case "vulnerabilityFixHistory": - return ec.fieldContext_Job_vulnerabilityFixHistory(ctx, field) case "events": return ec.fieldContext_Job_events(ctx, field) } @@ -43029,10 +42703,6 @@ func (ec *executionContext) childFields_Team(ctx context.Context, field graphql. return ec.fieldContext_Team_serviceUtilization(ctx, field) case "valkeys": return ec.fieldContext_Team_valkeys(ctx, field) - case "imageVulnerabilityHistory": - return ec.fieldContext_Team_imageVulnerabilityHistory(ctx, field) - case "vulnerabilityFixHistory": - return ec.fieldContext_Team_vulnerabilityFixHistory(ctx, field) case "vulnerabilitySummary": return ec.fieldContext_Team_vulnerabilitySummary(ctx, field) case "vulnerabilitySummaries": @@ -44219,34 +43889,6 @@ func (ec *executionContext) childFields_VulnerabilityActivityLogEntryData(ctx co return nil, fmt.Errorf("no field named %q was found under type VulnerabilityActivityLogEntryData", field.Name) } -func (ec *executionContext) childFields_VulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "samples": - return ec.fieldContext_VulnerabilityFixHistory_samples(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type VulnerabilityFixHistory", field.Name) -} - -func (ec *executionContext) childFields_VulnerabilityFixSample(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - switch field.Name { - case "severity": - return ec.fieldContext_VulnerabilityFixSample_severity(ctx, field) - case "date": - return ec.fieldContext_VulnerabilityFixSample_date(ctx, field) - case "days": - return ec.fieldContext_VulnerabilityFixSample_days(ctx, field) - case "fixedCount": - return ec.fieldContext_VulnerabilityFixSample_fixedCount(ctx, field) - case "firstFixedAt": - return ec.fieldContext_VulnerabilityFixSample_firstFixedAt(ctx, field) - case "lastFixedAt": - return ec.fieldContext_VulnerabilityFixSample_lastFixedAt(ctx, field) - case "totalWorkloads": - return ec.fieldContext_VulnerabilityFixSample_totalWorkloads(ctx, field) - } - return nil, fmt.Errorf("no field named %q was found under type VulnerabilityFixSample", field.Name) -} - func (ec *executionContext) childFields_VulnerabilityRemediation(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { switch field.Name { case "fixVersion": diff --git a/internal/graph/gengql/schema.generated.go b/internal/graph/gengql/schema.generated.go index d0f144c5e..7bbc0e290 100644 --- a/internal/graph/gengql/schema.generated.go +++ b/internal/graph/gengql/schema.generated.go @@ -162,10 +162,8 @@ type QueryResolver interface { Me(ctx context.Context) (authz.AuthenticatedUser, error) UserSyncLog(ctx context.Context, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[usersync.UserSyncLogEntry], error) TeamsUtilization(ctx context.Context, resourceType utilization.UtilizationResourceType) ([]*utilization.TeamUtilizationData, error) - ImageVulnerabilityHistory(ctx context.Context, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) VulnerabilitySummary(ctx context.Context, filter *vulnerability.TenantVulnerabilitySummaryFilter) (*vulnerability.TenantVulnerabilitySummary, error) VulnerabilitySummaries(ctx context.Context, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *vulnerability.TenantVulnerabilitySummaryFilter, orderBy *vulnerability.VulnerabilitySummaryOrder) (*pagination.Connection[*vulnerability.WorkloadVulnerabilitySummary], error) - VulnerabilityFixHistory(ctx context.Context, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) CVE(ctx context.Context, identifier string) (*vulnerability.CVE, error) Cves(ctx context.Context, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.CVEOrder, filter *vulnerability.CVEFilter) (*pagination.Connection[*vulnerability.CVE], error) GlobalWebhooks(ctx context.Context, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*webhook.WebhookSubscription], error) @@ -1458,20 +1456,6 @@ func (ec *executionContext) field_Query_globalWebhooks_args(ctx context.Context, return args, nil } -func (ec *executionContext) field_Query_imageVulnerabilityHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { - var err error - args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", - func(ctx context.Context, v any) (scalar.Date, error) { - return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) - }) - if err != nil { - return nil, err - } - args["from"] = arg0 - return args, nil -} - func (ec *executionContext) field_Query_issues_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -1902,20 +1886,6 @@ func (ec *executionContext) field_Query_users_args(ctx context.Context, rawArgs return args, nil } -func (ec *executionContext) field_Query_vulnerabilityFixHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { - var err error - args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", - func(ctx context.Context, v any) (scalar.Date, error) { - return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) - }) - if err != nil { - return nil, err - } - args["from"] = arg0 - return args, nil -} - func (ec *executionContext) field_Query_vulnerabilitySummaries_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -6260,50 +6230,6 @@ func (ec *executionContext) fieldContext_Query_teamsUtilization(ctx context.Cont return fc, nil } -func (ec *executionContext) _Query_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_Query_imageVulnerabilityHistory(ctx, field) - }, - func(ctx context.Context) (any, error) { - fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Query().ImageVulnerabilityHistory(ctx, fc.Args["from"].(scalar.Date)) - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { - return ec.marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_Query_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Query", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_ImageVulnerabilityHistory(ctx, field) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Query_imageVulnerabilityHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - func (ec *executionContext) _Query_vulnerabilitySummary(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -6392,50 +6318,6 @@ func (ec *executionContext) fieldContext_Query_vulnerabilitySummaries(ctx contex return fc, nil } -func (ec *executionContext) _Query_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_Query_vulnerabilityFixHistory(ctx, field) - }, - func(ctx context.Context) (any, error) { - fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Query().VulnerabilityFixHistory(ctx, fc.Args["from"].(scalar.Date)) - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { - return ec.marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_Query_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Query", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_VulnerabilityFixHistory(ctx, field) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Query_vulnerabilityFixHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - func (ec *executionContext) _Query_cve(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -9019,28 +8901,6 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) - case "imageVulnerabilityHistory": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Query_imageVulnerabilityHistory(ctx, field) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - rrm := func(ctx context.Context) graphql.Marshaler { - return ec.OperationContext.RootResolverMiddleware(ctx, - func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) case "vulnerabilitySummary": field := field @@ -9085,28 +8945,6 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) - case "vulnerabilityFixHistory": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Query_vulnerabilityFixHistory(ctx, field) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - rrm := func(ctx context.Context) graphql.Marshaler { - return ec.OperationContext.RootResolverMiddleware(ctx, - func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) case "cve": field := field diff --git a/internal/graph/gengql/teams.generated.go b/internal/graph/gengql/teams.generated.go index 89db334df..ed767f9c9 100644 --- a/internal/graph/gengql/teams.generated.go +++ b/internal/graph/gengql/teams.generated.go @@ -21,7 +21,6 @@ import ( "github.com/nais/api/internal/github/repository" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" - "github.com/nais/api/internal/graph/scalar" "github.com/nais/api/internal/issue" "github.com/nais/api/internal/persistence/bigquery" "github.com/nais/api/internal/persistence/bucket" @@ -85,8 +84,6 @@ type TeamResolver interface { WorkloadUtilization(ctx context.Context, obj *team.Team, resourceType utilization.UtilizationResourceType) ([]*utilization.WorkloadUtilizationData, error) ServiceUtilization(ctx context.Context, obj *team.Team) (*utilization.TeamServiceUtilization, error) Valkeys(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *valkey.ValkeyOrder, filter *valkey.ValkeyFilter) (*pagination.FacetableConnection[*valkey.Valkey, *valkey.ValkeyFilter], error) - ImageVulnerabilityHistory(ctx context.Context, obj *team.Team, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) - VulnerabilityFixHistory(ctx context.Context, obj *team.Team, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) VulnerabilitySummary(ctx context.Context, obj *team.Team, filter *vulnerability.TeamVulnerabilitySummaryFilter) (*vulnerability.TeamVulnerabilitySummary, error) VulnerabilitySummaries(ctx context.Context, obj *team.Team, filter *vulnerability.TeamVulnerabilitySummaryFilter, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.VulnerabilitySummaryOrder) (*pagination.Connection[*vulnerability.WorkloadVulnerabilitySummary], error) Webhooks(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*webhook.WebhookSubscription], error) @@ -772,20 +769,6 @@ func (ec *executionContext) field_Team_environment_args(ctx context.Context, raw return args, nil } -func (ec *executionContext) field_Team_imageVulnerabilityHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { - var err error - args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", - func(ctx context.Context, v any) (scalar.Date, error) { - return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) - }) - if err != nil { - return nil, err - } - args["from"] = arg0 - return args, nil -} - func (ec *executionContext) field_Team_issues_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -1362,20 +1345,6 @@ func (ec *executionContext) field_Team_valkeys_args(ctx context.Context, rawArgs return args, nil } -func (ec *executionContext) field_Team_vulnerabilityFixHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { - var err error - args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", - func(ctx context.Context, v any) (scalar.Date, error) { - return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) - }) - if err != nil { - return nil, err - } - args["from"] = arg0 - return args, nil -} - func (ec *executionContext) field_Team_vulnerabilitySummaries_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -3149,94 +3118,6 @@ func (ec *executionContext) fieldContext_Team_valkeys(ctx context.Context, field return fc, nil } -func (ec *executionContext) _Team_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField, obj *team.Team) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_Team_imageVulnerabilityHistory(ctx, field) - }, - func(ctx context.Context) (any, error) { - fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Team().ImageVulnerabilityHistory(ctx, obj, fc.Args["from"].(scalar.Date)) - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { - return ec.marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_Team_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Team", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_ImageVulnerabilityHistory(ctx, field) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Team_imageVulnerabilityHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - -func (ec *executionContext) _Team_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField, obj *team.Team) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_Team_vulnerabilityFixHistory(ctx, field) - }, - func(ctx context.Context) (any, error) { - fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Team().VulnerabilityFixHistory(ctx, obj, fc.Args["from"].(scalar.Date)) - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { - return ec.marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_Team_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "Team", - Field: field, - IsMethod: true, - IsResolver: true, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_VulnerabilityFixHistory(ctx, field) - }, - } - defer func() { - if r := recover(); r != nil { - err = ec.Recover(ctx, r) - ec.Error(ctx, err) - } - }() - ctx = graphql.WithFieldContext(ctx, fc) - if fc.Args, err = ec.field_Team_vulnerabilityFixHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { - ec.Error(ctx, err) - return fc, err - } - return fc, nil -} - func (ec *executionContext) _Team_vulnerabilitySummary(ctx context.Context, field graphql.CollectedField, obj *team.Team) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -9635,78 +9516,6 @@ func (ec *executionContext) _Team(ctx context.Context, sel ast.SelectionSet, obj continue } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - case "imageVulnerabilityHistory": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Team_imageVulnerabilityHistory(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue - } - - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) - case "vulnerabilityFixHistory": - field := field - - innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Team_vulnerabilityFixHistory(ctx, field, obj) - if res == graphql.Null { - atomic.AddUint32(&fs.Invalids, 1) - } - return res - } - - if field.Deferrable != nil { - dfs, ok := deferred[field.Deferrable.Label] - di := 0 - if ok { - dfs.AddField(field) - di = len(dfs.Values) - 1 - } else { - dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) - deferred[field.Deferrable.Label] = dfs - } - dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { - return innerFunc(ctx, dfs) - }) - - // don't run the out.Concurrently() call below - out.Values[i] = graphql.Null - continue - } - out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "vulnerabilitySummary": field := field diff --git a/internal/graph/gengql/vulnerability.generated.go b/internal/graph/gengql/vulnerability.generated.go index 5681bf3b9..5d8ca95e7 100644 --- a/internal/graph/gengql/vulnerability.generated.go +++ b/internal/graph/gengql/vulnerability.generated.go @@ -1588,93 +1588,6 @@ func (ec *executionContext) fieldContext_ImageVulnerabilityFacets_packageTypes(_ return fc, nil } -func (ec *executionContext) _ImageVulnerabilityHistory_samples(ctx context.Context, field graphql.CollectedField, obj *vulnerability.ImageVulnerabilityHistory) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_ImageVulnerabilityHistory_samples(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.Samples, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v []*vulnerability.ImageVulnerabilitySample) graphql.Marshaler { - return ec.marshalNImageVulnerabilitySample2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySampleᚄ(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_ImageVulnerabilityHistory_samples(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "ImageVulnerabilityHistory", - Field: field, - IsMethod: false, - IsResolver: false, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_ImageVulnerabilitySample(ctx, field) - }, - } - return fc, nil -} - -func (ec *executionContext) _ImageVulnerabilitySample_summary(ctx context.Context, field graphql.CollectedField, obj *vulnerability.ImageVulnerabilitySample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_ImageVulnerabilitySample_summary(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.Summary, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilitySummary) graphql.Marshaler { - return ec.marshalNImageVulnerabilitySummary2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySummary(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_ImageVulnerabilitySample_summary(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "ImageVulnerabilitySample", - Field: field, - IsMethod: false, - IsResolver: false, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_ImageVulnerabilitySummary(ctx, field) - }, - } - return fc, nil -} - -func (ec *executionContext) _ImageVulnerabilitySample_date(ctx context.Context, field graphql.CollectedField, obj *vulnerability.ImageVulnerabilitySample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_ImageVulnerabilitySample_date(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.Date, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v time.Time) graphql.Marshaler { - return ec.marshalNTime2timeᚐTime(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_ImageVulnerabilitySample_date(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - return graphql.NewScalarFieldContext("ImageVulnerabilitySample", field, false, false, errors.New("field of type Time does not have child fields")) -} - func (ec *executionContext) _ImageVulnerabilitySummary_total(ctx context.Context, field graphql.CollectedField, obj *vulnerability.ImageVulnerabilitySummary) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3021,199 +2934,6 @@ func (ec *executionContext) fieldContext_VulnerabilityActivityLogEntryData_newSu return fc, nil } -func (ec *executionContext) _VulnerabilityFixHistory_samples(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixHistory) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_VulnerabilityFixHistory_samples(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.Samples, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v []*vulnerability.VulnerabilityFixSample) graphql.Marshaler { - return ec.marshalNVulnerabilityFixSample2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixSampleᚄ(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_VulnerabilityFixHistory_samples(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - fc = &graphql.FieldContext{ - Object: "VulnerabilityFixHistory", - Field: field, - IsMethod: false, - IsResolver: false, - Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.childFields_VulnerabilityFixSample(ctx, field) - }, - } - return fc, nil -} - -func (ec *executionContext) _VulnerabilityFixSample_severity(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_VulnerabilityFixSample_severity(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.Severity, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v vulnerability.ImageVulnerabilitySeverity) graphql.Marshaler { - return ec.marshalNImageVulnerabilitySeverity2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySeverity(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_VulnerabilityFixSample_severity(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type ImageVulnerabilitySeverity does not have child fields")) -} - -func (ec *executionContext) _VulnerabilityFixSample_date(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_VulnerabilityFixSample_date(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.Date, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v time.Time) graphql.Marshaler { - return ec.marshalNTime2timeᚐTime(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_VulnerabilityFixSample_date(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Time does not have child fields")) -} - -func (ec *executionContext) _VulnerabilityFixSample_days(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_VulnerabilityFixSample_days(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.Days, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v int) graphql.Marshaler { - return ec.marshalNInt2int(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_VulnerabilityFixSample_days(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Int does not have child fields")) -} - -func (ec *executionContext) _VulnerabilityFixSample_fixedCount(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_VulnerabilityFixSample_fixedCount(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.FixedCount, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v int) graphql.Marshaler { - return ec.marshalNInt2int(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_VulnerabilityFixSample_fixedCount(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Int does not have child fields")) -} - -func (ec *executionContext) _VulnerabilityFixSample_firstFixedAt(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_VulnerabilityFixSample_firstFixedAt(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.FirstFixedAt, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *time.Time) graphql.Marshaler { - return ec.marshalOTime2ᚖtimeᚐTime(ctx, selections, v) - }, - true, - false, - ) -} -func (ec *executionContext) fieldContext_VulnerabilityFixSample_firstFixedAt(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Time does not have child fields")) -} - -func (ec *executionContext) _VulnerabilityFixSample_lastFixedAt(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_VulnerabilityFixSample_lastFixedAt(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.LastFixedAt, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v *time.Time) graphql.Marshaler { - return ec.marshalOTime2ᚖtimeᚐTime(ctx, selections, v) - }, - true, - false, - ) -} -func (ec *executionContext) fieldContext_VulnerabilityFixSample_lastFixedAt(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Time does not have child fields")) -} - -func (ec *executionContext) _VulnerabilityFixSample_totalWorkloads(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { - return graphql.ResolveField( - ctx, - ec.OperationContext, - field, - func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { - return ec.fieldContext_VulnerabilityFixSample_totalWorkloads(ctx, field) - }, - func(ctx context.Context) (any, error) { - return obj.TotalWorkloads, nil - }, - nil, - func(ctx context.Context, selections ast.SelectionSet, v int) graphql.Marshaler { - return ec.marshalNInt2int(ctx, selections, v) - }, - true, - true, - ) -} -func (ec *executionContext) fieldContext_VulnerabilityFixSample_totalWorkloads(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { - return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Int does not have child fields")) -} - func (ec *executionContext) _VulnerabilityRemediation_fixVersion(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityRemediation) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5412,89 +5132,6 @@ func (ec *executionContext) _ImageVulnerabilityFacets(ctx context.Context, sel a return out } -var imageVulnerabilityHistoryImplementors = []string{"ImageVulnerabilityHistory"} - -func (ec *executionContext) _ImageVulnerabilityHistory(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, imageVulnerabilityHistoryImplementors) - - out := graphql.NewFieldSet(fields) - deferred := make(map[string]*graphql.FieldSet) - for i, field := range fields { - switch field.Name { - case "__typename": - out.Values[i] = graphql.MarshalString("ImageVulnerabilityHistory") - case "samples": - out.Values[i] = ec._ImageVulnerabilityHistory_samples(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - default: - panic("unknown field " + strconv.Quote(field.Name)) - } - } - out.Dispatch(ctx) - if out.Invalids > 0 { - return graphql.Null - } - - atomic.AddInt32(&ec.Deferred, int32(min(len(deferred), math.MaxInt32))) - - for label, dfs := range deferred { - ec.ProcessDeferredGroup(graphql.DeferredGroup{ - Label: label, - Path: graphql.GetPath(ctx), - FieldSet: dfs, - Context: ctx, - }) - } - - return out -} - -var imageVulnerabilitySampleImplementors = []string{"ImageVulnerabilitySample"} - -func (ec *executionContext) _ImageVulnerabilitySample(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.ImageVulnerabilitySample) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, imageVulnerabilitySampleImplementors) - - out := graphql.NewFieldSet(fields) - deferred := make(map[string]*graphql.FieldSet) - for i, field := range fields { - switch field.Name { - case "__typename": - out.Values[i] = graphql.MarshalString("ImageVulnerabilitySample") - case "summary": - out.Values[i] = ec._ImageVulnerabilitySample_summary(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "date": - out.Values[i] = ec._ImageVulnerabilitySample_date(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - default: - panic("unknown field " + strconv.Quote(field.Name)) - } - } - out.Dispatch(ctx) - if out.Invalids > 0 { - return graphql.Null - } - - atomic.AddInt32(&ec.Deferred, int32(min(len(deferred), math.MaxInt32))) - - for label, dfs := range deferred { - ec.ProcessDeferredGroup(graphql.DeferredGroup{ - Label: label, - Path: graphql.GetPath(ctx), - FieldSet: dfs, - Context: ctx, - }) - } - - return out -} - var imageVulnerabilitySummaryImplementors = []string{"ImageVulnerabilitySummary"} func (ec *executionContext) _ImageVulnerabilitySummary(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.ImageVulnerabilitySummary) graphql.Marshaler { @@ -6052,108 +5689,6 @@ func (ec *executionContext) _VulnerabilityActivityLogEntryData(ctx context.Conte return out } -var vulnerabilityFixHistoryImplementors = []string{"VulnerabilityFixHistory"} - -func (ec *executionContext) _VulnerabilityFixHistory(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, vulnerabilityFixHistoryImplementors) - - out := graphql.NewFieldSet(fields) - deferred := make(map[string]*graphql.FieldSet) - for i, field := range fields { - switch field.Name { - case "__typename": - out.Values[i] = graphql.MarshalString("VulnerabilityFixHistory") - case "samples": - out.Values[i] = ec._VulnerabilityFixHistory_samples(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - default: - panic("unknown field " + strconv.Quote(field.Name)) - } - } - out.Dispatch(ctx) - if out.Invalids > 0 { - return graphql.Null - } - - atomic.AddInt32(&ec.Deferred, int32(min(len(deferred), math.MaxInt32))) - - for label, dfs := range deferred { - ec.ProcessDeferredGroup(graphql.DeferredGroup{ - Label: label, - Path: graphql.GetPath(ctx), - FieldSet: dfs, - Context: ctx, - }) - } - - return out -} - -var vulnerabilityFixSampleImplementors = []string{"VulnerabilityFixSample"} - -func (ec *executionContext) _VulnerabilityFixSample(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.VulnerabilityFixSample) graphql.Marshaler { - fields := graphql.CollectFields(ec.OperationContext, sel, vulnerabilityFixSampleImplementors) - - out := graphql.NewFieldSet(fields) - deferred := make(map[string]*graphql.FieldSet) - for i, field := range fields { - switch field.Name { - case "__typename": - out.Values[i] = graphql.MarshalString("VulnerabilityFixSample") - case "severity": - out.Values[i] = ec._VulnerabilityFixSample_severity(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "date": - out.Values[i] = ec._VulnerabilityFixSample_date(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "days": - out.Values[i] = ec._VulnerabilityFixSample_days(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "fixedCount": - out.Values[i] = ec._VulnerabilityFixSample_fixedCount(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - case "firstFixedAt": - out.Values[i] = ec._VulnerabilityFixSample_firstFixedAt(ctx, field, obj) - case "lastFixedAt": - out.Values[i] = ec._VulnerabilityFixSample_lastFixedAt(ctx, field, obj) - case "totalWorkloads": - out.Values[i] = ec._VulnerabilityFixSample_totalWorkloads(ctx, field, obj) - if out.Values[i] == graphql.Null { - out.Invalids++ - } - default: - panic("unknown field " + strconv.Quote(field.Name)) - } - } - out.Dispatch(ctx) - if out.Invalids > 0 { - return graphql.Null - } - - atomic.AddInt32(&ec.Deferred, int32(min(len(deferred), math.MaxInt32))) - - for label, dfs := range deferred { - ec.ProcessDeferredGroup(graphql.DeferredGroup{ - Label: label, - Path: graphql.GetPath(ctx), - FieldSet: dfs, - Context: ctx, - }) - } - - return out -} - var vulnerabilityRemediationImplementors = []string{"VulnerabilityRemediation"} func (ec *executionContext) _VulnerabilityRemediation(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.VulnerabilityRemediation) graphql.Marshaler { @@ -6876,20 +6411,6 @@ func (ec *executionContext) marshalNImageVulnerabilityEdge2ᚕgithubᚗcomᚋnai return ret } -func (ec *executionContext) marshalNImageVulnerabilityHistory2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx context.Context, sel ast.SelectionSet, v vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { - return ec._ImageVulnerabilityHistory(ctx, sel, &v) -} - -func (ec *executionContext) marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx context.Context, sel ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { - if v == nil { - if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { - graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") - } - return graphql.Null - } - return ec._ImageVulnerabilityHistory(ctx, sel, v) -} - func (ec *executionContext) unmarshalNImageVulnerabilityOrderField2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityOrderField(ctx context.Context, v any) (vulnerability.ImageVulnerabilityOrderField, error) { var res vulnerability.ImageVulnerabilityOrderField err := res.UnmarshalGQL(v) @@ -6900,32 +6421,6 @@ func (ec *executionContext) marshalNImageVulnerabilityOrderField2githubᚗcomᚋ return v } -func (ec *executionContext) marshalNImageVulnerabilitySample2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySampleᚄ(ctx context.Context, sel ast.SelectionSet, v []*vulnerability.ImageVulnerabilitySample) graphql.Marshaler { - ret := graphql.MarshalSliceConcurrently(ctx, len(v), 0, false, func(ctx context.Context, i int) graphql.Marshaler { - fc := graphql.GetFieldContext(ctx) - fc.Result = &v[i] - return ec.marshalNImageVulnerabilitySample2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySample(ctx, sel, v[i]) - }) - - for _, e := range ret { - if e == graphql.Null { - return graphql.Null - } - } - - return ret -} - -func (ec *executionContext) marshalNImageVulnerabilitySample2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySample(ctx context.Context, sel ast.SelectionSet, v *vulnerability.ImageVulnerabilitySample) graphql.Marshaler { - if v == nil { - if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { - graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") - } - return graphql.Null - } - return ec._ImageVulnerabilitySample(ctx, sel, v) -} - func (ec *executionContext) unmarshalNImageVulnerabilitySeverity2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySeverity(ctx context.Context, v any) (vulnerability.ImageVulnerabilitySeverity, error) { var res vulnerability.ImageVulnerabilitySeverity err := res.UnmarshalGQL(v) @@ -7041,46 +6536,6 @@ func (ec *executionContext) marshalNVulnerabilityActivityLogEntryData2ᚖgithub return ec._VulnerabilityActivityLogEntryData(ctx, sel, v) } -func (ec *executionContext) marshalNVulnerabilityFixHistory2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx context.Context, sel ast.SelectionSet, v vulnerability.VulnerabilityFixHistory) graphql.Marshaler { - return ec._VulnerabilityFixHistory(ctx, sel, &v) -} - -func (ec *executionContext) marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx context.Context, sel ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { - if v == nil { - if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { - graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") - } - return graphql.Null - } - return ec._VulnerabilityFixHistory(ctx, sel, v) -} - -func (ec *executionContext) marshalNVulnerabilityFixSample2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixSampleᚄ(ctx context.Context, sel ast.SelectionSet, v []*vulnerability.VulnerabilityFixSample) graphql.Marshaler { - ret := graphql.MarshalSliceConcurrently(ctx, len(v), 0, false, func(ctx context.Context, i int) graphql.Marshaler { - fc := graphql.GetFieldContext(ctx) - fc.Result = &v[i] - return ec.marshalNVulnerabilityFixSample2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixSample(ctx, sel, v[i]) - }) - - for _, e := range ret { - if e == graphql.Null { - return graphql.Null - } - } - - return ret -} - -func (ec *executionContext) marshalNVulnerabilityFixSample2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixSample(ctx context.Context, sel ast.SelectionSet, v *vulnerability.VulnerabilityFixSample) graphql.Marshaler { - if v == nil { - if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { - graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") - } - return graphql.Null - } - return ec._VulnerabilityFixSample(ctx, sel, v) -} - func (ec *executionContext) marshalNVulnerabilityRemediation2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityRemediation(ctx context.Context, sel ast.SelectionSet, v vulnerability.VulnerabilityRemediation) graphql.Marshaler { return ec._VulnerabilityRemediation(ctx, sel, &v) } diff --git a/internal/graph/schema/vulnerability.graphqls b/internal/graph/schema/vulnerability.graphqls index b1fa8960a..f2a438142 100644 --- a/internal/graph/schema/vulnerability.graphqls +++ b/internal/graph/schema/vulnerability.graphqls @@ -7,12 +7,6 @@ extend type Mutation { } extend type Query { - "Get the vulnerability summary history for all teams." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - "Get the vulnerability summary for the tenant." vulnerabilitySummary( "Filter the aggregate." @@ -40,9 +34,6 @@ extend type Query { orderBy: VulnerabilitySummaryOrder ): WorkloadVulnerabilitySummaryConnection! - "Get the mean time to fix history for all teams." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! - "Get a specific CVE by its identifier." cve(identifier: String!): CVE! @@ -99,17 +90,6 @@ enum CVEOrderField { PRIORITY } -extend interface Workload { - "Get the vulnerability summary history for workload." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - - "Get the mean time to fix history for a workload." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! -} - extend enum TeamOrderField { "The accumulated risk score of the teams workloads." RISK_SCORE @@ -129,44 +109,6 @@ extend enum TeamOrderField { KNOWN_EXPLOITED_VULNERABILITIES } -extend type Application { - "Get the vulnerability summary history for application." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - - "Get the mean time to fix history for an application." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! -} - -extend type Job { - "Get the vulnerability summary history for job." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - - "Get the mean time to fix history for a job." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! -} - -extend type Team { - "Get the vulnerability summary history for team." - imageVulnerabilityHistory( - "Get vulnerability summary from given date until today." - from: Date! - ): ImageVulnerabilityHistory! - - "Get the mean time to fix history for a team." - vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! -} - -type ImageVulnerabilityHistory { - "Vulnerability summary samples." - samples: [ImageVulnerabilitySample!]! -} - """ SBOM metadata for a container image, including pipeline status and processing information. This type is accessed through ContainerImage.sbom. @@ -478,14 +420,6 @@ type ImageVulnerabilityFacets { packageTypes: [StringFacetItem!]! } -type ImageVulnerabilitySample { - "The historic image vulnerability summary" - summary: ImageVulnerabilitySummary! - - "Timestamp of the vulnerability summary." - date: Time! -} - type ContainerImageWorkloadReferenceConnection { "Information to aid in pagination." pageInfo: PageInfo! @@ -1157,36 +1091,6 @@ extend enum ActivityLogActivityType { VULNERABILITY_UPDATED } -"Trend of mean time to fix vulnerabilities grouped by severity." -type VulnerabilityFixHistory { - "Mean time to fix samples." - samples: [VulnerabilityFixSample!]! -} - -"One MTTR sample for a severity at a point in time." -type VulnerabilityFixSample { - "Severity of vulnerabilities in this sample." - severity: ImageVulnerabilitySeverity! - - "Snapshot date of the sample." - date: Time! - - "Mean time to fix in days." - days: Int! - - "Number of vulnerabilities fixed in this sample." - fixedCount: Int! - - "Earliest time a vulnerability was fixed in this sample." - firstFixedAt: Time - - "Latest time a vulnerability was fixed in this sample." - lastFixedAt: Time - - "Total number of workloads with this severity of vulnerabilities." - totalWorkloads: Int! -} - "The SBOM pipeline status for an image or workload." enum SBOMStatus { "SBOM generation is in progress." diff --git a/internal/graph/vulnerability.resolvers.go b/internal/graph/vulnerability.resolvers.go index b9487c4d2..2068bd432 100644 --- a/internal/graph/vulnerability.resolvers.go +++ b/internal/graph/vulnerability.resolvers.go @@ -8,23 +8,12 @@ import ( "github.com/nais/api/internal/environmentmapper" "github.com/nais/api/internal/graph/gengql" "github.com/nais/api/internal/graph/pagination" - "github.com/nais/api/internal/graph/scalar" "github.com/nais/api/internal/slug" "github.com/nais/api/internal/team" "github.com/nais/api/internal/vulnerability" "github.com/nais/api/internal/workload" - "github.com/nais/api/internal/workload/application" - "github.com/nais/api/internal/workload/job" ) -func (r *applicationResolver) ImageVulnerabilityHistory(ctx context.Context, obj *application.Application, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) { - return vulnerability.GetWorkloadVulnerabilityHistoryForWorkload(ctx, obj, from.Time()) -} - -func (r *applicationResolver) VulnerabilityFixHistory(ctx context.Context, obj *application.Application, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) { - return vulnerability.GetVulnerabilityMeanTimeToFixHistoryForWorkload(ctx, obj, from.Time()) -} - func (r *cVEResolver) Workloads(ctx context.Context, obj *vulnerability.CVE, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *vulnerability.CVEWorkloadsFilter, orderBy *vulnerability.CVEWorkloadOrder) (*vulnerability.WorkloadWithVulnerabilityConnection, error) { if obj.AffectedWorkloads != nil && (filter == nil || (len(filter.TeamSlugs) == 0 && filter.TeamScope == nil && filter.EnvironmentName == nil)) && onlyAsksForPageInfoTotalCount(ctx) { return &vulnerability.WorkloadWithVulnerabilityConnection{ @@ -82,14 +71,6 @@ func (r *containerImageWorkloadReferenceResolver) Workload(ctx context.Context, return getWorkload(ctx, obj.Reference, obj.TeamSlug, environmentmapper.EnvironmentName(obj.EnvironmentName)) } -func (r *jobResolver) ImageVulnerabilityHistory(ctx context.Context, obj *job.Job, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) { - return vulnerability.GetWorkloadVulnerabilityHistoryForWorkload(ctx, obj, from.Time()) -} - -func (r *jobResolver) VulnerabilityFixHistory(ctx context.Context, obj *job.Job, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) { - return vulnerability.GetVulnerabilityMeanTimeToFixHistoryForWorkload(ctx, obj, from.Time()) -} - func (r *mutationResolver) UpdateImageVulnerability(ctx context.Context, input vulnerability.UpdateImageVulnerabilityInput) (*vulnerability.UpdateImageVulnerabilityPayload, error) { vulnWorkloads, err := vulnerability.ListWorkloadsForVulnerabilityByID(ctx, input.VulnerabilityID.ID) if err != nil { @@ -111,10 +92,6 @@ func (r *mutationResolver) UpdateImageVulnerability(ctx context.Context, input v return vulnerability.UpdateImageVulnerability(ctx, input) } -func (r *queryResolver) ImageVulnerabilityHistory(ctx context.Context, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) { - return vulnerability.GetWorkloadVulnerabilityHistoryForTenant(ctx, from.Time()) -} - func (r *queryResolver) VulnerabilitySummary(ctx context.Context, filter *vulnerability.TenantVulnerabilitySummaryFilter) (*vulnerability.TenantVulnerabilitySummary, error) { return vulnerability.GetTenantVulnerabilitySummary(ctx, filter) } @@ -128,10 +105,6 @@ func (r *queryResolver) VulnerabilitySummaries(ctx context.Context, first *int, return vulnerability.ListTenantVulnerabilitySummaries(ctx, filter, page, orderBy) } -func (r *queryResolver) VulnerabilityFixHistory(ctx context.Context, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) { - return vulnerability.GetVulnerabilityMeanTimeToFixHistory(ctx, from.Time()) -} - func (r *queryResolver) CVE(ctx context.Context, identifier string) (*vulnerability.CVE, error) { return vulnerability.GetCVE(ctx, identifier) } @@ -145,14 +118,6 @@ func (r *queryResolver) Cves(ctx context.Context, first *int, after *pagination. return vulnerability.ListCVEs(ctx, page, orderBy, filter) } -func (r *teamResolver) ImageVulnerabilityHistory(ctx context.Context, obj *team.Team, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) { - return vulnerability.GetWorkloadVulnerabilityHistoryForTeam(ctx, obj.Slug, from.Time()) -} - -func (r *teamResolver) VulnerabilityFixHistory(ctx context.Context, obj *team.Team, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) { - return vulnerability.GetVulnerabilityMeanTimeToFixHistoryForTeam(ctx, obj.Slug, from.Time()) -} - func (r *teamResolver) VulnerabilitySummary(ctx context.Context, obj *team.Team, filter *vulnerability.TeamVulnerabilitySummaryFilter) (*vulnerability.TeamVulnerabilitySummary, error) { return vulnerability.GetVulnerabilitySummary(ctx, obj.Slug, filter) } diff --git a/internal/vulnerability/models.go b/internal/vulnerability/models.go index ce0ab610e..000ed9888 100644 --- a/internal/vulnerability/models.go +++ b/internal/vulnerability/models.go @@ -540,15 +540,6 @@ type TenantVulnerabilitySummaryFilter struct { HasKevEntry *bool `json:"hasKevEntry,omitempty"` } -type ImageVulnerabilitySample struct { - Summary *ImageVulnerabilitySummary `json:"summary"` - Date time.Time `json:"date"` -} - -type ImageVulnerabilityHistory struct { - Samples []*ImageVulnerabilitySample `json:"samples"` -} - type TenantVulnerabilitySummary struct { RiskScore int `json:"riskScore"` CountsBySeverity ImageVulnerabilitySummaryCountsBySeverity `json:"countsBySeverity"` @@ -563,20 +554,6 @@ type TenantVulnerabilitySummary struct { LastUpdated *time.Time `json:"lastUpdated"` } -type VulnerabilityFixHistory struct { - Samples []*VulnerabilityFixSample `json:"samples"` -} - -type VulnerabilityFixSample struct { - Severity ImageVulnerabilitySeverity `json:"severity"` - Date time.Time `json:"date"` - Days int `json:"days"` - FixedCount int `json:"fixedCount"` - FirstFixedAt *time.Time `json:"firstFixedAt,omitempty"` - LastFixedAt *time.Time `json:"lastFixedAt,omitempty"` - TotalWorkloads int `json:"totalWorkloads"` -} - type CVEPriority string const ( diff --git a/internal/vulnerability/queries.go b/internal/vulnerability/queries.go index 04709d125..e7987a543 100644 --- a/internal/vulnerability/queries.go +++ b/internal/vulnerability/queries.go @@ -5,7 +5,6 @@ import ( "fmt" "math" "slices" - "sort" "strings" "time" @@ -589,23 +588,6 @@ func GetImageVulnerabilitySummary(ctx context.Context, ref string) (*ImageVulner }, nil } -func GetWorkloadVulnerabilityHistoryForTeam(ctx context.Context, slug slug.Slug, from time.Time) (*ImageVulnerabilityHistory, error) { - if from.Before(time.Now().AddDate(-1, 0, 0)) { - return nil, apierror.Errorf("`from` cannot be older than 1 year") - } - if from.After(time.Now()) { - return nil, apierror.Errorf("`from` cannot be in the future") - } - - since := normalizeFromDate(from) - - opts := []vulnerabilities.Option{} - opts = append(opts, vulnerabilities.Since(since)) - opts = append(opts, vulnerabilities.NamespaceFilter(slug.String())) - - return getVulnerabilityHistory(ctx, opts) -} - func teamSlugsFilterOption(teams []slug.Slug) vulnerabilities.Option { namespaces := make([]string, len(teams)) for i, team := range teams { @@ -675,103 +657,6 @@ func GetTenantVulnerabilitySummary(ctx context.Context, filter *TenantVulnerabil }, nil } -func GetWorkloadVulnerabilityHistoryForTenant(ctx context.Context, from time.Time) (*ImageVulnerabilityHistory, error) { - if from.Before(time.Now().AddDate(-1, 0, 0)) { - return nil, apierror.Errorf("`from` cannot be older than 1 year") - } - if from.After(time.Now()) { - return nil, apierror.Errorf("`from` cannot be in the future") - } - - since := normalizeFromDate(from) - - opts := []vulnerabilities.Option{} - opts = append(opts, vulnerabilities.Since(since)) - - return getVulnerabilityHistory(ctx, opts) -} - -func GetWorkloadVulnerabilityHistoryForWorkload(ctx context.Context, obj workload.Workload, from time.Time) (*ImageVulnerabilityHistory, error) { - var workloadType string - switch obj.GetType() { - case workload.TypeApplication: - workloadType = "app" - case workload.TypeJob: - workloadType = "job" - default: - return nil, apierror.Errorf("invalid workload type") - } - - if from.Before(time.Now().AddDate(-1, 0, 0)) { - return nil, apierror.Errorf("`from` cannot be older than 1 year") - } - if from.After(time.Now()) { - return nil, apierror.Errorf("`from` cannot be in the future") - } - - since := normalizeFromDate(from) - - opts := []vulnerabilities.Option{} - opts = append(opts, vulnerabilities.Since(since)) - opts = append(opts, vulnerabilities.ClusterFilter(environmentmapper.ClusterName(obj.GetEnvironmentName()))) - opts = append(opts, vulnerabilities.NamespaceFilter(obj.GetTeamSlug().String())) - opts = append(opts, vulnerabilities.WorkloadFilter(obj.GetName())) - opts = append(opts, vulnerabilities.WorkloadTypeFilter(workloadType)) - - return getVulnerabilityHistory(ctx, opts) -} - -// TODO: this is a hack to get the correct date for the vulnerability history. Probably timezone related. -func normalizeFromDate(from time.Time) time.Time { - return time.Date(from.Year(), from.Month(), from.Day(), 2, 0, 0, 0, time.UTC) -} - -func getVulnerabilityHistory(ctx context.Context, opts []vulnerabilities.Option) (*ImageVulnerabilityHistory, error) { - resp, err := fromContext(ctx).manager.Client.GetVulnerabilitySummaryTimeSeries(ctx, opts...) - if err != nil { - return nil, apierror.Errorf("get vulnerability history: %v", err) - } - - samples := make([]*ImageVulnerabilitySample, 0) - - for _, point := range resp.GetPoints() { - samples = append(samples, &ImageVulnerabilitySample{ - Summary: &ImageVulnerabilitySummary{ - Critical: int(point.GetCritical()), - High: int(point.GetHigh()), - Medium: int(point.GetMedium()), - Low: int(point.GetLow()), - Unassigned: int(point.GetUnassigned()), - Total: int(point.GetTotal()), - RiskScore: int(point.GetRiskScore()), - CountsBySeverity: ImageVulnerabilitySummaryCountsBySeverity{ - Critical: int(point.GetCritical()), - High: int(point.GetHigh()), - Medium: int(point.GetMedium()), - Low: int(point.GetLow()), - Unassigned: int(point.GetUnassigned()), - }, - CountsByPriority: ImageVulnerabilitySummaryCountsByPriority{ - Urgent: 0, - KnownExploited: int(point.GetKevCount()), - HighRisk: int(point.GetHighRisk()), - ElevatedRisk: int(point.GetElevatedRisk()), - Monitor: int(point.GetMonitor()), - }, - }, - Date: point.GetBucketTime().AsTime(), - }) - } - - sort.Slice(samples, func(i, j int) bool { - return samples[i].Date.After(samples[j].Date) - }) - - return &ImageVulnerabilityHistory{ - Samples: samples, - }, nil -} - func GetVulnerabilitySummary(ctx context.Context, s slug.Slug, filter *TeamVulnerabilitySummaryFilter) (*TeamVulnerabilitySummary, error) { opts, err := teamSummaryFilterOptions(filter) if err != nil { @@ -819,54 +704,6 @@ func GetVulnerabilitySummary(ctx context.Context, s slug.Slug, filter *TeamVulne }, nil } -func GetVulnerabilityMeanTimeToFixHistoryForWorkload(ctx context.Context, obj workload.Workload, from time.Time) (*VulnerabilityFixHistory, error) { - workloadType, err := getWorkloadType(obj.GetType()) - if err != nil { - return nil, err - } - - if from.Before(time.Now().AddDate(-1, 0, 0)) { - return nil, apierror.Errorf("`from` cannot be older than 1 year") - } - if from.After(time.Now()) { - return nil, apierror.Errorf("`from` cannot be in the future") - } - - since := normalizeFromDate(from) - opts := []vulnerabilities.Option{ - vulnerabilities.Since(since), - vulnerabilities.ClusterFilter(environmentmapper.ClusterName(obj.GetEnvironmentName())), - vulnerabilities.NamespaceFilter(obj.GetTeamSlug().String()), - vulnerabilities.WorkloadFilter(obj.GetName()), - vulnerabilities.WorkloadTypeFilter(workloadType), - } - - return getVulnerabilityMeanTimeToFixHistory(ctx, opts) -} - -func GetVulnerabilityMeanTimeToFixHistoryForTeam(ctx context.Context, slug slug.Slug, from time.Time) (*VulnerabilityFixHistory, error) { - if from.Before(time.Now().AddDate(-1, 0, 0)) { - return nil, apierror.Errorf("`from` cannot be older than 1 year") - } - if from.After(time.Now()) { - return nil, apierror.Errorf("`from` cannot be in the future") - } - - since := normalizeFromDate(from) - - opts := []vulnerabilities.Option{} - opts = append(opts, vulnerabilities.Since(since)) - opts = append(opts, vulnerabilities.NamespaceFilter(slug.String())) - - return getVulnerabilityMeanTimeToFixHistory(ctx, opts) -} - -func GetVulnerabilityMeanTimeToFixHistory(ctx context.Context, from time.Time) (*VulnerabilityFixHistory, error) { - var opts []vulnerabilities.Option - opts = append(opts, vulnerabilities.Since(from)) - return getVulnerabilityMeanTimeToFixHistory(ctx, opts) -} - func GetCVE(ctx context.Context, cve string) (*CVE, error) { vuln, err := fromContext(ctx).manager.Client.GetCve(ctx, cve) if err != nil { @@ -1087,63 +924,6 @@ func getCVEByIdent(ctx context.Context, id ident.Ident) (*CVE, error) { return GetCVE(ctx, cveID) } -func getVulnerabilityMeanTimeToFixHistory(ctx context.Context, opts []vulnerabilities.Option) (*VulnerabilityFixHistory, error) { - resp, err := fromContext(ctx).manager.Client.ListMeanTimeToFixTrendBySeverity(ctx, opts...) - if err != nil { - return nil, apierror.Errorf("list mean time to fix trend by severity: %v", err) - } - - samples := make([]*VulnerabilityFixSample, 0, len(resp.GetPoints())) - for _, point := range resp.GetPoints() { - firstFixedAt := point.GetFirstFixedAt().AsTime() - lastFixedAt := point.GetLastFixedAt().AsTime() - sample := &VulnerabilityFixSample{ - Severity: parseSeverity(point.Severity), - Date: point.SnapshotDate.AsTime(), - Days: int(point.GetMeanTimeToFixDays()), - FixedCount: int(point.FixedCount), - FirstFixedAt: &firstFixedAt, - LastFixedAt: &lastFixedAt, - TotalWorkloads: int(point.WorkloadCount), - } - samples = append(samples, sample) - } - - sort.Slice(samples, func(i, j int) bool { - return samples[i].Date.After(samples[j].Date) - }) - - return &VulnerabilityFixHistory{ - Samples: samples, - }, nil -} - -func getWorkloadType(workloadType workload.Type) (string, error) { - switch workloadType { - case workload.TypeApplication: - return "app", nil - case workload.TypeJob: - return "job", nil - default: - return "", apierror.Errorf("invalid workload type: %s", workloadType) - } -} - -func parseSeverity(s vulnerabilities.Severity) ImageVulnerabilitySeverity { - switch s { - case vulnerabilities.Severity_CRITICAL: - return ImageVulnerabilitySeverityCritical - case vulnerabilities.Severity_HIGH: - return ImageVulnerabilitySeverityHigh - case vulnerabilities.Severity_MEDIUM: - return ImageVulnerabilitySeverityMedium - case vulnerabilities.Severity_LOW: - return ImageVulnerabilitySeverityLow - default: - return ImageVulnerabilitySeverityUnassigned - } -} - func getVulnerabilityByIdent(ctx context.Context, id ident.Ident) (*ImageVulnerability, error) { resp, err := fromContext(ctx).manager.Client.GetVulnerabilityById(ctx, id.ID) if err != nil { From 9aafd54b433357fe279a12b24fe77ff562836126 Mon Sep 17 00:00:00 2001 From: Youssef Bel Mekki <38552193+ybelMekk@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:56:40 +0100 Subject: [PATCH 2/3] refactor: deprecate vulnerability history and MTTF Keep existing GraphQL consumers working while usage is assessed. --- integration_tests/vulnerabilities.lua | 50 ++ .../graph/gengql/applications.generated.go | 192 ++++++ internal/graph/gengql/jobs.generated.go | 192 ++++++ internal/graph/gengql/root_.generated.go | 652 ++++++++++++++---- internal/graph/gengql/schema.generated.go | 162 +++++ internal/graph/gengql/teams.generated.go | 191 +++++ .../graph/gengql/vulnerability.generated.go | 545 +++++++++++++++ internal/graph/schema/vulnerability.graphqls | 126 ++++ internal/graph/vulnerability.resolvers.go | 35 + .../graph/vulnerability.resolvers_test.go | 22 + internal/vulnerability/models.go | 23 + internal/vulnerability/queries.go | 220 ++++++ 12 files changed, 2278 insertions(+), 132 deletions(-) diff --git a/integration_tests/vulnerabilities.lua b/integration_tests/vulnerabilities.lua index 3193c9ed3..e58a90b23 100644 --- a/integration_tests/vulnerabilities.lua +++ b/integration_tests/vulnerabilities.lua @@ -2,6 +2,56 @@ Helper.readK8sResources("k8s_resources/vulnerability") local team = Team.new("slug-1", "purpose", "#channel") local user = User.new("authenticated", "authenticated@example.com", "some-id") +Test.gql("List vulnerability history for image", function(t) + t.addHeader("x-user-email", user:email()) + t.query(string.format([[ + { + team(slug: "%s") { + environment(name: "%s") { + workload(name: "%s") { + imageVulnerabilityHistory(from: "%s") { + samples { + summary { + riskScore + total + critical + high + medium + low + unassigned + countsBySeverity { + critical + high + medium + low + unassigned + } + } + date + } + } + } + } + } + } + ]], team:slug(), "dev", "app-with-vulnerabilities", os.date("%Y-%m-%d"))) + + t.check { + data = { + team = { + environment = { + workload = { + imageVulnerabilityHistory = { samples = { + { date = NotNull(), summary = { total = NotNull(), riskScore = NotNull(), critical = NotNull(), high = NotNull(), medium = NotNull(), low = NotNull(), unassigned = NotNull(), countsBySeverity = { critical = NotNull(), high = NotNull(), medium = NotNull(), low = NotNull(), unassigned = NotNull() } } }, + } }, + }, + }, + }, + }, + } +end) + + Test.gql("List vulnerability summaries for team", function(t) t.addHeader("x-user-email", user:email()) t.query(string.format([[ diff --git a/internal/graph/gengql/applications.generated.go b/internal/graph/gengql/applications.generated.go index a37166c56..812f35494 100644 --- a/internal/graph/gengql/applications.generated.go +++ b/internal/graph/gengql/applications.generated.go @@ -19,6 +19,7 @@ import ( "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" + "github.com/nais/api/internal/graph/scalar" "github.com/nais/api/internal/issue" "github.com/nais/api/internal/kubernetes/event" "github.com/nais/api/internal/persistence/bigquery" @@ -32,6 +33,7 @@ import ( "github.com/nais/api/internal/slug" "github.com/nais/api/internal/team" "github.com/nais/api/internal/utilization" + "github.com/nais/api/internal/vulnerability" "github.com/nais/api/internal/workload" "github.com/nais/api/internal/workload/application" "github.com/nais/api/internal/workload/config" @@ -73,6 +75,8 @@ type ApplicationResolver interface { SQLInstances(ctx context.Context, obj *application.Application, orderBy *sqlinstance.SQLInstanceOrder) (*pagination.Connection[*sqlinstance.SQLInstance], error) Utilization(ctx context.Context, obj *application.Application) (*utilization.WorkloadUtilization, error) Valkeys(ctx context.Context, obj *application.Application, orderBy *valkey.ValkeyOrder) (*pagination.FacetableConnection[*valkey.Valkey, *valkey.ValkeyFilter], error) + ImageVulnerabilityHistory(ctx context.Context, obj *application.Application, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) + VulnerabilityFixHistory(ctx context.Context, obj *application.Application, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) Events(ctx context.Context, obj *application.Application, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) (*pagination.Connection[event.WorkloadEvent], error) } type ApplicationConnectionResolver interface { @@ -311,6 +315,20 @@ func (ec *executionContext) field_Application_events_args(ctx context.Context, r return args, nil } +func (ec *executionContext) field_Application_imageVulnerabilityHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { + var err error + args := map[string]any{} + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", + func(ctx context.Context, v any) (scalar.Date, error) { + return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) + }) + if err != nil { + return nil, err + } + args["from"] = arg0 + return args, nil +} + func (ec *executionContext) field_Application_instances_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -521,6 +539,20 @@ func (ec *executionContext) field_Application_valkeys_args(ctx context.Context, return args, nil } +func (ec *executionContext) field_Application_vulnerabilityFixHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { + var err error + args := map[string]any{} + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", + func(ctx context.Context, v any) (scalar.Date, error) { + return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) + }) + if err != nil { + return nil, err + } + args["from"] = arg0 + return args, nil +} + // endregion ***************************** args.gotpl ***************************** // region ************************** directives.gotpl ************************** @@ -1652,6 +1684,94 @@ func (ec *executionContext) fieldContext_Application_valkeys(ctx context.Context return fc, nil } +func (ec *executionContext) _Application_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField, obj *application.Application) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_Application_imageVulnerabilityHistory(ctx, field) + }, + func(ctx context.Context) (any, error) { + fc := graphql.GetFieldContext(ctx) + return ec.Resolvers.Application().ImageVulnerabilityHistory(ctx, obj, fc.Args["from"].(scalar.Date)) + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { + return ec.marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_Application_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Application", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_ImageVulnerabilityHistory(ctx, field) + }, + } + defer func() { + if r := recover(); r != nil { + err = ec.Recover(ctx, r) + ec.Error(ctx, err) + } + }() + ctx = graphql.WithFieldContext(ctx, fc) + if fc.Args, err = ec.field_Application_imageVulnerabilityHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { + ec.Error(ctx, err) + return fc, err + } + return fc, nil +} + +func (ec *executionContext) _Application_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField, obj *application.Application) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_Application_vulnerabilityFixHistory(ctx, field) + }, + func(ctx context.Context) (any, error) { + fc := graphql.GetFieldContext(ctx) + return ec.Resolvers.Application().VulnerabilityFixHistory(ctx, obj, fc.Args["from"].(scalar.Date)) + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { + return ec.marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_Application_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Application", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_VulnerabilityFixHistory(ctx, field) + }, + } + defer func() { + if r := recover(); r != nil { + err = ec.Recover(ctx, r) + ec.Error(ctx, err) + } + }() + ctx = graphql.WithFieldContext(ctx, fc) + if fc.Args, err = ec.field_Application_vulnerabilityFixHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { + ec.Error(ctx, err) + return fc, err + } + return fc, nil +} + func (ec *executionContext) _Application_events(ctx context.Context, field graphql.CollectedField, obj *application.Application) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5797,6 +5917,78 @@ func (ec *executionContext) _Application(ctx context.Context, sel ast.SelectionS continue } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + case "imageVulnerabilityHistory": + field := field + + innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Application_imageVulnerabilityHistory(ctx, field, obj) + if res == graphql.Null { + atomic.AddUint32(&fs.Invalids, 1) + } + return res + } + + if field.Deferrable != nil { + dfs, ok := deferred[field.Deferrable.Label] + di := 0 + if ok { + dfs.AddField(field) + di = len(dfs.Values) - 1 + } else { + dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) + deferred[field.Deferrable.Label] = dfs + } + dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { + return innerFunc(ctx, dfs) + }) + + // don't run the out.Concurrently() call below + out.Values[i] = graphql.Null + continue + } + + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + case "vulnerabilityFixHistory": + field := field + + innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Application_vulnerabilityFixHistory(ctx, field, obj) + if res == graphql.Null { + atomic.AddUint32(&fs.Invalids, 1) + } + return res + } + + if field.Deferrable != nil { + dfs, ok := deferred[field.Deferrable.Label] + di := 0 + if ok { + dfs.AddField(field) + di = len(dfs.Values) - 1 + } else { + dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) + deferred[field.Deferrable.Label] = dfs + } + dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { + return innerFunc(ctx, dfs) + }) + + // don't run the out.Concurrently() call below + out.Values[i] = graphql.Null + continue + } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "events": field := field diff --git a/internal/graph/gengql/jobs.generated.go b/internal/graph/gengql/jobs.generated.go index 5b823c513..cf1fe4018 100644 --- a/internal/graph/gengql/jobs.generated.go +++ b/internal/graph/gengql/jobs.generated.go @@ -19,6 +19,7 @@ import ( "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" + "github.com/nais/api/internal/graph/scalar" "github.com/nais/api/internal/issue" "github.com/nais/api/internal/kubernetes/event" "github.com/nais/api/internal/persistence/bigquery" @@ -31,6 +32,7 @@ import ( "github.com/nais/api/internal/serviceaccount" "github.com/nais/api/internal/slug" "github.com/nais/api/internal/team" + "github.com/nais/api/internal/vulnerability" "github.com/nais/api/internal/workload" "github.com/nais/api/internal/workload/config" "github.com/nais/api/internal/workload/job" @@ -74,6 +76,8 @@ type JobResolver interface { ServiceAccount(ctx context.Context, obj *job.Job) (*serviceaccount.ServiceAccount, error) SQLInstances(ctx context.Context, obj *job.Job, orderBy *sqlinstance.SQLInstanceOrder) (*pagination.Connection[*sqlinstance.SQLInstance], error) Valkeys(ctx context.Context, obj *job.Job, orderBy *valkey.ValkeyOrder) (*pagination.FacetableConnection[*valkey.Valkey, *valkey.ValkeyFilter], error) + ImageVulnerabilityHistory(ctx context.Context, obj *job.Job, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) + VulnerabilityFixHistory(ctx context.Context, obj *job.Job, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) Events(ctx context.Context, obj *job.Job, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) (*pagination.Connection[event.WorkloadEvent], error) } type JobConnectionResolver interface { @@ -328,6 +332,20 @@ func (ec *executionContext) field_Job_events_args(ctx context.Context, rawArgs m return args, nil } +func (ec *executionContext) field_Job_imageVulnerabilityHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { + var err error + args := map[string]any{} + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", + func(ctx context.Context, v any) (scalar.Date, error) { + return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) + }) + if err != nil { + return nil, err + } + args["from"] = arg0 + return args, nil +} + func (ec *executionContext) field_Job_issues_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -538,6 +556,20 @@ func (ec *executionContext) field_Job_valkeys_args(ctx context.Context, rawArgs return args, nil } +func (ec *executionContext) field_Job_vulnerabilityFixHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { + var err error + args := map[string]any{} + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", + func(ctx context.Context, v any) (scalar.Date, error) { + return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) + }) + if err != nil { + return nil, err + } + args["from"] = arg0 + return args, nil +} + // endregion ***************************** args.gotpl ***************************** // region ************************** directives.gotpl ************************** @@ -1683,6 +1715,94 @@ func (ec *executionContext) fieldContext_Job_valkeys(ctx context.Context, field return fc, nil } +func (ec *executionContext) _Job_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField, obj *job.Job) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_Job_imageVulnerabilityHistory(ctx, field) + }, + func(ctx context.Context) (any, error) { + fc := graphql.GetFieldContext(ctx) + return ec.Resolvers.Job().ImageVulnerabilityHistory(ctx, obj, fc.Args["from"].(scalar.Date)) + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { + return ec.marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_Job_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Job", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_ImageVulnerabilityHistory(ctx, field) + }, + } + defer func() { + if r := recover(); r != nil { + err = ec.Recover(ctx, r) + ec.Error(ctx, err) + } + }() + ctx = graphql.WithFieldContext(ctx, fc) + if fc.Args, err = ec.field_Job_imageVulnerabilityHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { + ec.Error(ctx, err) + return fc, err + } + return fc, nil +} + +func (ec *executionContext) _Job_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField, obj *job.Job) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_Job_vulnerabilityFixHistory(ctx, field) + }, + func(ctx context.Context) (any, error) { + fc := graphql.GetFieldContext(ctx) + return ec.Resolvers.Job().VulnerabilityFixHistory(ctx, obj, fc.Args["from"].(scalar.Date)) + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { + return ec.marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_Job_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Job", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_VulnerabilityFixHistory(ctx, field) + }, + } + defer func() { + if r := recover(); r != nil { + err = ec.Recover(ctx, r) + ec.Error(ctx, err) + } + }() + ctx = graphql.WithFieldContext(ctx, fc) + if fc.Args, err = ec.field_Job_vulnerabilityFixHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { + ec.Error(ctx, err) + return fc, err + } + return fc, nil +} + func (ec *executionContext) _Job_events(ctx context.Context, field graphql.CollectedField, obj *job.Job) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5885,6 +6005,78 @@ func (ec *executionContext) _Job(ctx context.Context, sel ast.SelectionSet, obj continue } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + case "imageVulnerabilityHistory": + field := field + + innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Job_imageVulnerabilityHistory(ctx, field, obj) + if res == graphql.Null { + atomic.AddUint32(&fs.Invalids, 1) + } + return res + } + + if field.Deferrable != nil { + dfs, ok := deferred[field.Deferrable.Label] + di := 0 + if ok { + dfs.AddField(field) + di = len(dfs.Values) - 1 + } else { + dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) + deferred[field.Deferrable.Label] = dfs + } + dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { + return innerFunc(ctx, dfs) + }) + + // don't run the out.Concurrently() call below + out.Values[i] = graphql.Null + continue + } + + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + case "vulnerabilityFixHistory": + field := field + + innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Job_vulnerabilityFixHistory(ctx, field, obj) + if res == graphql.Null { + atomic.AddUint32(&fs.Invalids, 1) + } + return res + } + + if field.Deferrable != nil { + dfs, ok := deferred[field.Deferrable.Label] + di := 0 + if ok { + dfs.AddField(field) + di = len(dfs.Values) - 1 + } else { + dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) + deferred[field.Deferrable.Label] = dfs + } + dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { + return innerFunc(ctx, dfs) + }) + + // don't run the out.Concurrently() call below + out.Values[i] = graphql.Null + continue + } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "events": field := field diff --git a/internal/graph/gengql/root_.generated.go b/internal/graph/gengql/root_.generated.go index 192c5a710..a7d308d12 100644 --- a/internal/graph/gengql/root_.generated.go +++ b/internal/graph/gengql/root_.generated.go @@ -247,39 +247,41 @@ type ComplexityRoot struct { } Application struct { - ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int - AuthIntegrations func(childComplexity int) int - BigQueryDatasets func(childComplexity int, orderBy *bigquery.BigQueryDatasetOrder) int - Buckets func(childComplexity int, orderBy *bucket.BucketOrder) int - Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Cost func(childComplexity int) int - DeletionStartedAt func(childComplexity int) int - Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Events func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) int - History func(childComplexity int) int - ID func(childComplexity int) int - Image func(childComplexity int) int - Ingresses func(childComplexity int) int - InstanceGroups func(childComplexity int) int - Instances func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) int - KafkaTopicAcls func(childComplexity int, orderBy *kafkatopic.KafkaTopicACLOrder) int - Labels func(childComplexity int) int - LogDestinations func(childComplexity int) int - Manifest func(childComplexity int) int - Name func(childComplexity int) int - NetworkPolicy func(childComplexity int) int - OpenSearch func(childComplexity int) int - Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Resources func(childComplexity int) int - SQLInstances func(childComplexity int, orderBy *sqlinstance.SQLInstanceOrder) int - Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - ServiceAccount func(childComplexity int) int - State func(childComplexity int) int - Team func(childComplexity int) int - TeamEnvironment func(childComplexity int) int - Utilization func(childComplexity int) int - Valkeys func(childComplexity int, orderBy *valkey.ValkeyOrder) int + ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int + AuthIntegrations func(childComplexity int) int + BigQueryDatasets func(childComplexity int, orderBy *bigquery.BigQueryDatasetOrder) int + Buckets func(childComplexity int, orderBy *bucket.BucketOrder) int + Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Cost func(childComplexity int) int + DeletionStartedAt func(childComplexity int) int + Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Events func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) int + History func(childComplexity int) int + ID func(childComplexity int) int + Image func(childComplexity int) int + ImageVulnerabilityHistory func(childComplexity int, from scalar.Date) int + Ingresses func(childComplexity int) int + InstanceGroups func(childComplexity int) int + Instances func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) int + KafkaTopicAcls func(childComplexity int, orderBy *kafkatopic.KafkaTopicACLOrder) int + Labels func(childComplexity int) int + LogDestinations func(childComplexity int) int + Manifest func(childComplexity int) int + Name func(childComplexity int) int + NetworkPolicy func(childComplexity int) int + OpenSearch func(childComplexity int) int + Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Resources func(childComplexity int) int + SQLInstances func(childComplexity int, orderBy *sqlinstance.SQLInstanceOrder) int + Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + ServiceAccount func(childComplexity int) int + State func(childComplexity int) int + Team func(childComplexity int) int + TeamEnvironment func(childComplexity int) int + Utilization func(childComplexity int) int + Valkeys func(childComplexity int, orderBy *valkey.ValkeyOrder) int + VulnerabilityFixHistory func(childComplexity int, from scalar.Date) int } ApplicationConnection struct { @@ -1151,6 +1153,15 @@ type ComplexityRoot struct { PackageTypes func(childComplexity int) int } + ImageVulnerabilityHistory struct { + Samples func(childComplexity int) int + } + + ImageVulnerabilitySample struct { + Date func(childComplexity int) int + Summary func(childComplexity int) int + } + ImageVulnerabilitySummary struct { CountsByPriority func(childComplexity int) int CountsBySeverity func(childComplexity int) int @@ -1276,36 +1287,38 @@ type ComplexityRoot struct { } Job struct { - ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int - AuthIntegrations func(childComplexity int) int - BigQueryDatasets func(childComplexity int, orderBy *bigquery.BigQueryDatasetOrder) int - Buckets func(childComplexity int, orderBy *bucket.BucketOrder) int - Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Cost func(childComplexity int) int - DeletionStartedAt func(childComplexity int) int - Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Events func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) int - ID func(childComplexity int) int - Image func(childComplexity int) int - Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) int - KafkaTopicAcls func(childComplexity int, orderBy *kafkatopic.KafkaTopicACLOrder) int - Labels func(childComplexity int) int - LogDestinations func(childComplexity int) int - Manifest func(childComplexity int) int - Name func(childComplexity int) int - NetworkPolicy func(childComplexity int) int - OpenSearch func(childComplexity int) int - Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Resources func(childComplexity int) int - Runs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - SQLInstances func(childComplexity int, orderBy *sqlinstance.SQLInstanceOrder) int - Schedule func(childComplexity int) int - Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - ServiceAccount func(childComplexity int) int - State func(childComplexity int) int - Team func(childComplexity int) int - TeamEnvironment func(childComplexity int) int - Valkeys func(childComplexity int, orderBy *valkey.ValkeyOrder) int + ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int + AuthIntegrations func(childComplexity int) int + BigQueryDatasets func(childComplexity int, orderBy *bigquery.BigQueryDatasetOrder) int + Buckets func(childComplexity int, orderBy *bucket.BucketOrder) int + Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Cost func(childComplexity int) int + DeletionStartedAt func(childComplexity int) int + Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Events func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *event.WorkloadEventFilter) int + ID func(childComplexity int) int + Image func(childComplexity int) int + ImageVulnerabilityHistory func(childComplexity int, from scalar.Date) int + Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) int + KafkaTopicAcls func(childComplexity int, orderBy *kafkatopic.KafkaTopicACLOrder) int + Labels func(childComplexity int) int + LogDestinations func(childComplexity int) int + Manifest func(childComplexity int) int + Name func(childComplexity int) int + NetworkPolicy func(childComplexity int) int + OpenSearch func(childComplexity int) int + Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Resources func(childComplexity int) int + Runs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + SQLInstances func(childComplexity int, orderBy *sqlinstance.SQLInstanceOrder) int + Schedule func(childComplexity int) int + Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + ServiceAccount func(childComplexity int) int + State func(childComplexity int) int + Team func(childComplexity int) int + TeamEnvironment func(childComplexity int) int + Valkeys func(childComplexity int, orderBy *valkey.ValkeyOrder) int + VulnerabilityFixHistory func(childComplexity int, from scalar.Date) int } JobConnection struct { @@ -2244,34 +2257,36 @@ type ComplexityRoot struct { } Query struct { - ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.TenantActivityLogFilter) int - CVE func(childComplexity int, identifier string) int - CostMonthlySummary func(childComplexity int, from scalar.Date, to scalar.Date) int - CurrentUnitPrices func(childComplexity int) int - Cves func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.CVEOrder, filter *vulnerability.CVEFilter) int - Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *deployment.DeploymentOrder, filter *deployment.DeploymentFilter) int - Environment func(childComplexity int, name string) int - Environments func(childComplexity int, orderBy *environment.EnvironmentOrder) int - Features func(childComplexity int) int - GlobalWebhooks func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.TenantIssueFilter) int - Me func(childComplexity int) int - Node func(childComplexity int, id ident.Ident) int - Reconcilers func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Roles func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *authz.RoleFilter) int - Search func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter search.SearchFilter) int - ServiceAccount func(childComplexity int, id ident.Ident) int - ServiceAccounts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Team func(childComplexity int, slug slug.Slug) int - Teams func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *team.TeamOrder, filter *team.TeamFilter) int - TeamsUtilization func(childComplexity int, resourceType utilization.UtilizationResourceType) int - UnleashReleaseChannels func(childComplexity int) int - User func(childComplexity int, email *string) int - UserSyncLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Users func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *user.UserOrder) int - VulnerabilitySummaries func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *vulnerability.TenantVulnerabilitySummaryFilter, orderBy *vulnerability.VulnerabilitySummaryOrder) int - VulnerabilitySummary func(childComplexity int, filter *vulnerability.TenantVulnerabilitySummaryFilter) int - WebhookEventTypes func(childComplexity int) int + ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.TenantActivityLogFilter) int + CVE func(childComplexity int, identifier string) int + CostMonthlySummary func(childComplexity int, from scalar.Date, to scalar.Date) int + CurrentUnitPrices func(childComplexity int) int + Cves func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.CVEOrder, filter *vulnerability.CVEFilter) int + Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *deployment.DeploymentOrder, filter *deployment.DeploymentFilter) int + Environment func(childComplexity int, name string) int + Environments func(childComplexity int, orderBy *environment.EnvironmentOrder) int + Features func(childComplexity int) int + GlobalWebhooks func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + ImageVulnerabilityHistory func(childComplexity int, from scalar.Date) int + Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.TenantIssueFilter) int + Me func(childComplexity int) int + Node func(childComplexity int, id ident.Ident) int + Reconcilers func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Roles func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *authz.RoleFilter) int + Search func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter search.SearchFilter) int + ServiceAccount func(childComplexity int, id ident.Ident) int + ServiceAccounts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Team func(childComplexity int, slug slug.Slug) int + Teams func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *team.TeamOrder, filter *team.TeamFilter) int + TeamsUtilization func(childComplexity int, resourceType utilization.UtilizationResourceType) int + UnleashReleaseChannels func(childComplexity int) int + User func(childComplexity int, email *string) int + UserSyncLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Users func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *user.UserOrder) int + VulnerabilityFixHistory func(childComplexity int, from scalar.Date) int + VulnerabilitySummaries func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *vulnerability.TenantVulnerabilitySummaryFilter, orderBy *vulnerability.VulnerabilitySummaryOrder) int + VulnerabilitySummary func(childComplexity int, filter *vulnerability.TenantVulnerabilitySummaryFilter) int + WebhookEventTypes func(childComplexity int) int } Reconciler struct { @@ -3095,47 +3110,49 @@ type ComplexityRoot struct { } Team struct { - ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int - Alerts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *alerts.AlertOrder, filter *alerts.TeamAlertsFilter) int - Applications func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *application.ApplicationOrder, filter *application.TeamApplicationsFilter) int - BigQueryDatasets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bigquery.BigQueryDatasetOrder, filter *bigquery.BigQueryDatasetFilter) int - Buckets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bucket.BucketOrder, filter *bucket.BucketFilter) int - Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *config.ConfigOrder, filter *config.ConfigFilter) int - Cost func(childComplexity int) int - DeleteKey func(childComplexity int, key string) int - DeletionInProgress func(childComplexity int) int - DeploymentKey func(childComplexity int) int - Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - Environment func(childComplexity int, name string) int - Environments func(childComplexity int) int - ExternalResources func(childComplexity int) int - ID func(childComplexity int) int - InventoryCounts func(childComplexity int) int - Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.IssueFilter) int - Jobs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *job.JobOrder, filter *job.TeamJobsFilter) int - KafkaTopics func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *kafkatopic.KafkaTopicOrder, filter *kafkatopic.KafkaTopicFilter) int - LastSuccessfulSync func(childComplexity int) int - Member func(childComplexity int, email string) int - Members func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *team.TeamMemberOrder) int - OpenSearches func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *opensearch.OpenSearchOrder, filter *opensearch.OpenSearchFilter) int - Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *postgres.TeamPostgresFilter) int - Purpose func(childComplexity int) int - Repositories func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *repository.RepositoryOrder, filter *repository.TeamRepositoryFilter) int - SQLInstances func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *sqlinstance.SQLInstanceOrder, filter *sqlinstance.SQLInstanceFilter) int - Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *secret.SecretOrder, filter *secret.SecretFilter) int - ServiceAccounts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - ServiceUtilization func(childComplexity int) int - SlackChannel func(childComplexity int) int - Slug func(childComplexity int) int - Unleash func(childComplexity int) int - Valkeys func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *valkey.ValkeyOrder, filter *valkey.ValkeyFilter) int - ViewerIsMember func(childComplexity int) int - ViewerIsOwner func(childComplexity int) int - VulnerabilitySummaries func(childComplexity int, filter *vulnerability.TeamVulnerabilitySummaryFilter, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.VulnerabilitySummaryOrder) int - VulnerabilitySummary func(childComplexity int, filter *vulnerability.TeamVulnerabilitySummaryFilter) int - Webhooks func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int - WorkloadUtilization func(childComplexity int, resourceType utilization.UtilizationResourceType) int - Workloads func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *workload.WorkloadOrder, filter *workload.TeamWorkloadsFilter) int + ActivityLog func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) int + Alerts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *alerts.AlertOrder, filter *alerts.TeamAlertsFilter) int + Applications func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *application.ApplicationOrder, filter *application.TeamApplicationsFilter) int + BigQueryDatasets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bigquery.BigQueryDatasetOrder, filter *bigquery.BigQueryDatasetFilter) int + Buckets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bucket.BucketOrder, filter *bucket.BucketFilter) int + Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *config.ConfigOrder, filter *config.ConfigFilter) int + Cost func(childComplexity int) int + DeleteKey func(childComplexity int, key string) int + DeletionInProgress func(childComplexity int) int + DeploymentKey func(childComplexity int) int + Deployments func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + Environment func(childComplexity int, name string) int + Environments func(childComplexity int) int + ExternalResources func(childComplexity int) int + ID func(childComplexity int) int + ImageVulnerabilityHistory func(childComplexity int, from scalar.Date) int + InventoryCounts func(childComplexity int) int + Issues func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.IssueFilter) int + Jobs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *job.JobOrder, filter *job.TeamJobsFilter) int + KafkaTopics func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *kafkatopic.KafkaTopicOrder, filter *kafkatopic.KafkaTopicFilter) int + LastSuccessfulSync func(childComplexity int) int + Member func(childComplexity int, email string) int + Members func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *team.TeamMemberOrder) int + OpenSearches func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *opensearch.OpenSearchOrder, filter *opensearch.OpenSearchFilter) int + Postgreses func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *postgres.TeamPostgresFilter) int + Purpose func(childComplexity int) int + Repositories func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *repository.RepositoryOrder, filter *repository.TeamRepositoryFilter) int + SQLInstances func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *sqlinstance.SQLInstanceOrder, filter *sqlinstance.SQLInstanceFilter) int + Secrets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *secret.SecretOrder, filter *secret.SecretFilter) int + ServiceAccounts func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + ServiceUtilization func(childComplexity int) int + SlackChannel func(childComplexity int) int + Slug func(childComplexity int) int + Unleash func(childComplexity int) int + Valkeys func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *valkey.ValkeyOrder, filter *valkey.ValkeyFilter) int + ViewerIsMember func(childComplexity int) int + ViewerIsOwner func(childComplexity int) int + VulnerabilityFixHistory func(childComplexity int, from scalar.Date) int + VulnerabilitySummaries func(childComplexity int, filter *vulnerability.TeamVulnerabilitySummaryFilter, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.VulnerabilitySummaryOrder) int + VulnerabilitySummary func(childComplexity int, filter *vulnerability.TeamVulnerabilitySummaryFilter) int + Webhooks func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int + WorkloadUtilization func(childComplexity int, resourceType utilization.UtilizationResourceType) int + Workloads func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *workload.WorkloadOrder, filter *workload.TeamWorkloadsFilter) int } TeamCDN struct { @@ -4004,6 +4021,20 @@ type ComplexityRoot struct { Severity func(childComplexity int) int } + VulnerabilityFixHistory struct { + Samples func(childComplexity int) int + } + + VulnerabilityFixSample struct { + Date func(childComplexity int) int + Days func(childComplexity int) int + FirstFixedAt func(childComplexity int) int + FixedCount func(childComplexity int) int + LastFixedAt func(childComplexity int) int + Severity func(childComplexity int) int + TotalWorkloads func(childComplexity int) int + } + VulnerabilityRemediation struct { FixVersion func(childComplexity int) int LatestVersion func(childComplexity int) int @@ -4677,6 +4708,18 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Application.Image(childComplexity), true + case "Application.imageVulnerabilityHistory": + if e.ComplexityRoot.Application.ImageVulnerabilityHistory == nil { + break + } + + args, err := ec.field_Application_imageVulnerabilityHistory_args(ctx, rawArgs) + if err != nil { + return 0, false + } + + return e.ComplexityRoot.Application.ImageVulnerabilityHistory(childComplexity, args["from"].(scalar.Date)), true + case "Application.ingresses": if e.ComplexityRoot.Application.Ingresses == nil { break @@ -4859,6 +4902,18 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Application.Valkeys(childComplexity, args["orderBy"].(*valkey.ValkeyOrder)), true + case "Application.vulnerabilityFixHistory": + if e.ComplexityRoot.Application.VulnerabilityFixHistory == nil { + break + } + + args, err := ec.field_Application_vulnerabilityFixHistory_args(ctx, rawArgs) + if err != nil { + return 0, false + } + + return e.ComplexityRoot.Application.VulnerabilityFixHistory(childComplexity, args["from"].(scalar.Date)), true + case "ApplicationConnection.edges": if e.ComplexityRoot.ApplicationConnection.Edges == nil { break @@ -8282,6 +8337,27 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ImageVulnerabilityFacets.PackageTypes(childComplexity), true + case "ImageVulnerabilityHistory.samples": + if e.ComplexityRoot.ImageVulnerabilityHistory.Samples == nil { + break + } + + return e.ComplexityRoot.ImageVulnerabilityHistory.Samples(childComplexity), true + + case "ImageVulnerabilitySample.date": + if e.ComplexityRoot.ImageVulnerabilitySample.Date == nil { + break + } + + return e.ComplexityRoot.ImageVulnerabilitySample.Date(childComplexity), true + + case "ImageVulnerabilitySample.summary": + if e.ComplexityRoot.ImageVulnerabilitySample.Summary == nil { + break + } + + return e.ComplexityRoot.ImageVulnerabilitySample.Summary(childComplexity), true + case "ImageVulnerabilitySummary.countsByPriority": if e.ComplexityRoot.ImageVulnerabilitySummary.CountsByPriority == nil { break @@ -8879,6 +8955,18 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Job.Image(childComplexity), true + case "Job.imageVulnerabilityHistory": + if e.ComplexityRoot.Job.ImageVulnerabilityHistory == nil { + break + } + + args, err := ec.field_Job_imageVulnerabilityHistory_args(ctx, rawArgs) + if err != nil { + return 0, false + } + + return e.ComplexityRoot.Job.ImageVulnerabilityHistory(childComplexity, args["from"].(scalar.Date)), true + case "Job.issues": if e.ComplexityRoot.Job.Issues == nil { break @@ -9047,6 +9135,18 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Job.Valkeys(childComplexity, args["orderBy"].(*valkey.ValkeyOrder)), true + case "Job.vulnerabilityFixHistory": + if e.ComplexityRoot.Job.VulnerabilityFixHistory == nil { + break + } + + args, err := ec.field_Job_vulnerabilityFixHistory_args(ctx, rawArgs) + if err != nil { + return 0, false + } + + return e.ComplexityRoot.Job.VulnerabilityFixHistory(childComplexity, args["from"].(scalar.Date)), true + case "JobConnection.edges": if e.ComplexityRoot.JobConnection.Edges == nil { break @@ -13718,6 +13818,18 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Query.GlobalWebhooks(childComplexity, args["first"].(*int), args["after"].(*pagination.Cursor), args["last"].(*int), args["before"].(*pagination.Cursor)), true + case "Query.imageVulnerabilityHistory": + if e.ComplexityRoot.Query.ImageVulnerabilityHistory == nil { + break + } + + args, err := ec.field_Query_imageVulnerabilityHistory_args(ctx, rawArgs) + if err != nil { + return 0, false + } + + return e.ComplexityRoot.Query.ImageVulnerabilityHistory(childComplexity, args["from"].(scalar.Date)), true + case "Query.issues": if e.ComplexityRoot.Query.Issues == nil { break @@ -13888,6 +14000,18 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Query.Users(childComplexity, args["first"].(*int), args["after"].(*pagination.Cursor), args["last"].(*int), args["before"].(*pagination.Cursor), args["orderBy"].(*user.UserOrder)), true + case "Query.vulnerabilityFixHistory": + if e.ComplexityRoot.Query.VulnerabilityFixHistory == nil { + break + } + + args, err := ec.field_Query_vulnerabilityFixHistory_args(ctx, rawArgs) + if err != nil { + return 0, false + } + + return e.ComplexityRoot.Query.VulnerabilityFixHistory(childComplexity, args["from"].(scalar.Date)), true + case "Query.vulnerabilitySummaries": if e.ComplexityRoot.Query.VulnerabilitySummaries == nil { break @@ -17595,6 +17719,18 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Team.ID(childComplexity), true + case "Team.imageVulnerabilityHistory": + if e.ComplexityRoot.Team.ImageVulnerabilityHistory == nil { + break + } + + args, err := ec.field_Team_imageVulnerabilityHistory_args(ctx, rawArgs) + if err != nil { + return 0, false + } + + return e.ComplexityRoot.Team.ImageVulnerabilityHistory(childComplexity, args["from"].(scalar.Date)), true + case "Team.inventoryCounts": if e.ComplexityRoot.Team.InventoryCounts == nil { break @@ -17802,6 +17938,18 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.Team.ViewerIsOwner(childComplexity), true + case "Team.vulnerabilityFixHistory": + if e.ComplexityRoot.Team.VulnerabilityFixHistory == nil { + break + } + + args, err := ec.field_Team_vulnerabilityFixHistory_args(ctx, rawArgs) + if err != nil { + return 0, false + } + + return e.ComplexityRoot.Team.VulnerabilityFixHistory(childComplexity, args["from"].(scalar.Date)), true + case "Team.vulnerabilitySummaries": if e.ComplexityRoot.Team.VulnerabilitySummaries == nil { break @@ -21477,6 +21625,62 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.VulnerabilityActivityLogEntryData.Severity(childComplexity), true + case "VulnerabilityFixHistory.samples": + if e.ComplexityRoot.VulnerabilityFixHistory.Samples == nil { + break + } + + return e.ComplexityRoot.VulnerabilityFixHistory.Samples(childComplexity), true + + case "VulnerabilityFixSample.date": + if e.ComplexityRoot.VulnerabilityFixSample.Date == nil { + break + } + + return e.ComplexityRoot.VulnerabilityFixSample.Date(childComplexity), true + + case "VulnerabilityFixSample.days": + if e.ComplexityRoot.VulnerabilityFixSample.Days == nil { + break + } + + return e.ComplexityRoot.VulnerabilityFixSample.Days(childComplexity), true + + case "VulnerabilityFixSample.firstFixedAt": + if e.ComplexityRoot.VulnerabilityFixSample.FirstFixedAt == nil { + break + } + + return e.ComplexityRoot.VulnerabilityFixSample.FirstFixedAt(childComplexity), true + + case "VulnerabilityFixSample.fixedCount": + if e.ComplexityRoot.VulnerabilityFixSample.FixedCount == nil { + break + } + + return e.ComplexityRoot.VulnerabilityFixSample.FixedCount(childComplexity), true + + case "VulnerabilityFixSample.lastFixedAt": + if e.ComplexityRoot.VulnerabilityFixSample.LastFixedAt == nil { + break + } + + return e.ComplexityRoot.VulnerabilityFixSample.LastFixedAt(childComplexity), true + + case "VulnerabilityFixSample.severity": + if e.ComplexityRoot.VulnerabilityFixSample.Severity == nil { + break + } + + return e.ComplexityRoot.VulnerabilityFixSample.Severity(childComplexity), true + + case "VulnerabilityFixSample.totalWorkloads": + if e.ComplexityRoot.VulnerabilityFixSample.TotalWorkloads == nil { + break + } + + return e.ComplexityRoot.VulnerabilityFixSample.TotalWorkloads(childComplexity), true + case "VulnerabilityRemediation.fixVersion": if e.ComplexityRoot.VulnerabilityRemediation.FixVersion == nil { break @@ -36523,6 +36727,15 @@ extend enum ActivityLogActivityType { } extend type Query { + "Get the vulnerability summary history for all teams." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + "Get the vulnerability summary for the tenant." vulnerabilitySummary( "Filter the aggregate." @@ -36550,6 +36763,12 @@ extend type Query { orderBy: VulnerabilitySummaryOrder ): WorkloadVulnerabilitySummaryConnection! + "Get the mean time to fix history for all teams." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + "Get a specific CVE by its identifier." cve(identifier: String!): CVE! @@ -36606,6 +36825,23 @@ enum CVEOrderField { PRIORITY } +extend interface Workload { + "Get the vulnerability summary history for workload." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + + "Get the mean time to fix history for a workload." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) +} + extend enum TeamOrderField { "The accumulated risk score of the teams workloads." RISK_SCORE @@ -36625,6 +36861,62 @@ extend enum TeamOrderField { KNOWN_EXPLOITED_VULNERABILITIES } +extend type Application { + "Get the vulnerability summary history for application." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + + "Get the mean time to fix history for an application." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) +} + +extend type Job { + "Get the vulnerability summary history for job." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + + "Get the mean time to fix history for a job." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) +} + +extend type Team { + "Get the vulnerability summary history for team." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + + "Get the mean time to fix history for a team." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) +} + +type ImageVulnerabilityHistory { + "Vulnerability summary samples." + samples: [ImageVulnerabilitySample!]! +} + """ SBOM metadata for a container image, including pipeline status and processing information. This type is accessed through ContainerImage.sbom. @@ -36936,6 +37228,14 @@ type ImageVulnerabilityFacets { packageTypes: [StringFacetItem!]! } +type ImageVulnerabilitySample { + "The historic image vulnerability summary" + summary: ImageVulnerabilitySummary! + + "Timestamp of the vulnerability summary." + date: Time! +} + type ContainerImageWorkloadReferenceConnection { "Information to aid in pagination." pageInfo: PageInfo! @@ -37607,6 +37907,36 @@ extend enum ActivityLogActivityType { VULNERABILITY_UPDATED } +"Trend of mean time to fix vulnerabilities grouped by severity." +type VulnerabilityFixHistory { + "Mean time to fix samples." + samples: [VulnerabilityFixSample!]! +} + +"One MTTR sample for a severity at a point in time." +type VulnerabilityFixSample { + "Severity of vulnerabilities in this sample." + severity: ImageVulnerabilitySeverity! + + "Snapshot date of the sample." + date: Time! + + "Mean time to fix in days." + days: Int! + + "Number of vulnerabilities fixed in this sample." + fixedCount: Int! + + "Earliest time a vulnerability was fixed in this sample." + firstFixedAt: Time + + "Latest time a vulnerability was fixed in this sample." + lastFixedAt: Time + + "Total number of workloads with this severity of vulnerabilities." + totalWorkloads: Int! +} + "The SBOM pipeline status for an image or workload." enum SBOMStatus { "SBOM generation is in progress." @@ -38981,6 +39311,10 @@ func (ec *executionContext) childFields_Application(ctx context.Context, field g return ec.fieldContext_Application_utilization(ctx, field) case "valkeys": return ec.fieldContext_Application_valkeys(ctx, field) + case "imageVulnerabilityHistory": + return ec.fieldContext_Application_imageVulnerabilityHistory(ctx, field) + case "vulnerabilityFixHistory": + return ec.fieldContext_Application_vulnerabilityFixHistory(ctx, field) case "events": return ec.fieldContext_Application_events(ctx, field) } @@ -40293,6 +40627,24 @@ func (ec *executionContext) childFields_ImageVulnerabilityFacets(ctx context.Con return nil, fmt.Errorf("no field named %q was found under type ImageVulnerabilityFacets", field.Name) } +func (ec *executionContext) childFields_ImageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + switch field.Name { + case "samples": + return ec.fieldContext_ImageVulnerabilityHistory_samples(ctx, field) + } + return nil, fmt.Errorf("no field named %q was found under type ImageVulnerabilityHistory", field.Name) +} + +func (ec *executionContext) childFields_ImageVulnerabilitySample(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + switch field.Name { + case "summary": + return ec.fieldContext_ImageVulnerabilitySample_summary(ctx, field) + case "date": + return ec.fieldContext_ImageVulnerabilitySample_date(ctx, field) + } + return nil, fmt.Errorf("no field named %q was found under type ImageVulnerabilitySample", field.Name) +} + func (ec *executionContext) childFields_ImageVulnerabilitySummary(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { switch field.Name { case "total": @@ -40585,6 +40937,10 @@ func (ec *executionContext) childFields_Job(ctx context.Context, field graphql.C return ec.fieldContext_Job_sqlInstances(ctx, field) case "valkeys": return ec.fieldContext_Job_valkeys(ctx, field) + case "imageVulnerabilityHistory": + return ec.fieldContext_Job_imageVulnerabilityHistory(ctx, field) + case "vulnerabilityFixHistory": + return ec.fieldContext_Job_vulnerabilityFixHistory(ctx, field) case "events": return ec.fieldContext_Job_events(ctx, field) } @@ -42703,6 +43059,10 @@ func (ec *executionContext) childFields_Team(ctx context.Context, field graphql. return ec.fieldContext_Team_serviceUtilization(ctx, field) case "valkeys": return ec.fieldContext_Team_valkeys(ctx, field) + case "imageVulnerabilityHistory": + return ec.fieldContext_Team_imageVulnerabilityHistory(ctx, field) + case "vulnerabilityFixHistory": + return ec.fieldContext_Team_vulnerabilityFixHistory(ctx, field) case "vulnerabilitySummary": return ec.fieldContext_Team_vulnerabilitySummary(ctx, field) case "vulnerabilitySummaries": @@ -43889,6 +44249,34 @@ func (ec *executionContext) childFields_VulnerabilityActivityLogEntryData(ctx co return nil, fmt.Errorf("no field named %q was found under type VulnerabilityActivityLogEntryData", field.Name) } +func (ec *executionContext) childFields_VulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + switch field.Name { + case "samples": + return ec.fieldContext_VulnerabilityFixHistory_samples(ctx, field) + } + return nil, fmt.Errorf("no field named %q was found under type VulnerabilityFixHistory", field.Name) +} + +func (ec *executionContext) childFields_VulnerabilityFixSample(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + switch field.Name { + case "severity": + return ec.fieldContext_VulnerabilityFixSample_severity(ctx, field) + case "date": + return ec.fieldContext_VulnerabilityFixSample_date(ctx, field) + case "days": + return ec.fieldContext_VulnerabilityFixSample_days(ctx, field) + case "fixedCount": + return ec.fieldContext_VulnerabilityFixSample_fixedCount(ctx, field) + case "firstFixedAt": + return ec.fieldContext_VulnerabilityFixSample_firstFixedAt(ctx, field) + case "lastFixedAt": + return ec.fieldContext_VulnerabilityFixSample_lastFixedAt(ctx, field) + case "totalWorkloads": + return ec.fieldContext_VulnerabilityFixSample_totalWorkloads(ctx, field) + } + return nil, fmt.Errorf("no field named %q was found under type VulnerabilityFixSample", field.Name) +} + func (ec *executionContext) childFields_VulnerabilityRemediation(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { switch field.Name { case "fixVersion": diff --git a/internal/graph/gengql/schema.generated.go b/internal/graph/gengql/schema.generated.go index 7bbc0e290..d0f144c5e 100644 --- a/internal/graph/gengql/schema.generated.go +++ b/internal/graph/gengql/schema.generated.go @@ -162,8 +162,10 @@ type QueryResolver interface { Me(ctx context.Context) (authz.AuthenticatedUser, error) UserSyncLog(ctx context.Context, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[usersync.UserSyncLogEntry], error) TeamsUtilization(ctx context.Context, resourceType utilization.UtilizationResourceType) ([]*utilization.TeamUtilizationData, error) + ImageVulnerabilityHistory(ctx context.Context, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) VulnerabilitySummary(ctx context.Context, filter *vulnerability.TenantVulnerabilitySummaryFilter) (*vulnerability.TenantVulnerabilitySummary, error) VulnerabilitySummaries(ctx context.Context, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *vulnerability.TenantVulnerabilitySummaryFilter, orderBy *vulnerability.VulnerabilitySummaryOrder) (*pagination.Connection[*vulnerability.WorkloadVulnerabilitySummary], error) + VulnerabilityFixHistory(ctx context.Context, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) CVE(ctx context.Context, identifier string) (*vulnerability.CVE, error) Cves(ctx context.Context, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.CVEOrder, filter *vulnerability.CVEFilter) (*pagination.Connection[*vulnerability.CVE], error) GlobalWebhooks(ctx context.Context, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*webhook.WebhookSubscription], error) @@ -1456,6 +1458,20 @@ func (ec *executionContext) field_Query_globalWebhooks_args(ctx context.Context, return args, nil } +func (ec *executionContext) field_Query_imageVulnerabilityHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { + var err error + args := map[string]any{} + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", + func(ctx context.Context, v any) (scalar.Date, error) { + return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) + }) + if err != nil { + return nil, err + } + args["from"] = arg0 + return args, nil +} + func (ec *executionContext) field_Query_issues_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -1886,6 +1902,20 @@ func (ec *executionContext) field_Query_users_args(ctx context.Context, rawArgs return args, nil } +func (ec *executionContext) field_Query_vulnerabilityFixHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { + var err error + args := map[string]any{} + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", + func(ctx context.Context, v any) (scalar.Date, error) { + return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) + }) + if err != nil { + return nil, err + } + args["from"] = arg0 + return args, nil +} + func (ec *executionContext) field_Query_vulnerabilitySummaries_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -6230,6 +6260,50 @@ func (ec *executionContext) fieldContext_Query_teamsUtilization(ctx context.Cont return fc, nil } +func (ec *executionContext) _Query_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_Query_imageVulnerabilityHistory(ctx, field) + }, + func(ctx context.Context) (any, error) { + fc := graphql.GetFieldContext(ctx) + return ec.Resolvers.Query().ImageVulnerabilityHistory(ctx, fc.Args["from"].(scalar.Date)) + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { + return ec.marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_Query_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Query", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_ImageVulnerabilityHistory(ctx, field) + }, + } + defer func() { + if r := recover(); r != nil { + err = ec.Recover(ctx, r) + ec.Error(ctx, err) + } + }() + ctx = graphql.WithFieldContext(ctx, fc) + if fc.Args, err = ec.field_Query_imageVulnerabilityHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { + ec.Error(ctx, err) + return fc, err + } + return fc, nil +} + func (ec *executionContext) _Query_vulnerabilitySummary(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -6318,6 +6392,50 @@ func (ec *executionContext) fieldContext_Query_vulnerabilitySummaries(ctx contex return fc, nil } +func (ec *executionContext) _Query_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_Query_vulnerabilityFixHistory(ctx, field) + }, + func(ctx context.Context) (any, error) { + fc := graphql.GetFieldContext(ctx) + return ec.Resolvers.Query().VulnerabilityFixHistory(ctx, fc.Args["from"].(scalar.Date)) + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { + return ec.marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_Query_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Query", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_VulnerabilityFixHistory(ctx, field) + }, + } + defer func() { + if r := recover(); r != nil { + err = ec.Recover(ctx, r) + ec.Error(ctx, err) + } + }() + ctx = graphql.WithFieldContext(ctx, fc) + if fc.Args, err = ec.field_Query_vulnerabilityFixHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { + ec.Error(ctx, err) + return fc, err + } + return fc, nil +} + func (ec *executionContext) _Query_cve(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -8901,6 +9019,28 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) + case "imageVulnerabilityHistory": + field := field + + innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Query_imageVulnerabilityHistory(ctx, field) + if res == graphql.Null { + atomic.AddUint32(&fs.Invalids, 1) + } + return res + } + + rrm := func(ctx context.Context) graphql.Marshaler { + return ec.OperationContext.RootResolverMiddleware(ctx, + func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) case "vulnerabilitySummary": field := field @@ -8945,6 +9085,28 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) + case "vulnerabilityFixHistory": + field := field + + innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Query_vulnerabilityFixHistory(ctx, field) + if res == graphql.Null { + atomic.AddUint32(&fs.Invalids, 1) + } + return res + } + + rrm := func(ctx context.Context) graphql.Marshaler { + return ec.OperationContext.RootResolverMiddleware(ctx, + func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return rrm(innerCtx) }) case "cve": field := field diff --git a/internal/graph/gengql/teams.generated.go b/internal/graph/gengql/teams.generated.go index ed767f9c9..89db334df 100644 --- a/internal/graph/gengql/teams.generated.go +++ b/internal/graph/gengql/teams.generated.go @@ -21,6 +21,7 @@ import ( "github.com/nais/api/internal/github/repository" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" + "github.com/nais/api/internal/graph/scalar" "github.com/nais/api/internal/issue" "github.com/nais/api/internal/persistence/bigquery" "github.com/nais/api/internal/persistence/bucket" @@ -84,6 +85,8 @@ type TeamResolver interface { WorkloadUtilization(ctx context.Context, obj *team.Team, resourceType utilization.UtilizationResourceType) ([]*utilization.WorkloadUtilizationData, error) ServiceUtilization(ctx context.Context, obj *team.Team) (*utilization.TeamServiceUtilization, error) Valkeys(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *valkey.ValkeyOrder, filter *valkey.ValkeyFilter) (*pagination.FacetableConnection[*valkey.Valkey, *valkey.ValkeyFilter], error) + ImageVulnerabilityHistory(ctx context.Context, obj *team.Team, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) + VulnerabilityFixHistory(ctx context.Context, obj *team.Team, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) VulnerabilitySummary(ctx context.Context, obj *team.Team, filter *vulnerability.TeamVulnerabilitySummaryFilter) (*vulnerability.TeamVulnerabilitySummary, error) VulnerabilitySummaries(ctx context.Context, obj *team.Team, filter *vulnerability.TeamVulnerabilitySummaryFilter, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *vulnerability.VulnerabilitySummaryOrder) (*pagination.Connection[*vulnerability.WorkloadVulnerabilitySummary], error) Webhooks(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*webhook.WebhookSubscription], error) @@ -769,6 +772,20 @@ func (ec *executionContext) field_Team_environment_args(ctx context.Context, raw return args, nil } +func (ec *executionContext) field_Team_imageVulnerabilityHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { + var err error + args := map[string]any{} + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", + func(ctx context.Context, v any) (scalar.Date, error) { + return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) + }) + if err != nil { + return nil, err + } + args["from"] = arg0 + return args, nil +} + func (ec *executionContext) field_Team_issues_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -1345,6 +1362,20 @@ func (ec *executionContext) field_Team_valkeys_args(ctx context.Context, rawArgs return args, nil } +func (ec *executionContext) field_Team_vulnerabilityFixHistory_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { + var err error + args := map[string]any{} + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "from", + func(ctx context.Context, v any) (scalar.Date, error) { + return ec.unmarshalNDate2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋscalarᚐDate(ctx, v) + }) + if err != nil { + return nil, err + } + args["from"] = arg0 + return args, nil +} + func (ec *executionContext) field_Team_vulnerabilitySummaries_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} @@ -3118,6 +3149,94 @@ func (ec *executionContext) fieldContext_Team_valkeys(ctx context.Context, field return fc, nil } +func (ec *executionContext) _Team_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField, obj *team.Team) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_Team_imageVulnerabilityHistory(ctx, field) + }, + func(ctx context.Context) (any, error) { + fc := graphql.GetFieldContext(ctx) + return ec.Resolvers.Team().ImageVulnerabilityHistory(ctx, obj, fc.Args["from"].(scalar.Date)) + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { + return ec.marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_Team_imageVulnerabilityHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Team", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_ImageVulnerabilityHistory(ctx, field) + }, + } + defer func() { + if r := recover(); r != nil { + err = ec.Recover(ctx, r) + ec.Error(ctx, err) + } + }() + ctx = graphql.WithFieldContext(ctx, fc) + if fc.Args, err = ec.field_Team_imageVulnerabilityHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { + ec.Error(ctx, err) + return fc, err + } + return fc, nil +} + +func (ec *executionContext) _Team_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField, obj *team.Team) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_Team_vulnerabilityFixHistory(ctx, field) + }, + func(ctx context.Context) (any, error) { + fc := graphql.GetFieldContext(ctx) + return ec.Resolvers.Team().VulnerabilityFixHistory(ctx, obj, fc.Args["from"].(scalar.Date)) + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { + return ec.marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_Team_vulnerabilityFixHistory(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Team", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_VulnerabilityFixHistory(ctx, field) + }, + } + defer func() { + if r := recover(); r != nil { + err = ec.Recover(ctx, r) + ec.Error(ctx, err) + } + }() + ctx = graphql.WithFieldContext(ctx, fc) + if fc.Args, err = ec.field_Team_vulnerabilityFixHistory_args(ctx, field.ArgumentMap(ec.Variables)); err != nil { + ec.Error(ctx, err) + return fc, err + } + return fc, nil +} + func (ec *executionContext) _Team_vulnerabilitySummary(ctx context.Context, field graphql.CollectedField, obj *team.Team) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -9516,6 +9635,78 @@ func (ec *executionContext) _Team(ctx context.Context, sel ast.SelectionSet, obj continue } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + case "imageVulnerabilityHistory": + field := field + + innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Team_imageVulnerabilityHistory(ctx, field, obj) + if res == graphql.Null { + atomic.AddUint32(&fs.Invalids, 1) + } + return res + } + + if field.Deferrable != nil { + dfs, ok := deferred[field.Deferrable.Label] + di := 0 + if ok { + dfs.AddField(field) + di = len(dfs.Values) - 1 + } else { + dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) + deferred[field.Deferrable.Label] = dfs + } + dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { + return innerFunc(ctx, dfs) + }) + + // don't run the out.Concurrently() call below + out.Values[i] = graphql.Null + continue + } + + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + case "vulnerabilityFixHistory": + field := field + + innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Team_vulnerabilityFixHistory(ctx, field, obj) + if res == graphql.Null { + atomic.AddUint32(&fs.Invalids, 1) + } + return res + } + + if field.Deferrable != nil { + dfs, ok := deferred[field.Deferrable.Label] + di := 0 + if ok { + dfs.AddField(field) + di = len(dfs.Values) - 1 + } else { + dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) + deferred[field.Deferrable.Label] = dfs + } + dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { + return innerFunc(ctx, dfs) + }) + + // don't run the out.Concurrently() call below + out.Values[i] = graphql.Null + continue + } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "vulnerabilitySummary": field := field diff --git a/internal/graph/gengql/vulnerability.generated.go b/internal/graph/gengql/vulnerability.generated.go index 5d8ca95e7..5681bf3b9 100644 --- a/internal/graph/gengql/vulnerability.generated.go +++ b/internal/graph/gengql/vulnerability.generated.go @@ -1588,6 +1588,93 @@ func (ec *executionContext) fieldContext_ImageVulnerabilityFacets_packageTypes(_ return fc, nil } +func (ec *executionContext) _ImageVulnerabilityHistory_samples(ctx context.Context, field graphql.CollectedField, obj *vulnerability.ImageVulnerabilityHistory) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ImageVulnerabilityHistory_samples(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.Samples, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v []*vulnerability.ImageVulnerabilitySample) graphql.Marshaler { + return ec.marshalNImageVulnerabilitySample2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySampleᚄ(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_ImageVulnerabilityHistory_samples(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ImageVulnerabilityHistory", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_ImageVulnerabilitySample(ctx, field) + }, + } + return fc, nil +} + +func (ec *executionContext) _ImageVulnerabilitySample_summary(ctx context.Context, field graphql.CollectedField, obj *vulnerability.ImageVulnerabilitySample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ImageVulnerabilitySample_summary(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.Summary, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *vulnerability.ImageVulnerabilitySummary) graphql.Marshaler { + return ec.marshalNImageVulnerabilitySummary2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySummary(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_ImageVulnerabilitySample_summary(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ImageVulnerabilitySample", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_ImageVulnerabilitySummary(ctx, field) + }, + } + return fc, nil +} + +func (ec *executionContext) _ImageVulnerabilitySample_date(ctx context.Context, field graphql.CollectedField, obj *vulnerability.ImageVulnerabilitySample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ImageVulnerabilitySample_date(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.Date, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v time.Time) graphql.Marshaler { + return ec.marshalNTime2timeᚐTime(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_ImageVulnerabilitySample_date(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + return graphql.NewScalarFieldContext("ImageVulnerabilitySample", field, false, false, errors.New("field of type Time does not have child fields")) +} + func (ec *executionContext) _ImageVulnerabilitySummary_total(ctx context.Context, field graphql.CollectedField, obj *vulnerability.ImageVulnerabilitySummary) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2934,6 +3021,199 @@ func (ec *executionContext) fieldContext_VulnerabilityActivityLogEntryData_newSu return fc, nil } +func (ec *executionContext) _VulnerabilityFixHistory_samples(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixHistory) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityFixHistory_samples(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.Samples, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v []*vulnerability.VulnerabilityFixSample) graphql.Marshaler { + return ec.marshalNVulnerabilityFixSample2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixSampleᚄ(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityFixHistory_samples(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "VulnerabilityFixHistory", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_VulnerabilityFixSample(ctx, field) + }, + } + return fc, nil +} + +func (ec *executionContext) _VulnerabilityFixSample_severity(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityFixSample_severity(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.Severity, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v vulnerability.ImageVulnerabilitySeverity) graphql.Marshaler { + return ec.marshalNImageVulnerabilitySeverity2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySeverity(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityFixSample_severity(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type ImageVulnerabilitySeverity does not have child fields")) +} + +func (ec *executionContext) _VulnerabilityFixSample_date(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityFixSample_date(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.Date, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v time.Time) graphql.Marshaler { + return ec.marshalNTime2timeᚐTime(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityFixSample_date(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Time does not have child fields")) +} + +func (ec *executionContext) _VulnerabilityFixSample_days(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityFixSample_days(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.Days, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v int) graphql.Marshaler { + return ec.marshalNInt2int(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityFixSample_days(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Int does not have child fields")) +} + +func (ec *executionContext) _VulnerabilityFixSample_fixedCount(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityFixSample_fixedCount(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.FixedCount, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v int) graphql.Marshaler { + return ec.marshalNInt2int(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityFixSample_fixedCount(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Int does not have child fields")) +} + +func (ec *executionContext) _VulnerabilityFixSample_firstFixedAt(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityFixSample_firstFixedAt(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.FirstFixedAt, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *time.Time) graphql.Marshaler { + return ec.marshalOTime2ᚖtimeᚐTime(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityFixSample_firstFixedAt(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Time does not have child fields")) +} + +func (ec *executionContext) _VulnerabilityFixSample_lastFixedAt(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityFixSample_lastFixedAt(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.LastFixedAt, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *time.Time) graphql.Marshaler { + return ec.marshalOTime2ᚖtimeᚐTime(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityFixSample_lastFixedAt(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Time does not have child fields")) +} + +func (ec *executionContext) _VulnerabilityFixSample_totalWorkloads(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityFixSample) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityFixSample_totalWorkloads(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.TotalWorkloads, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v int) graphql.Marshaler { + return ec.marshalNInt2int(ctx, selections, v) + }, + true, + true, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityFixSample_totalWorkloads(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + return graphql.NewScalarFieldContext("VulnerabilityFixSample", field, false, false, errors.New("field of type Int does not have child fields")) +} + func (ec *executionContext) _VulnerabilityRemediation_fixVersion(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityRemediation) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5132,6 +5412,89 @@ func (ec *executionContext) _ImageVulnerabilityFacets(ctx context.Context, sel a return out } +var imageVulnerabilityHistoryImplementors = []string{"ImageVulnerabilityHistory"} + +func (ec *executionContext) _ImageVulnerabilityHistory(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { + fields := graphql.CollectFields(ec.OperationContext, sel, imageVulnerabilityHistoryImplementors) + + out := graphql.NewFieldSet(fields) + deferred := make(map[string]*graphql.FieldSet) + for i, field := range fields { + switch field.Name { + case "__typename": + out.Values[i] = graphql.MarshalString("ImageVulnerabilityHistory") + case "samples": + out.Values[i] = ec._ImageVulnerabilityHistory_samples(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + default: + panic("unknown field " + strconv.Quote(field.Name)) + } + } + out.Dispatch(ctx) + if out.Invalids > 0 { + return graphql.Null + } + + atomic.AddInt32(&ec.Deferred, int32(min(len(deferred), math.MaxInt32))) + + for label, dfs := range deferred { + ec.ProcessDeferredGroup(graphql.DeferredGroup{ + Label: label, + Path: graphql.GetPath(ctx), + FieldSet: dfs, + Context: ctx, + }) + } + + return out +} + +var imageVulnerabilitySampleImplementors = []string{"ImageVulnerabilitySample"} + +func (ec *executionContext) _ImageVulnerabilitySample(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.ImageVulnerabilitySample) graphql.Marshaler { + fields := graphql.CollectFields(ec.OperationContext, sel, imageVulnerabilitySampleImplementors) + + out := graphql.NewFieldSet(fields) + deferred := make(map[string]*graphql.FieldSet) + for i, field := range fields { + switch field.Name { + case "__typename": + out.Values[i] = graphql.MarshalString("ImageVulnerabilitySample") + case "summary": + out.Values[i] = ec._ImageVulnerabilitySample_summary(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "date": + out.Values[i] = ec._ImageVulnerabilitySample_date(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + default: + panic("unknown field " + strconv.Quote(field.Name)) + } + } + out.Dispatch(ctx) + if out.Invalids > 0 { + return graphql.Null + } + + atomic.AddInt32(&ec.Deferred, int32(min(len(deferred), math.MaxInt32))) + + for label, dfs := range deferred { + ec.ProcessDeferredGroup(graphql.DeferredGroup{ + Label: label, + Path: graphql.GetPath(ctx), + FieldSet: dfs, + Context: ctx, + }) + } + + return out +} + var imageVulnerabilitySummaryImplementors = []string{"ImageVulnerabilitySummary"} func (ec *executionContext) _ImageVulnerabilitySummary(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.ImageVulnerabilitySummary) graphql.Marshaler { @@ -5689,6 +6052,108 @@ func (ec *executionContext) _VulnerabilityActivityLogEntryData(ctx context.Conte return out } +var vulnerabilityFixHistoryImplementors = []string{"VulnerabilityFixHistory"} + +func (ec *executionContext) _VulnerabilityFixHistory(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { + fields := graphql.CollectFields(ec.OperationContext, sel, vulnerabilityFixHistoryImplementors) + + out := graphql.NewFieldSet(fields) + deferred := make(map[string]*graphql.FieldSet) + for i, field := range fields { + switch field.Name { + case "__typename": + out.Values[i] = graphql.MarshalString("VulnerabilityFixHistory") + case "samples": + out.Values[i] = ec._VulnerabilityFixHistory_samples(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + default: + panic("unknown field " + strconv.Quote(field.Name)) + } + } + out.Dispatch(ctx) + if out.Invalids > 0 { + return graphql.Null + } + + atomic.AddInt32(&ec.Deferred, int32(min(len(deferred), math.MaxInt32))) + + for label, dfs := range deferred { + ec.ProcessDeferredGroup(graphql.DeferredGroup{ + Label: label, + Path: graphql.GetPath(ctx), + FieldSet: dfs, + Context: ctx, + }) + } + + return out +} + +var vulnerabilityFixSampleImplementors = []string{"VulnerabilityFixSample"} + +func (ec *executionContext) _VulnerabilityFixSample(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.VulnerabilityFixSample) graphql.Marshaler { + fields := graphql.CollectFields(ec.OperationContext, sel, vulnerabilityFixSampleImplementors) + + out := graphql.NewFieldSet(fields) + deferred := make(map[string]*graphql.FieldSet) + for i, field := range fields { + switch field.Name { + case "__typename": + out.Values[i] = graphql.MarshalString("VulnerabilityFixSample") + case "severity": + out.Values[i] = ec._VulnerabilityFixSample_severity(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "date": + out.Values[i] = ec._VulnerabilityFixSample_date(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "days": + out.Values[i] = ec._VulnerabilityFixSample_days(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "fixedCount": + out.Values[i] = ec._VulnerabilityFixSample_fixedCount(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + case "firstFixedAt": + out.Values[i] = ec._VulnerabilityFixSample_firstFixedAt(ctx, field, obj) + case "lastFixedAt": + out.Values[i] = ec._VulnerabilityFixSample_lastFixedAt(ctx, field, obj) + case "totalWorkloads": + out.Values[i] = ec._VulnerabilityFixSample_totalWorkloads(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } + default: + panic("unknown field " + strconv.Quote(field.Name)) + } + } + out.Dispatch(ctx) + if out.Invalids > 0 { + return graphql.Null + } + + atomic.AddInt32(&ec.Deferred, int32(min(len(deferred), math.MaxInt32))) + + for label, dfs := range deferred { + ec.ProcessDeferredGroup(graphql.DeferredGroup{ + Label: label, + Path: graphql.GetPath(ctx), + FieldSet: dfs, + Context: ctx, + }) + } + + return out +} + var vulnerabilityRemediationImplementors = []string{"VulnerabilityRemediation"} func (ec *executionContext) _VulnerabilityRemediation(ctx context.Context, sel ast.SelectionSet, obj *vulnerability.VulnerabilityRemediation) graphql.Marshaler { @@ -6411,6 +6876,20 @@ func (ec *executionContext) marshalNImageVulnerabilityEdge2ᚕgithubᚗcomᚋnai return ret } +func (ec *executionContext) marshalNImageVulnerabilityHistory2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx context.Context, sel ast.SelectionSet, v vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { + return ec._ImageVulnerabilityHistory(ctx, sel, &v) +} + +func (ec *executionContext) marshalNImageVulnerabilityHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityHistory(ctx context.Context, sel ast.SelectionSet, v *vulnerability.ImageVulnerabilityHistory) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._ImageVulnerabilityHistory(ctx, sel, v) +} + func (ec *executionContext) unmarshalNImageVulnerabilityOrderField2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilityOrderField(ctx context.Context, v any) (vulnerability.ImageVulnerabilityOrderField, error) { var res vulnerability.ImageVulnerabilityOrderField err := res.UnmarshalGQL(v) @@ -6421,6 +6900,32 @@ func (ec *executionContext) marshalNImageVulnerabilityOrderField2githubᚗcomᚋ return v } +func (ec *executionContext) marshalNImageVulnerabilitySample2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySampleᚄ(ctx context.Context, sel ast.SelectionSet, v []*vulnerability.ImageVulnerabilitySample) graphql.Marshaler { + ret := graphql.MarshalSliceConcurrently(ctx, len(v), 0, false, func(ctx context.Context, i int) graphql.Marshaler { + fc := graphql.GetFieldContext(ctx) + fc.Result = &v[i] + return ec.marshalNImageVulnerabilitySample2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySample(ctx, sel, v[i]) + }) + + for _, e := range ret { + if e == graphql.Null { + return graphql.Null + } + } + + return ret +} + +func (ec *executionContext) marshalNImageVulnerabilitySample2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySample(ctx context.Context, sel ast.SelectionSet, v *vulnerability.ImageVulnerabilitySample) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._ImageVulnerabilitySample(ctx, sel, v) +} + func (ec *executionContext) unmarshalNImageVulnerabilitySeverity2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐImageVulnerabilitySeverity(ctx context.Context, v any) (vulnerability.ImageVulnerabilitySeverity, error) { var res vulnerability.ImageVulnerabilitySeverity err := res.UnmarshalGQL(v) @@ -6536,6 +7041,46 @@ func (ec *executionContext) marshalNVulnerabilityActivityLogEntryData2ᚖgithub return ec._VulnerabilityActivityLogEntryData(ctx, sel, v) } +func (ec *executionContext) marshalNVulnerabilityFixHistory2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx context.Context, sel ast.SelectionSet, v vulnerability.VulnerabilityFixHistory) graphql.Marshaler { + return ec._VulnerabilityFixHistory(ctx, sel, &v) +} + +func (ec *executionContext) marshalNVulnerabilityFixHistory2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixHistory(ctx context.Context, sel ast.SelectionSet, v *vulnerability.VulnerabilityFixHistory) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._VulnerabilityFixHistory(ctx, sel, v) +} + +func (ec *executionContext) marshalNVulnerabilityFixSample2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixSampleᚄ(ctx context.Context, sel ast.SelectionSet, v []*vulnerability.VulnerabilityFixSample) graphql.Marshaler { + ret := graphql.MarshalSliceConcurrently(ctx, len(v), 0, false, func(ctx context.Context, i int) graphql.Marshaler { + fc := graphql.GetFieldContext(ctx) + fc.Result = &v[i] + return ec.marshalNVulnerabilityFixSample2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixSample(ctx, sel, v[i]) + }) + + for _, e := range ret { + if e == graphql.Null { + return graphql.Null + } + } + + return ret +} + +func (ec *executionContext) marshalNVulnerabilityFixSample2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityFixSample(ctx context.Context, sel ast.SelectionSet, v *vulnerability.VulnerabilityFixSample) graphql.Marshaler { + if v == nil { + if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { + graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") + } + return graphql.Null + } + return ec._VulnerabilityFixSample(ctx, sel, v) +} + func (ec *executionContext) marshalNVulnerabilityRemediation2githubᚗcomᚋnaisᚋapiᚋinternalᚋvulnerabilityᚐVulnerabilityRemediation(ctx context.Context, sel ast.SelectionSet, v vulnerability.VulnerabilityRemediation) graphql.Marshaler { return ec._VulnerabilityRemediation(ctx, sel, &v) } diff --git a/internal/graph/schema/vulnerability.graphqls b/internal/graph/schema/vulnerability.graphqls index f2a438142..7553a04c7 100644 --- a/internal/graph/schema/vulnerability.graphqls +++ b/internal/graph/schema/vulnerability.graphqls @@ -7,6 +7,15 @@ extend type Mutation { } extend type Query { + "Get the vulnerability summary history for all teams." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + "Get the vulnerability summary for the tenant." vulnerabilitySummary( "Filter the aggregate." @@ -34,6 +43,12 @@ extend type Query { orderBy: VulnerabilitySummaryOrder ): WorkloadVulnerabilitySummaryConnection! + "Get the mean time to fix history for all teams." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + "Get a specific CVE by its identifier." cve(identifier: String!): CVE! @@ -90,6 +105,23 @@ enum CVEOrderField { PRIORITY } +extend interface Workload { + "Get the vulnerability summary history for workload." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + + "Get the mean time to fix history for a workload." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) +} + extend enum TeamOrderField { "The accumulated risk score of the teams workloads." RISK_SCORE @@ -109,6 +141,62 @@ extend enum TeamOrderField { KNOWN_EXPLOITED_VULNERABILITIES } +extend type Application { + "Get the vulnerability summary history for application." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + + "Get the mean time to fix history for an application." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) +} + +extend type Job { + "Get the vulnerability summary history for job." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + + "Get the mean time to fix history for a job." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) +} + +extend type Team { + "Get the vulnerability summary history for team." + imageVulnerabilityHistory( + "Get vulnerability summary from given date until today." + from: Date! + ): ImageVulnerabilityHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) + + "Get the mean time to fix history for a team." + vulnerabilityFixHistory(from: Date!): VulnerabilityFixHistory! + @deprecated( + reason: "No longer used by Console. Retained for compatibility while consumer usage is assessed." + ) +} + +type ImageVulnerabilityHistory { + "Vulnerability summary samples." + samples: [ImageVulnerabilitySample!]! +} + """ SBOM metadata for a container image, including pipeline status and processing information. This type is accessed through ContainerImage.sbom. @@ -420,6 +508,14 @@ type ImageVulnerabilityFacets { packageTypes: [StringFacetItem!]! } +type ImageVulnerabilitySample { + "The historic image vulnerability summary" + summary: ImageVulnerabilitySummary! + + "Timestamp of the vulnerability summary." + date: Time! +} + type ContainerImageWorkloadReferenceConnection { "Information to aid in pagination." pageInfo: PageInfo! @@ -1091,6 +1187,36 @@ extend enum ActivityLogActivityType { VULNERABILITY_UPDATED } +"Trend of mean time to fix vulnerabilities grouped by severity." +type VulnerabilityFixHistory { + "Mean time to fix samples." + samples: [VulnerabilityFixSample!]! +} + +"One MTTR sample for a severity at a point in time." +type VulnerabilityFixSample { + "Severity of vulnerabilities in this sample." + severity: ImageVulnerabilitySeverity! + + "Snapshot date of the sample." + date: Time! + + "Mean time to fix in days." + days: Int! + + "Number of vulnerabilities fixed in this sample." + fixedCount: Int! + + "Earliest time a vulnerability was fixed in this sample." + firstFixedAt: Time + + "Latest time a vulnerability was fixed in this sample." + lastFixedAt: Time + + "Total number of workloads with this severity of vulnerabilities." + totalWorkloads: Int! +} + "The SBOM pipeline status for an image or workload." enum SBOMStatus { "SBOM generation is in progress." diff --git a/internal/graph/vulnerability.resolvers.go b/internal/graph/vulnerability.resolvers.go index 2068bd432..b9487c4d2 100644 --- a/internal/graph/vulnerability.resolvers.go +++ b/internal/graph/vulnerability.resolvers.go @@ -8,12 +8,23 @@ import ( "github.com/nais/api/internal/environmentmapper" "github.com/nais/api/internal/graph/gengql" "github.com/nais/api/internal/graph/pagination" + "github.com/nais/api/internal/graph/scalar" "github.com/nais/api/internal/slug" "github.com/nais/api/internal/team" "github.com/nais/api/internal/vulnerability" "github.com/nais/api/internal/workload" + "github.com/nais/api/internal/workload/application" + "github.com/nais/api/internal/workload/job" ) +func (r *applicationResolver) ImageVulnerabilityHistory(ctx context.Context, obj *application.Application, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) { + return vulnerability.GetWorkloadVulnerabilityHistoryForWorkload(ctx, obj, from.Time()) +} + +func (r *applicationResolver) VulnerabilityFixHistory(ctx context.Context, obj *application.Application, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) { + return vulnerability.GetVulnerabilityMeanTimeToFixHistoryForWorkload(ctx, obj, from.Time()) +} + func (r *cVEResolver) Workloads(ctx context.Context, obj *vulnerability.CVE, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *vulnerability.CVEWorkloadsFilter, orderBy *vulnerability.CVEWorkloadOrder) (*vulnerability.WorkloadWithVulnerabilityConnection, error) { if obj.AffectedWorkloads != nil && (filter == nil || (len(filter.TeamSlugs) == 0 && filter.TeamScope == nil && filter.EnvironmentName == nil)) && onlyAsksForPageInfoTotalCount(ctx) { return &vulnerability.WorkloadWithVulnerabilityConnection{ @@ -71,6 +82,14 @@ func (r *containerImageWorkloadReferenceResolver) Workload(ctx context.Context, return getWorkload(ctx, obj.Reference, obj.TeamSlug, environmentmapper.EnvironmentName(obj.EnvironmentName)) } +func (r *jobResolver) ImageVulnerabilityHistory(ctx context.Context, obj *job.Job, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) { + return vulnerability.GetWorkloadVulnerabilityHistoryForWorkload(ctx, obj, from.Time()) +} + +func (r *jobResolver) VulnerabilityFixHistory(ctx context.Context, obj *job.Job, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) { + return vulnerability.GetVulnerabilityMeanTimeToFixHistoryForWorkload(ctx, obj, from.Time()) +} + func (r *mutationResolver) UpdateImageVulnerability(ctx context.Context, input vulnerability.UpdateImageVulnerabilityInput) (*vulnerability.UpdateImageVulnerabilityPayload, error) { vulnWorkloads, err := vulnerability.ListWorkloadsForVulnerabilityByID(ctx, input.VulnerabilityID.ID) if err != nil { @@ -92,6 +111,10 @@ func (r *mutationResolver) UpdateImageVulnerability(ctx context.Context, input v return vulnerability.UpdateImageVulnerability(ctx, input) } +func (r *queryResolver) ImageVulnerabilityHistory(ctx context.Context, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) { + return vulnerability.GetWorkloadVulnerabilityHistoryForTenant(ctx, from.Time()) +} + func (r *queryResolver) VulnerabilitySummary(ctx context.Context, filter *vulnerability.TenantVulnerabilitySummaryFilter) (*vulnerability.TenantVulnerabilitySummary, error) { return vulnerability.GetTenantVulnerabilitySummary(ctx, filter) } @@ -105,6 +128,10 @@ func (r *queryResolver) VulnerabilitySummaries(ctx context.Context, first *int, return vulnerability.ListTenantVulnerabilitySummaries(ctx, filter, page, orderBy) } +func (r *queryResolver) VulnerabilityFixHistory(ctx context.Context, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) { + return vulnerability.GetVulnerabilityMeanTimeToFixHistory(ctx, from.Time()) +} + func (r *queryResolver) CVE(ctx context.Context, identifier string) (*vulnerability.CVE, error) { return vulnerability.GetCVE(ctx, identifier) } @@ -118,6 +145,14 @@ func (r *queryResolver) Cves(ctx context.Context, first *int, after *pagination. return vulnerability.ListCVEs(ctx, page, orderBy, filter) } +func (r *teamResolver) ImageVulnerabilityHistory(ctx context.Context, obj *team.Team, from scalar.Date) (*vulnerability.ImageVulnerabilityHistory, error) { + return vulnerability.GetWorkloadVulnerabilityHistoryForTeam(ctx, obj.Slug, from.Time()) +} + +func (r *teamResolver) VulnerabilityFixHistory(ctx context.Context, obj *team.Team, from scalar.Date) (*vulnerability.VulnerabilityFixHistory, error) { + return vulnerability.GetVulnerabilityMeanTimeToFixHistoryForTeam(ctx, obj.Slug, from.Time()) +} + func (r *teamResolver) VulnerabilitySummary(ctx context.Context, obj *team.Team, filter *vulnerability.TeamVulnerabilitySummaryFilter) (*vulnerability.TeamVulnerabilitySummary, error) { return vulnerability.GetVulnerabilitySummary(ctx, obj.Slug, filter) } diff --git a/internal/graph/vulnerability.resolvers_test.go b/internal/graph/vulnerability.resolvers_test.go index 55ab825af..ea5875717 100644 --- a/internal/graph/vulnerability.resolvers_test.go +++ b/internal/graph/vulnerability.resolvers_test.go @@ -21,6 +21,28 @@ import ( "github.com/sirupsen/logrus" ) +func TestVulnerabilityHistoryFieldsDeprecated(t *testing.T) { + schema := gengql.NewExecutableSchema(gengql.Config{}).Schema() + for _, typeName := range []string{"Query", "Workload", "Application", "Job", "Team"} { + for _, fieldName := range []string{"imageVulnerabilityHistory", "vulnerabilityFixHistory"} { + t.Run(typeName+"."+fieldName, func(t *testing.T) { + field := schema.Types[typeName].Fields.ForName(fieldName) + if field == nil { + t.Fatal("field must remain available for existing consumers") + } + deprecation := field.Directives.ForName("deprecated") + if deprecation == nil { + t.Fatal("field must be marked deprecated") + } + reason := deprecation.Arguments.ForName("reason") + if reason == nil || reason.Value.Raw == "" { + t.Error("deprecation must explain why the field is being phased out") + } + }) + } + } +} + type cveAliasClient struct { vulnerabilities.Client nodes []*vulnerabilities.CveSummary diff --git a/internal/vulnerability/models.go b/internal/vulnerability/models.go index 000ed9888..ce0ab610e 100644 --- a/internal/vulnerability/models.go +++ b/internal/vulnerability/models.go @@ -540,6 +540,15 @@ type TenantVulnerabilitySummaryFilter struct { HasKevEntry *bool `json:"hasKevEntry,omitempty"` } +type ImageVulnerabilitySample struct { + Summary *ImageVulnerabilitySummary `json:"summary"` + Date time.Time `json:"date"` +} + +type ImageVulnerabilityHistory struct { + Samples []*ImageVulnerabilitySample `json:"samples"` +} + type TenantVulnerabilitySummary struct { RiskScore int `json:"riskScore"` CountsBySeverity ImageVulnerabilitySummaryCountsBySeverity `json:"countsBySeverity"` @@ -554,6 +563,20 @@ type TenantVulnerabilitySummary struct { LastUpdated *time.Time `json:"lastUpdated"` } +type VulnerabilityFixHistory struct { + Samples []*VulnerabilityFixSample `json:"samples"` +} + +type VulnerabilityFixSample struct { + Severity ImageVulnerabilitySeverity `json:"severity"` + Date time.Time `json:"date"` + Days int `json:"days"` + FixedCount int `json:"fixedCount"` + FirstFixedAt *time.Time `json:"firstFixedAt,omitempty"` + LastFixedAt *time.Time `json:"lastFixedAt,omitempty"` + TotalWorkloads int `json:"totalWorkloads"` +} + type CVEPriority string const ( diff --git a/internal/vulnerability/queries.go b/internal/vulnerability/queries.go index e7987a543..04709d125 100644 --- a/internal/vulnerability/queries.go +++ b/internal/vulnerability/queries.go @@ -5,6 +5,7 @@ import ( "fmt" "math" "slices" + "sort" "strings" "time" @@ -588,6 +589,23 @@ func GetImageVulnerabilitySummary(ctx context.Context, ref string) (*ImageVulner }, nil } +func GetWorkloadVulnerabilityHistoryForTeam(ctx context.Context, slug slug.Slug, from time.Time) (*ImageVulnerabilityHistory, error) { + if from.Before(time.Now().AddDate(-1, 0, 0)) { + return nil, apierror.Errorf("`from` cannot be older than 1 year") + } + if from.After(time.Now()) { + return nil, apierror.Errorf("`from` cannot be in the future") + } + + since := normalizeFromDate(from) + + opts := []vulnerabilities.Option{} + opts = append(opts, vulnerabilities.Since(since)) + opts = append(opts, vulnerabilities.NamespaceFilter(slug.String())) + + return getVulnerabilityHistory(ctx, opts) +} + func teamSlugsFilterOption(teams []slug.Slug) vulnerabilities.Option { namespaces := make([]string, len(teams)) for i, team := range teams { @@ -657,6 +675,103 @@ func GetTenantVulnerabilitySummary(ctx context.Context, filter *TenantVulnerabil }, nil } +func GetWorkloadVulnerabilityHistoryForTenant(ctx context.Context, from time.Time) (*ImageVulnerabilityHistory, error) { + if from.Before(time.Now().AddDate(-1, 0, 0)) { + return nil, apierror.Errorf("`from` cannot be older than 1 year") + } + if from.After(time.Now()) { + return nil, apierror.Errorf("`from` cannot be in the future") + } + + since := normalizeFromDate(from) + + opts := []vulnerabilities.Option{} + opts = append(opts, vulnerabilities.Since(since)) + + return getVulnerabilityHistory(ctx, opts) +} + +func GetWorkloadVulnerabilityHistoryForWorkload(ctx context.Context, obj workload.Workload, from time.Time) (*ImageVulnerabilityHistory, error) { + var workloadType string + switch obj.GetType() { + case workload.TypeApplication: + workloadType = "app" + case workload.TypeJob: + workloadType = "job" + default: + return nil, apierror.Errorf("invalid workload type") + } + + if from.Before(time.Now().AddDate(-1, 0, 0)) { + return nil, apierror.Errorf("`from` cannot be older than 1 year") + } + if from.After(time.Now()) { + return nil, apierror.Errorf("`from` cannot be in the future") + } + + since := normalizeFromDate(from) + + opts := []vulnerabilities.Option{} + opts = append(opts, vulnerabilities.Since(since)) + opts = append(opts, vulnerabilities.ClusterFilter(environmentmapper.ClusterName(obj.GetEnvironmentName()))) + opts = append(opts, vulnerabilities.NamespaceFilter(obj.GetTeamSlug().String())) + opts = append(opts, vulnerabilities.WorkloadFilter(obj.GetName())) + opts = append(opts, vulnerabilities.WorkloadTypeFilter(workloadType)) + + return getVulnerabilityHistory(ctx, opts) +} + +// TODO: this is a hack to get the correct date for the vulnerability history. Probably timezone related. +func normalizeFromDate(from time.Time) time.Time { + return time.Date(from.Year(), from.Month(), from.Day(), 2, 0, 0, 0, time.UTC) +} + +func getVulnerabilityHistory(ctx context.Context, opts []vulnerabilities.Option) (*ImageVulnerabilityHistory, error) { + resp, err := fromContext(ctx).manager.Client.GetVulnerabilitySummaryTimeSeries(ctx, opts...) + if err != nil { + return nil, apierror.Errorf("get vulnerability history: %v", err) + } + + samples := make([]*ImageVulnerabilitySample, 0) + + for _, point := range resp.GetPoints() { + samples = append(samples, &ImageVulnerabilitySample{ + Summary: &ImageVulnerabilitySummary{ + Critical: int(point.GetCritical()), + High: int(point.GetHigh()), + Medium: int(point.GetMedium()), + Low: int(point.GetLow()), + Unassigned: int(point.GetUnassigned()), + Total: int(point.GetTotal()), + RiskScore: int(point.GetRiskScore()), + CountsBySeverity: ImageVulnerabilitySummaryCountsBySeverity{ + Critical: int(point.GetCritical()), + High: int(point.GetHigh()), + Medium: int(point.GetMedium()), + Low: int(point.GetLow()), + Unassigned: int(point.GetUnassigned()), + }, + CountsByPriority: ImageVulnerabilitySummaryCountsByPriority{ + Urgent: 0, + KnownExploited: int(point.GetKevCount()), + HighRisk: int(point.GetHighRisk()), + ElevatedRisk: int(point.GetElevatedRisk()), + Monitor: int(point.GetMonitor()), + }, + }, + Date: point.GetBucketTime().AsTime(), + }) + } + + sort.Slice(samples, func(i, j int) bool { + return samples[i].Date.After(samples[j].Date) + }) + + return &ImageVulnerabilityHistory{ + Samples: samples, + }, nil +} + func GetVulnerabilitySummary(ctx context.Context, s slug.Slug, filter *TeamVulnerabilitySummaryFilter) (*TeamVulnerabilitySummary, error) { opts, err := teamSummaryFilterOptions(filter) if err != nil { @@ -704,6 +819,54 @@ func GetVulnerabilitySummary(ctx context.Context, s slug.Slug, filter *TeamVulne }, nil } +func GetVulnerabilityMeanTimeToFixHistoryForWorkload(ctx context.Context, obj workload.Workload, from time.Time) (*VulnerabilityFixHistory, error) { + workloadType, err := getWorkloadType(obj.GetType()) + if err != nil { + return nil, err + } + + if from.Before(time.Now().AddDate(-1, 0, 0)) { + return nil, apierror.Errorf("`from` cannot be older than 1 year") + } + if from.After(time.Now()) { + return nil, apierror.Errorf("`from` cannot be in the future") + } + + since := normalizeFromDate(from) + opts := []vulnerabilities.Option{ + vulnerabilities.Since(since), + vulnerabilities.ClusterFilter(environmentmapper.ClusterName(obj.GetEnvironmentName())), + vulnerabilities.NamespaceFilter(obj.GetTeamSlug().String()), + vulnerabilities.WorkloadFilter(obj.GetName()), + vulnerabilities.WorkloadTypeFilter(workloadType), + } + + return getVulnerabilityMeanTimeToFixHistory(ctx, opts) +} + +func GetVulnerabilityMeanTimeToFixHistoryForTeam(ctx context.Context, slug slug.Slug, from time.Time) (*VulnerabilityFixHistory, error) { + if from.Before(time.Now().AddDate(-1, 0, 0)) { + return nil, apierror.Errorf("`from` cannot be older than 1 year") + } + if from.After(time.Now()) { + return nil, apierror.Errorf("`from` cannot be in the future") + } + + since := normalizeFromDate(from) + + opts := []vulnerabilities.Option{} + opts = append(opts, vulnerabilities.Since(since)) + opts = append(opts, vulnerabilities.NamespaceFilter(slug.String())) + + return getVulnerabilityMeanTimeToFixHistory(ctx, opts) +} + +func GetVulnerabilityMeanTimeToFixHistory(ctx context.Context, from time.Time) (*VulnerabilityFixHistory, error) { + var opts []vulnerabilities.Option + opts = append(opts, vulnerabilities.Since(from)) + return getVulnerabilityMeanTimeToFixHistory(ctx, opts) +} + func GetCVE(ctx context.Context, cve string) (*CVE, error) { vuln, err := fromContext(ctx).manager.Client.GetCve(ctx, cve) if err != nil { @@ -924,6 +1087,63 @@ func getCVEByIdent(ctx context.Context, id ident.Ident) (*CVE, error) { return GetCVE(ctx, cveID) } +func getVulnerabilityMeanTimeToFixHistory(ctx context.Context, opts []vulnerabilities.Option) (*VulnerabilityFixHistory, error) { + resp, err := fromContext(ctx).manager.Client.ListMeanTimeToFixTrendBySeverity(ctx, opts...) + if err != nil { + return nil, apierror.Errorf("list mean time to fix trend by severity: %v", err) + } + + samples := make([]*VulnerabilityFixSample, 0, len(resp.GetPoints())) + for _, point := range resp.GetPoints() { + firstFixedAt := point.GetFirstFixedAt().AsTime() + lastFixedAt := point.GetLastFixedAt().AsTime() + sample := &VulnerabilityFixSample{ + Severity: parseSeverity(point.Severity), + Date: point.SnapshotDate.AsTime(), + Days: int(point.GetMeanTimeToFixDays()), + FixedCount: int(point.FixedCount), + FirstFixedAt: &firstFixedAt, + LastFixedAt: &lastFixedAt, + TotalWorkloads: int(point.WorkloadCount), + } + samples = append(samples, sample) + } + + sort.Slice(samples, func(i, j int) bool { + return samples[i].Date.After(samples[j].Date) + }) + + return &VulnerabilityFixHistory{ + Samples: samples, + }, nil +} + +func getWorkloadType(workloadType workload.Type) (string, error) { + switch workloadType { + case workload.TypeApplication: + return "app", nil + case workload.TypeJob: + return "job", nil + default: + return "", apierror.Errorf("invalid workload type: %s", workloadType) + } +} + +func parseSeverity(s vulnerabilities.Severity) ImageVulnerabilitySeverity { + switch s { + case vulnerabilities.Severity_CRITICAL: + return ImageVulnerabilitySeverityCritical + case vulnerabilities.Severity_HIGH: + return ImageVulnerabilitySeverityHigh + case vulnerabilities.Severity_MEDIUM: + return ImageVulnerabilitySeverityMedium + case vulnerabilities.Severity_LOW: + return ImageVulnerabilitySeverityLow + default: + return ImageVulnerabilitySeverityUnassigned + } +} + func getVulnerabilityByIdent(ctx context.Context, id ident.Ident) (*ImageVulnerability, error) { resp, err := fromContext(ctx).manager.Client.GetVulnerabilityById(ctx, id.ID) if err != nil { From e64d1f1c86056e91aa0fb183e60a52a847410479 Mon Sep 17 00:00:00 2001 From: Youssef Bel Mekki <38552193+ybelMekk@users.noreply.github.com> Date: Fri, 20 Nov 2026 09:22:59 +0100 Subject: [PATCH 3/3] test: remove deprecated vulnerability history fields tests --- .../graph/vulnerability.resolvers_test.go | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/internal/graph/vulnerability.resolvers_test.go b/internal/graph/vulnerability.resolvers_test.go index ea5875717..55ab825af 100644 --- a/internal/graph/vulnerability.resolvers_test.go +++ b/internal/graph/vulnerability.resolvers_test.go @@ -21,28 +21,6 @@ import ( "github.com/sirupsen/logrus" ) -func TestVulnerabilityHistoryFieldsDeprecated(t *testing.T) { - schema := gengql.NewExecutableSchema(gengql.Config{}).Schema() - for _, typeName := range []string{"Query", "Workload", "Application", "Job", "Team"} { - for _, fieldName := range []string{"imageVulnerabilityHistory", "vulnerabilityFixHistory"} { - t.Run(typeName+"."+fieldName, func(t *testing.T) { - field := schema.Types[typeName].Fields.ForName(fieldName) - if field == nil { - t.Fatal("field must remain available for existing consumers") - } - deprecation := field.Directives.ForName("deprecated") - if deprecation == nil { - t.Fatal("field must be marked deprecated") - } - reason := deprecation.Arguments.ForName("reason") - if reason == nil || reason.Value.Raw == "" { - t.Error("deprecation must explain why the field is being phased out") - } - }) - } - } -} - type cveAliasClient struct { vulnerabilities.Client nodes []*vulnerabilities.CveSummary