Skip to content
Merged
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@

## To Be Released

* build(deps): update `github.com/Scalingo/go-scalingo` to v10
* build(deps): update `github.com/Scalingo/go-scalingo` from v9 to v11
* refactor: replace `errgo` and `pkg/errors` with `github.com/Scalingo/go-utils/errors/v3`
* refactor: autofix by `go fix` and golangci-lint
* fix(error): correctly parse in case of `RequestFailedError`
* feat(run): add a `bash` alias for us out there often forgetting the `run` in front
* feat(sshkeys): add support for ed25519 keys
* feat(apps/create): detect Git main branch name
* fix(databases): `parseScheduleAtFlag` returns a validation error
* fix(privatenetworks): `PrivateNetworksDomainsList` must take a `pagination.Request` in argument
* build(deps): update `github.com/Scalingo/go-scalingo` from v10 to v11

## 1.43.3

Expand Down
2 changes: 1 addition & 1 deletion addonproviders/plans.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/olekukonko/tablewriter"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion addons/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/utils"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion addons/destroy.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion addons/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/db"
"github.com/Scalingo/cli/utils"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion addons/provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/cli/utils"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion addons/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/cli/utils"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion alerts/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion alerts/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
4 changes: 2 additions & 2 deletions apps/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/utils"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand All @@ -32,7 +32,7 @@ func Create(ctx context.Context, appName, remote, buildpack, projectID string, h

