Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 1 addition & 26 deletions apps/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,15 @@ package apps

import (
"context"
"encoding/json"
"io"
"strings"

"gopkg.in/errgo.v1"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/logs"
"github.com/Scalingo/go-scalingo/v9"
"github.com/Scalingo/go-scalingo/v9/debug"
)

type LogsRes struct {
LogsURL string `json:"logs_url"`
App *scalingo.App `json:"app"`
}

func Logs(ctx context.Context, appName string, stream bool, n int, filter string) error {
c, err := config.ScalingoClient(ctx)
if err != nil {
Expand All @@ -30,28 +22,11 @@ func Logs(ctx context.Context, appName string, stream bool, n int, filter string
return errgo.Mask(err, errgo.Any)
}

res, err := c.LogsURL(ctx, appName)
if err != nil {
return errgo.Mask(err, errgo.Any)
}
defer res.Body.Close()

if res.StatusCode != 200 {
return errgo.Newf("fail to query logs: %s", res.Status)
}

body, err := io.ReadAll(res.Body)
logsRes, err := c.LogsURL(ctx, appName)
if err != nil {
return errgo.Mask(err, errgo.Any)
}

debug.Println("[API-Response] ", string(body))

logsRes := &LogsRes{}
if err = json.Unmarshal(body, &logsRes); err != nil {
return errgo.Mask(err, errgo.Any)
}

if err = logs.Dump(ctx, logsRes.LogsURL, n, filter); err != nil {
return errgo.Mask(err, errgo.Any)
}
Expand Down
2 changes: 1 addition & 1 deletion db/backup_download.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func DownloadBackup(ctx context.Context, app, addonID, backupID string, opts Dow
spinner.Stop()

if resp.StatusCode != http.StatusOK {
return httpclient.NewRequestFailedError(resp, &httpclient.APIRequest{
return httpclient.NewRequestFailedError(ctx, resp, &httpclient.APIRequest{
URL: downloadURL,
Method: http.MethodGet,
})
Expand Down
5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.0

require (
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/Scalingo/go-scalingo/v9 v9.1.0
github.com/Scalingo/go-scalingo/v9 v9.2.1-0.20260227154930-b5d3e5afa44b
github.com/Scalingo/go-utils/errors/v2 v2.5.1
github.com/Scalingo/go-utils/logger v1.11.0
github.com/Scalingo/gopassword v1.1.0
Expand Down Expand Up @@ -34,6 +34,7 @@ require (
dario.cat/mergo v1.0.2 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.3.0 // indirect
github.com/Scalingo/go-utils/errors/v3 v3.2.0 // indirect
github.com/Scalingo/go-utils/pagination v1.1.2 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/clipperhouse/displaywidth v0.8.0 // indirect
Expand All @@ -45,7 +46,7 @@ require (
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.7.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/go-querystring v1.2.0 // indirect
Expand Down
10 changes: 6 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
github.com/Scalingo/go-scalingo/v9 v9.1.0 h1:VyXg120FnHcgs9i305PC2RF3lEh37JmrEdZxy49g5kQ=
github.com/Scalingo/go-scalingo/v9 v9.1.0/go.mod h1:35IIuHmIYXHfwwRF1bik8ZJwkyIpsI7dmhqtWslzoYc=
github.com/Scalingo/go-scalingo/v9 v9.2.1-0.20260227154930-b5d3e5afa44b h1:yLHHQ/g/rdqncvv2k+OKJaYje8xSCBaYp/T/y+yipCY=
github.com/Scalingo/go-scalingo/v9 v9.2.1-0.20260227154930-b5d3e5afa44b/go.mod h1:IP0dmaWsauELy5x/SkpP4ZkoanMNbU2h/ZqxVHG5Tv4=
github.com/Scalingo/go-utils/errors/v2 v2.5.1 h1:1tfJW6/ZxTgrRmFTlKQCOtArQquOW0/XdZQzx8wMHoM=
github.com/Scalingo/go-utils/errors/v2 v2.5.1/go.mod h1:SbR1JuMtfAl+gpM7ahUW/c3Jm5MMzMAwJBk1pEHkVd8=
github.com/Scalingo/go-utils/errors/v3 v3.2.0 h1:Ks+v2oRwv3VZfe+xVB+kpfmZouXHVCPHHtwL5W60prc=
github.com/Scalingo/go-utils/errors/v3 v3.2.0/go.mod h1:jVVNoOdYFjuNkR/BeEZWNWJVvu4jmyLY4udlsQQyBss=
github.com/Scalingo/go-utils/logger v1.11.0 h1:QUsGgZIv6LWUCyKKy06DuW67FLmzSmWPmnhD/3YlxeM=
github.com/Scalingo/go-utils/logger v1.11.0/go.mod h1:Aui6aiU13vZ15EqMm6T2HxkvXFEU1czkfQyfNSyiH5Y=
github.com/Scalingo/go-utils/pagination v1.1.2 h1:DfHxWXK76F6+UyJqmJ/XIxTuwurMIJHRFfiejmPBC+8=
Expand Down Expand Up @@ -64,8 +66,8 @@ github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMj
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
github.com/go-git/go-git/v5 v5.16.5 h1:mdkuqblwr57kVfXri5TTH+nMFLNUxIj9Z7F5ykFbw5s=
github.com/go-git/go-git/v5 v5.16.5/go.mod h1:QOMLpNf1qxuSY4StA/ArOdfFR2TrKEjJiye2kel2m+M=
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
Expand Down
9 changes: 9 additions & 0 deletions vendor/github.com/Scalingo/go-scalingo/v9/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions vendor/github.com/Scalingo/go-scalingo/v9/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 11 additions & 12 deletions vendor/github.com/Scalingo/go-scalingo/v9/addons.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions vendor/github.com/Scalingo/go-scalingo/v9/addons_providers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions vendor/github.com/Scalingo/go-scalingo/v9/alerts.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading