Skip to content

fix: stream analytics API responses #924

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

Open
inickt wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −22
Open

fix: stream analytics API responses #924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 16 additions & 22 deletions cmd/lk/analytics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,15 @@ func listAnalyticsSessions(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
defer body.Close()

if cmd.Bool("json") {
var obj any
if err := json.Unmarshal(body, &obj); err != nil {
return err
}
util.PrintJSON(obj)
return nil
_, err := io.Copy(out.ResultWriter(), body)
return err
}

var res analyticsListResponse
if err := json.Unmarshal(body, &res); err != nil {
if err := json.NewDecoder(body).Decode(&res); err != nil {
return fmt.Errorf("failed to parse analytics list response: %w", err)
}

Expand Down Expand Up @@ -194,18 +191,15 @@ func getAnalyticsSession(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
defer body.Close()

if cmd.Bool("json") {
var obj any
if err := json.Unmarshal(body, &obj); err != nil {
return err
}
util.PrintJSON(obj)
return nil
_, err := io.Copy(out.ResultWriter(), body)
return err
}

var details analyticsSessionDetails
if err := json.Unmarshal(body, &details); err != nil {
if err := json.NewDecoder(body).Decode(&details); err != nil {
return fmt.Errorf("failed to parse analytics details response: %w", err)
}

Expand Down Expand Up @@ -310,7 +304,7 @@ func validateAnalyticsDateRange(startDate, endDate string) (time.Time, time.Time
return start, end, nil
}

func callAnalyticsAPI(ctx context.Context, cmd *cli.Command, sessionID string, query url.Values) ([]byte, error) {
func callAnalyticsAPI(ctx context.Context, cmd *cli.Command, sessionID string, query url.Values) (io.ReadCloser, error) {
_, err := requireProject(ctx, cmd)
if err != nil {
return nil, err
Expand Down Expand Up @@ -356,18 +350,18 @@ func callAnalyticsAPI(ctx context.Context, cmd *cli.Command, sessionID string, q
if err != nil {
return nil, err
}
defer resp.Body.Close()

body, err := io.ReadAll(resp.Body)
if err != nil {
return nil, err
if resp.StatusCode < 400 {
return resp.Body, nil
}

if resp.StatusCode >= 400 {
return nil, mapAnalyticsHTTPError(resp.StatusCode, string(body))
defer resp.Body.Close()
body, err := io.ReadAll(io.LimitReader(resp.Body, 201))
if err != nil {
return nil, err
}

return body, nil
return nil, mapAnalyticsHTTPError(resp.StatusCode, string(body))
}

func resolveAnalyticsProjectID() (string, error) {
Expand Down
Loading