diff --git a/internal/deployment/sortfilter.go b/internal/deployment/sortfilter.go new file mode 100644 index 000000000..d229f879e --- /dev/null +++ b/internal/deployment/sortfilter.go @@ -0,0 +1,32 @@ +package deployment + +import ( + "context" + + "github.com/nais/api/internal/workload" + "github.com/nais/api/internal/workload/application" + "github.com/nais/api/internal/workload/job" +) + +func init() { + sortByTimestamp := func(ctx context.Context, wl workload.Workload) int { + ts, err := latestDeploymentTimestampForWorkload(ctx, wl) + if err != nil { + return -1 + } + + return int(ts.Unix()) + } + + application.SortFilter.RegisterConcurrentSort("DEPLOYMENT_TIME", func(ctx context.Context, a *application.Application) int { + return sortByTimestamp(ctx, a) + }) + + job.SortFilter.RegisterConcurrentSort("DEPLOYMENT_TIME", func(ctx context.Context, a *job.Job) int { + return sortByTimestamp(ctx, a) + }) + + workload.SortFilter.RegisterConcurrentSort("DEPLOYMENT_TIME", func(ctx context.Context, a workload.Workload) int { + return sortByTimestamp(ctx, a) + }) +} diff --git a/internal/deployment/sortorder.go b/internal/deployment/sortorder.go deleted file mode 100644 index 39bad36c6..000000000 --- a/internal/deployment/sortorder.go +++ /dev/null @@ -1,36 +0,0 @@ -package deployment - -import ( - "context" - - "github.com/nais/api/internal/workload" - "github.com/nais/api/internal/workload/application" - "github.com/nais/api/internal/workload/job" -) - -const ( - ApplicationOrderFieldDeploymentTime application.ApplicationOrderField = "DEPLOYMENT_TIME" - JobOrderFieldDeploymentTime job.JobOrderField = "DEPLOYMENT_TIME" -) - -func init() { - application.AllApplicationOrderField = append(application.AllApplicationOrderField, ApplicationOrderFieldDeploymentTime) - job.AllJobOrderField = append(job.AllJobOrderField, JobOrderFieldDeploymentTime) - - sortByTimestamp := func(ctx context.Context, wl workload.Workload) int { - ts, err := latestDeploymentTimestampForWorkload(ctx, wl) - if err != nil { - return -1 - } - - return int(ts.Unix()) - } - - application.SortFilter.RegisterConcurrentOrderBy(ApplicationOrderFieldDeploymentTime, func(ctx context.Context, a *application.Application) int { - return sortByTimestamp(ctx, a) - }) - - job.SortFilter.RegisterConcurrentOrderBy(JobOrderFieldDeploymentTime, func(ctx context.Context, a *job.Job) int { - return sortByTimestamp(ctx, a) - }) -} diff --git a/internal/github/repository/model.go b/internal/github/repository/model.go index 6cae1e017..d7fe392a8 100644 --- a/internal/github/repository/model.go +++ b/internal/github/repository/model.go @@ -3,6 +3,7 @@ package repository import ( "fmt" "io" + "slices" "strconv" "strings" @@ -58,11 +59,8 @@ type TeamRepositoryFilter struct { Name *string `json:"name"` } -// Ordering options when fetching repositories. type RepositoryOrder struct { - // The field to order items by. - Field RepositoryOrderField `json:"field"` - // The direction to order items by. + Field RepositoryOrderField `json:"field"` Direction model.OrderDirection `json:"direction"` } @@ -77,7 +75,6 @@ func (o *RepositoryOrder) String() string { type RepositoryOrderField string const ( - // Order repositories by name. RepositoryOrderFieldName RepositoryOrderField = "NAME" ) @@ -86,11 +83,7 @@ var AllRepositoryOrderField = []RepositoryOrderField{ } func (e RepositoryOrderField) IsValid() bool { - switch e { - case RepositoryOrderFieldName: - return true - } - return false + return slices.Contains(AllRepositoryOrderField, e) } func (e RepositoryOrderField) String() string { diff --git a/internal/graph/applications.resolvers.go b/internal/graph/applications.resolvers.go index 749335642..e80a6274c 100644 --- a/internal/graph/applications.resolvers.go +++ b/internal/graph/applications.resolvers.go @@ -6,7 +6,6 @@ import ( "github.com/nais/api/internal/auth/authz" "github.com/nais/api/internal/graph/gengql" - "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" "github.com/nais/api/internal/status" "github.com/nais/api/internal/team" @@ -102,26 +101,12 @@ func (r *restartApplicationPayloadResolver) Application(ctx context.Context, obj } func (r *teamResolver) Applications(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *application.ApplicationOrder, filter *application.TeamApplicationsFilter) (*pagination.Connection[*application.Application], error) { - if filter == nil { - filter = &application.TeamApplicationsFilter{} - } - page, err := pagination.ParsePage(first, after, last, before) if err != nil { return nil, err } - if orderBy == nil { - orderBy = &application.ApplicationOrder{ - Field: application.ApplicationOrderFieldName, - Direction: model.OrderDirectionAsc, - } - } - - ret := application.ListAllForTeam(ctx, obj.Slug) - ret = application.SortFilter.Filter(ctx, ret, filter) - - application.SortFilter.Sort(ctx, ret, orderBy.Field, orderBy.Direction) + ret := application.ListAllForTeam(ctx, obj.Slug, orderBy, filter) apps := pagination.Slice(ret, page) return pagination.NewConnection(apps, page, len(ret)), nil } @@ -131,7 +116,7 @@ func (r *teamEnvironmentResolver) Application(ctx context.Context, obj *team.Tea } func (r *teamInventoryCountApplicationsResolver) NotNais(ctx context.Context, obj *application.TeamInventoryCountApplications) (int, error) { - apps := application.ListAllForTeam(ctx, obj.TeamSlug) + apps := application.ListAllForTeam(ctx, obj.TeamSlug, nil, nil) notNais := 0 for _, app := range apps { @@ -144,7 +129,7 @@ func (r *teamInventoryCountApplicationsResolver) NotNais(ctx context.Context, ob } func (r *teamInventoryCountsResolver) Applications(ctx context.Context, obj *team.TeamInventoryCounts) (*application.TeamInventoryCountApplications, error) { - apps := application.ListAllForTeam(ctx, obj.TeamSlug) + apps := application.ListAllForTeam(ctx, obj.TeamSlug, nil, nil) return &application.TeamInventoryCountApplications{ Total: len(apps), diff --git a/internal/graph/bigquery.resolvers.go b/internal/graph/bigquery.resolvers.go index 02d57984b..74038adad 100644 --- a/internal/graph/bigquery.resolvers.go +++ b/internal/graph/bigquery.resolvers.go @@ -39,7 +39,7 @@ func (r *bigQueryDatasetResolver) Access(ctx context.Context, obj *bigquery.BigQ if orderBy == nil { orderBy = &bigquery.BigQueryDatasetAccessOrder{ - Field: bigquery.BigQueryDatasetAccessOrderFieldEmail, + Field: "EMAIL", Direction: model.OrderDirectionAsc, } } diff --git a/internal/graph/jobs.resolvers.go b/internal/graph/jobs.resolvers.go index 3891e44d1..a6a22e180 100644 --- a/internal/graph/jobs.resolvers.go +++ b/internal/graph/jobs.resolvers.go @@ -6,7 +6,6 @@ import ( "github.com/nais/api/internal/auth/authz" "github.com/nais/api/internal/graph/gengql" - "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" "github.com/nais/api/internal/status" "github.com/nais/api/internal/team" @@ -96,25 +95,12 @@ func (r *mutationResolver) TriggerJob(ctx context.Context, input job.TriggerJobI } func (r *teamResolver) Jobs(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *job.JobOrder, filter *job.TeamJobsFilter) (*pagination.Connection[*job.Job], error) { - if filter == nil { - filter = &job.TeamJobsFilter{} - } page, err := pagination.ParsePage(first, after, last, before) if err != nil { return nil, err } - if orderBy == nil { - orderBy = &job.JobOrder{ - Field: job.JobOrderFieldName, - Direction: model.OrderDirectionAsc, - } - } - - ret := job.ListAllForTeam(ctx, obj.Slug) - ret = job.SortFilter.Filter(ctx, ret, filter) - - job.SortFilter.Sort(ctx, ret, orderBy.Field, orderBy.Direction) + ret := job.ListAllForTeam(ctx, obj.Slug, orderBy, filter) jobs := pagination.Slice(ret, page) return pagination.NewConnection(jobs, page, len(ret)), nil } @@ -124,11 +110,11 @@ func (r *teamEnvironmentResolver) Job(ctx context.Context, obj *team.TeamEnviron } func (r *teamInventoryCountJobsResolver) NotNais(ctx context.Context, obj *job.TeamInventoryCountJobs) (int, error) { - jobs := job.ListAllForTeam(ctx, obj.TeamSlug) + jobs := job.ListAllForTeam(ctx, obj.TeamSlug, nil, nil) notNais := 0 - for _, job := range jobs { - s := status.ForWorkload(ctx, job) + for _, j := range jobs { + s := status.ForWorkload(ctx, j) if s.State == status.WorkloadStateNotNais { notNais++ } @@ -137,10 +123,10 @@ func (r *teamInventoryCountJobsResolver) NotNais(ctx context.Context, obj *job.T } func (r *teamInventoryCountsResolver) Jobs(ctx context.Context, obj *team.TeamInventoryCounts) (*job.TeamInventoryCountJobs, error) { - apps := job.ListAllForTeam(ctx, obj.TeamSlug) + jobs := job.ListAllForTeam(ctx, obj.TeamSlug, nil, nil) return &job.TeamInventoryCountJobs{ - Total: len(apps), + Total: len(jobs), TeamSlug: obj.TeamSlug, }, nil } diff --git a/internal/graph/kafka.resolvers.go b/internal/graph/kafka.resolvers.go index a5f5d77f2..bf5da784c 100644 --- a/internal/graph/kafka.resolvers.go +++ b/internal/graph/kafka.resolvers.go @@ -50,7 +50,7 @@ func (r *kafkaTopicResolver) ACL(ctx context.Context, obj *kafkatopic.KafkaTopic if orderBy == nil { orderBy = &kafkatopic.KafkaTopicACLOrder{ - Field: kafkatopic.KafkaTopicACLOrderFieldTopicName, + Field: "TOPIC_NAME", Direction: model.OrderDirectionAsc, } } diff --git a/internal/graph/secret.resolvers.go b/internal/graph/secret.resolvers.go index 68ec3873a..41598a9c0 100644 --- a/internal/graph/secret.resolvers.go +++ b/internal/graph/secret.resolvers.go @@ -137,7 +137,7 @@ func (r *secretResolver) Applications(ctx context.Context, obj *secret.Secret, f return nil, err } - allApps := application.ListAllForTeam(ctx, obj.TeamSlug) + allApps := application.ListAllForTeam(ctx, obj.TeamSlug, nil, nil) ret := make([]*application.Application, 0) for _, app := range allApps { @@ -156,7 +156,7 @@ func (r *secretResolver) Jobs(ctx context.Context, obj *secret.Secret, first *in return nil, err } - allJobs := job.ListAllForTeam(ctx, obj.TeamSlug) + allJobs := job.ListAllForTeam(ctx, obj.TeamSlug, nil, nil) ret := make([]*job.Job, 0) for _, j := range allJobs { diff --git a/internal/graph/sortfilter/sortfilter.go b/internal/graph/sortfilter/sortfilter.go index c9855c2c8..617d52558 100644 --- a/internal/graph/sortfilter/sortfilter.go +++ b/internal/graph/sortfilter/sortfilter.go @@ -9,62 +9,77 @@ import ( "github.com/sourcegraph/conc/pool" ) -// OrderBy compares two values of type V and returns an integer indicating their order. +// SortFunc compares two values of type V and returns an integer indicating their order. // If a < b, the function should return a negative value. // If a == b, the function should return 0. // If a > b, the function should return a positive value. -type OrderBy[V any] func(ctx context.Context, a, b V) int +type SortFunc[V any] func(ctx context.Context, a, b V) int -// ConcurrentOrderBy should return a integer indicating the order of the given value. -// The results will later be ordered by the returned value. -type ConcurrentOrderBy[V any] func(ctx context.Context, a V) int +// ConcurrentSortFunc should return an integer indicating the order of the given value. +// The results will later be sorted by the returned value. +type ConcurrentSortFunc[V any] func(ctx context.Context, a V) int +// Filter is a function that returns true if the given value should be included in the result. type Filter[V any, FilterObj any] func(ctx context.Context, v V, filter FilterObj) bool -type orderByValue[V any] struct { - concurrentOrderBy ConcurrentOrderBy[V] - orderBy OrderBy[V] +type funcs[V any] struct { + concurrentSort ConcurrentSortFunc[V] + sort SortFunc[V] } -type SortFilter[V any, OrderKey comparable, FilterObj comparable] struct { - orderBys map[OrderKey]orderByValue[V] - filters []Filter[V, FilterObj] - defaultSortKey OrderKey +type SortFilter[V any, SortField comparable, FilterObj comparable] struct { + sorters map[SortField]funcs[V] + filters []Filter[V, FilterObj] + tieBreakSortField SortField + tieBreakSortDirection model.OrderDirection } -// New creates a new SortFilter with the given defaultSortKey. -// The defaultSortKey is used when two values are equal in the OrderBy function. -// The defaultSortKey must not be registered as a ConcurrentOrderBy. -func New[V any, OrderKey comparable, FilterObj comparable](defaultSortKey OrderKey) *SortFilter[V, OrderKey, FilterObj] { - return &SortFilter[V, OrderKey, FilterObj]{ - orderBys: make(map[OrderKey]orderByValue[V]), - defaultSortKey: defaultSortKey, +// New creates a new SortFilter with the given tieBreakSortField and tieBreakSortDirection. +// The tieBreakSortField is used when two values are equal in the Sort function. +// The tieBreakSortField must not be registered as a ConcurrentSort. +func New[V any, SortField comparable, FilterObj comparable](tieBreakSortField SortField, tieBreakSortDirection model.OrderDirection) *SortFilter[V, SortField, FilterObj] { + return &SortFilter[V, SortField, FilterObj]{ + sorters: make(map[SortField]funcs[V]), + tieBreakSortField: tieBreakSortField, + tieBreakSortDirection: tieBreakSortDirection, } } -func (s *SortFilter[T, OrderKey, FilterObj]) RegisterFilter(filter Filter[T, FilterObj]) { - s.filters = append(s.filters, filter) +// SupportsSort returns true if the given field is registered using RegisterSort or RegisterConcurrentSort. +func (s *SortFilter[T, SortField, FilterObj]) SupportsSort(field SortField) bool { + _, exists := s.sorters[field] + return exists } -func (s *SortFilter[T, OrderKey, FilterObj]) RegisterOrderBy(key OrderKey, orderBy OrderBy[T]) { - if _, ok := s.orderBys[key]; ok { - panic(fmt.Sprintf("OrderBy already registered for key: %v", key)) +func (s *SortFilter[T, SortField, FilterObj]) RegisterSort(field SortField, sort SortFunc[T]) { + if _, ok := s.sorters[field]; ok { + panic(fmt.Sprintf("sort field is already registered: %v", field)) } - s.orderBys[key] = orderByValue[T]{ - orderBy: orderBy, + + s.sorters[field] = funcs[T]{ + sort: sort, } } -func (s *SortFilter[T, OrderKey, FilterObj]) RegisterConcurrentOrderBy(key OrderKey, orderBy ConcurrentOrderBy[T]) { - if _, ok := s.orderBys[key]; ok { - panic(fmt.Sprintf("OrderBy already registered for key: %v", key)) +func (s *SortFilter[T, SortField, FilterObj]) RegisterConcurrentSort(field SortField, sort ConcurrentSortFunc[T]) { + if _, ok := s.sorters[field]; ok { + panic(fmt.Sprintf("sort field is already registered: %v", field)) + } else if field == s.tieBreakSortField { + panic(fmt.Sprintf("sort field is used for tie break and can not be concurrent: %v", field)) } - s.orderBys[key] = orderByValue[T]{ - concurrentOrderBy: orderBy, + + s.sorters[field] = funcs[T]{ + concurrentSort: sort, } } -func (s *SortFilter[T, OrderKey, FilterObj]) Filter(ctx context.Context, items []T, filter FilterObj) []T { +// RegisterFilter registers a filter function that will be applied to the items when calling Filter. +func (s *SortFilter[T, SortField, FilterObj]) RegisterFilter(filter Filter[T, FilterObj]) { + s.filters = append(s.filters, filter) +} + +// Filter filters all items based on the filters registered with RegisterFilter. +func (s *SortFilter[T, SortField, FilterObj]) Filter(ctx context.Context, items []T, filter FilterObj) []T { var nillish FilterObj if filter == nillish { return items @@ -103,25 +118,27 @@ func (s *SortFilter[T, OrderKey, FilterObj]) Filter(ctx context.Context, items [ return filtered } -func (s *SortFilter[T, OrderKey, FilterObj]) Sort(ctx context.Context, items []T, key OrderKey, direction model.OrderDirection) { - orderBy, ok := s.orderBys[key] +// Sort will sort items based on a specific field and direction. The field used must be registered with RegisterSort or +// RegisterConcurrentSort. +func (s *SortFilter[T, SortField, FilterObj]) Sort(ctx context.Context, items []T, field SortField, direction model.OrderDirection) { + sorter, ok := s.sorters[field] if !ok { - panic(fmt.Sprintf("OrderBy not registered for key: %v", key)) + panic(fmt.Sprintf("no sort registered for field: %v", field)) } if len(items) == 0 { return } - if orderBy.concurrentOrderBy != nil { - s.sortConcurrent(ctx, items, orderBy.concurrentOrderBy, direction) + if sorter.concurrentSort != nil { + s.sortConcurrent(ctx, items, sorter.concurrentSort, direction) return } - s.sort(ctx, items, orderBy.orderBy, direction) + s.sort(ctx, items, sorter.sort, direction) } -func (s *SortFilter[T, OrderKey, FilterObj]) sortConcurrent(ctx context.Context, items []T, orderBy ConcurrentOrderBy[T], direction model.OrderDirection) { +func (s *SortFilter[T, SortField, FilterObj]) sortConcurrent(ctx context.Context, items []T, sort ConcurrentSortFunc[T], direction model.OrderDirection) { type sortable struct { item T key int @@ -132,26 +149,26 @@ func (s *SortFilter[T, OrderKey, FilterObj]) sortConcurrent(ctx context.Context, wg.Go(func(ctx context.Context) (sortable, error) { return sortable{ item: item, - key: orderBy(ctx, item), + key: sort(ctx, item), }, nil }) } res, err := wg.Wait() if err != nil { - // This should never happen, as orderBy doesn't return errors. + // This should never happen, as sort doesn't return errors. panic(err) } - slices.SortStableFunc(res, func(i, j sortable) int { - if j.key == i.key { - return s.defaultSort(ctx, i.item, j.item) + slices.SortStableFunc(res, func(a, b sortable) int { + if b.key == a.key { + return s.tieBreak(ctx, a.item, b.item) } if direction == model.OrderDirectionDesc { - return j.key - i.key + return b.key - a.key } - return i.key - j.key + return a.key - b.key }) for i, r := range res { @@ -159,22 +176,26 @@ func (s *SortFilter[T, OrderKey, FilterObj]) sortConcurrent(ctx context.Context, } } -func (s *SortFilter[T, OrderKey, FilterObj]) sort(ctx context.Context, items []T, orderBy OrderBy[T], direction model.OrderDirection) { - slices.SortStableFunc(items, func(i, j T) int { +func (s *SortFilter[T, SortField, FilterObj]) sort(ctx context.Context, items []T, sort SortFunc[T], direction model.OrderDirection) { + slices.SortStableFunc(items, func(a, b T) int { var ret int if direction == model.OrderDirectionDesc { - ret = orderBy(ctx, j, i) + ret = sort(ctx, b, a) } else { - ret = orderBy(ctx, i, j) + ret = sort(ctx, a, b) } if ret == 0 { - return s.defaultSort(ctx, i, j) + return s.tieBreak(ctx, a, b) } return ret }) } -func (s *SortFilter[T, OrderKey, FilterObj]) defaultSort(ctx context.Context, a, b T) int { - return s.orderBys[s.defaultSortKey].orderBy(ctx, a, b) +func (s *SortFilter[T, SortField, FilterObj]) tieBreak(ctx context.Context, a, b T) int { + if s.tieBreakSortDirection == model.OrderDirectionDesc { + return s.sorters[s.tieBreakSortField].sort(ctx, b, a) + } + + return s.sorters[s.tieBreakSortField].sort(ctx, a, b) } diff --git a/internal/graph/vulnerability.resolvers.go b/internal/graph/vulnerability.resolvers.go index d750d07fb..86adb809a 100644 --- a/internal/graph/vulnerability.resolvers.go +++ b/internal/graph/vulnerability.resolvers.go @@ -84,8 +84,8 @@ func (r *teamResolver) VulnerabilitySummary(ctx context.Context, obj *team.Team, jobs = append(jobs, job.ListAllForTeamInEnvironment(ctx, obj.Slug, env)...) } } else { - apps = application.ListAllForTeam(ctx, obj.Slug) - jobs = job.ListAllForTeam(ctx, obj.Slug) + apps = application.ListAllForTeam(ctx, obj.Slug, nil, nil) + jobs = job.ListAllForTeam(ctx, obj.Slug, nil, nil) } retVal := &vulnerability.TeamVulnerabilitySummary{ @@ -102,8 +102,8 @@ func (r *teamResolver) VulnerabilitySummary(ctx context.Context, obj *team.Team, wg.Go(fetchImage(app)) } - for _, job := range jobs { - wg.Go(fetchImage(job)) + for _, j := range jobs { + wg.Go(fetchImage(j)) } images, err := wg.Wait() diff --git a/internal/graph/workloads.resolvers.go b/internal/graph/workloads.resolvers.go index f833b4e37..7f236edcc 100644 --- a/internal/graph/workloads.resolvers.go +++ b/internal/graph/workloads.resolvers.go @@ -18,20 +18,23 @@ func (r *teamResolver) Workloads(ctx context.Context, obj *team.Team, first *int return nil, err } - apps := application.ListAllForTeam(ctx, obj.Slug) - jobs := job.ListAllForTeam(ctx, obj.Slug) + apps := application.ListAllForTeam(ctx, obj.Slug, nil, nil) + jobs := job.ListAllForTeam(ctx, obj.Slug, nil, nil) workloads := make([]workload.Workload, 0, len(apps)+len(jobs)) for _, app := range apps { workloads = append(workloads, app) } - for _, job := range jobs { - workloads = append(workloads, job) + for _, j := range jobs { + workloads = append(workloads, j) } filtered := workload.SortFilter.Filter(ctx, workloads, filter) if orderBy == nil { - orderBy = &workload.WorkloadOrder{Field: workload.WorkloadOrderFieldName, Direction: model.OrderDirectionAsc} + orderBy = &workload.WorkloadOrder{ + Field: "NAME", + Direction: model.OrderDirectionAsc, + } } workload.SortFilter.Sort(ctx, filtered, orderBy.Field, orderBy.Direction) diff --git a/internal/persistence/bigquery/models.go b/internal/persistence/bigquery/models.go index bbe661de9..59e520030 100644 --- a/internal/persistence/bigquery/models.go +++ b/internal/persistence/bigquery/models.go @@ -81,17 +81,8 @@ type BigQueryDatasetOrder struct { type BigQueryDatasetOrderField string -const ( - BigQueryDatasetOrderFieldName BigQueryDatasetOrderField = "NAME" - BigQueryDatasetOrderFieldEnvironment BigQueryDatasetOrderField = "ENVIRONMENT" -) - func (e BigQueryDatasetOrderField) IsValid() bool { - switch e { - case BigQueryDatasetOrderFieldName, BigQueryDatasetOrderFieldEnvironment: - return true - } - return false + return SortFilter.SupportsSort(e) } func (e BigQueryDatasetOrderField) String() string { @@ -122,17 +113,8 @@ type BigQueryDatasetAccessOrder struct { type BigQueryDatasetAccessOrderField string -const ( - BigQueryDatasetAccessOrderFieldRole BigQueryDatasetAccessOrderField = "ROLE" - BigQueryDatasetAccessOrderFieldEmail BigQueryDatasetAccessOrderField = "EMAIL" -) - func (e BigQueryDatasetAccessOrderField) IsValid() bool { - switch e { - case BigQueryDatasetAccessOrderFieldRole, BigQueryDatasetAccessOrderFieldEmail: - return true - } - return false + return SortFilterAccess.SupportsSort(e) } func (e BigQueryDatasetAccessOrderField) String() string { diff --git a/internal/persistence/bigquery/queries.go b/internal/persistence/bigquery/queries.go index 4c0429d66..f875ff14a 100644 --- a/internal/persistence/bigquery/queries.go +++ b/internal/persistence/bigquery/queries.go @@ -67,7 +67,7 @@ func ListForWorkload(ctx context.Context, teamSlug slug.Slug, datasets []nais_io func orderDatasets(ctx context.Context, datasets []*BigQueryDataset, orderBy *BigQueryDatasetOrder) { if orderBy == nil { orderBy = &BigQueryDatasetOrder{ - Field: BigQueryDatasetOrderFieldName, + Field: "NAME", Direction: model.OrderDirectionAsc, } } diff --git a/internal/persistence/bigquery/sortfilter.go b/internal/persistence/bigquery/sortfilter.go new file mode 100644 index 000000000..a44510c3a --- /dev/null +++ b/internal/persistence/bigquery/sortfilter.go @@ -0,0 +1,30 @@ +package bigquery + +import ( + "context" + "strings" + + "github.com/nais/api/internal/graph/model" + "github.com/nais/api/internal/graph/sortfilter" +) + +var ( + SortFilter = sortfilter.New[*BigQueryDataset, BigQueryDatasetOrderField, struct{}]("NAME", model.OrderDirectionAsc) + SortFilterAccess = sortfilter.New[*BigQueryDatasetAccess, BigQueryDatasetAccessOrderField, struct{}]("EMAIL", model.OrderDirectionAsc) +) + +func init() { + SortFilter.RegisterSort("NAME", func(ctx context.Context, a, b *BigQueryDataset) int { + return strings.Compare(a.GetName(), b.GetName()) + }) + SortFilter.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *BigQueryDataset) int { + return strings.Compare(a.EnvironmentName, b.EnvironmentName) + }) + + SortFilterAccess.RegisterSort("EMAIL", func(ctx context.Context, a, b *BigQueryDatasetAccess) int { + return strings.Compare(a.Email, b.Email) + }) + SortFilterAccess.RegisterSort("ROLE", func(ctx context.Context, a, b *BigQueryDatasetAccess) int { + return strings.Compare(a.Role, b.Role) + }) +} diff --git a/internal/persistence/bigquery/sortorder.go b/internal/persistence/bigquery/sortorder.go deleted file mode 100644 index 58d3ae175..000000000 --- a/internal/persistence/bigquery/sortorder.go +++ /dev/null @@ -1,29 +0,0 @@ -package bigquery - -import ( - "context" - "strings" - - "github.com/nais/api/internal/graph/sortfilter" -) - -var ( - SortFilter = sortfilter.New[*BigQueryDataset, BigQueryDatasetOrderField, struct{}](BigQueryDatasetOrderFieldName) - SortFilterAccess = sortfilter.New[*BigQueryDatasetAccess, BigQueryDatasetAccessOrderField, struct{}](BigQueryDatasetAccessOrderFieldEmail) -) - -func init() { - SortFilter.RegisterOrderBy(BigQueryDatasetOrderFieldName, func(ctx context.Context, a, b *BigQueryDataset) int { - return strings.Compare(a.GetName(), b.GetName()) - }) - SortFilter.RegisterOrderBy(BigQueryDatasetOrderFieldEnvironment, func(ctx context.Context, a, b *BigQueryDataset) int { - return strings.Compare(a.EnvironmentName, b.EnvironmentName) - }) - - SortFilterAccess.RegisterOrderBy(BigQueryDatasetAccessOrderFieldEmail, func(ctx context.Context, a, b *BigQueryDatasetAccess) int { - return strings.Compare(a.Email, b.Email) - }) - SortFilterAccess.RegisterOrderBy(BigQueryDatasetAccessOrderFieldRole, func(ctx context.Context, a, b *BigQueryDatasetAccess) int { - return strings.Compare(a.Role, b.Role) - }) -} diff --git a/internal/persistence/bucket/models.go b/internal/persistence/bucket/models.go index c89388436..9fd082ba0 100644 --- a/internal/persistence/bucket/models.go +++ b/internal/persistence/bucket/models.go @@ -77,17 +77,8 @@ type BucketStatus struct { type BucketOrderField string -const ( - BucketOrderFieldName BucketOrderField = "NAME" - BucketOrderFieldEnvironment BucketOrderField = "ENVIRONMENT" -) - func (e BucketOrderField) IsValid() bool { - switch e { - case BucketOrderFieldName, BucketOrderFieldEnvironment: - return true - } - return false + return SortFilter.SupportsSort(e) } func (e BucketOrderField) String() string { diff --git a/internal/persistence/bucket/queries.go b/internal/persistence/bucket/queries.go index 7a2c8b59d..1ab8d1bad 100644 --- a/internal/persistence/bucket/queries.go +++ b/internal/persistence/bucket/queries.go @@ -56,7 +56,7 @@ func ListForWorkload(ctx context.Context, teamSlug slug.Slug, references []nais_ func orderBuckets(ctx context.Context, buckets []*Bucket, orderBy *BucketOrder) { if orderBy == nil { orderBy = &BucketOrder{ - Field: BucketOrderFieldName, + Field: "NAME", Direction: model.OrderDirectionAsc, } } diff --git a/internal/persistence/bucket/sortorder.go b/internal/persistence/bucket/sortfilter.go similarity index 55% rename from internal/persistence/bucket/sortorder.go rename to internal/persistence/bucket/sortfilter.go index 21b23befc..94271f7dc 100644 --- a/internal/persistence/bucket/sortorder.go +++ b/internal/persistence/bucket/sortfilter.go @@ -4,16 +4,17 @@ import ( "context" "strings" + "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/sortfilter" ) -var SortFilter = sortfilter.New[*Bucket, BucketOrderField, struct{}](BucketOrderFieldName) +var SortFilter = sortfilter.New[*Bucket, BucketOrderField, struct{}]("NAME", model.OrderDirectionAsc) func init() { - SortFilter.RegisterOrderBy(BucketOrderFieldName, func(ctx context.Context, a, b *Bucket) int { + SortFilter.RegisterSort("NAME", func(ctx context.Context, a, b *Bucket) int { return strings.Compare(a.GetName(), b.GetName()) }) - SortFilter.RegisterOrderBy(BucketOrderFieldEnvironment, func(ctx context.Context, a, b *Bucket) int { + SortFilter.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *Bucket) int { return strings.Compare(a.EnvironmentName, b.EnvironmentName) }) } diff --git a/internal/persistence/kafkatopic/models.go b/internal/persistence/kafkatopic/models.go index c0c9a8cf5..915b42219 100644 --- a/internal/persistence/kafkatopic/models.go +++ b/internal/persistence/kafkatopic/models.go @@ -5,8 +5,6 @@ import ( "io" "strconv" - "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" @@ -14,6 +12,7 @@ import ( kafka_nais_io_v1 "github.com/nais/liberator/pkg/apis/kafka.nais.io/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" ) type ( @@ -61,17 +60,8 @@ type KafkaTopicOrder struct { type KafkaTopicOrderField string -const ( - KafkaTopicOrderFieldName KafkaTopicOrderField = "NAME" - KafkaTopicOrderFieldEnvironment KafkaTopicOrderField = "ENVIRONMENT" -) - func (e KafkaTopicOrderField) IsValid() bool { - switch e { - case KafkaTopicOrderFieldName, KafkaTopicOrderFieldEnvironment: - return true - } - return false + return SortFilterTopic.SupportsSort(e) } func (e KafkaTopicOrderField) String() string { @@ -124,19 +114,8 @@ type KafkaTopicConfiguration struct { type KafkaTopicACLOrderField string -const ( - KafkaTopicACLOrderFieldTopicName KafkaTopicACLOrderField = "TOPIC_NAME" - KafkaTopicACLOrderFieldTeamSlug KafkaTopicACLOrderField = "TEAM_SLUG" - KafkaTopicACLOrderFieldConsumer KafkaTopicACLOrderField = "CONSUMER" - KafkaTopicACLOrderFieldAccess KafkaTopicACLOrderField = "ACCESS" -) - func (e KafkaTopicACLOrderField) IsValid() bool { - switch e { - case KafkaTopicACLOrderFieldTopicName, KafkaTopicACLOrderFieldTeamSlug, KafkaTopicACLOrderFieldConsumer, KafkaTopicACLOrderFieldAccess: - return true - } - return false + return SortFilterTopicACL.SupportsSort(e) } func (e KafkaTopicACLOrderField) String() string { diff --git a/internal/persistence/kafkatopic/queries.go b/internal/persistence/kafkatopic/queries.go index 224e613da..0af4760dc 100644 --- a/internal/persistence/kafkatopic/queries.go +++ b/internal/persistence/kafkatopic/queries.go @@ -71,7 +71,7 @@ func stringMatch(s, pattern string) bool { func orderTopics(ctx context.Context, topics []*KafkaTopic, orderBy *KafkaTopicOrder) { if orderBy == nil { orderBy = &KafkaTopicOrder{ - Field: KafkaTopicOrderFieldName, + Field: "NAME", Direction: model.OrderDirectionAsc, } } @@ -81,7 +81,7 @@ func orderTopics(ctx context.Context, topics []*KafkaTopic, orderBy *KafkaTopicO func orderTopicACLs(ctx context.Context, acls []*KafkaTopicACL, orderBy *KafkaTopicACLOrder) { if orderBy == nil { orderBy = &KafkaTopicACLOrder{ - Field: KafkaTopicACLOrderFieldTopicName, + Field: "TOPIC_NAME", Direction: model.OrderDirectionAsc, } } diff --git a/internal/persistence/kafkatopic/sortorder.go b/internal/persistence/kafkatopic/sortfilter.go similarity index 53% rename from internal/persistence/kafkatopic/sortorder.go rename to internal/persistence/kafkatopic/sortfilter.go index 6c74e6d76..9d7dfdd5a 100644 --- a/internal/persistence/kafkatopic/sortorder.go +++ b/internal/persistence/kafkatopic/sortfilter.go @@ -4,32 +4,33 @@ import ( "context" "strings" + "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/sortfilter" ) var ( - SortFilterTopic = sortfilter.New[*KafkaTopic, KafkaTopicOrderField, struct{}](KafkaTopicOrderFieldName) - SortFilterTopicACL = sortfilter.New[*KafkaTopicACL, KafkaTopicACLOrderField, *KafkaTopicACLFilter](KafkaTopicACLOrderFieldTopicName) + SortFilterTopic = sortfilter.New[*KafkaTopic, KafkaTopicOrderField, struct{}]("NAME", model.OrderDirectionAsc) + SortFilterTopicACL = sortfilter.New[*KafkaTopicACL, KafkaTopicACLOrderField, *KafkaTopicACLFilter]("TOPIC_NAME", model.OrderDirectionAsc) ) func init() { - SortFilterTopic.RegisterOrderBy(KafkaTopicOrderFieldName, func(ctx context.Context, a, b *KafkaTopic) int { + SortFilterTopic.RegisterSort("NAME", func(ctx context.Context, a, b *KafkaTopic) int { return strings.Compare(a.GetName(), b.GetName()) }) - SortFilterTopic.RegisterOrderBy(KafkaTopicOrderFieldEnvironment, func(ctx context.Context, a, b *KafkaTopic) int { + SortFilterTopic.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *KafkaTopic) int { return strings.Compare(a.EnvironmentName, b.EnvironmentName) }) - SortFilterTopicACL.RegisterOrderBy(KafkaTopicACLOrderFieldTopicName, func(ctx context.Context, a, b *KafkaTopicACL) int { + SortFilterTopicACL.RegisterSort("TOPIC_NAME", func(ctx context.Context, a, b *KafkaTopicACL) int { return strings.Compare(a.TopicName, b.TopicName) }) - SortFilterTopicACL.RegisterOrderBy(KafkaTopicACLOrderFieldTeamSlug, func(ctx context.Context, a, b *KafkaTopicACL) int { + SortFilterTopicACL.RegisterSort("TEAM_SLUG", func(ctx context.Context, a, b *KafkaTopicACL) int { return strings.Compare(a.TeamName, b.TeamName) }) - SortFilterTopicACL.RegisterOrderBy(KafkaTopicACLOrderFieldAccess, func(ctx context.Context, a, b *KafkaTopicACL) int { + SortFilterTopicACL.RegisterSort("ACCESS", func(ctx context.Context, a, b *KafkaTopicACL) int { return strings.Compare(a.Access, b.Access) }) - SortFilterTopicACL.RegisterOrderBy(KafkaTopicACLOrderFieldConsumer, func(ctx context.Context, a, b *KafkaTopicACL) int { + SortFilterTopicACL.RegisterSort("CONSUMER", func(ctx context.Context, a, b *KafkaTopicACL) int { return strings.Compare(a.WorkloadName, b.WorkloadName) }) diff --git a/internal/persistence/opensearch/models.go b/internal/persistence/opensearch/models.go index f6943e571..364bb749e 100644 --- a/internal/persistence/opensearch/models.go +++ b/internal/persistence/opensearch/models.go @@ -73,17 +73,8 @@ type OpenSearchOrder struct { type OpenSearchOrderField string -const ( - OpenSearchOrderFieldName OpenSearchOrderField = "NAME" - OpenSearchOrderFieldEnvironment OpenSearchOrderField = "ENVIRONMENT" -) - func (e OpenSearchOrderField) IsValid() bool { - switch e { - case OpenSearchOrderFieldName, OpenSearchOrderFieldEnvironment: - return true - } - return false + return SortFilterOpenSearch.SupportsSort(e) } func (e OpenSearchOrderField) String() string { @@ -114,17 +105,8 @@ type OpenSearchAccessOrder struct { type OpenSearchAccessOrderField string -const ( - OpenSearchAccessOrderFieldAccess OpenSearchAccessOrderField = "ACCESS" - OpenSearchAccessOrderFieldWorkload OpenSearchAccessOrderField = "WORKLOAD" -) - func (e OpenSearchAccessOrderField) IsValid() bool { - switch e { - case OpenSearchAccessOrderFieldAccess, OpenSearchAccessOrderFieldWorkload: - return true - } - return false + return SortFilterOpenSearchAccess.SupportsSort(e) } func (e OpenSearchAccessOrderField) String() string { diff --git a/internal/persistence/opensearch/queries.go b/internal/persistence/opensearch/queries.go index 82bed1417..50d0f118f 100644 --- a/internal/persistence/opensearch/queries.go +++ b/internal/persistence/opensearch/queries.go @@ -55,7 +55,10 @@ func ListAccess(ctx context.Context, openSearch *OpenSearch, page *pagination.Pa all = append(all, jobAccess...) if orderBy == nil { - orderBy = &OpenSearchAccessOrder{Field: OpenSearchAccessOrderFieldAccess, Direction: model.OrderDirectionAsc} + orderBy = &OpenSearchAccessOrder{ + Field: "ACCESS", + Direction: model.OrderDirectionAsc, + } } SortFilterOpenSearchAccess.Sort(ctx, all, orderBy.Field, orderBy.Direction) @@ -73,7 +76,10 @@ func GetForWorkload(ctx context.Context, teamSlug slug.Slug, environment string, func orderOpenSearch(ctx context.Context, ret []*OpenSearch, orderBy *OpenSearchOrder) { if orderBy == nil { - orderBy = &OpenSearchOrder{Field: OpenSearchOrderFieldName, Direction: model.OrderDirectionAsc} + orderBy = &OpenSearchOrder{ + Field: "NAME", + Direction: model.OrderDirectionAsc, + } } SortFilterOpenSearch.Sort(ctx, ret, orderBy.Field, orderBy.Direction) diff --git a/internal/persistence/opensearch/sortfilter.go b/internal/persistence/opensearch/sortfilter.go new file mode 100644 index 000000000..02cde162a --- /dev/null +++ b/internal/persistence/opensearch/sortfilter.go @@ -0,0 +1,30 @@ +package opensearch + +import ( + "context" + "strings" + + "github.com/nais/api/internal/graph/model" + "github.com/nais/api/internal/graph/sortfilter" +) + +var ( + SortFilterOpenSearch = sortfilter.New[*OpenSearch, OpenSearchOrderField, struct{}]("NAME", model.OrderDirectionAsc) + SortFilterOpenSearchAccess = sortfilter.New[*OpenSearchAccess, OpenSearchAccessOrderField, struct{}]("ACCESS", model.OrderDirectionAsc) +) + +func init() { + SortFilterOpenSearch.RegisterSort("NAME", func(ctx context.Context, a, b *OpenSearch) int { + return strings.Compare(a.GetName(), b.GetName()) + }) + SortFilterOpenSearch.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *OpenSearch) int { + return strings.Compare(a.EnvironmentName, b.EnvironmentName) + }) + + SortFilterOpenSearchAccess.RegisterSort("ACCESS", func(ctx context.Context, a, b *OpenSearchAccess) int { + return strings.Compare(a.Access, b.Access) + }) + SortFilterOpenSearchAccess.RegisterSort("WORKLOAD", func(ctx context.Context, a, b *OpenSearchAccess) int { + return strings.Compare(a.WorkloadReference.Name, b.WorkloadReference.Name) + }) +} diff --git a/internal/persistence/opensearch/sortorder.go b/internal/persistence/opensearch/sortorder.go deleted file mode 100644 index 5ba97362e..000000000 --- a/internal/persistence/opensearch/sortorder.go +++ /dev/null @@ -1,29 +0,0 @@ -package opensearch - -import ( - "context" - "strings" - - "github.com/nais/api/internal/graph/sortfilter" -) - -var ( - SortFilterOpenSearch = sortfilter.New[*OpenSearch, OpenSearchOrderField, struct{}](OpenSearchOrderFieldName) - SortFilterOpenSearchAccess = sortfilter.New[*OpenSearchAccess, OpenSearchAccessOrderField, struct{}](OpenSearchAccessOrderFieldAccess) -) - -func init() { - SortFilterOpenSearch.RegisterOrderBy(OpenSearchOrderFieldName, func(ctx context.Context, a, b *OpenSearch) int { - return strings.Compare(a.GetName(), b.GetName()) - }) - SortFilterOpenSearch.RegisterOrderBy(OpenSearchOrderFieldEnvironment, func(ctx context.Context, a, b *OpenSearch) int { - return strings.Compare(a.EnvironmentName, b.EnvironmentName) - }) - - SortFilterOpenSearchAccess.RegisterOrderBy(OpenSearchAccessOrderFieldAccess, func(ctx context.Context, a, b *OpenSearchAccess) int { - return strings.Compare(a.Access, b.Access) - }) - SortFilterOpenSearchAccess.RegisterOrderBy(OpenSearchAccessOrderFieldWorkload, func(ctx context.Context, a, b *OpenSearchAccess) int { - return strings.Compare(a.WorkloadReference.Name, b.WorkloadReference.Name) - }) -} diff --git a/internal/persistence/redis/models.go b/internal/persistence/redis/models.go index 4639c0e24..b4fd34e0e 100644 --- a/internal/persistence/redis/models.go +++ b/internal/persistence/redis/models.go @@ -73,17 +73,8 @@ type RedisInstanceOrder struct { type RedisInstanceOrderField string -const ( - RedisInstanceOrderFieldName RedisInstanceOrderField = "NAME" - RedisInstanceOrderFieldEnvironment RedisInstanceOrderField = "ENVIRONMENT" -) - func (e RedisInstanceOrderField) IsValid() bool { - switch e { - case RedisInstanceOrderFieldName, RedisInstanceOrderFieldEnvironment: - return true - } - return false + return SortFilterRedisInstance.SupportsSort(e) } func (e RedisInstanceOrderField) String() string { @@ -114,22 +105,8 @@ type RedisInstanceAccessOrder struct { type RedisInstanceAccessOrderField string -const ( - RedisInstanceAccessOrderFieldAccess RedisInstanceAccessOrderField = "ACCESS" - RedisInstanceAccessOrderFieldWorkload RedisInstanceAccessOrderField = "WORKLOAD" -) - -var AllRedisInstanceAccessOrderField = []RedisInstanceAccessOrderField{ - RedisInstanceAccessOrderFieldAccess, - RedisInstanceAccessOrderFieldWorkload, -} - func (e RedisInstanceAccessOrderField) IsValid() bool { - switch e { - case RedisInstanceAccessOrderFieldAccess, RedisInstanceAccessOrderFieldWorkload: - return true - } - return false + return SortFilterRedisInstanceAccess.SupportsSort(e) } func (e RedisInstanceAccessOrderField) String() string { diff --git a/internal/persistence/redis/queries.go b/internal/persistence/redis/queries.go index 1052b2d56..216d8f8de 100644 --- a/internal/persistence/redis/queries.go +++ b/internal/persistence/redis/queries.go @@ -55,7 +55,10 @@ func ListAccess(ctx context.Context, redis *RedisInstance, page *pagination.Pagi all = append(all, jobAccess...) if orderBy == nil { - orderBy = &RedisInstanceAccessOrder{Field: RedisInstanceAccessOrderFieldAccess, Direction: model.OrderDirectionAsc} + orderBy = &RedisInstanceAccessOrder{ + Field: "ACCESS", + Direction: model.OrderDirectionAsc, + } } SortFilterRedisInstanceAccess.Sort(ctx, all, orderBy.Field, orderBy.Direction) @@ -82,7 +85,7 @@ func ListForWorkload(ctx context.Context, teamSlug slug.Slug, references []nais_ func orderRedisInstance(ctx context.Context, instances []*RedisInstance, orderBy *RedisInstanceOrder) { if orderBy == nil { orderBy = &RedisInstanceOrder{ - Field: RedisInstanceOrderFieldName, + Field: "NAME", Direction: model.OrderDirectionAsc, } } diff --git a/internal/persistence/redis/sortfilter.go b/internal/persistence/redis/sortfilter.go new file mode 100644 index 000000000..6c5608fa2 --- /dev/null +++ b/internal/persistence/redis/sortfilter.go @@ -0,0 +1,30 @@ +package redis + +import ( + "context" + "strings" + + "github.com/nais/api/internal/graph/model" + "github.com/nais/api/internal/graph/sortfilter" +) + +var ( + SortFilterRedisInstance = sortfilter.New[*RedisInstance, RedisInstanceOrderField, struct{}]("NAME", model.OrderDirectionAsc) + SortFilterRedisInstanceAccess = sortfilter.New[*RedisInstanceAccess, RedisInstanceAccessOrderField, struct{}]("ACCESS", model.OrderDirectionAsc) +) + +func init() { + SortFilterRedisInstance.RegisterSort("NAME", func(ctx context.Context, a, b *RedisInstance) int { + return strings.Compare(a.GetName(), b.GetName()) + }) + SortFilterRedisInstance.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *RedisInstance) int { + return strings.Compare(a.EnvironmentName, b.EnvironmentName) + }) + + SortFilterRedisInstanceAccess.RegisterSort("ACCESS", func(ctx context.Context, a, b *RedisInstanceAccess) int { + return strings.Compare(a.Access, b.Access) + }) + SortFilterRedisInstanceAccess.RegisterSort("WORKLOAD", func(ctx context.Context, a, b *RedisInstanceAccess) int { + return strings.Compare(a.WorkloadReference.Name, b.WorkloadReference.Name) + }) +} diff --git a/internal/persistence/redis/sortorder.go b/internal/persistence/redis/sortorder.go deleted file mode 100644 index c8eb9044d..000000000 --- a/internal/persistence/redis/sortorder.go +++ /dev/null @@ -1,29 +0,0 @@ -package redis - -import ( - "context" - "strings" - - "github.com/nais/api/internal/graph/sortfilter" -) - -var ( - SortFilterRedisInstance = sortfilter.New[*RedisInstance, RedisInstanceOrderField, struct{}](RedisInstanceOrderFieldName) - SortFilterRedisInstanceAccess = sortfilter.New[*RedisInstanceAccess, RedisInstanceAccessOrderField, struct{}](RedisInstanceAccessOrderFieldAccess) -) - -func init() { - SortFilterRedisInstance.RegisterOrderBy(RedisInstanceOrderFieldName, func(ctx context.Context, a, b *RedisInstance) int { - return strings.Compare(a.GetName(), b.GetName()) - }) - SortFilterRedisInstance.RegisterOrderBy(RedisInstanceOrderFieldEnvironment, func(ctx context.Context, a, b *RedisInstance) int { - return strings.Compare(a.EnvironmentName, b.EnvironmentName) - }) - - SortFilterRedisInstanceAccess.RegisterOrderBy(RedisInstanceAccessOrderFieldAccess, func(ctx context.Context, a, b *RedisInstanceAccess) int { - return strings.Compare(a.Access, b.Access) - }) - SortFilterRedisInstanceAccess.RegisterOrderBy(RedisInstanceAccessOrderFieldWorkload, func(ctx context.Context, a, b *RedisInstanceAccess) int { - return strings.Compare(a.WorkloadReference.Name, b.WorkloadReference.Name) - }) -} diff --git a/internal/persistence/sqlinstance/models.go b/internal/persistence/sqlinstance/models.go index 8b40c6c1d..685bd7682 100644 --- a/internal/persistence/sqlinstance/models.go +++ b/internal/persistence/sqlinstance/models.go @@ -139,17 +139,8 @@ type SQLInstanceUserOrder struct { type SQLInstanceUserOrderField string -const ( - SQLInstanceUserOrderFieldName SQLInstanceUserOrderField = "NAME" - SQLInstanceUserOrderFieldAuthentication SQLInstanceUserOrderField = "AUTHENTICATION" -) - func (e SQLInstanceUserOrderField) IsValid() bool { - switch e { - case SQLInstanceUserOrderFieldName, SQLInstanceUserOrderFieldAuthentication: - return true - } - return false + return SortFilterSQLInstanceUser.SupportsSort(e) } func (e SQLInstanceUserOrderField) String() string { @@ -180,23 +171,8 @@ type SQLInstanceOrder struct { type SQLInstanceOrderField string -const ( - SQLInstanceOrderFieldName SQLInstanceOrderField = "NAME" - SQLInstanceOrderFieldVersion SQLInstanceOrderField = "VERSION" - SQLInstanceOrderFieldEnvironment SQLInstanceOrderField = "ENVIRONMENT" - SQLInstanceOrderFieldStatus SQLInstanceOrderField = "STATUS" - SQLInstanceOrderFieldCost SQLInstanceOrderField = "COST" - SQLInstanceOrderFieldCPU SQLInstanceOrderField = "CPU_UTILIZATION" - SQLInstanceOrderFieldMemory SQLInstanceOrderField = "MEMORY_UTILIZATION" - SQLInstanceOrderFieldDisk SQLInstanceOrderField = "DISK_UTILIZATION" -) - func (e SQLInstanceOrderField) IsValid() bool { - switch e { - case SQLInstanceOrderFieldName, SQLInstanceOrderFieldVersion, SQLInstanceOrderFieldEnvironment, SQLInstanceOrderFieldStatus, SQLInstanceOrderFieldCost, SQLInstanceOrderFieldCPU, SQLInstanceOrderFieldMemory, SQLInstanceOrderFieldDisk: - return true - } - return false + return SortFilterSQLInstance.SupportsSort(e) } func (e SQLInstanceOrderField) String() string { diff --git a/internal/persistence/sqlinstance/queries.go b/internal/persistence/sqlinstance/queries.go index 22c01809a..9a12f673c 100644 --- a/internal/persistence/sqlinstance/queries.go +++ b/internal/persistence/sqlinstance/queries.go @@ -65,7 +65,7 @@ func ListForWorkload(ctx context.Context, teamSlug slug.Slug, environmentName st func orderSQLInstances(ctx context.Context, instances []*SQLInstance, orderBy *SQLInstanceOrder) { if orderBy == nil { orderBy = &SQLInstanceOrder{ - Field: SQLInstanceOrderFieldName, + Field: "NAME", Direction: model.OrderDirectionAsc, } } @@ -104,7 +104,7 @@ func ListSQLInstanceUsers(ctx context.Context, sqlInstance *SQLInstance, page *p if orderBy == nil { orderBy = &SQLInstanceUserOrder{ - Field: SQLInstanceUserOrderFieldName, + Field: "NAME", Direction: model.OrderDirectionAsc, } } diff --git a/internal/persistence/sqlinstance/sortorder.go b/internal/persistence/sqlinstance/sortfilter.go similarity index 56% rename from internal/persistence/sqlinstance/sortorder.go rename to internal/persistence/sqlinstance/sortfilter.go index f04e2bc98..2da27804c 100644 --- a/internal/persistence/sqlinstance/sortorder.go +++ b/internal/persistence/sqlinstance/sortfilter.go @@ -5,23 +5,23 @@ import ( "strings" "github.com/nais/api/internal/cost" + "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/sortfilter" ) var ( - SortFilterSQLInstance = sortfilter.New[*SQLInstance, SQLInstanceOrderField, struct{}](SQLInstanceOrderFieldName) - SortFilterSQLInstanceUser = sortfilter.New[*SQLInstanceUser, SQLInstanceUserOrderField, struct{}](SQLInstanceUserOrderFieldName) + SortFilterSQLInstance = sortfilter.New[*SQLInstance, SQLInstanceOrderField, struct{}]("NAME", model.OrderDirectionAsc) + SortFilterSQLInstanceUser = sortfilter.New[*SQLInstanceUser, SQLInstanceUserOrderField, struct{}]("NAME", model.OrderDirectionAsc) ) func init() { - // SQLInstance - SortFilterSQLInstance.RegisterOrderBy(SQLInstanceOrderFieldName, func(ctx context.Context, a, b *SQLInstance) int { + SortFilterSQLInstance.RegisterSort("NAME", func(ctx context.Context, a, b *SQLInstance) int { return strings.Compare(a.GetName(), b.GetName()) }) - SortFilterSQLInstance.RegisterOrderBy(SQLInstanceOrderFieldEnvironment, func(ctx context.Context, a, b *SQLInstance) int { + SortFilterSQLInstance.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *SQLInstance) int { return strings.Compare(a.EnvironmentName, b.EnvironmentName) }) - SortFilterSQLInstance.RegisterOrderBy(SQLInstanceOrderFieldVersion, func(ctx context.Context, a, b *SQLInstance) int { + SortFilterSQLInstance.RegisterSort("VERSION", func(ctx context.Context, a, b *SQLInstance) int { if a.Version == nil && b.Version == nil { return 0 } else if a.Version == nil { @@ -31,7 +31,7 @@ func init() { } return strings.Compare(*a.Version, *b.Version) }) - SortFilterSQLInstance.RegisterConcurrentOrderBy(SQLInstanceOrderFieldStatus, func(ctx context.Context, a *SQLInstance) int { + SortFilterSQLInstance.RegisterConcurrentSort("STATUS", func(ctx context.Context, a *SQLInstance) int { stateOrder := map[string]int{ "UNSPECIFIED": 0, "RUNNABLE": 1, @@ -49,7 +49,7 @@ func init() { return stateOrder[aState.String()] }) - SortFilterSQLInstance.RegisterConcurrentOrderBy(SQLInstanceOrderFieldCost, func(ctx context.Context, a *SQLInstance) int { + SortFilterSQLInstance.RegisterConcurrentSort("COST", func(ctx context.Context, a *SQLInstance) int { if a.WorkloadReference == nil { return 0 } @@ -60,7 +60,7 @@ func init() { return int(aCost * 100) }) - SortFilterSQLInstance.RegisterConcurrentOrderBy(SQLInstanceOrderFieldCPU, func(ctx context.Context, a *SQLInstance) int { + SortFilterSQLInstance.RegisterConcurrentSort("CPU_UTILIZATION", func(ctx context.Context, a *SQLInstance) int { aCPU, err := CPUForInstance(ctx, a.ProjectID, a.Name) if err != nil { return 0 @@ -72,7 +72,7 @@ func init() { return int(aCPU.Utilization * 100) }) - SortFilterSQLInstance.RegisterConcurrentOrderBy(SQLInstanceOrderFieldMemory, func(ctx context.Context, a *SQLInstance) int { + SortFilterSQLInstance.RegisterConcurrentSort("MEMORY_UTILIZATION", func(ctx context.Context, a *SQLInstance) int { aMemory, err := MemoryForInstance(ctx, a.ProjectID, a.Name) if err != nil { return 0 @@ -84,7 +84,7 @@ func init() { return int(aMemory.Utilization * 100) }) - SortFilterSQLInstance.RegisterConcurrentOrderBy(SQLInstanceOrderFieldDisk, func(ctx context.Context, a *SQLInstance) int { + SortFilterSQLInstance.RegisterConcurrentSort("DISK_UTILIZATION", func(ctx context.Context, a *SQLInstance) int { aDisk, err := DiskForInstance(ctx, a.ProjectID, a.Name) if err != nil { return 0 @@ -98,10 +98,10 @@ func init() { }) // SQLInstanceUser - SortFilterSQLInstanceUser.RegisterOrderBy(SQLInstanceUserOrderFieldName, func(ctx context.Context, a, b *SQLInstanceUser) int { + SortFilterSQLInstanceUser.RegisterSort("NAME", func(ctx context.Context, a, b *SQLInstanceUser) int { return strings.Compare(a.Name, b.Name) }) - SortFilterSQLInstanceUser.RegisterOrderBy(SQLInstanceUserOrderFieldAuthentication, func(ctx context.Context, a, b *SQLInstanceUser) int { + SortFilterSQLInstanceUser.RegisterSort("AUTHENTICATION", func(ctx context.Context, a, b *SQLInstanceUser) int { return strings.Compare(a.Authentication, b.Authentication) }) } diff --git a/internal/persistence/valkey/models.go b/internal/persistence/valkey/models.go index 5292bc353..174f4fab9 100644 --- a/internal/persistence/valkey/models.go +++ b/internal/persistence/valkey/models.go @@ -73,17 +73,8 @@ type ValkeyInstanceOrder struct { type ValkeyInstanceOrderField string -const ( - ValkeyInstanceOrderFieldName ValkeyInstanceOrderField = "NAME" - ValkeyInstanceOrderFieldEnvironment ValkeyInstanceOrderField = "ENVIRONMENT" -) - func (e ValkeyInstanceOrderField) IsValid() bool { - switch e { - case ValkeyInstanceOrderFieldName, ValkeyInstanceOrderFieldEnvironment: - return true - } - return false + return SortFilterValkeyInstance.SupportsSort(e) } func (e ValkeyInstanceOrderField) String() string { @@ -114,22 +105,8 @@ type ValkeyInstanceAccessOrder struct { type ValkeyInstanceAccessOrderField string -const ( - ValkeyInstanceAccessOrderFieldAccess ValkeyInstanceAccessOrderField = "ACCESS" - ValkeyInstanceAccessOrderFieldWorkload ValkeyInstanceAccessOrderField = "WORKLOAD" -) - -var AllValkeyInstanceAccessOrderField = []ValkeyInstanceAccessOrderField{ - ValkeyInstanceAccessOrderFieldAccess, - ValkeyInstanceAccessOrderFieldWorkload, -} - func (e ValkeyInstanceAccessOrderField) IsValid() bool { - switch e { - case ValkeyInstanceAccessOrderFieldAccess, ValkeyInstanceAccessOrderFieldWorkload: - return true - } - return false + return SortFilterValkeyInstanceAccess.SupportsSort(e) } func (e ValkeyInstanceAccessOrderField) String() string { diff --git a/internal/persistence/valkey/queries.go b/internal/persistence/valkey/queries.go index d73916e96..b20a281c3 100644 --- a/internal/persistence/valkey/queries.go +++ b/internal/persistence/valkey/queries.go @@ -55,7 +55,10 @@ func ListAccess(ctx context.Context, valkey *ValkeyInstance, page *pagination.Pa all = append(all, jobAccess...) if orderBy == nil { - orderBy = &ValkeyInstanceAccessOrder{Field: ValkeyInstanceAccessOrderFieldAccess, Direction: model.OrderDirectionAsc} + orderBy = &ValkeyInstanceAccessOrder{ + Field: "ACCESS", + Direction: model.OrderDirectionAsc, + } } SortFilterValkeyInstanceAccess.Sort(ctx, all, orderBy.Field, orderBy.Direction) @@ -82,7 +85,7 @@ func ListForWorkload(ctx context.Context, teamSlug slug.Slug, environmentName st func orderValkeyInstance(ctx context.Context, instances []*ValkeyInstance, orderBy *ValkeyInstanceOrder) { if orderBy == nil { orderBy = &ValkeyInstanceOrder{ - Field: ValkeyInstanceOrderFieldName, + Field: "NAME", Direction: model.OrderDirectionAsc, } } diff --git a/internal/persistence/valkey/sortfilter.go b/internal/persistence/valkey/sortfilter.go new file mode 100644 index 000000000..9975b12c6 --- /dev/null +++ b/internal/persistence/valkey/sortfilter.go @@ -0,0 +1,30 @@ +package valkey + +import ( + "context" + "strings" + + "github.com/nais/api/internal/graph/model" + "github.com/nais/api/internal/graph/sortfilter" +) + +var ( + SortFilterValkeyInstance = sortfilter.New[*ValkeyInstance, ValkeyInstanceOrderField, struct{}]("NAME", model.OrderDirectionAsc) + SortFilterValkeyInstanceAccess = sortfilter.New[*ValkeyInstanceAccess, ValkeyInstanceAccessOrderField, struct{}]("ACCESS", model.OrderDirectionAsc) +) + +func init() { + SortFilterValkeyInstance.RegisterSort("NAME", func(ctx context.Context, a, b *ValkeyInstance) int { + return strings.Compare(a.GetName(), b.GetName()) + }) + SortFilterValkeyInstance.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *ValkeyInstance) int { + return strings.Compare(a.EnvironmentName, b.EnvironmentName) + }) + + SortFilterValkeyInstanceAccess.RegisterSort("ACCESS", func(ctx context.Context, a, b *ValkeyInstanceAccess) int { + return strings.Compare(a.Access, b.Access) + }) + SortFilterValkeyInstanceAccess.RegisterSort("WORKLOAD", func(ctx context.Context, a, b *ValkeyInstanceAccess) int { + return strings.Compare(a.WorkloadReference.Name, b.WorkloadReference.Name) + }) +} diff --git a/internal/persistence/valkey/sortorder.go b/internal/persistence/valkey/sortorder.go deleted file mode 100644 index b76d6406d..000000000 --- a/internal/persistence/valkey/sortorder.go +++ /dev/null @@ -1,29 +0,0 @@ -package valkey - -import ( - "context" - "strings" - - "github.com/nais/api/internal/graph/sortfilter" -) - -var ( - SortFilterValkeyInstance = sortfilter.New[*ValkeyInstance, ValkeyInstanceOrderField, struct{}](ValkeyInstanceOrderFieldName) - SortFilterValkeyInstanceAccess = sortfilter.New[*ValkeyInstanceAccess, ValkeyInstanceAccessOrderField, struct{}](ValkeyInstanceAccessOrderFieldAccess) -) - -func init() { - SortFilterValkeyInstance.RegisterOrderBy(ValkeyInstanceOrderFieldName, func(ctx context.Context, a, b *ValkeyInstance) int { - return strings.Compare(a.GetName(), b.GetName()) - }) - SortFilterValkeyInstance.RegisterOrderBy(ValkeyInstanceOrderFieldEnvironment, func(ctx context.Context, a, b *ValkeyInstance) int { - return strings.Compare(a.EnvironmentName, b.EnvironmentName) - }) - - SortFilterValkeyInstanceAccess.RegisterOrderBy(ValkeyInstanceAccessOrderFieldAccess, func(ctx context.Context, a, b *ValkeyInstanceAccess) int { - return strings.Compare(a.Access, b.Access) - }) - SortFilterValkeyInstanceAccess.RegisterOrderBy(ValkeyInstanceAccessOrderFieldWorkload, func(ctx context.Context, a, b *ValkeyInstanceAccess) int { - return strings.Compare(a.WorkloadReference.Name, b.WorkloadReference.Name) - }) -} diff --git a/internal/status/sortfilter.go b/internal/status/sortfilter.go new file mode 100644 index 000000000..ab967673b --- /dev/null +++ b/internal/status/sortfilter.go @@ -0,0 +1,23 @@ +package status + +import ( + "context" + + "github.com/nais/api/internal/workload" + "github.com/nais/api/internal/workload/application" + "github.com/nais/api/internal/workload/job" +) + +func init() { + application.SortFilter.RegisterConcurrentSort("STATUS", func(ctx context.Context, a *application.Application) int { + return int(ForWorkload(ctx, a).State) + }) + + job.SortFilter.RegisterConcurrentSort("STATUS", func(ctx context.Context, a *job.Job) int { + return int(ForWorkload(ctx, a).State) + }) + + workload.SortFilter.RegisterConcurrentSort("STATUS", func(ctx context.Context, a workload.Workload) int { + return int(ForWorkload(ctx, a).State) + }) +} diff --git a/internal/status/sortorder.go b/internal/status/sortorder.go deleted file mode 100644 index bd24fe267..000000000 --- a/internal/status/sortorder.go +++ /dev/null @@ -1,26 +0,0 @@ -package status - -import ( - "context" - - "github.com/nais/api/internal/workload/application" - "github.com/nais/api/internal/workload/job" -) - -const ( - ApplicationOrderFieldStatus application.ApplicationOrderField = "STATUS" - JobOrderFieldStatus job.JobOrderField = "STATUS" -) - -func init() { - application.AllApplicationOrderField = append(application.AllApplicationOrderField, ApplicationOrderFieldStatus) - job.AllJobOrderField = append(job.AllJobOrderField, JobOrderFieldStatus) - - application.SortFilter.RegisterConcurrentOrderBy(ApplicationOrderFieldStatus, func(ctx context.Context, a *application.Application) int { - return int(ForWorkload(ctx, a).State) - }) - - job.SortFilter.RegisterConcurrentOrderBy(JobOrderFieldStatus, func(ctx context.Context, a *job.Job) int { - return int(ForWorkload(ctx, a).State) - }) -} diff --git a/internal/team/model.go b/internal/team/model.go index a9c210c79..5d2273c68 100644 --- a/internal/team/model.go +++ b/internal/team/model.go @@ -5,6 +5,7 @@ import ( "fmt" "io" "regexp" + "slices" "strconv" "strings" "time" @@ -83,12 +84,12 @@ const ( TeamOrderFieldSlug TeamOrderField = "SLUG" ) +var AllTeamOrderField = []TeamOrderField{ + TeamOrderFieldSlug, +} + func (e TeamOrderField) IsValid() bool { - switch e { - case TeamOrderFieldSlug: - return true - } - return false + return slices.Contains(AllTeamOrderField, e) } func (e TeamOrderField) String() string { diff --git a/internal/utilization/fake.go b/internal/utilization/fake.go index 3f0bb4a09..95307cb61 100644 --- a/internal/utilization/fake.go +++ b/internal/utilization/fake.go @@ -77,16 +77,16 @@ func (c *FakeClient) query(ctx context.Context, environment string, query string } makeLabels := func() prom.Metric { - labels := prom.Metric{} + lbls := prom.Metric{} for _, label := range labelsToCreate { switch label { case "namespace": - labels["namespace"] = prom.LabelValue(teamSlug) + lbls["namespace"] = prom.LabelValue(teamSlug) case "container": - labels["container"] = prom.LabelValue(workload) + lbls["container"] = prom.LabelValue(workload) } } - return labels + return lbls } value := func() prom.SampleValue { @@ -103,7 +103,7 @@ func (c *FakeClient) query(ctx context.Context, environment string, query string ret := prom.Vector{} if teamSlug != "" { if workload == "" { - for _, app := range application.ListAllForTeam(ctx, teamSlug) { + for _, app := range application.ListAllForTeam(ctx, teamSlug, nil, nil) { if app.EnvironmentName != environment { continue } diff --git a/internal/vulnerability/models.go b/internal/vulnerability/models.go index 2b73890b5..b6459dac8 100644 --- a/internal/vulnerability/models.go +++ b/internal/vulnerability/models.go @@ -1,76 +1,18 @@ package vulnerability import ( - "context" "fmt" "io" - "slices" "strconv" "time" "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/sortfilter" "github.com/nais/api/internal/slug" "github.com/nais/api/internal/workload" ) -// Extend WorkloadOrderField -const ( - WorkloadOrderFieldRiskScore workload.WorkloadOrderField = "VULNERABILITY_RISK_SCORE" - WorkloadOrderFieldSeverityCritical workload.WorkloadOrderField = "VULNERABILITY_SEVERITY_CRITICAL" - WorkloadOrderFieldSeverityHigh workload.WorkloadOrderField = "VULNERABILITY_SEVERITY_HIGH" - WorkloadOrderFieldSeverityMedium workload.WorkloadOrderField = "VULNERABILITY_SEVERITY_MEDIUM" - WorkloadOrderFieldSeverityLow workload.WorkloadOrderField = "VULNERABILITY_SEVERITY_LOW" - WorkloadOrderFieldSeverityUnassigned workload.WorkloadOrderField = "VULNERABILITY_SEVERITY_UNASSIGNED" -) - -func init() { - workload.AllWorkloadOrderField = append( - workload.AllWorkloadOrderField, - WorkloadOrderFieldRiskScore, - WorkloadOrderFieldSeverityCritical, - WorkloadOrderFieldSeverityHigh, - WorkloadOrderFieldSeverityMedium, - WorkloadOrderFieldSeverityLow, - WorkloadOrderFieldSeverityUnassigned, - ) - - summarySorter := func(fn func(sum *ImageVulnerabilitySummary) int) sortfilter.ConcurrentOrderBy[workload.Workload] { - return func(ctx context.Context, a workload.Workload) int { - ref, err := GetImageMetadata(ctx, a.GetImageString()) - if err != nil { - return -1 - } - if ref == nil || ref.Summary == nil { - return -1 - } - - return fn(ref.Summary) - } - } - - workload.SortFilter.RegisterConcurrentOrderBy(WorkloadOrderFieldRiskScore, summarySorter(func(sum *ImageVulnerabilitySummary) int { - return sum.RiskScore - })) - workload.SortFilter.RegisterConcurrentOrderBy(WorkloadOrderFieldSeverityCritical, summarySorter(func(sum *ImageVulnerabilitySummary) int { - return sum.Critical - })) - workload.SortFilter.RegisterConcurrentOrderBy(WorkloadOrderFieldSeverityHigh, summarySorter(func(sum *ImageVulnerabilitySummary) int { - return sum.High - })) - workload.SortFilter.RegisterConcurrentOrderBy(WorkloadOrderFieldSeverityMedium, summarySorter(func(sum *ImageVulnerabilitySummary) int { - return sum.Medium - })) - workload.SortFilter.RegisterConcurrentOrderBy(WorkloadOrderFieldSeverityLow, summarySorter(func(sum *ImageVulnerabilitySummary) int { - return sum.Low - })) - workload.SortFilter.RegisterConcurrentOrderBy(WorkloadOrderFieldSeverityUnassigned, summarySorter(func(sum *ImageVulnerabilitySummary) int { - return sum.Unassigned - })) -} - type ( ImageVulnerabilityConnection = pagination.Connection[*ImageVulnerability] ImageVulnerabilityEdge = pagination.Edge[*ImageVulnerability] @@ -120,25 +62,8 @@ type ImageVulnerabilitySummary struct { type ImageVulnerabilityOrderField string -const ( - // Order by the field - ImageVulnerabilityOrderFieldIdentifier ImageVulnerabilityOrderField = "IDENTIFIER" - ImageVulnerabilityOrderFieldSeverity ImageVulnerabilityOrderField = "SEVERITY" - ImageVulnerabilityOrderFieldPackage ImageVulnerabilityOrderField = "PACKAGE" - ImageVulnerabilityOrderFieldState ImageVulnerabilityOrderField = "STATE" - ImageVulnerabilityOrderFieldSuppressed ImageVulnerabilityOrderField = "SUPPRESSED" -) - -var AllImageVulnerabilityOrderField = []ImageVulnerabilityOrderField{ - ImageVulnerabilityOrderFieldSeverity, - ImageVulnerabilityOrderFieldIdentifier, - ImageVulnerabilityOrderFieldPackage, - ImageVulnerabilityOrderFieldState, - ImageVulnerabilityOrderFieldSuppressed, -} - func (e ImageVulnerabilityOrderField) IsValid() bool { - return slices.Contains(AllImageVulnerabilityOrderField, e) + return SortFilterImageVulnerabilities.SupportsSort(e) } func (e ImageVulnerabilityOrderField) String() string { @@ -172,14 +97,6 @@ const ( ImageVulnerabilitySeverityUnassigned ImageVulnerabilitySeverity = "UNASSIGNED" ) -var AllImageVulnerabilitySeverity = []ImageVulnerabilitySeverity{ - ImageVulnerabilitySeverityLow, - ImageVulnerabilitySeverityMedium, - ImageVulnerabilitySeverityHigh, - ImageVulnerabilitySeverityCritical, - ImageVulnerabilitySeverityUnassigned, -} - func (e ImageVulnerabilitySeverity) IsValid() bool { switch e { case ImageVulnerabilitySeverityLow, ImageVulnerabilitySeverityMedium, ImageVulnerabilitySeverityHigh, ImageVulnerabilitySeverityCritical, ImageVulnerabilitySeverityUnassigned: diff --git a/internal/vulnerability/queries.go b/internal/vulnerability/queries.go index 3043c69fe..c577da5f9 100644 --- a/internal/vulnerability/queries.go +++ b/internal/vulnerability/queries.go @@ -25,8 +25,8 @@ func GetTeamVulnerabilityStatus(ctx context.Context, teamSlug slug.Slug) ([]*Tea var images []*ImageDetails retVal := make([]*TeamVulnerabilityStatus, 0) - apps := application.ListAllForTeam(ctx, teamSlug) - jobs := job.ListAllForTeam(ctx, teamSlug) + apps := application.ListAllForTeam(ctx, teamSlug, nil, nil) + jobs := job.ListAllForTeam(ctx, teamSlug, nil, nil) for _, app := range apps { image, err := GetImageMetadata(ctx, app.Image().Ref()) @@ -36,10 +36,10 @@ func GetTeamVulnerabilityStatus(ctx context.Context, teamSlug slug.Slug) ([]*Tea images = append(images, image) } - for _, job := range jobs { - image, err := GetImageMetadata(ctx, job.Image().Ref()) + for _, j := range jobs { + image, err := GetImageMetadata(ctx, j.Image().Ref()) if err != nil { - return nil, fmt.Errorf("getting metadata for image %q: %w", job.Name, err) + return nil, fmt.Errorf("getting metadata for image %q: %w", j.Name, err) } images = append(images, image) } @@ -174,7 +174,7 @@ func ListImageVulnerabilities(ctx context.Context, ref string, page *pagination. if order == nil { order = &ImageVulnerabilityOrder{ - Field: ImageVulnerabilityOrderFieldSeverity, + Field: "SEVERITY", Direction: model.OrderDirectionDesc, } } diff --git a/internal/vulnerability/sortfilter.go b/internal/vulnerability/sortfilter.go new file mode 100644 index 000000000..0214080f5 --- /dev/null +++ b/internal/vulnerability/sortfilter.go @@ -0,0 +1,85 @@ +package vulnerability + +import ( + "context" + "strings" + + "github.com/nais/api/internal/graph/model" + "github.com/nais/api/internal/graph/sortfilter" + "github.com/nais/api/internal/workload" +) + +var SortFilterImageVulnerabilities = sortfilter.New[*ImageVulnerability, ImageVulnerabilityOrderField, *struct{}]("IDENTIFIER", model.OrderDirectionAsc) + +func init() { + workloadInit() + + SortFilterImageVulnerabilities.RegisterSort("IDENTIFIER", func(ctx context.Context, a, b *ImageVulnerability) int { + return strings.Compare(a.Identifier, b.Identifier) + }) + SortFilterImageVulnerabilities.RegisterSort("PACKAGE", func(ctx context.Context, a, b *ImageVulnerability) int { + return strings.Compare(a.Package, b.Package) + }) + SortFilterImageVulnerabilities.RegisterSort("STATE", func(ctx context.Context, a, b *ImageVulnerability) int { + return strings.Compare(a.State.String(), b.State.String()) + }) + SortFilterImageVulnerabilities.RegisterConcurrentSort("SUPPRESSED", func(ctx context.Context, a *ImageVulnerability) int { + vuln, err := GetImageAnalysisTrail(ctx, a) + if err != nil { + return 0 + } + + if vuln.Suppressed { + return 1 + } + + return 0 + }) + SortFilterImageVulnerabilities.RegisterSort("SEVERITY", func(ctx context.Context, a, b *ImageVulnerability) int { + severityToScore := map[ImageVulnerabilitySeverity]int{ + ImageVulnerabilitySeverityCritical: 5, + ImageVulnerabilitySeverityHigh: 4, + ImageVulnerabilitySeverityMedium: 3, + ImageVulnerabilitySeverityLow: 2, + ImageVulnerabilitySeverityUnassigned: 1, + } + + return severityToScore[a.Severity] - severityToScore[b.Severity] + }) +} + +func workloadInit() { + summarySorter := func(fn func(sum *ImageVulnerabilitySummary) int) sortfilter.ConcurrentSortFunc[workload.Workload] { + return func(ctx context.Context, a workload.Workload) int { + ref, err := GetImageMetadata(ctx, a.GetImageString()) + if err != nil { + return -1 + } + + if ref == nil || ref.Summary == nil { + return -1 + } + + return fn(ref.Summary) + } + } + + workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_RISK_SCORE", summarySorter(func(sum *ImageVulnerabilitySummary) int { + return sum.RiskScore + })) + workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_CRITICAL", summarySorter(func(sum *ImageVulnerabilitySummary) int { + return sum.Critical + })) + workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_HIGH", summarySorter(func(sum *ImageVulnerabilitySummary) int { + return sum.High + })) + workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_MEDIUM", summarySorter(func(sum *ImageVulnerabilitySummary) int { + return sum.Medium + })) + workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_LOW", summarySorter(func(sum *ImageVulnerabilitySummary) int { + return sum.Low + })) + workload.SortFilter.RegisterConcurrentSort("VULNERABILITY_SEVERITY_UNASSIGNED", summarySorter(func(sum *ImageVulnerabilitySummary) int { + return sum.Unassigned + })) +} diff --git a/internal/vulnerability/sortorder.go b/internal/vulnerability/sortorder.go deleted file mode 100644 index d6096ea0d..000000000 --- a/internal/vulnerability/sortorder.go +++ /dev/null @@ -1,45 +0,0 @@ -package vulnerability - -import ( - "context" - "strings" - - "github.com/nais/api/internal/graph/sortfilter" -) - -var SortFilterImageVulnerabilities = sortfilter.New[*ImageVulnerability, ImageVulnerabilityOrderField, *struct{}](ImageVulnerabilityOrderFieldIdentifier) - -func init() { - SortFilterImageVulnerabilities.RegisterOrderBy(ImageVulnerabilityOrderFieldIdentifier, func(ctx context.Context, a, b *ImageVulnerability) int { - return strings.Compare(a.Identifier, b.Identifier) - }) - SortFilterImageVulnerabilities.RegisterOrderBy(ImageVulnerabilityOrderFieldPackage, func(ctx context.Context, a, b *ImageVulnerability) int { - return strings.Compare(a.Package, b.Package) - }) - SortFilterImageVulnerabilities.RegisterOrderBy(ImageVulnerabilityOrderFieldState, func(ctx context.Context, a, b *ImageVulnerability) int { - return strings.Compare(a.State.String(), b.State.String()) - }) - SortFilterImageVulnerabilities.RegisterConcurrentOrderBy(ImageVulnerabilityOrderFieldSuppressed, func(ctx context.Context, a *ImageVulnerability) int { - vuln, err := GetImageAnalysisTrail(ctx, a) - if err != nil { - return 0 - } - - if vuln.Suppressed { - return 1 - } - - return 0 - }) - SortFilterImageVulnerabilities.RegisterOrderBy(ImageVulnerabilityOrderFieldSeverity, func(ctx context.Context, a, b *ImageVulnerability) int { - severityToScore := map[ImageVulnerabilitySeverity]int{ - ImageVulnerabilitySeverityCritical: 5, - ImageVulnerabilitySeverityHigh: 4, - ImageVulnerabilitySeverityMedium: 3, - ImageVulnerabilitySeverityLow: 2, - ImageVulnerabilitySeverityUnassigned: 1, - } - - return severityToScore[a.Severity] - severityToScore[b.Severity] - }) -} diff --git a/internal/workload/application/models.go b/internal/workload/application/models.go index 1223032fe..53093d2da 100644 --- a/internal/workload/application/models.go +++ b/internal/workload/application/models.go @@ -3,7 +3,6 @@ package application import ( "fmt" "io" - "slices" "strconv" "strings" "time" @@ -151,18 +150,8 @@ type ApplicationOrder struct { type ApplicationOrderField string -const ( - ApplicationOrderFieldName ApplicationOrderField = "NAME" - ApplicationOrderFieldEnvironment ApplicationOrderField = "ENVIRONMENT" -) - -var AllApplicationOrderField = []ApplicationOrderField{ - ApplicationOrderFieldName, - ApplicationOrderFieldEnvironment, -} - func (e ApplicationOrderField) IsValid() bool { - return slices.Contains(AllApplicationOrderField, e) + return SortFilter.SupportsSort(e) } func (e ApplicationOrderField) String() string { diff --git a/internal/workload/application/queries.go b/internal/workload/application/queries.go index 4415bd692..87a239bc3 100644 --- a/internal/workload/application/queries.go +++ b/internal/workload/application/queries.go @@ -9,6 +9,7 @@ import ( "github.com/nais/api/internal/activitylog" "github.com/nais/api/internal/auth/authz" "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/kubernetes/watcher" "github.com/nais/api/internal/slug" @@ -22,14 +23,26 @@ import ( "sigs.k8s.io/yaml" ) -func ListAllForTeam(ctx context.Context, teamSlug slug.Slug) []*Application { - k8s := fromContext(ctx).appWatcher - allApplications := k8s.GetByNamespace(teamSlug.String()) - +func ListAllForTeam(ctx context.Context, teamSlug slug.Slug, orderBy *ApplicationOrder, filter *TeamApplicationsFilter) []*Application { + allApplications := fromContext(ctx).appWatcher.GetByNamespace(teamSlug.String()) ret := make([]*Application, len(allApplications)) for i, obj := range allApplications { ret[i] = toGraphApplication(obj.Obj, obj.Cluster) } + + if filter != nil { + ret = SortFilter.Filter(ctx, ret, filter) + } + + if orderBy == nil { + orderBy = &ApplicationOrder{ + Field: "NAME", + Direction: model.OrderDirectionAsc, + } + } + + SortFilter.Sort(ctx, ret, orderBy.Field, orderBy.Direction) + return ret } diff --git a/internal/workload/application/sortorder.go b/internal/workload/application/sortfilter.go similarity index 71% rename from internal/workload/application/sortorder.go rename to internal/workload/application/sortfilter.go index 87d184f49..b7a0c4bc0 100644 --- a/internal/workload/application/sortorder.go +++ b/internal/workload/application/sortfilter.go @@ -5,18 +5,20 @@ import ( "slices" "strings" + "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/sortfilter" ) -var SortFilter = sortfilter.New[*Application, ApplicationOrderField, *TeamApplicationsFilter](ApplicationOrderFieldName) +var SortFilter = sortfilter.New[*Application, ApplicationOrderField, *TeamApplicationsFilter]("NAME", model.OrderDirectionAsc) func init() { - SortFilter.RegisterOrderBy(ApplicationOrderFieldName, func(ctx context.Context, a, b *Application) int { + SortFilter.RegisterSort("NAME", func(ctx context.Context, a, b *Application) int { return strings.Compare(a.GetName(), b.GetName()) }) - SortFilter.RegisterOrderBy(ApplicationOrderFieldEnvironment, func(ctx context.Context, a, b *Application) int { + SortFilter.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *Application) int { return strings.Compare(a.GetEnvironmentName(), b.GetEnvironmentName()) }) + SortFilter.RegisterFilter(func(ctx context.Context, v *Application, filter *TeamApplicationsFilter) bool { if filter.Name != "" { if !strings.Contains(strings.ToLower(v.Name), strings.ToLower(filter.Name)) { diff --git a/internal/workload/job/models.go b/internal/workload/job/models.go index bf8518c78..c40d4ecf8 100644 --- a/internal/workload/job/models.go +++ b/internal/workload/job/models.go @@ -3,7 +3,6 @@ package job import ( "fmt" "io" - "slices" "strconv" "strings" "time" @@ -224,20 +223,8 @@ type JobOrder struct { type JobOrderField string -const ( - // JobOrderFieldStatus JobOrderField = "STATUS" - JobOrderFieldName JobOrderField = "NAME" - JobOrderFieldEnvironment JobOrderField = "ENVIRONMENT" - // JobOrderFieldDeploymentTime JobOrderField = "DEPLOYMENT_TIME" -) - -var AllJobOrderField = []JobOrderField{ - JobOrderFieldName, - JobOrderFieldEnvironment, -} - func (e JobOrderField) IsValid() bool { - return slices.Contains(AllJobOrderField, e) + return SortFilter.SupportsSort(e) } func (e JobOrderField) String() string { diff --git a/internal/workload/job/queries.go b/internal/workload/job/queries.go index 02234ad5f..334848545 100644 --- a/internal/workload/job/queries.go +++ b/internal/workload/job/queries.go @@ -9,6 +9,7 @@ import ( "github.com/nais/api/internal/auth/authz" "github.com/nais/api/internal/graph/apierror" "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/kubernetes/watcher" "github.com/nais/api/internal/slug" @@ -22,13 +23,26 @@ import ( "sigs.k8s.io/yaml" ) -func ListAllForTeam(ctx context.Context, teamSlug slug.Slug) []*Job { +func ListAllForTeam(ctx context.Context, teamSlug slug.Slug, orderBy *JobOrder, filter *TeamJobsFilter) []*Job { allJobs := fromContext(ctx).jobWatcher.GetByNamespace(teamSlug.String()) ret := make([]*Job, len(allJobs)) for i, obj := range allJobs { ret[i] = toGraphJob(obj.Obj, obj.Cluster) } + if filter != nil { + ret = SortFilter.Filter(ctx, ret, filter) + } + + if orderBy == nil { + orderBy = &JobOrder{ + Field: "NAME", + Direction: model.OrderDirectionAsc, + } + } + + SortFilter.Sort(ctx, ret, orderBy.Field, orderBy.Direction) + return ret } diff --git a/internal/workload/job/sortorder.go b/internal/workload/job/sortfilter.go similarity index 74% rename from internal/workload/job/sortorder.go rename to internal/workload/job/sortfilter.go index 780ab3dde..ad8f7fe73 100644 --- a/internal/workload/job/sortorder.go +++ b/internal/workload/job/sortfilter.go @@ -5,16 +5,17 @@ import ( "slices" "strings" + "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/sortfilter" ) -var SortFilter = sortfilter.New[*Job, JobOrderField, *TeamJobsFilter](JobOrderFieldName) +var SortFilter = sortfilter.New[*Job, JobOrderField, *TeamJobsFilter]("NAME", model.OrderDirectionAsc) func init() { - SortFilter.RegisterOrderBy(JobOrderFieldName, func(ctx context.Context, a, b *Job) int { + SortFilter.RegisterSort("NAME", func(ctx context.Context, a, b *Job) int { return strings.Compare(a.GetName(), b.GetName()) }) - SortFilter.RegisterOrderBy(JobOrderFieldEnvironment, func(ctx context.Context, a, b *Job) int { + SortFilter.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *Job) int { return strings.Compare(a.GetEnvironmentName(), b.GetEnvironmentName()) }) SortFilter.RegisterFilter(func(ctx context.Context, v *Job, filter *TeamJobsFilter) bool { diff --git a/internal/workload/models.go b/internal/workload/models.go index 174c39ca9..af597c780 100644 --- a/internal/workload/models.go +++ b/internal/workload/models.go @@ -142,27 +142,8 @@ type WorkloadOrder struct { type WorkloadOrderField string -const ( - WorkloadOrderFieldName WorkloadOrderField = "NAME" - WorkloadOrderFieldStatus WorkloadOrderField = "STATUS" - WorkloadOrderFieldEnvironment WorkloadOrderField = "ENVIRONMENT" - WorkloadOrderFieldDeploymentTime WorkloadOrderField = "DEPLOYMENT_TIME" -) - -var AllWorkloadOrderField = []WorkloadOrderField{ - WorkloadOrderFieldName, - WorkloadOrderFieldStatus, - WorkloadOrderFieldEnvironment, - WorkloadOrderFieldDeploymentTime, -} - func (e WorkloadOrderField) IsValid() bool { - for _, f := range AllWorkloadOrderField { - if e == f { - return true - } - } - return false + return SortFilter.SupportsSort(e) } func (e WorkloadOrderField) String() string { diff --git a/internal/workload/secret/models.go b/internal/workload/secret/models.go index a2d630eb6..f322b78e7 100644 --- a/internal/workload/secret/models.go +++ b/internal/workload/secret/models.go @@ -169,35 +169,14 @@ type RemoveSecretValuePayload struct { } type SecretOrder struct { - // The field to order items by. - Field SecretOrderField `json:"field"` - // The direction to order items by. + Field SecretOrderField `json:"field"` Direction model.OrderDirection `json:"direction"` } type SecretOrderField string -const ( - // Order secrets by name. - SecretOrderFieldName SecretOrderField = "NAME" - // Order secrets by the name of the environment. - SecretOrderFieldEnvironment SecretOrderField = "ENVIRONMENT" - // Order secrets by the last time it was modified. - SecretOrderFieldLastModifiedAt SecretOrderField = "LAST_MODIFIED_AT" -) - -var AllSecretOrderField = []SecretOrderField{ - SecretOrderFieldName, - SecretOrderFieldEnvironment, - SecretOrderFieldLastModifiedAt, -} - func (e SecretOrderField) IsValid() bool { - switch e { - case SecretOrderFieldName, SecretOrderFieldEnvironment, SecretOrderFieldLastModifiedAt: - return true - } - return false + return SortFilter.SupportsSort(e) } func (e SecretOrderField) String() string { @@ -221,8 +200,6 @@ func (e SecretOrderField) MarshalGQL(w io.Writer) { fmt.Fprint(w, strconv.Quote(e.String())) } -// Input for filtering the secrets of a team. type SecretFilter struct { - // Filter by usage of the secret. InUse *bool `json:"inUse"` } diff --git a/internal/workload/secret/queries.go b/internal/workload/secret/queries.go index a1a9d711d..68d146bfd 100644 --- a/internal/workload/secret/queries.go +++ b/internal/workload/secret/queries.go @@ -27,11 +27,6 @@ import ( ) func ListForWorkload(ctx context.Context, teamSlug slug.Slug, environmentName string, workload workload.Workload, page *pagination.Pagination) (*SecretConnection, error) { - // all := fromContext(ctx).secretWatcher.GetByNamespace( - // teamSlug.String(), - // watcher.InCluster(environmentName), - // watcher.WithObjectNames(workload.GetSecrets()), - // ) client, err := fromContext(ctx).Client(ctx, environmentName) if err != nil { return nil, err @@ -58,7 +53,7 @@ func ListForWorkload(ctx context.Context, teamSlug slug.Slug, environmentName st ret = append(ret, s) } - SortFilter.Sort(ctx, ret, SecretOrderFieldName, model.OrderDirectionAsc) + SortFilter.Sort(ctx, ret, "NAME", model.OrderDirectionAsc) paginated := pagination.Slice(ret, page) return pagination.NewConnection(paginated, page, len(ret)), nil } @@ -89,7 +84,7 @@ func ListForTeam(ctx context.Context, teamSlug slug.Slug, page *pagination.Pagin if orderBy == nil { orderBy = &SecretOrder{ - Field: SecretOrderFieldName, + Field: "NAME", Direction: model.OrderDirectionAsc, } } diff --git a/internal/workload/secret/sortorder.go b/internal/workload/secret/sortfilter.go similarity index 68% rename from internal/workload/secret/sortorder.go rename to internal/workload/secret/sortfilter.go index d3644637b..28c01db52 100644 --- a/internal/workload/secret/sortorder.go +++ b/internal/workload/secret/sortfilter.go @@ -5,21 +5,22 @@ import ( "slices" "strings" + "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/sortfilter" "github.com/nais/api/internal/workload/application" "github.com/nais/api/internal/workload/job" ) -var SortFilter = sortfilter.New[*Secret, SecretOrderField, *SecretFilter](SecretOrderFieldName) +var SortFilter = sortfilter.New[*Secret, SecretOrderField, *SecretFilter]("NAME", model.OrderDirectionAsc) func init() { - SortFilter.RegisterOrderBy(SecretOrderFieldName, func(ctx context.Context, a, b *Secret) int { + SortFilter.RegisterSort("NAME", func(ctx context.Context, a, b *Secret) int { return strings.Compare(a.GetName(), b.GetName()) }) - SortFilter.RegisterOrderBy(SecretOrderFieldEnvironment, func(ctx context.Context, a, b *Secret) int { + SortFilter.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *Secret) int { return strings.Compare(a.EnvironmentName, b.EnvironmentName) }) - SortFilter.RegisterOrderBy(SecretOrderFieldLastModifiedAt, func(ctx context.Context, a, b *Secret) int { + SortFilter.RegisterSort("LAST_MODIFIED_AT", func(ctx context.Context, a, b *Secret) int { if a.LastModifiedAt == nil && b.LastModifiedAt == nil { return 0 } @@ -37,14 +38,14 @@ func init() { } uses := 0 - applications := application.ListAllForTeam(ctx, v.TeamSlug) + applications := application.ListAllForTeam(ctx, v.TeamSlug, nil, nil) for _, app := range applications { if slices.Contains(app.GetSecrets(), v.Name) { uses++ } } - jobs := job.ListAllForTeam(ctx, v.TeamSlug) + jobs := job.ListAllForTeam(ctx, v.TeamSlug, nil, nil) for _, j := range jobs { if slices.Contains(j.GetSecrets(), v.Name) { uses++ diff --git a/internal/workload/sortorder.go b/internal/workload/sortfilter.go similarity index 57% rename from internal/workload/sortorder.go rename to internal/workload/sortfilter.go index ac5c79b91..21afe0c02 100644 --- a/internal/workload/sortorder.go +++ b/internal/workload/sortfilter.go @@ -5,21 +5,20 @@ import ( "slices" "strings" + "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/sortfilter" ) -var SortFilter = sortfilter.New[Workload, WorkloadOrderField, *TeamWorkloadsFilter](WorkloadOrderFieldName) +var SortFilter = sortfilter.New[Workload, WorkloadOrderField, *TeamWorkloadsFilter]("NAME", model.OrderDirectionAsc) func init() { - SortFilter.RegisterOrderBy(WorkloadOrderFieldName, func(ctx context.Context, a, b Workload) int { + SortFilter.RegisterSort("NAME", func(ctx context.Context, a, b Workload) int { return strings.Compare(a.GetName(), b.GetName()) }) - SortFilter.RegisterOrderBy(WorkloadOrderFieldEnvironment, func(ctx context.Context, a, b Workload) int { + SortFilter.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b Workload) int { return strings.Compare(a.GetEnvironmentName(), b.GetEnvironmentName()) }) - SortFilter.RegisterOrderBy(WorkloadOrderFieldDeploymentTime, func(ctx context.Context, a, b Workload) int { - return int(a.GetRolloutCompleteTime() - b.GetRolloutCompleteTime()) - }) + SortFilter.RegisterFilter(func(ctx context.Context, v Workload, filter *TeamWorkloadsFilter) bool { if len(filter.Environments) == 0 { return true