Resolve merge issues

Author: Bruce Hill

pkg/cmd/build.go

@@ -154,14 +154,14 @@ var buildsList = cli.Command{
 		&requestflag.Flag[float64]{
 			Name:        "limit",
 			Usage:       "Maximum number of builds to return, defaults to 10 (maximum: 100).",
-			Default:       10,
+			Default:     10,
 			DefaultText: "10",
-			QueryPath: "limit",
+			QueryPath:   "limit",
 		},
 		&requestflag.Flag[any]{
 			Name:      "revision",
 			Usage:     "A config commit SHA used for the build",
-			Default:   requestflag.Value[any](map[string]any{}),
+			Default:   map[string]any{},
 			QueryPath: "revision",
 		},
 	},
@@ -211,7 +211,7 @@ func handleBuildsCreate(ctx context.Context, cmd *cli.Command) error {
 	var revision map[string]map[string]map[string][]byte
 	if cmd.IsSet("revision") {
 		var ok bool
-		revision, ok = requestflag.CommandRequestValue[any](cmd, "revision").(map[string]map[string]map[string][]byte)
+		revision, ok = cmd.Value("revision").(map[string]map[string]map[string][]byte)
 		if !ok {
 			revision = make(map[string]map[string]map[string][]byte)
 		}

pkg/cmd/buildtargetoutput.go

@@ -33,18 +33,15 @@ var buildsTargetOutputsRetrieve = cli.Command{
 			Name:  "project",
 			Usage: "Project name (required when build-id is not provided)",
 		},
-		&requestflag.StringFlag{
-			Name:        "branch",
-			Usage:       "Branch name (defaults to main if not provided)",
-			Value:       requestflag.Value[string]("main"),
-			DefaultText: "main",
+		&requestflag.Flag[string]{
+			Name:    "branch",
+			Usage:   "Branch name (defaults to main if not provided)",
+			Default: "main",
 		},
-		&requestflag.StringSliceFlag{
-			Name:  "target",
-			Usage: "SDK language target name(s). Can be specified multiple times.",
-			Config: requestflag.RequestConfig{
-				QueryPath: "target",
-			},
+		&requestflag.Flag[string]{
+			Name:      "target",
+			Usage:     "SDK language target name(s). Can be specified multiple times.",
+			QueryPath: "target",
 		},
 		&requestflag.Flag[string]{
 			Name:      "type",
@@ -53,9 +50,9 @@ var buildsTargetOutputsRetrieve = cli.Command{
 		&requestflag.Flag[string]{
 			Name:        "output",
 			Usage:       "Output format: url (download URL) or git (temporary access token).",
-			Default:       requestflag.Value[string]("url"),
+			DefaultText: "url",
 			HideDefault: true,
-			QueryPath: "output",
+			QueryPath:   "output",
 		},
 	},
 	Before: before,
@@ -87,7 +84,7 @@ func handleBuildsTargetOutputsRetrieve(ctx context.Context, cmd *cli.Command) er
 		return err
 	}
 
-	buildID := requestflag.CommandRequestValue[string](cmd, "build-id")
+	buildID := cmd.Value("build-id").(string)
 	if buildID == "" {
 		latestBuild, err := getLatestBuild(ctx, client, cmd.String("project"), cmd.String("branch"))
 		if err != nil {

pkg/cmd/flagoptions.go

@@ -101,36 +101,31 @@ func flagOptions(
 		}
 	}
 
-	// Only send request body if there's actual data
-	if len(body) > 0 {
-		
-
 	switch bodyType {
-		case MultipartFormEncoded:
-			buf := new(bytes.Buffer)
-			writer := multipart.NewWriter(buf)
-
-			// For multipart/form-encoded, we need a map structure
-			bodyMap, ok := bodyData.(map[string]any)
-			if !ok {
-				return nil, fmt.Errorf("Cannot send a non-map value to a form-encoded endpoint: %v\n", bodyData)
-			}
-			if err := apiform.MarshalWithSettings(bodyMap, writer, apiform.FormatComma); err != nil {
-				return nil, err
-			}
-			if err := writer.Close(); err != nil {
-				return nil, err
-			}
-			options = append(options, option.WithRequestBody(writer.FormDataContentType(), buf))
-		case ApplicationJSON:
-			bodyBytes, err := json.Marshal(bodyData)
-			if err != nil {
-				return nil, err
-			}
-			options = append(options, option.WithRequestBody("application/json", bodyBytes))
-		default:
-			panic("Invalid body content type!")
+	case MultipartFormEncoded:
+		buf := new(bytes.Buffer)
+		writer := multipart.NewWriter(buf)
+
+		// For multipart/form-encoded, we need a map structure
+		bodyMap, ok := bodyData.(map[string]any)
+		if !ok {
+			return nil, fmt.Errorf("Cannot send a non-map value to a form-encoded endpoint: %v\n", bodyData)
+		}
+		if err := apiform.MarshalWithSettings(bodyMap, writer, apiform.FormatComma); err != nil {
+			return nil, err
+		}
+		if err := writer.Close(); err != nil {
+			return nil, err
+		}
+		options = append(options, option.WithRequestBody(writer.FormDataContentType(), buf))
+	case ApplicationJSON:
+		bodyBytes, err := json.Marshal(bodyData)
+		if err != nil {
+			return nil, err
 		}
+		options = append(options, option.WithRequestBody("application/json", bodyBytes))
+	default:
+		panic("Invalid body content type!")
 	}
 
 	return options, nil