diff --git a/pkg/cmd/audit/list/list.go b/pkg/cmd/audit/list/list.go index f4ff2ab99..3a3244df0 100644 --- a/pkg/cmd/audit/list/list.go +++ b/pkg/cmd/audit/list/list.go @@ -122,7 +122,7 @@ func NewCmdList(f *cmdutil.Factory) *cobra.Command { } if flagOrderBy != "" { - if err := cmdutil.ValidateEnum("order-by", flagOrderBy, []string{"CREATED_AT", "VALID_FROM", "VALID_UNTIL", "STATE"}); err != nil { + if err := cmdutil.ValidateEnum("order-by", flagOrderBy, []string{"CREATED_AT", "VALID_FROM", "VALID_UNTIL", "AUDIT_START_DATE", "AUDIT_END_DATE", "STATE"}); err != nil { return err } @@ -224,7 +224,7 @@ func NewCmdList(f *cmdutil.Factory) *cobra.Command { cmd.Flags().StringVar(&flagOrg, "org", "", "Organization ID") cmd.Flags().IntVarP(&flagLimit, "limit", "L", 30, "Maximum number of audits to list") - cmd.Flags().StringVar(&flagOrderBy, "order-by", "", "Order by field (CREATED_AT, VALID_FROM, VALID_UNTIL, STATE)") + cmd.Flags().StringVar(&flagOrderBy, "order-by", "", "Order by field (CREATED_AT, VALID_FROM, VALID_UNTIL, AUDIT_START_DATE, AUDIT_END_DATE, STATE)") cmd.Flags().StringVar(&flagOrderDir, "order-direction", "DESC", "Sort direction (ASC, DESC)") flagOutput = cmdutil.AddOutputFlag(cmd) diff --git a/pkg/coredata/audit.go b/pkg/coredata/audit.go index 10b9e3ce5..242676087 100644 --- a/pkg/coredata/audit.go +++ b/pkg/coredata/audit.go @@ -62,6 +62,10 @@ func (a *Audit) CursorKey(field AuditOrderField) page.CursorKey { return page.NewCursorKey(a.ID, a.ValidFrom) case AuditOrderFieldValidUntil: return page.NewCursorKey(a.ID, a.ValidUntil) + case AuditOrderFieldAuditStartDate: + return page.NewCursorKey(a.ID, a.AuditStartDate) + case AuditOrderFieldAuditEndDate: + return page.NewCursorKey(a.ID, a.AuditEndDate) case AuditOrderFieldState: return page.NewCursorKey(a.ID, a.State) } diff --git a/pkg/coredata/audit_order_field.go b/pkg/coredata/audit_order_field.go index 9939f91e3..29c38f116 100644 --- a/pkg/coredata/audit_order_field.go +++ b/pkg/coredata/audit_order_field.go @@ -30,10 +30,12 @@ import ( type AuditOrderField string const ( - AuditOrderFieldCreatedAt AuditOrderField = "CREATED_AT" - AuditOrderFieldValidFrom AuditOrderField = "VALID_FROM" - AuditOrderFieldValidUntil AuditOrderField = "VALID_UNTIL" - AuditOrderFieldState AuditOrderField = "STATE" + AuditOrderFieldCreatedAt AuditOrderField = "CREATED_AT" + AuditOrderFieldValidFrom AuditOrderField = "VALID_FROM" + AuditOrderFieldValidUntil AuditOrderField = "VALID_UNTIL" + AuditOrderFieldAuditStartDate AuditOrderField = "AUDIT_START_DATE" + AuditOrderFieldAuditEndDate AuditOrderField = "AUDIT_END_DATE" + AuditOrderFieldState AuditOrderField = "STATE" ) var ( @@ -48,6 +50,8 @@ func AuditOrderFields() []AuditOrderField { AuditOrderFieldCreatedAt, AuditOrderFieldValidFrom, AuditOrderFieldValidUntil, + AuditOrderFieldAuditStartDate, + AuditOrderFieldAuditEndDate, AuditOrderFieldState, } } @@ -58,6 +62,8 @@ func (v AuditOrderField) IsValid() bool { AuditOrderFieldCreatedAt, AuditOrderFieldValidFrom, AuditOrderFieldValidUntil, + AuditOrderFieldAuditStartDate, + AuditOrderFieldAuditEndDate, AuditOrderFieldState: return true } diff --git a/pkg/server/api/console/v1/graphql/audit.graphql b/pkg/server/api/console/v1/graphql/audit.graphql index 7ee17ac4c..26477194a 100644 --- a/pkg/server/api/console/v1/graphql/audit.graphql +++ b/pkg/server/api/console/v1/graphql/audit.graphql @@ -89,6 +89,14 @@ enum AuditOrderField @goEnum( value: "go.probo.inc/probo/pkg/coredata.AuditOrderFieldValidUntil" ) + AUDIT_START_DATE + @goEnum( + value: "go.probo.inc/probo/pkg/coredata.AuditOrderFieldAuditStartDate" + ) + AUDIT_END_DATE + @goEnum( + value: "go.probo.inc/probo/pkg/coredata.AuditOrderFieldAuditEndDate" + ) STATE @goEnum(value: "go.probo.inc/probo/pkg/coredata.AuditOrderFieldState") } diff --git a/pkg/server/api/mcp/v1/specification.yaml b/pkg/server/api/mcp/v1/specification.yaml index 8c5ff18d1..2802ce42f 100644 --- a/pkg/server/api/mcp/v1/specification.yaml +++ b/pkg/server/api/mcp/v1/specification.yaml @@ -4620,6 +4620,8 @@ components: - CREATED_AT - VALID_FROM - VALID_UNTIL + - AUDIT_START_DATE + - AUDIT_END_DATE - STATE go.probo.inc/mcpgen/type: go.probo.inc/probo/pkg/coredata.AuditOrderField