rename consts to match SigningKey.Format

Author: wxiaoguang

modules/git/key.go

@@ -5,10 +5,8 @@ package git
 
 // Based on https://git-scm.com/docs/git-config#Documentation/git-config.txt-gpgformat
 const (
-	// KeyTypeOpenPGP is the key type for GPG keys, expected default of git cli
-	KeyTypeOpenPGP = "openpgp"
-	// KeyTypeSSH is the key type for SSH keys
-	KeyTypeSSH = "ssh"
+	SigningKeyFormatOpenPGP = "openpgp" // for GPG keys, the expected default of git cli
+	SigningKeyFormatSSH     = "ssh"
 )
 
 type SigningKey struct {

modules/git/repo_gpg.go

@@ -14,7 +14,7 @@ import (
 
 // LoadPublicKeyContent will load the key from gpg
 func (gpgSettings *GPGSettings) LoadPublicKeyContent() error {
-	if gpgSettings.Format == KeyTypeSSH {
+	if gpgSettings.Format == SigningKeyFormatSSH {
 		content, err := os.ReadFile(gpgSettings.KeyID)
 		if err != nil {
 			return fmt.Errorf("unable to read SSH public key file: %s, %w", gpgSettings.KeyID, err)
@@ -53,7 +53,7 @@ func (repo *Repository) GetDefaultPublicGPGKey(forceUpdate bool) (*GPGSettings,
 	signingKey, _, _ := NewCommand("config", "--get", "user.signingkey").RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
 	gpgSettings.KeyID = strings.TrimSpace(signingKey)
 
-	format, _, _ := NewCommand("config", "--default", KeyTypeOpenPGP, "--get", "gpg.format").RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
+	format, _, _ := NewCommand("config", "--default", SigningKeyFormatOpenPGP, "--get", "gpg.format").RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
 	gpgSettings.Format = strings.TrimSpace(format)
 
 	defaultEmail, _, _ := NewCommand("config", "--get", "user.email").RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})

routers/api/v1/misc/signing.go

@@ -65,7 +65,7 @@ func SigningKeyGPG(ctx *context.APIContext) {
 	//     description: "GPG armored public key"
 	//     schema:
 	//       type: string
-	getSigningKey(ctx, git.KeyTypeOpenPGP)
+	getSigningKey(ctx, git.SigningKeyFormatOpenPGP)
 }
 
 // SigningKeySSH returns the public key of the default signing key if it exists
@@ -102,5 +102,5 @@ func SigningKeySSH(ctx *context.APIContext) {
 	//     description: "ssh public key"
 	//     schema:
 	//       type: string
-	getSigningKey(ctx, git.KeyTypeSSH)
+	getSigningKey(ctx, git.SigningKeyFormatSSH)
 }

services/asymkey/commit.go

@@ -428,7 +428,7 @@ func ParseCommitWithSSHSignature(ctx context.Context, c *git.Commit, committerUs
 	}
 
 	// Try the configured instance-wide SSH public key
-	if setting.Repository.Signing.SigningFormat == git.KeyTypeSSH && !slices.Contains([]string{"", "default", "none"}, setting.Repository.Signing.SigningKey) {
+	if setting.Repository.Signing.SigningFormat == git.SigningKeyFormatSSH && !slices.Contains([]string{"", "default", "none"}, setting.Repository.Signing.SigningKey) {
 		gpgSettings := git.GPGSettings{
 			Sign:   true,
 			KeyID:  setting.Repository.Signing.SigningKey,

services/asymkey/sign.go

@@ -99,7 +99,7 @@ func SigningKey(ctx context.Context, repoPath string) (*git.SigningKey, *git.Sig
 			return nil, nil
 		}
 
-		format, _, _ := git.NewCommand("config", "--default", git.KeyTypeOpenPGP, "--get", "gpg.format").RunStdString(ctx, &git.RunOpts{Dir: repoPath})
+		format, _, _ := git.NewCommand("config", "--default", git.SigningKeyFormatOpenPGP, "--get", "gpg.format").RunStdString(ctx, &git.RunOpts{Dir: repoPath})
 		signingKey, _, _ := git.NewCommand("config", "--get", "user.signingkey").RunStdString(ctx, &git.RunOpts{Dir: repoPath})
 		signingName, _, _ := git.NewCommand("config", "--get", "user.name").RunStdString(ctx, &git.RunOpts{Dir: repoPath})
 		signingEmail, _, _ := git.NewCommand("config", "--get", "user.email").RunStdString(ctx, &git.RunOpts{Dir: repoPath})
@@ -136,7 +136,7 @@ func PublicSigningKey(ctx context.Context, repoPath string) (content string, for
 	if signingKey == nil {
 		return "", "", nil
 	}
-	if signingKey.Format == git.KeyTypeSSH {
+	if signingKey.Format == git.SigningKeyFormatSSH {
 		content, err := os.ReadFile(signingKey.KeyID)
 		if err != nil {
 			log.Error("Unable to read SSH public key file in %s: %s, %v", repoPath, signingKey, err)