Skip to content

Commit 836f0c1

Browse files
committed
build(deps): update github.com/Scalingo/go-scalingo from v9 to v10
1 parent f930ebd commit 836f0c1

100 files changed

Lines changed: 2362 additions & 1546 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/logs.go

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,15 @@ package apps
22

33
import (
44
"context"
5-
"encoding/json"
6-
"io"
75
"strings"
86

97
"gopkg.in/errgo.v1"
108

119
"github.com/Scalingo/cli/config"
1210
"github.com/Scalingo/cli/logs"
1311
"github.com/Scalingo/go-scalingo/v9"
14-
"github.com/Scalingo/go-scalingo/v9/debug"
1512
)
1613

17-
type LogsRes struct {
18-
LogsURL string `json:"logs_url"`
19-
App *scalingo.App `json:"app"`
20-
}
21-
2214
func Logs(ctx context.Context, appName string, stream bool, n int, filter string) error {
2315
c, err := config.ScalingoClient(ctx)
2416
if err != nil {
@@ -30,28 +22,11 @@ func Logs(ctx context.Context, appName string, stream bool, n int, filter string
3022
return errgo.Mask(err, errgo.Any)
3123
}
3224

33-
res, err := c.LogsURL(ctx, appName)
34-
if err != nil {
35-
return errgo.Mask(err, errgo.Any)
36-
}
37-
defer res.Body.Close()
38-
39-
if res.StatusCode != 200 {
40-
return errgo.Newf("fail to query logs: %s", res.Status)
41-
}
42-
43-
body, err := io.ReadAll(res.Body)
25+
logsRes, err := c.LogsURL(ctx, appName)
4426
if err != nil {
4527
return errgo.Mask(err, errgo.Any)
4628
}
4729

48-
debug.Println("[API-Response] ", string(body))
49-
50-
logsRes := &LogsRes{}
51-
if err = json.Unmarshal(body, &logsRes); err != nil {
52-
return errgo.Mask(err, errgo.Any)
53-
}
54-
5530
if err = logs.Dump(ctx, logsRes.LogsURL, n, filter); err != nil {
5631
return errgo.Mask(err, errgo.Any)
5732
}

db/backup_download.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func DownloadBackup(ctx context.Context, app, addonID, backupID string, opts Dow
125125
spinner.Stop()
126126

127127
if resp.StatusCode != http.StatusOK {
128-
return httpclient.NewRequestFailedError(resp, &httpclient.APIRequest{
128+
return httpclient.NewRequestFailedError(ctx, resp, &httpclient.APIRequest{
129129
URL: downloadURL,
130130
Method: http.MethodGet,
131131
})

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.0
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.7
7-
github.com/Scalingo/go-scalingo/v9 v9.1.0
7+
github.com/Scalingo/go-scalingo/v9 v9.2.1-0.20260227110208-51a090a69e00
88
github.com/Scalingo/go-utils/errors/v2 v2.5.1
99
github.com/Scalingo/go-utils/logger v1.11.0
1010
github.com/Scalingo/gopassword v1.1.0
@@ -34,6 +34,7 @@ require (
3434
dario.cat/mergo v1.0.2 // indirect
3535
github.com/Microsoft/go-winio v0.6.2 // indirect
3636
github.com/ProtonMail/go-crypto v1.3.0 // indirect
37+
github.com/Scalingo/go-utils/errors/v3 v3.2.0 // indirect
3738
github.com/Scalingo/go-utils/pagination v1.1.2 // indirect
3839
github.com/VividCortex/ewma v1.2.0 // indirect
3940
github.com/clipperhouse/displaywidth v0.8.0 // indirect
@@ -45,7 +46,7 @@ require (
4546
github.com/emirpasic/gods v1.18.1 // indirect
4647
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
4748
github.com/go-git/go-billy/v5 v5.7.0 // indirect
48-
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
49+
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
4950
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
5051
github.com/golang/mock v1.6.0 // indirect
5152
github.com/google/go-querystring v1.2.0 // indirect

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
99
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
1010
github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
1111
github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
12-
github.com/Scalingo/go-scalingo/v9 v9.1.0 h1:VyXg120FnHcgs9i305PC2RF3lEh37JmrEdZxy49g5kQ=
13-
github.com/Scalingo/go-scalingo/v9 v9.1.0/go.mod h1:35IIuHmIYXHfwwRF1bik8ZJwkyIpsI7dmhqtWslzoYc=
12+
github.com/Scalingo/go-scalingo/v9 v9.2.1-0.20260227110208-51a090a69e00 h1:7TGS4OAX+DuNVTLIJEo4VYmuSE8DPnlLUrwGiGKT4Pw=
13+
github.com/Scalingo/go-scalingo/v9 v9.2.1-0.20260227110208-51a090a69e00/go.mod h1:IP0dmaWsauELy5x/SkpP4ZkoanMNbU2h/ZqxVHG5Tv4=
1414
github.com/Scalingo/go-utils/errors/v2 v2.5.1 h1:1tfJW6/ZxTgrRmFTlKQCOtArQquOW0/XdZQzx8wMHoM=
1515
github.com/Scalingo/go-utils/errors/v2 v2.5.1/go.mod h1:SbR1JuMtfAl+gpM7ahUW/c3Jm5MMzMAwJBk1pEHkVd8=
16+
github.com/Scalingo/go-utils/errors/v3 v3.2.0 h1:Ks+v2oRwv3VZfe+xVB+kpfmZouXHVCPHHtwL5W60prc=
17+
github.com/Scalingo/go-utils/errors/v3 v3.2.0/go.mod h1:jVVNoOdYFjuNkR/BeEZWNWJVvu4jmyLY4udlsQQyBss=
1618
github.com/Scalingo/go-utils/logger v1.11.0 h1:QUsGgZIv6LWUCyKKy06DuW67FLmzSmWPmnhD/3YlxeM=
1719
github.com/Scalingo/go-utils/logger v1.11.0/go.mod h1:Aui6aiU13vZ15EqMm6T2HxkvXFEU1czkfQyfNSyiH5Y=
1820
github.com/Scalingo/go-utils/pagination v1.1.2 h1:DfHxWXK76F6+UyJqmJ/XIxTuwurMIJHRFfiejmPBC+8=
@@ -64,8 +66,8 @@ github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMj
6466
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
6567
github.com/go-git/go-git/v5 v5.16.5 h1:mdkuqblwr57kVfXri5TTH+nMFLNUxIj9Z7F5ykFbw5s=
6668
github.com/go-git/go-git/v5 v5.16.5/go.mod h1:QOMLpNf1qxuSY4StA/ArOdfFR2TrKEjJiye2kel2m+M=
67-
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
68-
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
69+
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
70+
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
6971
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
7072
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
7173
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=

vendor/github.com/Scalingo/go-scalingo/v9/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Scalingo/go-scalingo/v9/README.md

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Scalingo/go-scalingo/v9/addons.go

Lines changed: 11 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Scalingo/go-scalingo/v9/addons_providers.go

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Scalingo/go-scalingo/v9/alerts.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)