Migrate to urfave v3 #34510

TheFox0x7 · 2025-05-20T22:32:32Z

migrate cli to urfave v3

add more cli tests

ensure flags don't carry state through tests

patch smtp idflag persisting

cmd/cert.go

cmd/main.go

cmd/admin_auth_ldap.go

TheFox0x7 · 2025-06-04T15:22:48Z

For future: I don't mind you/someone else fixing/editing stuff but a heads up would be nice - especially on a WIP where half of it is hacks to get tests to pass.

Either way thanks for some cleanups on this.

wxiaoguang · 2025-06-04T15:27:57Z

Sorry, I saw it had no progress for long time, and we had some discussions about the strange "config" behavior in discord, so I just tried to fix the problems. Will ask ahead next time.

TheFox0x7 · 2025-06-04T15:30:15Z

No problem, I appreciate your effort regardless. :)

TheFox0x7 · 2025-06-07T22:55:21Z

cmd/docs.go

-	docs, err := ctx.App.ToMarkdown()
-	if ctx.Bool("man") {
-		docs, err = ctx.App.ToMan()
+func runDocs(_ context.Context, cmd *cli.Command) error {


For reviewers: Double check if the docs are correct as the generation is weird, but it might not have the same issue as with tea due to custom help.

wxiaoguang

Thank you very much, and there are new cool tests

lunny · 2025-06-08T04:26:43Z

cmd/admin_user_delete_test.go

@@ -0,0 +1,111 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.


Suggested change

// Copyright 2023 The Gitea Authors. All rights reserved.

// Copyright 2025 The Gitea Authors. All rights reserved.

lunny · 2025-06-08T04:29:30Z

cmd/cert.go

 	}
 	if err != nil {
-		log.Fatalf("Failed to generate private key: %v", err)
+		// log.Fatalf("Failed to generate private key: %v", err)


Why not delete this line?

lunny · 2025-06-08T04:29:51Z

cmd/cert.go

 	}

 	var notBefore time.Time
 	if startDate := c.String("start-date"); startDate != "" {
 		notBefore, err = time.Parse("Jan 2 15:04:05 2006", startDate)
 		if err != nil {
-			log.Fatalf("Failed to parse creation date: %v", err)
+			// log.Fatalf("Failed to parse creation date: %v", err)


The same as previous one.

lunny · 2025-06-08T04:30:00Z

cmd/cert.go

@@ -129,7 +141,8 @@ func runCert(c *cli.Context) error {
 	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
 	serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
 	if err != nil {
-		log.Fatalf("Failed to generate serial number: %v", err)
+		// log.Fatalf("Failed to generate serial number: %v", err)


The same as previous one.

lunny · 2025-06-08T04:30:06Z

cmd/cert.go

@@ -162,34 +175,41 @@ func runCert(c *cli.Context) error {

 	derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, publicKey(priv), priv)
 	if err != nil {
-		log.Fatalf("Failed to create certificate: %v", err)
+		// log.Fatalf("Failed to create certificate: %v", err)


The same as previous one.

lunny · 2025-06-08T04:30:48Z

cmd/cmd.go

 	for _, a := range args {
+		// fmt.Println("checking:", a, "it's set:", c.IsSet(a), "and it's:", c.String(a), "but value:", c.Value(a))


trace line?

lunny · 2025-06-08T04:40:53Z

cmd/cert.go

-	Usage: "Generate self-signed certificate",
-	Description: `Generate a self-signed X.509 certificate for a TLS server.
+// cmdCert represents the available cert sub-command.
+func cmdCert() *cli.Command {


Why use a function instead of a variable here.

TheFox0x7 added 6 commits May 18, 2025 16:51

migrate to urfave v3

d281b11

inline flags for ldap commands

df9c7f2

ensure flags don't carry state through tests

align tests

d29b785

add tests for smtp command

ffd04d0

add oauth coverage

553b43a

patch smtp idflag persisting

fix formatting

69cde4d

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 20, 2025

github-actions bot added modifies/go Pull requests that update Go code modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin modifies/internal modifies/dependencies labels May 20, 2025

TheFox0x7 and others added 9 commits May 23, 2025 22:35

install signals in main

4ae57e8

add coverage for cert subcommand

eba1408

add coverage for admin user delete command

173ad6c

add coverage for change password

13b9d6e

add coverage for must change password

02497c0

drop argsSet in favor of required

8e2333f

Merge branch 'main' into migrate-to-urfave-v3

97589cf

fix

23dd90f

Merge branch 'main' into migrate-to-urfave-v3

70deea2

wxiaoguang reviewed Jun 4, 2025

View reviewed changes

cmd/cert.go Show resolved Hide resolved

fix

dfd47ce

wxiaoguang reviewed Jun 4, 2025

View reviewed changes

cmd/main.go Outdated Show resolved Hide resolved

wxiaoguang reviewed Jun 4, 2025

View reviewed changes

cmd/main.go Outdated Show resolved Hide resolved

wxiaoguang added 4 commits June 4, 2025 18:42

fix

cda23a7

fix

c47d666

fix name, fix lint

9441550

fix

b2d5244

wxiaoguang reviewed Jun 4, 2025

View reviewed changes

cmd/admin_auth_ldap.go Outdated Show resolved Hide resolved

wxiaoguang reviewed Jun 4, 2025

View reviewed changes

cmd/admin_auth_ldap.go Show resolved Hide resolved

revert ldap flag rework

ba990d0

TheFox0x7 marked this pull request as ready for review June 7, 2025 22:34

correct docs root

40fb2ae

TheFox0x7 commented Jun 7, 2025

View reviewed changes

wxiaoguang approved these changes Jun 8, 2025

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 8, 2025

wxiaoguang added this to the 1.25.0 milestone Jun 8, 2025

wxiaoguang added type/refactoring Existing code has been cleaned up. There should be no new functionality. and removed type/refactoring Existing code has been cleaned up. There should be no new functionality. labels Jun 8, 2025

lunny reviewed Jun 8, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Migrate to urfave v3 #34510

Migrate to urfave v3 #34510

TheFox0x7 commented May 20, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

TheFox0x7 commented Jun 4, 2025

Uh oh!

wxiaoguang commented Jun 4, 2025

Uh oh!

TheFox0x7 commented Jun 4, 2025

Uh oh!

TheFox0x7 Jun 7, 2025

Uh oh!

wxiaoguang left a comment

Uh oh!

lunny Jun 8, 2025

Uh oh!

lunny Jun 8, 2025

Uh oh!

lunny Jun 8, 2025

Uh oh!

lunny Jun 8, 2025

Uh oh!

lunny Jun 8, 2025

Uh oh!

lunny Jun 8, 2025

Uh oh!

lunny Jun 8, 2025

Uh oh!

Uh oh!

		@@ -0,0 +1,111 @@
		// Copyright 2023 The Gitea Authors. All rights reserved.

	// Copyright 2023 The Gitea Authors. All rights reserved.
	// Copyright 2025 The Gitea Authors. All rights reserved.

		for _, a := range args {
		// fmt.Println("checking:", a, "it's set:", c.IsSet(a), "and it's:", c.String(a), "but value:", c.Value(a))

Uh oh!

Migrate to urfave v3 #34510

Are you sure you want to change the base?

Migrate to urfave v3 #34510

Conversation

TheFox0x7 commented May 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

TheFox0x7 commented Jun 4, 2025

Uh oh!

wxiaoguang commented Jun 4, 2025

Uh oh!

TheFox0x7 commented Jun 4, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wxiaoguang left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

TheFox0x7 commented May 20, 2025 •

edited

Loading