if buildpack != "" {
fmt.Println("Installing custom buildpack...")
_, _, err := c.VariableSet(ctx, app.Name, "BUILDPACK_URL", buildpack)
_, err := c.VariableSet(ctx, app.Name, "BUILDPACK_URL", buildpack)
if err != nil {
fmt.Println("Failed to set custom buildpack. Please add BUILDPACK_URL=" + buildpack + " to your application environment")
}
Expand Down
4 changes: 2 additions & 2 deletions apps/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/olekukonko/tablewriter"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v10/debug"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-scalingo/v11/debug"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/logs"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/one_off_stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
14 changes: 4 additions & 10 deletions apps/operations.go → apps/operation_waiter.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ import (
"context"
"fmt"
stdio "io"
"net/http"
"net/url"
"os"
"path/filepath"
"time"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand All @@ -27,16 +26,11 @@ type OperationWaiter struct {
url string
}

func NewOperationWaiterFromHTTPResponse(app string, res *http.Response) *OperationWaiter {
operationURL := res.Header.Get("Location")
return NewOperationWaiterFromURL(app, operationURL)
func newOperationWaiterFromURL(app, url string) *OperationWaiter {
return newOperationWaiter(os.Stderr, app, url)
}

func NewOperationWaiterFromURL(app, url string) *OperationWaiter {
return NewOperationWaiter(os.Stderr, app, url)
}

func NewOperationWaiter(output stdio.Writer, app, url string) *OperationWaiter {
func newOperationWaiter(output stdio.Writer, app, url string) *OperationWaiter {
return &OperationWaiter{
output: output,
app: app,
Expand Down
7 changes: 3 additions & 4 deletions apps/restart.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand All @@ -17,18 +17,17 @@ func Restart(ctx context.Context, app string, sync bool, args []string) error {
return errors.Wrapf(ctx, err, "fail to get Scalingo client")
}

res, err := c.AppsRestart(ctx, app, &params)
restartOpURL, err := c.AppsRestart(ctx, app, &params)
if err != nil {
return errors.Wrapf(ctx, err, "restart app %s", app)
}
res.Body.Close()

if !sync {
fmt.Println("Your application is being restarted.")
return nil
}

waiter := NewOperationWaiterFromHTTPResponse(app, res)
waiter := newOperationWaiterFromURL(app, restartOpURL)
_, err = waiter.WaitOperation(ctx)
if err != nil {
return errors.Wrap(ctx, err, "wait for restart operation")
Expand Down
6 changes: 3 additions & 3 deletions apps/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/Scalingo/cli/io"
"github.com/Scalingo/cli/signals"
"github.com/Scalingo/cli/term"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v10/debug"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-scalingo/v11/debug"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down Expand Up @@ -139,7 +139,7 @@ func Run(ctx context.Context, opts RunOpts) error {
return nil
}

waiter := NewOperationWaiter(runCtx.waitingTextOutputWriter, opts.App, runRes.OperationURL)
waiter := newOperationWaiter(runCtx.waitingTextOutputWriter, opts.App, runRes.OperationURL)
waiter.SetPrompt(fmt.Sprintf("-----> Starting container %v ", runRes.Container.Label))
operation, err := waiter.WaitOperation(ctx)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions apps/run/run_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"golang.org/x/term"

"github.com/Scalingo/cli/httpclient"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v10/debug"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-scalingo/v11/debug"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/run/run_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net"
"os"

"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
)

func NotifiedSignals() chan os.Signal {
Expand Down
22 changes: 7 additions & 15 deletions apps/scale.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package apps

import (
"context"
"encoding/json"
"fmt"

"strconv"
Expand All @@ -11,9 +10,9 @@ import (
"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/cli/utils"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v10/debug"
"github.com/Scalingo/go-scalingo/v10/http"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-scalingo/v11/debug"
"github.com/Scalingo/go-scalingo/v11/http"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down Expand Up @@ -107,7 +106,7 @@ func Scale(ctx context.Context, app string, sync bool, types []string) error {
}
}

res, err := c.AppsScale(ctx, app, scaleParams)
resContainerTypes, operationURL, err := c.AppsScale(ctx, app, scaleParams)
if err != nil {
if !utils.IsPaymentRequiredAndFreeTrialExceededError(err) {
var reqestFailedError *http.RequestFailedError
Expand All @@ -127,27 +126,20 @@ func Scale(ctx context.Context, app string, sync bool, types []string) error {
return Scale(ctx, app, sync, types)
})
}
defer res.Body.Close()

var scaleRes ScaleRes
err = json.NewDecoder(res.Body).Decode(&scaleRes)
if err != nil {
return errors.Wrapf(ctx, err, "fail to decode API response to scale operation")
}

fmt.Printf("Your application is being scaled to:\n")
for _, ct := range scaleRes.Containers {
for _, ct := range resContainerTypes {
fmt.Println(io.Indent(fmt.Sprintf("%s: %d - %s", ct.Name, ct.Amount, ct.Size), 2))
}

if !sync {
return nil
}

waiter := NewOperationWaiterFromHTTPResponse(app, res)
waiter := newOperationWaiterFromURL(app, operationURL)
_, err = waiter.WaitOperation(ctx)
if err != nil {
return errors.Wrapf(ctx, err, "fail to handle the scale operation")
return errors.Wrapf(ctx, err, "wait for the end of the scale operation")
}

fmt.Println("Your application has been scaled.")
Expand Down
2 changes: 1 addition & 1 deletion apps/sendsignal.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/olekukonko/tablewriter"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion autoscalers/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion autoscalers/get_from_container_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
stderrors "errors"

"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion autoscalers/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Scalingo/cli/config"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/alerts.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/Scalingo/cli/cmd/autocomplete"
"github.com/Scalingo/cli/detect"
"github.com/Scalingo/cli/utils"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/autocomplete/addons_add.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/autocomplete/addons_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/urfave/cli/v3"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/autocomplete/apps.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v10/debug"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-scalingo/v11/debug"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/autocomplete/collaborators_add.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/urfave/cli/v3"

"github.com/Scalingo/cli/config"
"github.com/Scalingo/go-scalingo/v10"
"github.com/Scalingo/go-scalingo/v10/debug"
"github.com/Scalingo/go-scalingo/v11"
"github.com/Scalingo/go-scalingo/v11/debug"
"github.com/Scalingo/go-utils/errors/v3"
)

Expand Down
Loading