Skip to content
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

fix(stats/historical): avoid runtime SIGSEGV #1169

Merged
merged 2 commits into from
Mar 27, 2024
Merged

fix(stats/historical): avoid runtime SIGSEGV #1169

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bb346c
fix(stats/historical): avoid runtime SIGSEGV
Integralist Mar 27, 2024
597e0e2
refactor(stats/historical): optionally set fields
Integralist Mar 27, 2024
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
23 changes: 16 additions & 7 deletions pkg/commands/stats/historical.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ const statusSuccess = "success"
type HistoricalCommand struct {
argparser.Base

Input fastly.GetStatsInput
by string
formatFlag string
from string
region string
serviceName argparser.OptionalServiceNameID
to string
}

// NewHistoricalCommand is the "stats historical" subcommand.
Expand All @@ -41,10 +44,10 @@ func NewHistoricalCommand(parent argparser.Registerer, g *global.Data) *Historic
Dst: &c.serviceName.Value,
})

c.CmdClause.Flag("from", "From time, accepted formats at https://fastly.dev/reference/api/metrics-stats/historical-stats").StringVar(c.Input.From)
c.CmdClause.Flag("to", "To time").StringVar(c.Input.To)
c.CmdClause.Flag("by", "Aggregation period (minute/hour/day)").EnumVar(c.Input.By, "minute", "hour", "day")
c.CmdClause.Flag("region", "Filter by region ('stats regions' to list)").StringVar(c.Input.Region)
c.CmdClause.Flag("from", "From time, accepted formats at https://fastly.dev/reference/api/metrics-stats/historical-stats").StringVar(&c.from)
c.CmdClause.Flag("to", "To time").StringVar(&c.to)
c.CmdClause.Flag("by", "Aggregation period (minute/hour/day)").EnumVar(&c.by, "minute", "hour", "day")
c.CmdClause.Flag("region", "Filter by region ('stats regions' to list)").StringVar(&c.region)

c.CmdClause.Flag("format", "Output format (json)").EnumVar(&c.formatFlag, "json")

Expand All @@ -61,10 +64,16 @@ func (c *HistoricalCommand) Exec(_ io.Reader, out io.Writer) error {
argparser.DisplayServiceID(serviceID, flag, source, out)
}

c.Input.Service = fastly.ToPointer(serviceID)
input := fastly.GetStatsInput{
By: &c.by,
From: &c.from,
Region: &c.region,
Service: fastly.ToPointer(serviceID),
To: &c.to,
}

var envelope statsResponse
err = c.Globals.APIClient.GetStatsJSON(&c.Input, &envelope)
err = c.Globals.APIClient.GetStatsJSON(&input, &envelope)
if err != nil {
c.Globals.ErrLog.AddWithContext(err, map[string]any{
"Service ID": serviceID,
Expand Down
Loading