fix(aws): only strip the value that follows --profile

plugins/aws/access_key_test.go

@@ -742,6 +742,16 @@ func TestStripAndReturnProfileFlag(t *testing.T) {
 			expectedArgs:      []string{"--", "wrapped command", "--profile", "dev"},
 			expectedFlagValue: "",
 		},
+		{
+			args:              []string{"iam", "get-user", "--profile", "alice", "--user-name", "alice"},
+			expectedArgs:      []string{"iam", "get-user", "--user-name", "alice"},
+			expectedFlagValue: "alice",
+		},
+		{
+			args:              []string{"iam", "get-user", "--profile=alice", "--user-name", "alice"},
+			expectedArgs:      []string{"iam", "get-user", "--user-name", "alice"},
+			expectedFlagValue: "alice",
+		},
 	} {
 		t.Run(fmt.Sprintf("test case %d", i), func(t *testing.T) {
 			flag, args, err := stripAndReturnProfileFlag(scenario.args)

plugins/aws/cli_provisioner.go

@@ -29,7 +29,8 @@ func stripAndReturnProfileFlag(args []string) (string, []string, error) {
 	var profileValue string
 	var newArgs []string
 	commandOptionsEnded := false
-	for i, arg := range args {
+	for i := 0; i < len(args); i++ {
+		arg := args[i]
 		// if `--profile` is used after `--`, it should not be interpreted as a flag
 		if arg == "--" {
 			commandOptionsEnded = true
@@ -39,12 +40,14 @@ func stripAndReturnProfileFlag(args []string) (string, []string, error) {
 				return "", nil, fmt.Errorf("--profile flag was specified without a value")
 			}
 			profileValue = args[i+1]
+			// skip the value too, so later arguments equal to the profile name are kept
+			i++
 		} else if !commandOptionsEnded && strings.HasPrefix(arg, "--profile=") {
 			profileValue = strings.TrimPrefix(arg, "--profile=")
 			if profileValue == "" {
 				return "", nil, fmt.Errorf("--profile flag was specified without a value")
 			}
-		} else if commandOptionsEnded || arg != profileValue {
+		} else {
 			// make sure only profile specification args are removed from the command line so that aws cli does not attempt to assume a role by itself.
 			newArgs = append(newArgs, arg)
 		}