fix name, fix lint

Author: wxiaoguang

cmd/admin.go

@@ -53,10 +53,10 @@ var (
 		Commands: []*cli.Command{
 			microcmdAuthAddOauth(),
 			microcmdAuthUpdateOauth(),
-			newMicrocmdAuthAddLdapBindDn(),
-			newMicrocmdAuthUpdateLdapBindDn(),
-			newMicrocmdAuthAddLdapSimpleAuth(),
-			newMicrocmdAuthUpdateLdapSimpleAuth(),
+			microcmdAuthAddLdapBindDn(),
+			microcmdAuthUpdateLdapBindDn(),
+			microcmdAuthAddLdapSimpleAuth(),
+			microcmdAuthUpdateLdapSimpleAuth(),
 			microcmdAuthAddSMTP(),
 			microcmdAuthUpdateSMTP(),
 			microcmdAuthList,

cmd/admin_auth_ldap.go

@@ -24,7 +24,7 @@ type (
 	}
 )
 
-func newMicrocmdAuthAddLdapBindDn() *cli.Command {
+func microcmdAuthAddLdapBindDn() *cli.Command {
 	return &cli.Command{
 		Name:  "add-ldap",
 		Usage: "Add new LDAP (via Bind DN) authentication source",
@@ -68,7 +68,7 @@ func newMicrocmdAuthAddLdapBindDn() *cli.Command {
 	}
 }
 
-func newMicrocmdAuthUpdateLdapBindDn() *cli.Command {
+func microcmdAuthUpdateLdapBindDn() *cli.Command {
 	return &cli.Command{
 		Name:  "update-ldap",
 		Usage: "Update existing LDAP (via Bind DN) authentication source",
@@ -113,7 +113,7 @@ func newMicrocmdAuthUpdateLdapBindDn() *cli.Command {
 	}
 }
 
-func newMicrocmdAuthAddLdapSimpleAuth() *cli.Command {
+func microcmdAuthAddLdapSimpleAuth() *cli.Command {
 	return &cli.Command{
 		Name:  "add-ldap-simple",
 		Usage: "Add new LDAP (simple auth) authentication source",
@@ -145,7 +145,7 @@ func newMicrocmdAuthAddLdapSimpleAuth() *cli.Command {
 	}
 }
 
-func newMicrocmdAuthUpdateLdapSimpleAuth() *cli.Command {
+func microcmdAuthUpdateLdapSimpleAuth() *cli.Command {
 	return &cli.Command{
 		Name:  "update-ldap-simple",
 		Usage: "Update existing LDAP (simple auth) authentication source",

cmd/admin_auth_ldap_test.go

@@ -239,7 +239,7 @@ func TestAddLdapBindDn(t *testing.T) {
 
 		// Create a copy of command to test
 		app := cli.Command{
-			Flags:  newMicrocmdAuthAddLdapBindDn().Flags,
+			Flags:  microcmdAuthAddLdapBindDn().Flags,
 			Action: service.addLdapBindDn,
 		}
 
@@ -469,7 +469,7 @@ func TestAddLdapSimpleAuth(t *testing.T) {
 
 		// Create a copy of command to test
 		app := &cli.Command{
-			Flags:  newMicrocmdAuthAddLdapSimpleAuth().Flags,
+			Flags:  microcmdAuthAddLdapSimpleAuth().Flags,
 			Action: service.addLdapSimpleAuth,
 		}
 
@@ -945,7 +945,7 @@ func TestUpdateLdapBindDn(t *testing.T) {
 
 		// Create a copy of command to test
 		app := cli.Command{
-			Flags:  newMicrocmdAuthUpdateLdapBindDn().Flags,
+			Flags:  microcmdAuthUpdateLdapBindDn().Flags,
 			Action: service.updateLdapBindDn,
 		}
 		// Run it
@@ -1333,7 +1333,7 @@ func TestUpdateLdapSimpleAuth(t *testing.T) {
 
 		// Create a copy of command to test
 		app := cli.Command{
-			Flags:  newMicrocmdAuthUpdateLdapSimpleAuth().Flags,
+			Flags:  microcmdAuthUpdateLdapSimpleAuth().Flags,
 			Action: service.updateLdapSimpleAuth,
 		}
 		// Run it

cmd/admin_user_delete_test.go

@@ -4,7 +4,7 @@
 package cmd
 
 import (
-	"fmt"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -34,7 +34,7 @@ func TestAdminUserDelete(t *testing.T) {
 		setupTestUser(t)
 
 		u := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: "testuser"})
-		err := microcmdUserDelete().Run(ctx, []string{"delete-test", "--id", fmt.Sprintf("%d", u.ID)})
+		err := microcmdUserDelete().Run(ctx, []string{"delete-test", "--id", strconv.FormatInt(u.ID, 10)})
 		require.NoError(t, err)
 		unittest.AssertNotExistsBean(t, &user_model.User{LowerName: "testuser"})
 	})
@@ -56,7 +56,7 @@ func TestAdminUserDelete(t *testing.T) {
 		setupTestUser(t)
 
 		u := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: "testuser"})
-		err := microcmdUserDelete().Run(ctx, []string{"delete", "--id", fmt.Sprintf("%d", u.ID), "--username", "testuser", "--email", "[email protected]"})
+		err := microcmdUserDelete().Run(ctx, []string{"delete", "--id", strconv.FormatInt(u.ID, 10), "--username", "testuser", "--email", "[email protected]"})
 		require.NoError(t, err)
 		unittest.AssertNotExistsBean(t, &user_model.User{LowerName: "testuser"})
 	})
@@ -91,7 +91,6 @@ func TestAdminUserDeleteFailure(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := t.Context()
 			if strings.Contains(tc.name, "user exists") {

cmd/cert.go

@@ -25,8 +25,8 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
-// CmdCert represents the available cert sub-command.
-func CmdCert() *cli.Command {
+// cmdCert represents the available cert sub-command.
+func cmdCert() *cli.Command {
 	return &cli.Command{
 		Name:  "cert",
 		Usage: "Generate self-signed certificate",

cmd/cert_test.go

@@ -49,14 +49,13 @@ func TestCertCommand(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			app := CmdCert()
+			app := cmdCert()
 			tempDir := t.TempDir()
 
 			certFile := filepath.Join(tempDir, "cert.pem")
 			keyFile := filepath.Join(tempDir, "key.pem")
 
-			args := append(c.args, "--out", certFile, "--keyout", keyFile)
-			err := app.Run(t.Context(), args)
+			err := app.Run(t.Context(), append(c.args, "--out", certFile, "--keyout", keyFile))
 			require.NoError(t, err)
 
 			assert.FileExists(t, certFile)
@@ -107,13 +106,12 @@ func TestCertCommandFailures(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			app := CmdCert()
+			app := cmdCert()
 			tempDir := t.TempDir()
 
 			certFile := filepath.Join(tempDir, "cert.pem")
 			keyFile := filepath.Join(tempDir, "key.pem")
-			args := append(c.args, "--out", certFile, "--keyout", keyFile)
-			err := app.Run(t.Context(), args)
+			err := app.Run(t.Context(), append(c.args, "--out", certFile, "--keyout", keyFile))
 			require.Error(t, err)
 			if c.errMsg != "" {
 				assert.ErrorContains(t, err, c.errMsg)

cmd/main.go

@@ -149,7 +149,7 @@ func NewMainApp(appVer AppVersion) *cli.Command {
 
 	// these sub-commands do not need the config file, and they do not depend on any path or environment variable.
 	subCmdStandalone := []*cli.Command{
-		CmdCert(),
+		cmdCert(),
 		CmdGenerate,
 		CmdDocs,
 	}