lint

Author: matt2e

cmd/ftl/cmd_mcp.go

@@ -74,15 +74,15 @@ func newMCPServer(ctx context.Context, k *kong.Kong, projectConfig projectconfig
 	), func(serverCtx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 		return statusTool(ctx, buildEngineClient, adminClient)
 	})
-	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewModule", []string{"module", "new"}, IncludeOptional("dir"), Pattern("name", optional.Some(moduleRegex))))
-	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "CallVerb", []string{"call"}, IncludeOptional("request")))
+	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewModule", []string{"module", "new"}, includeOptional("dir"), pattern("name", optional.Some(moduleRegex))))
+	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "CallVerb", []string{"call"}, includeOptional("request")))
 	// all secret commands, with xor group of bools for providers
 	// all config commands, with xor group of bools for providers
 	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "ResetSubscription", []string{"pubsub", "subscription", "reset"}))
-	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewMySQLDatabase", []string{"mysql", "new"}, Pattern("datasource", optional.Some(refRegex))))
-	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewMySQLMigration", []string{"mysql", "new", "migration"}, Ignore(newSQLCmd{}, "datasource")))
+	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewMySQLDatabase", []string{"mysql", "new"}, pattern("datasource", optional.Some(refRegex))))
+	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewMySQLMigration", []string{"mysql", "new", "migration"}, ignore(newSQLCmd{}, "datasource")))
 	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewPostgresDatabase", []string{"postgres", "new"}))
-	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewPostgresMigration", []string{"postgres", "new", "migration"}, Ignore(newSQLCmd{}, "datasource")))
+	addTool(toolFromCLI(ctx, k, projectConfig, bindContext, "NewPostgresMigration", []string{"postgres", "new", "migration"}, ignore(newSQLCmd{}, "datasource")))
 	return s
 }
 
@@ -202,7 +202,7 @@ func commentForPath(pos schema.Position, modulePath string) (string, error) {
 
 type cliToolOption func(inputOptions *cliConfig)
 
-func IncludeOptional(name string) cliToolOption {
+func includeOptional(name string) cliToolOption {
 	return func(inputOptions *cliConfig) {
 		o, ok := inputOptions.InputOptions[name]
 		if !ok {
@@ -213,7 +213,7 @@ func IncludeOptional(name string) cliToolOption {
 	}
 }
 
-func Pattern(name string, pattern optional.Option[string]) cliToolOption {
+func pattern(name string, pattern optional.Option[string]) cliToolOption {
 	return func(inputOptions *cliConfig) {
 		o, ok := inputOptions.InputOptions[name]
 		if !ok {
@@ -224,7 +224,7 @@ func Pattern(name string, pattern optional.Option[string]) cliToolOption {
 	}
 }
 
-func Ignore(model any, name string) cliToolOption {
+func ignore(model any, name string) cliToolOption {
 	return func(inputOptions *cliConfig) {
 		o, ok := inputOptions.InputOptions[name]
 		if !ok {
@@ -329,7 +329,7 @@ func toolFromCLI(ctx context.Context, k *kong.Kong, projectConfig projectconfig.
 	// validate that all configured options were found
 	for name := range config.InputOptions {
 		if !included[name] {
-			panic(fmt.Sprintf("ftl %v: could not find option %q in:\n%v", strings.Join(cmdPath, " "), name, strings.Join(slices.Map(maps.Keys(all), func(name string) string {
+			panic(fmt.Sprintf("ftl %v: could not find option %q in:\n%v", strings.Join(cmdPath, " "), name, strings.Join(slices.Map(maps.Keys(all), func(name string) string { //nolint: exptostd
 				if included[name] {
 					return name
 				}
@@ -407,7 +407,11 @@ func optionForInput(value *kong.Value, description string, flag bool, config *op
 			panic("unhandled bool argument")
 		}
 		if value.HasDefault {
-			opts = append(opts, mcp.DefaultBool(value.DefaultValue.Interface().(bool)))
+			defaultValue, ok := value.DefaultValue.Interface().(bool)
+			if !ok {
+				panic("expected default value to be a bool")
+			}
+			opts = append(opts, mcp.DefaultBool(defaultValue))
 		}
 		return mcp.WithBoolean(name, opts...), func(args map[string]any) ([]string, error) {
 			anyValue, ok := args[name]
@@ -425,7 +429,11 @@ func optionForInput(value *kong.Value, description string, flag bool, config *op
 
 	case reflect.String:
 		if value.HasDefault {
-			opts = append(opts, mcp.DefaultString(value.DefaultValue.Interface().(string)))
+			defaultValue, ok := value.DefaultValue.Interface().(string)
+			if !ok {
+				panic("expected default value to be a string")
+			}
+			opts = append(opts, mcp.DefaultString(defaultValue))
 		}
 		return newStringOption(name, flag, opts)
 	case reflect.Struct:
@@ -434,8 +442,9 @@ func optionForInput(value *kong.Value, description string, flag bool, config *op
 			opts = append(opts, mcp.Pattern(refRegex))
 			return newStringOption(name, flag, opts)
 		}
-	}
 
+	default:
+	}
 	panic(fmt.Sprintf("implement type %v %v for %s (hasDefault = %v)", value.Target.Type(), value.Target.Kind(), name, value.HasDefault))
 }
 

cmd/ftl/cmd_mcp_test.go

@@ -13,7 +13,7 @@ import (
 func TestMCPServerCreation(t *testing.T) {
 	t.Parallel()
 
-	ctx := log.ContextWithNewDefaultLogger(context.Background())
+	ctx := log.ContextWithNewDefaultLogger(t.Context())
 	csm := &currentStatusManager{}
 	k := createKongApplication(&cli, csm)
 	assert.NotPanics(t, func() {

cmd/ftl/inner_cmd.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"syscall"
 
 	"github.com/alecthomas/kong"
@@ -39,18 +40,18 @@ func runInnerCmd(ctx context.Context, k *kong.Kong, projConfig projectconfig.Con
 	// Dynamically update the kong app with language specific flags for the "ftl module new" command.
 	languagePlugin, err := languageplugin.PrepareNewCmd(ctx, projConfig, k, args)
 	if err != nil {
-		return err
+		return fmt.Errorf("could not prepare for command: %w", err)
 	}
 	kctx, err := k.Parse(args)
 	if err != nil {
-		return err
+		return err //nolint:wrapcheck
 	}
 	kctx.Bind(languagePlugin)
 	subctx := binder(ctx, kctx)
 
 	err = kctx.Run(subctx)
 	if err != nil {
-		return err
+		return err //no:lint:wrapcheck
 	}
 	return nil
 }