[housekeeping] explicitly name urfavecli fns

Author: lispyclouds

README.md

@@ -124,7 +124,7 @@ handlers := map[string]HandlerCobra{
 }
 
 // urfave/cli
-handlers := map[string]HandlerUrfaveCli{
+handlers := map[string]HandlerUrfaveCliV3{
 	"AddGet":      handler,
 	"AddPost":     handler,
 	"HealthCheck": handler,
@@ -139,7 +139,7 @@ Bootstrap the root command:
 err := climate.BootstrapV3Cobra(rootCmd, *model, handlers)
 
 // urfave/cli
-err := climate.BootstrapV3UrfaveCli(rootCmd, *model, handlers)
+err := climate.BootstrapV3UrfaveCliV3(rootCmd, *model, handlers)
 ```
 
 Continue adding more commands and/or execute:

urfavecli.go

@@ -19,9 +19,9 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
-type HandlerUrfaveCli func(opts *cli.Command, args []string, data HandlerData) error
+type HandlerUrfaveCliV3 func(opts *cli.Command, args []string, data HandlerData) error
 
-func addParamsUrfaveCli(cmd *cli.Command, op *v3.Operation, handlerData *HandlerData) {
+func addParamsUrfaveCliV3(cmd *cli.Command, op *v3.Operation, handlerData *HandlerData) {
 	var (
 		queryParams  []ParamMeta
 		pathParams   []ParamMeta
@@ -91,7 +91,7 @@ func addParamsUrfaveCli(cmd *cli.Command, op *v3.Operation, handlerData *Handler
 	handlerData.CookieParams = cookieParams
 }
 
-func addRequestBodyUrfaveCli(cmd *cli.Command, op *v3.Operation, handlerData *HandlerData) error {
+func addRequestBodyUrfaveCliV3(cmd *cli.Command, op *v3.Operation, handlerData *HandlerData) error {
 	name, desc, required, err := makeRequestBody(op, handlerData)
 	if err != nil {
 		return err
@@ -106,7 +106,7 @@ func addRequestBodyUrfaveCli(cmd *cli.Command, op *v3.Operation, handlerData *Ha
 	return nil
 }
 
-func interpolatePathUrfaveCli(cmd *cli.Command, h *HandlerData) error {
+func interpolatePathUrfaveCliV3(cmd *cli.Command, h *HandlerData) error {
 	// TODO: Extract commom
 	for _, param := range h.PathParams {
 		pattern, err := regexp.Compile(fmt.Sprintf("({%s})+", param.Name))
@@ -134,7 +134,7 @@ func interpolatePathUrfaveCli(cmd *cli.Command, h *HandlerData) error {
 }
 
 // Bootstraps a cli.Command with the loaded model and a handler map
-func BootstrapV3UrfaveCli(rootCmd *cli.Command, model libopenapi.DocumentModel[v3.Document], handlers map[string]HandlerUrfaveCli) error {
+func BootstrapV3UrfaveCliV3(rootCmd *cli.Command, model libopenapi.DocumentModel[v3.Document], handlers map[string]HandlerUrfaveCliV3) error {
 	cmdGroups := make(map[string][]*cli.Command)
 
 	for path, item := range model.Model.Paths.PathItems.FromOldest() {
@@ -150,8 +150,8 @@ func BootstrapV3UrfaveCli(rootCmd *cli.Command, model libopenapi.DocumentModel[v
 			}
 
 			hData := HandlerData{Method: method, Path: path}
-			addParamsUrfaveCli(&cmd, op, &hData)
-			if err := addRequestBodyUrfaveCli(&cmd, op, &hData); err != nil {
+			addParamsUrfaveCliV3(&cmd, op, &hData)
+			if err := addRequestBodyUrfaveCliV3(&cmd, op, &hData); err != nil {
 				return err
 			}
 
@@ -168,7 +168,7 @@ func BootstrapV3UrfaveCli(rootCmd *cli.Command, model libopenapi.DocumentModel[v
 				cmd.Usage = op.Summary
 			}
 			cmd.Action = func(_ context.Context, cmd *cli.Command) error {
-				if err := interpolatePathUrfaveCli(cmd, &hData); err != nil {
+				if err := interpolatePathUrfaveCliV3(cmd, &hData); err != nil {
 					return err
 				}
 

urfavecli_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
-func TestInterpolatePathUrfaveCli(t *testing.T) {
+func TestInterpolatePathUrfaveCliV3(t *testing.T) {
 	hData := HandlerData{
 		Method: "get",
 		Path:   "/path/{foo}/to/{bar}/with/{baz}/and/{quxx}/together",
@@ -44,13 +44,13 @@ func TestInterpolatePathUrfaveCli(t *testing.T) {
 		},
 	}
 
-	err := interpolatePathUrfaveCli(&cmd, &hData)
+	err := interpolatePathUrfaveCliV3(&cmd, &hData)
 	assert.NoError(t, err)
 
 	assert.Equal(t, hData.Path, "/path/yes/to/420/with/420.69/and/false/together")
 }
 
-func assertCmdTreeUrfaveCli(t *testing.T, cmd *cli.Command, expected *cli.Command) {
+func assertCmdTreeUrfaveCliV3(t *testing.T, cmd *cli.Command, expected *cli.Command) {
 	t.Logf("Checking command %s", cmd.Name)
 
 	assert.Equal(t, expected.Name, cmd.Name)
@@ -76,11 +76,11 @@ func assertCmdTreeUrfaveCli(t *testing.T, cmd *cli.Command, expected *cli.Comman
 	}
 
 	for _, subCmd := range cmd.Commands {
-		assertCmdTreeUrfaveCli(t, subCmd, expected.Command(subCmd.Name))
+		assertCmdTreeUrfaveCliV3(t, subCmd, expected.Command(subCmd.Name))
 	}
 }
 
-func TestBootstrapV3UrfaveCli(t *testing.T) {
+func TestBootstrapV3UrfaveCliV3(t *testing.T) {
 	model, err := LoadFileV3("api.yaml")
 	assert.NoError(t, err)
 
@@ -97,14 +97,14 @@ func TestBootstrapV3UrfaveCli(t *testing.T) {
 		Name:  "calc",
 		Usage: "My Calc",
 	}
-	handlers := map[string]HandlerUrfaveCli{
+	handlers := map[string]HandlerUrfaveCliV3{
 		"AddGet":      handler,
 		"AddPost":     handler,
 		"HealthCheck": handler,
 		"GetInfo":     handler,
 	}
 
-	err = BootstrapV3UrfaveCli(rootCmd, *model, handlers)
+	err = BootstrapV3UrfaveCliV3(rootCmd, *model, handlers)
 	assert.NoError(t, err)
 
 	var noAlias []string
@@ -163,7 +163,7 @@ func TestBootstrapV3UrfaveCli(t *testing.T) {
 		},
 	}
 
-	assertCmdTreeUrfaveCli(t, rootCmd, expectedCmd)
+	assertCmdTreeUrfaveCliV3(t, rootCmd, expectedCmd)
 
 	assert.NoError(t, rootCmd.Run(
 		context.Background(),