Merge branch 'master' into fix/remove-async-one-off

Scalingo · Aug 20, 2024 · f2c69ce · f2c69ce
2 parents 766f2b2 + 3d7de67
commit f2c69ce
Show file tree

Hide file tree

Showing 481 changed files with 14,987 additions and 21,898 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -30,7 +30,7 @@ jobs:
         id: new-from-rev
         run: echo "NEW_FROM_REV=$( git rev-parse origin/master )" >> "$GITHUB_OUTPUT"
       - name: "Execute golangci-lint on a pull request"
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           # The `only-new-issues` flag is not working (https://github.com/golangci/golangci-lint-action/issues/531).
           # We rather decided to use the suggestion from the FAQ (https://golangci-lint.run/usage/faq/#how-to-integrate-golangci-lint-into-large-project-with-thousands-of-issues) and use `--new-from-rev`
@@ -53,7 +53,7 @@ jobs:
       - name: Get golangci-lint configuration file
         run: wget --output-document=$(pwd)/.golangci.yml https://sc-devtools.s3.eu-west-1.amazonaws.com/golang-ci/golangci.yml
       - name: "Execute golangci-lint on the master branch"
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           # The `only-new-issues` flag is not working (https://github.com/golangci/golangci-lint-action/issues/531).
           # We rather decided to use the suggestion from the FAQ (https://golangci-lint.run/usage/faq/#how-to-integrate-golangci-lint-into-large-project-with-thousands-of-issues) and use `--new-from-rev`
@@ -92,9 +92,9 @@ jobs:
           go-version-file: "go.mod"
           check-latest: true
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
-          version: latest
+          version: "~> v2"
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -120,9 +120,9 @@ jobs:
           go-version-file: "go.mod"
           check-latest: true
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
-          version: latest
+          version: "~> v2"
           args: release --config .goreleaser-windows.yaml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.goreleaser-windows.yaml b/.goreleaser-windows.yaml
@@ -1,4 +1,5 @@
 # We need a specific GoRelease file for Windows because we don't want to use Go cross compile feature. We prefer compiling on an actual Windows.
