Merge branch 'master' into instance_enroll_new_ssh_key

Author: Mia-Cross

.github/workflows/deploy-docs.yml

@@ -33,7 +33,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt install curl unzip -y
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.22.20.zip" -o "awscliv2.zip"
           unzip awscliv2.zip
           ./aws/install
 

core/arg_specs.go

@@ -14,11 +14,15 @@ var AllLocalities = "all"
 
 type ArgSpecs []*ArgSpec
 
-// GetPositionalArg returns the last positional argument from the arg specs.
+// GetPositionalArg if exist returns the positional argument from the arg specs.
+// Panics when more than one positional arg is found.
 func (s ArgSpecs) GetPositionalArg() *ArgSpec {
 	var positionalArg *ArgSpec
 	for _, argSpec := range s {
 		if argSpec.Positional {
+			if positionalArg != nil {
+				panic(fmt.Errorf("more than one positional parameter detected: %s and %s are flagged as positional arg", positionalArg.Name, argSpec.Name))
+			}
 			positionalArg = argSpec
 		}
 	}

core/cobra_utils_test.go

@@ -17,11 +17,6 @@ type testType struct {
 	Tag    string
 }
 
-type testTypeManyTags struct {
-	NameID string
-	Tags   []string
-}
-
 type testDate struct {
 	Date *time.Time
 }
@@ -83,45 +78,6 @@ func testGetCommands() *core.Commands {
 				return argsI, nil
 			},
 		},
-		&core.Command{
-			Namespace: "test",
-			Resource:  "many-positional",
-			ArgSpecs: core.ArgSpecs{
-				{
-					Name:       "name-id",
-					Positional: true,
-				},
-				{
-					Name:       "tag",
-					Positional: true,
-				},
-			},
-			AllowAnonymousClient: true,
-			ArgsType:             reflect.TypeOf(testType{}),
-			Run: func(_ context.Context, argsI interface{}) (i interface{}, e error) {
-				return argsI, nil
-			},
-		},
-		&core.Command{
-			Namespace: "test",
-			Resource:  "many-multi-positional",
-			ArgSpecs: core.ArgSpecs{
-				{
-					Name:       "name-id",
-					Positional: true,
-				},
-				{
-					Name:       "tags",
-					Positional: true,
-				},
-			},
-			AcceptMultiplePositionalArgs: true,
-			AllowAnonymousClient:         true,
-			ArgsType:                     reflect.TypeOf(testTypeManyTags{}),
-			Run: func(_ context.Context, argsI interface{}) (i interface{}, e error) {
-				return argsI, nil
-			},
-		},
 		&core.Command{
 			Namespace:            "test",
 			Resource:             "raw-args",
@@ -298,41 +254,6 @@ func Test_PositionalArg(t *testing.T) {
 			core.TestCheckGolden(),
 		),
 	}))
-
-	t.Run("many positional", core.Test(&core.TestConfig{
-		Commands: testGetCommands(),
-		Cmd:      "scw test many-positional tag1 name-id=plop",
-		Check:    core.TestCheckExitCode(0),
-	}))
-
-	t.Run("many positional", core.Test(&core.TestConfig{
-		Commands: testGetCommands(),
-		Cmd:      "scw test many-positional tag1 name-id=plop",
-		Check: core.TestCheckCombine(
-			core.TestCheckExitCode(0),
-			func(t *testing.T, ctx *core.CheckFuncCtx) {
-				t.Helper()
-				res := ctx.Result.(*testType)
-				assert.Equal(t, "plop", res.NameID)
-				assert.Equal(t, "tag1", res.Tag)
-			},
-		),
-	}))
-
-	t.Run("many multi-positional", core.Test(&core.TestConfig{
-		Commands: testGetCommands(),
-		Cmd:      "scw test many-multi-positional pos1 pos2 name-id=plop",
-		Check: core.TestCheckCombine(
-			core.TestCheckExitCode(0),
-			func(t *testing.T, ctx *core.CheckFuncCtx) {
-				t.Helper()
-				res := ctx.Result.(*testTypeManyTags)
-				assert.Equal(t, "plop", res.NameID)
-				assert.Equal(t, "pos1", res.Tags[0])
-				assert.Equal(t, "pos2", res.Tags[1])
-			},
-		),
-	}))
 }
 
 func Test_MultiPositionalArg(t *testing.T) {

go.mod

@@ -1,6 +1,6 @@
 module github.com/scaleway/scaleway-cli/v2
 
-go 1.24
+go 1.24.0
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.36.3