Merge branch 'master' into v1.6531.0

Author: remyleone

.github/workflows/release.yml

@@ -22,6 +22,11 @@ jobs:
         with:
           go-version: '1.24'
 
+      - name: Verify go.mod is tidy
+        run: |
+          go mod tidy
+          git diff --exit-code
+
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:

.github/workflows/unit-tests.yaml

@@ -24,6 +24,10 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: '1.24'
+      - name: Verify go.mod is tidy
+        run: |
+          go mod tidy
+          git diff --exit-code
       - name: Run unit tests
         run: go test ./...
       - name: Execute main binary # Test the runtime for potential panics.

cmd/scw-sweeper/main.go

@@ -67,123 +67,164 @@ func mainNoExit() int {
 
 	err = accountSweeper.SweepAll(client)
 	if err != nil {
+		log.Fatalf("Error sweeping account: %s", err)
+
 		return -1
 	}
 
 	err = applesiliconSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping applesilicon: %s", err)
+
 		return -1
 	}
 
 	err = baremetalSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping baremetal: %s", err)
+
 		return -1
 	}
 
 	err = cockpitSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping cockpit: %s", err)
+
 		return -1
 	}
 
 	err = containerSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping container: %s", err)
+
 		return -1
 	}
 
 	err = flexibleipSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping flexibleip: %s", err)
+
 		return -1
 	}
 
 	err = functionSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping function: %s", err)
+
 		return -1
 	}
 
 	err = iamSweeper.SweepSSHKey(client)
 	if err != nil {
+		log.Fatalf("Error sweeping iam: %s", err)
+
 		return -1
 	}
 
 	err = inferenceSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping inference: %s", err)
+
 		return -1
 	}
 
 	err = instanceSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping instance: %s", err)
+
 		return -1
 	}
 
 	// Instance servers need to be swept before volumes and snapshots can be swept
 	// because volumes and snapshots are attached to servers.
 	err = blockSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping block: %s", err)
+
 		return -1
 	}
 
 	err = iotSweeper.SweepAllLocalities(client)
 	if err != nil {
-		return -1
-	}
+		log.Fatalf("Error sweeping iot: %s", err)
 
-	err = ipamSweeper.SweepAllLocalities(client)
-	if err != nil {
 		return -1
 	}
 
 	err = jobsSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping jobs: %s", err)
+
 		return -1
 	}
 
 	err = k8sSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping k8s: %s", err)
+
 		return -1
 	}
 
 	err = lbSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping lb: %s", err)
+
 		return -1
 	}
 
 	err = mongodbSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping mongodb: %s", err)
+
 		return -1
 	}
 
 	err = mnqSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping mnq: %s", err)
+
 		return -1
 	}
 
 	err = rdbSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping rdb: %s", err)
+
 		return -1
 	}
 
 	err = redisSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping redis: %s", err)
+
 		return -1
 	}
 
 	err = registrySweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping registry: %s", err)
+
 		return -1
 	}
 
 	err = secretSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping secret: %s", err)
+
 		return -1
 	}
 
 	err = sdbSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping sdb: %s", err)
+
 		return -1
 	}
 
 	err = vpcSweeper.SweepAllLocalities(client)
 	if err != nil {
+		log.Fatalf("Error sweeping vpc: %s", err)
+
 		return -1
 	}
 
@@ -201,5 +242,14 @@ func mainNoExit() int {
 		return -1
 	}
 
+	// IPAM IPs need to be swept in the end because we need to be sure
+	// that every resource with an attached ip is destroyed before executing it.
+	err = ipamSweeper.SweepAllLocalities(client)
+	if err != nil {
+		log.Fatalf("Error sweeping ipam: %s", err)
+
+		return -1
+	}
+
 	return 0
 }

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/docker/docker v27.5.1+incompatible
 	github.com/dustin/go-humanize v1.0.1
 	github.com/fatih/color v1.18.0
-	github.com/getsentry/sentry-go v0.32.0
+	github.com/getsentry/sentry-go v0.33.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/hashicorp/go-version v1.7.0