+version: 2
 before:
   hooks:
     - go mod tidy

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -1,3 +1,4 @@
+version: 2
 before:
   hooks:
     - go mod tidy

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,12 @@
 ### To be Released
 
 * fix(one-off): remove async one-off ([PR#1060](https://github.com/Scalingo/cli/pull/1060))
-* fix(cmd): addons-info working for non-db addons ([PR#1055](https://github.com/Scalingo/cli/pull/1055))
+* feat(database/users): use API DatabaseUserResetPassword method for resetting password
+
+### 1.32.0
+
+* feat(domains): `domains-add` now supports `--no-letsencrypt` flag to completely disable Let's Encrypt certificat generation ([PR#1058](https://github.com/Scalingo/cli/pull/1058))
+* fix(cmd): `addons-info` working for non-db addons ([PR#1055](https://github.com/Scalingo/cli/pull/1055))
 
 ### 1.31.0
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Scalingo-CLI v1.31.0
+# Scalingo-CLI v1.32.0
 
 ![publish workflow](https://github.com/Scalingo/cli/actions/workflows/publish.yml/badge.svg)
 
@@ -56,7 +56,7 @@ USAGE:
    scalingo [global options] command [command options] [arguments...]
 
 VERSION:
-   1.31.0
+   1.32.0
 
 AUTHOR:
    Scalingo Team <[email protected]>
@@ -263,12 +263,12 @@ the commit for the version bump.
 
 ```bash
 git checkout <base commit ID>
-git checkout -b v1.31.0
+git checkout -b v1.32.0
 git cherry-pick -m 1 <commit ID number 1>
 git cherry-pick -m 1 <commit ID number 2>
 ...
 git cherry-pick -m 1 <commit ID number X>
-git push --set-upstream origin v1.31.0
+git push --set-upstream origin v1.32.0
 ```
 
 ### New Version Bump
@@ -283,7 +283,7 @@ Bump new version number in:
 And commit these changes:
 
 ```bash
-version="1.31.0"
+version="1.32.0"
 
 git switch --create release/${version}
 git add .
@@ -313,6 +313,6 @@ It serves as cache between GitHub and our customers for a more efficient check o
 
 You can now update the [changelog](https://doc.scalingo.com/changelog) and tweet about it!
 
-> [Changelog] CLI - Release of version 1.31.0 https://cli.scalingo.com - More news at https://changelog.scalingo.com #cli #paas #changelog #bugfix
+> [Changelog] CLI - Release of version 1.32.0 https://cli.scalingo.com - More news at https://changelog.scalingo.com #cli #paas #changelog #bugfix
 
 Add in a tweets thread the changelog of this new version.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.31.0
+1.32.0
diff --git a/addons/config.go b/addons/config.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/utils"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 	"github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/addons/destroy.go b/addons/destroy.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func Destroy(ctx context.Context, app, addonID string) error {

diff --git a/addons/info.go b/addons/info.go
@@ -18,7 +18,7 @@ import (
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/db"
 	"github.com/Scalingo/cli/utils"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 // Info is the command handler displaying static information about one given addon

diff --git a/addons/provision.go b/addons/provision.go
@@ -9,7 +9,7 @@ import (
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
 	"github.com/Scalingo/cli/utils"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func Provision(ctx context.Context, app, addon, plan string) error {

diff --git a/addons/upgrade.go b/addons/upgrade.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func Upgrade(ctx context.Context, app, addonID, plan string) error {

diff --git a/alerts/add.go b/alerts/add.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 	"github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/alerts/update.go b/alerts/update.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 	"github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/apps/create.go b/apps/create.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/utils"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func Create(ctx context.Context, appName string, remote string, buildpack string) error {

diff --git a/apps/events.go b/apps/events.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/events"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func Events(ctx context.Context, app string, paginationOpts scalingo.PaginationOpts) error {

diff --git a/apps/info.go b/apps/info.go
@@ -8,8 +8,8 @@ import (
 	"github.com/olekukonko/tablewriter"
 
 	"github.com/Scalingo/cli/config"
-	"github.com/Scalingo/go-scalingo/v6"
-	"github.com/Scalingo/go-scalingo/v6/debug"
+	"github.com/Scalingo/go-scalingo/v7"
+	"github.com/Scalingo/go-scalingo/v7/debug"
 	"github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/apps/logs.go b/apps/logs.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/logs"
-	"github.com/Scalingo/go-scalingo/v6"
-	"github.com/Scalingo/go-scalingo/v6/debug"
+	"github.com/Scalingo/go-scalingo/v7"
+	"github.com/Scalingo/go-scalingo/v7/debug"
 )
 
 type WSEvent struct {

diff --git a/apps/one_off_stop.go b/apps/one_off_stop.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func OneOffStop(ctx context.Context, appName, oneOffLabel string) error {

diff --git a/apps/operations.go b/apps/operations.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	scalingo "github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 	errors "github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/apps/restart.go b/apps/restart.go
@@ -7,7 +7,7 @@ import (
 	"gopkg.in/errgo.v1"
 
 	"github.com/Scalingo/cli/config"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func Restart(ctx context.Context, app string, sync bool, args []string) error {

diff --git a/apps/run.go b/apps/run.go
@@ -28,8 +28,8 @@ import (
 	"github.com/Scalingo/cli/io"
 	"github.com/Scalingo/cli/signals"
 	"github.com/Scalingo/cli/term"
-	"github.com/Scalingo/go-scalingo/v6"
-	"github.com/Scalingo/go-scalingo/v6/debug"
+	"github.com/Scalingo/go-scalingo/v7"
+	"github.com/Scalingo/go-scalingo/v7/debug"
 	errors "github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/apps/run/run_unix.go b/apps/run/run_unix.go
@@ -18,8 +18,8 @@ import (
 	"gopkg.in/errgo.v1"
 
 	"github.com/Scalingo/cli/httpclient"
-	"github.com/Scalingo/go-scalingo/v6"
-	"github.com/Scalingo/go-scalingo/v6/debug"
+	"github.com/Scalingo/go-scalingo/v7"
+	"github.com/Scalingo/go-scalingo/v7/debug"
 )
 
 type UpdateTtyParams struct {

diff --git a/apps/run/run_windows.go b/apps/run/run_windows.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"os"
 
-	scalingo "github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func NotifiedSignals() chan os.Signal {

diff --git a/apps/scale.go b/apps/scale.go
@@ -13,9 +13,9 @@ import (
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
 	"github.com/Scalingo/cli/utils"
-	"github.com/Scalingo/go-scalingo/v6"
-	"github.com/Scalingo/go-scalingo/v6/debug"
-	"github.com/Scalingo/go-scalingo/v6/http"
+	"github.com/Scalingo/go-scalingo/v7"
+	"github.com/Scalingo/go-scalingo/v7/debug"
+	"github.com/Scalingo/go-scalingo/v7/http"
 	"github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/apps/sendsignal.go b/apps/sendsignal.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 	"github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/apps/stats.go b/apps/stats.go
@@ -11,7 +11,7 @@ import (
 	"gopkg.in/errgo.v1"
 
 	"github.com/Scalingo/cli/config"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 const (

diff --git a/autoscalers/add.go b/autoscalers/add.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 func Add(ctx context.Context, app string, params scalingo.AutoscalerAddParams) error {

diff --git a/autoscalers/get_from_container_type.go b/autoscalers/get_from_container_type.go
@@ -6,7 +6,7 @@ import (
 
 	"gopkg.in/errgo.v1"
 
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 var (

diff --git a/autoscalers/update.go b/autoscalers/update.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 	"github.com/Scalingo/go-utils/errors/v2"
 )
 

diff --git a/cmd/alerts.go b/cmd/alerts.go
@@ -7,7 +7,7 @@ import (
 	"github.com/Scalingo/cli/cmd/autocomplete"
 	"github.com/Scalingo/cli/detect"
 	"github.com/Scalingo/cli/utils"
-	scalingo "github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 var (

diff --git a/cmd/autocomplete/apps.go b/cmd/autocomplete/apps.go
@@ -10,8 +10,8 @@ import (
 	"gopkg.in/errgo.v1"
 
 	"github.com/Scalingo/cli/config"
-	"github.com/Scalingo/go-scalingo/v6"
-	"github.com/Scalingo/go-scalingo/v6/debug"
+	"github.com/Scalingo/go-scalingo/v7"
+	"github.com/Scalingo/go-scalingo/v7/debug"
 )
 
 type appsCache struct {

diff --git a/cmd/autocomplete/collaborators_add.go b/cmd/autocomplete/collaborators_add.go
@@ -8,8 +8,8 @@ import (
 	"gopkg.in/errgo.v1"
 
 	"github.com/Scalingo/cli/config"
-	"github.com/Scalingo/go-scalingo/v6"
-	"github.com/Scalingo/go-scalingo/v6/debug"
+	"github.com/Scalingo/go-scalingo/v7"
+	"github.com/Scalingo/go-scalingo/v7/debug"
 )
 
 func CollaboratorsAddAutoComplete(c *cli.Context) error {

diff --git a/cmd/autocomplete/current_app.go b/cmd/autocomplete/current_app.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Scalingo/cli/detect"
 	"github.com/Scalingo/cli/utils"
-	"github.com/Scalingo/go-scalingo/v6/debug"
+	"github.com/Scalingo/go-scalingo/v7/debug"
 )
 
 func CurrentAppCompletion(c *cli.Context) string {

diff --git a/cmd/autocomplete/flag_app.go b/cmd/autocomplete/flag_app.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/Scalingo/go-scalingo/v6/debug"
+	"github.com/Scalingo/go-scalingo/v7/debug"
 )
 
 func FlagAppAutoComplete(c *cli.Context) bool {

diff --git a/cmd/autoscalers.go b/cmd/autoscalers.go
@@ -7,7 +7,7 @@ import (
 	"github.com/Scalingo/cli/cmd/autocomplete"
 	"github.com/Scalingo/cli/detect"
 	"github.com/Scalingo/cli/utils"
-	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-scalingo/v7"
 )
 
 var (