Merge branch 'master' into v1.6116.0

Author: remyleone

.github/workflows/deploy-docs.yml

@@ -1,5 +1,6 @@
 name: Build and push CLI doc to S3
 on:
+  workflow_dispatch:
   release:
     types:
       - published # Triggered only when a new release is published

cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden

@@ -11,6 +11,7 @@ ARGS:
   [type]               Create a server of the given type
   [os-id]              Create a server with the given os_id
   [enable-vpc]         Activate the Private Network feature for this server
+  [commitment-type]    Activate commitment for this server (duration_24h | renewed_monthly | none)
   [zone=fr-par-1]      Zone to target. If none is passed will use default zone from the config (fr-par-3)
 
 FLAGS:

cmd/scw/testdata/test-all-usage-apple-silicon-server-update-usage.golden

@@ -6,11 +6,12 @@ USAGE:
   scw apple-silicon server update <server-id ...> [arg=value ...]
 
 ARGS:
-  server-id             UUID of the server you want to update
-  [name]                Updated name for your server
-  [schedule-deletion]   Specify whether the server should be flagged for automatic deletion
-  [enable-vpc]          Activate or deactivate Private Network support for this server
-  [zone=fr-par-1]       Zone to target. If none is passed will use default zone from the config (fr-par-3)
+  server-id                           UUID of the server you want to update
+  [name]                              Updated name for your server
+  [schedule-deletion]                 Specify whether the server should be flagged for automatic deletion
+  [enable-vpc]                        Activate or deactivate Private Network support for this server
+  [commitment-type.commitment-type]    (duration_24h | renewed_monthly | none)
+  [zone=fr-par-1]                     Zone to target. If none is passed will use default zone from the config (fr-par-3)
 
 FLAGS:
   -h, --help   help for update

core/alias_test.go

@@ -3,9 +3,9 @@ package core_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert"
 	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/alias"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCommandMatchAlias(t *testing.T) {

core/arg_specs_test.go

@@ -3,8 +3,8 @@ package core_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert"
 	"github.com/scaleway/scaleway-cli/v2/core"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestOneOf(t *testing.T) {

core/bootstrap_test.go

@@ -5,10 +5,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/alecthomas/assert"
 	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestInterruptError(t *testing.T) {

core/build_info_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/alecthomas/assert"
 	"github.com/hashicorp/go-version"
 	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
 	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 

core/checks_test.go

@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/alecthomas/assert"
 	"github.com/scaleway/scaleway-cli/v2/core"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCheckAPIKey(t *testing.T) {

core/cobra_usage_builder_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/alecthomas/assert"
 	"github.com/scaleway/scaleway-cli/v2/core"
+	"github.com/stretchr/testify/assert"
 )
 
 type ServerColor string

core/command_interceptor_test.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/alecthomas/assert"
 	"github.com/scaleway/scaleway-cli/v2/core"
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_CombineCommandInterceptor(t *testing.T) {