go.sum

@@ -230,8 +230,8 @@ github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdk
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU=
 github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg=
-github.com/getsentry/sentry-go v0.32.0 h1:YKs+//QmwE3DcYtfKRH8/KyOOF/I6Qnx7qYGNHCGmCY=
-github.com/getsentry/sentry-go v0.32.0/go.mod h1:CYNcMMz73YigoHljQRG+qPF+eMq8gG72XcGN/p71BAY=
+github.com/getsentry/sentry-go v0.33.0 h1:YWyDii0KGVov3xOaamOnF0mjOrqSjBqwv48UEzn7QFg=
+github.com/getsentry/sentry-go v0.33.0/go.mod h1:C55omcY9ChRQIUcVcGcs+Zdy4ZpQGvNJ7JYHIoSWOtE=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=

internal/namespaces/audit_trail/v1alpha1/audit_trail_cli.go

@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-sdk-go/api/audit_trail/v1alpha1"
+	audit_trail "github.com/scaleway/scaleway-sdk-go/api/audit_trail/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 

internal/namespaces/inference/v1beta1/custom_endpoint.go

@@ -42,7 +42,9 @@ func endpointCreateBuilder(c *core.Command) *core.Command {
 			endpointToCreate.Public = publicEndpoint
 		}
 		if endpoint.PrivateNetwork != nil && endpoint.PrivateNetwork.PrivateNetworkID != "" {
-			endpointToCreate.PrivateNetwork = &inference.EndpointSpecPrivateNetwork{PrivateNetworkID: endpoint.PrivateNetwork.PrivateNetworkID}
+			endpointToCreate.PrivateNetwork = &inference.EndpointSpecPrivateNetwork{
+				PrivateNetworkID: endpoint.PrivateNetwork.PrivateNetworkID,
+			}
 		}
 		createEndpointreq.Endpoint = &endpointToCreate
 

internal/namespaces/rdb/v1/custom_user.go

@@ -7,6 +7,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
+	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/passwordgenerator"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -170,34 +171,48 @@ func userUpdateBuilder(c *core.Command) *core.Command {
 		api := rdb.NewAPI(client)
 
 		customRequest := argsI.(*rdbUpdateUserRequestCustom)
-
 		updateUserRequest := customRequest.UpdateUserRequest
 
 		var err error
-		if customRequest.GeneratePassword && customRequest.Password == nil {
-			updateUserRequest.Password = new(string)
-			*updateUserRequest.Password, err = passwordgenerator.GeneratePassword(21, 1, 1, 1, 1)
-			if err != nil {
-				return nil, err
-			}
-			fmt.Printf("Your generated password is %v \n", *updateUserRequest.Password)
-			fmt.Printf("\n")
-		}
 
-		if !customRequest.GeneratePassword && customRequest.Password == nil {
-			return nil, errors.New(
-				"you must provide a password when generate-password is set to false",
-			)
+		if customRequest.GeneratePassword || customRequest.Password != nil {
+			switch {
+			case customRequest.GeneratePassword && customRequest.Password == nil:
+				updateUserRequest.Password = new(string)
+				pwd, err := passwordgenerator.GeneratePassword(21, 1, 1, 1, 1)
+				if err != nil {
+					return nil, err
+				}
+				*updateUserRequest.Password = pwd
+
+				_, err = interactive.Println("Your generated password is", pwd)
+				if err != nil {
+					return nil, err
+				}
+
+			case !customRequest.GeneratePassword && customRequest.Password == nil:
+				return nil, errors.New(
+					"you must provide a password when generate-password is set to false",
+				)
+
+			default:
+				updateUserRequest.Password = customRequest.Password
+			}
 		}
 
 		user, err := api.UpdateUser(updateUserRequest)
 		if err != nil {
 			return nil, err
 		}
 
+		respPwd := ""
+		if updateUserRequest.Password != nil {
+			respPwd = *updateUserRequest.Password
+		}
+
 		result := rdbUpdateUserResponseCustom{
 			User:     user,
-			Password: *updateUserRequest.Password,
+			Password: respPwd,
 		}
 
 		return result, nil