fix our custom commands for stainless changes

Author: rgarcia

pkg/cmd/logs.go

@@ -51,11 +51,16 @@ func handleLogs(ctx context.Context, cmd *cli.Command) error {
 		params.Tail = hypeman.Opt(int64(cmd.Int("tail")))
 	}
 
+	var opts []option.RequestOption
+	if cmd.Root().Bool("debug") {
+		opts = append(opts, debugMiddlewareOption)
+	}
+
 	stream := client.Instances.LogsStreaming(
 		ctx,
 		instanceID,
 		params,
-		option.WithMiddleware(debugMiddleware(cmd.Root().Bool("debug"))),
+		opts...,
 	)
 	defer stream.Close()
 

pkg/cmd/ps.go

@@ -32,9 +32,14 @@ var psCmd = cli.Command{
 func handlePs(ctx context.Context, cmd *cli.Command) error {
 	client := hypeman.NewClient(getDefaultRequestOptions(cmd)...)
 
+	var opts []option.RequestOption
+	if cmd.Root().Bool("debug") {
+		opts = append(opts, debugMiddlewareOption)
+	}
+
 	instances, err := client.Instances.List(
 		ctx,
-		option.WithMiddleware(debugMiddleware(cmd.Root().Bool("debug"))),
+		opts...,
 	)
 	if err != nil {
 		return err

pkg/cmd/pull.go

@@ -34,10 +34,15 @@ func handlePull(ctx context.Context, cmd *cli.Command) error {
 		Name: image,
 	}
 
+	var opts []option.RequestOption
+	if cmd.Root().Bool("debug") {
+		opts = append(opts, debugMiddlewareOption)
+	}
+
 	result, err := client.Images.New(
 		ctx,
 		params,
-		option.WithMiddleware(debugMiddleware(cmd.Root().Bool("debug"))),
+		opts...,
 	)
 	if err != nil {
 		return err

pkg/cmd/rm.go

@@ -73,12 +73,18 @@ func handleRm(ctx context.Context, cmd *cli.Command) error {
 			}
 		}
 
+		// Build debug options once
+		var opts []option.RequestOption
+		if cmd.Root().Bool("debug") {
+			opts = append(opts, debugMiddlewareOption)
+		}
+
 		// Check instance state if not forcing
 		if !force {
 			inst, err := client.Instances.Get(
 				ctx,
 				instanceID,
-				option.WithMiddleware(debugMiddleware(cmd.Root().Bool("debug"))),
+				opts...,
 			)
 			if err != nil {
 				fmt.Printf("Error: failed to get instance %s: %v\n", instanceID, err)
@@ -101,7 +107,7 @@ func handleRm(ctx context.Context, cmd *cli.Command) error {
 		err = client.Instances.Delete(
 			ctx,
 			instanceID,
-			option.WithMiddleware(debugMiddleware(cmd.Root().Bool("debug"))),
+			opts...,
 		)
 		if err != nil {
 			fmt.Printf("Error: failed to remove instance %s: %v\n", instanceID, err)

pkg/cmd/run.go

@@ -120,10 +120,15 @@ func handleRun(ctx context.Context, cmd *cli.Command) error {
 
 	fmt.Fprintf(os.Stderr, "Creating instance %s...\n", name)
 
+	var opts []option.RequestOption
+	if cmd.Root().Bool("debug") {
+		opts = append(opts, debugMiddlewareOption)
+	}
+
 	result, err := client.Instances.New(
 		ctx,
 		params,
-		option.WithMiddleware(debugMiddleware(cmd.Root().Bool("debug"))),
+		opts...,
 	)
 	if err != nil {
 		return err