Skip to content

waf: add events subcommand (SPEC-waf-events row 6) #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
acoshift wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

waf: add events subcommand (SPEC-waf-events row 6) #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3aa768
add waf events subcommand
acoshift Jul 11, 2026
3d84c19
print next page cursor after events table
acoshift Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/deploys-app/deploys
go 1.26

require (
github.com/deploys-app/api v0.0.0-20260713024420-a04c48ceccc7
github.com/deploys-app/api v0.0.0-20260714032625-fb28c7d02fcd
github.com/moonrhythm/toon v0.0.0-20260702100246-6fcdad0a6a12
golang.org/x/mod v0.37.0
golang.org/x/oauth2 v0.14.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:W
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/deploys-app/api v0.0.0-20260713024420-a04c48ceccc7 h1:7ecexsz+To+O0+NNPAfDI7hLgHabTjS48I8n/5TKvLw=
github.com/deploys-app/api v0.0.0-20260713024420-a04c48ceccc7/go.mod h1:X70UJs5awlRV4Cmn0FPJAgEbn4N933K8YgSKc1y9aD8=
github.com/deploys-app/api v0.0.0-20260714032625-fb28c7d02fcd h1:q1fIyT4RvpzCxxOpaLseENsNpbQEupvAtsS7uo89/ZQ=
github.com/deploys-app/api v0.0.0-20260714032625-fb28c7d02fcd/go.mod h1:X70UJs5awlRV4Cmn0FPJAgEbn4N933K8YgSKc1y9aD8=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
Expand Down
1 change: 1 addition & 0 deletions internal/runner/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ var commands = []command{
{name: "list", short: "list WAF zones in a project"},
{name: "set", args: "-f <spec.yaml> [-description]", short: "apply a WAF zone from a YAML spec"},
{name: "delete", short: "delete the WAF zone"},
{name: "events", args: "[-rule <id>] [-action log|allow|block] [-limit n] [-before <cursor>]", short: "show recent sampled firewall match events"},
{name: "metrics", args: "[-time-range 1h|6h|12h|1d|7d|30d]", short: "show WAF request metrics"},
{name: "limitmetrics", args: "[-time-range 1h|6h|12h|1d|7d|30d]", short: "show WAF rate-limit metrics"},
},
Expand Down
22 changes: 22 additions & 0 deletions internal/runner/waf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,28 @@ func (rn Runner) waf(args ...string) error {
f.StringVar(&req.Location, "location", "", "location")
f.Parse(args[1:])
resp, err = s.Delete(context.Background(), &req)
case "events":
var req api.WAFEvents
f.StringVar(&req.Project, "project", "", "project id")
f.StringVar(&req.Location, "location", "", "location")
f.StringVar(&req.RuleID, "rule", "", "rule id filter (short id from waf get)")
f.StringVar(&req.Action, "action", "", "action filter: log, allow, block")
f.StringVar(&req.Before, "before", "", "page cursor from a previous response's next")
f.IntVar(&req.Limit, "limit", 0, "max events per page (default 50, max 200)")
f.Parse(args[1:])
r, rerr := s.Events(context.Background(), &req)
if rerr != nil {
return rerr
}
if perr := rn.print(r); perr != nil {
return perr
}
// Table() carries no cursor column, so without this trailer a
// table-mode user has no way to obtain the -before value.
if (rn.OutputMode == "" || rn.OutputMode == "table") && r.Next != "" {
fmt.Fprintf(rn.output(), "next: %s\n", r.Next)
}
return nil
case "metrics":
var (
req api.WAFMetrics
Expand Down