autofix: format code with gofumpt and gofmt (#6803)

deepsource-autofix[bot] · web-flow · commit e452d94fc842 · 2022-03-06T17:55:17.000+08:00
Co-authored-by: deepsource-autofix[bot] &lt;62050782+deepsource-autofix[bot]@users.noreply.github.com&gt;
diff --git a/internal/auth/pam/pam.go b/internal/auth/pam/pam.go
@@ -1,3 +1,4 @@
+//go:build pam
 // +build pam
 
 // Copyright 2014 The Gogs Authors. All rights reserved.
diff --git a/internal/cmd/backup.go b/internal/cmd/backup.go
@@ -42,8 +42,10 @@ portable among all supported database engines.`,
 	},
 }
 
-const currentBackupFormatVersion = 1
-const archiveRootDir = "gogs-backup"
+const (
+	currentBackupFormatVersion = 1
+	archiveRootDir             = "gogs-backup"
+)
 
 func runBackup(c *cli.Context) error {
 	zip.Verbose = c.Bool("verbose")
diff --git a/internal/cmd/cert.go b/internal/cmd/cert.go
@@ -1,3 +1,4 @@
+//go:build cert
 // +build cert
 
 // Copyright 2009 The Go Authors. All rights reserved.
diff --git a/internal/cmd/web.go b/internal/cmd/web.go
@@ -456,7 +456,6 @@ func runWeb(c *cli.Context) error {
 						Post(bindIgnErr(form.AddSSHKey{}), repo.SettingsDeployKeysPost)
 					m.Post("/delete", repo.DeleteDeployKey)
 				})
-
 			}, func(c *context.Context) {
 				c.Data["PageIsSettings"] = true
 			})
@@ -734,7 +733,8 @@ func runWeb(c *cli.Context) error {
 					tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
 					tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
 				},
-			}, Handler: m}
+			}, Handler: m,
+		}
 		err = server.ListenAndServeTLS(conf.Server.CertFile, conf.Server.KeyFile)
 
 	case "fcgi":
diff --git a/internal/conf/static_minwinsvc.go b/internal/conf/static_minwinsvc.go
@@ -1,3 +1,4 @@
+//go:build minwinsvc
 // +build minwinsvc
 
 // Copyright 2015 The Gogs Authors. All rights reserved.
diff --git a/internal/db/models.go b/internal/db/models.go
@@ -83,7 +83,7 @@ func getEngine() (*xorm.Engine, error) {
 			connStr = fmt.Sprintf("%s:%s@tcp(%s)/%s%scharset=utf8mb4&parseTime=true",
 				conf.Database.User, conf.Database.Password, conf.Database.Host, conf.Database.Name, Param)
 		}
-		var engineParams = map[string]string{"rowFormat": "DYNAMIC"}
+		engineParams := map[string]string{"rowFormat": "DYNAMIC"}
 		return xorm.NewEngineWithParams(conf.Database.Type, connStr, engineParams)
 
 	case "postgres":
diff --git a/internal/db/perms_test.go b/internal/db/perms_test.go
@@ -41,6 +41,7 @@ func Test_perms(t *testing.T) {
 		})
 	}
 }
+
 func test_perms_AccessMode(t *testing.T, db *perms) {
 	// Set up permissions
 	err := db.SetRepoPerms(1, map[int64]AccessMode{
diff --git a/internal/db/webhook_dingtalk.go b/internal/db/webhook_dingtalk.go
@@ -18,7 +18,7 @@ const (
 	DingtalkNotificationTitle = "Gogs Notification"
 )
 
-//Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1
+// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1
 type DingtalkActionCard struct {
 	Title          string `json:"title"`
 	Text           string `json:"text"`
@@ -28,13 +28,13 @@ type DingtalkActionCard struct {
 	SingleURL      string `json:"singleURL"`
 }
 
-//Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1
+// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1
 type DingtalkAtObject struct {
 	AtMobiles []string `json:"atMobiles"`
 	IsAtAll   bool     `json:"isAtAll"`
 }
 
-//Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1
+// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1
 type DingtalkPayload struct {
 	MsgType    string             `json:"msgtype"`
 	At         DingtalkAtObject   `json:"at"`
@@ -57,7 +57,7 @@ func NewDingtalkActionCard(singleTitle, singleURL string) DingtalkActionCard {
 	}
 }
 
-//TODO: add content
+// TODO: add content
 func GetDingtalkPayload(p api.Payloader, event HookEventType) (payload *DingtalkPayload, err error) {
 	switch event {
 	case HOOK_EVENT_CREATE:
@@ -255,7 +255,7 @@ func getDingtalkReleasePayload(p *api.ReleasePayload) (*DingtalkPayload, error)
 	return &DingtalkPayload{MsgType: "actionCard", ActionCard: actionCard}, nil
 }
 
-//Format link addr and title into markdown style
+// Format link addr and title into markdown style
 func MarkdownLinkFormatter(link, text string) string {
 	return "[" + text + "](" + link + ")"
 }
diff --git a/internal/gitutil/error.go b/internal/gitutil/error.go
@@ -20,7 +20,6 @@ type Error struct {
 func (e Error) NotFound() bool {
 	return IsErrSubmoduleNotExist(e.error) ||
 		IsErrRevisionNotExist(e.error)
-
 }
 
 // NewError wraps given error.
diff --git a/internal/process/manager.go b/internal/process/manager.go
@@ -15,9 +15,7 @@ import (
 	log "unknwon.dev/clog/v2"
 )
 
-var (
-	ErrExecTimeout = errors.New("process execution timeout")
-)
+var ErrExecTimeout = errors.New("process execution timeout")
 
 const DEFAULT_TIMEOUT = 60 * time.Second
 
@@ -41,8 +39,10 @@ func (c *pidCounter) PID() int64 {
 	return c.pid
 }
 
-var counter = new(pidCounter)
-var Processes []*Process
+var (
+	counter   = new(pidCounter)
+	Processes []*Process
+)
 
 // Add adds a process to global list and returns its PID.
 func Add(desc string, cmd *exec.Cmd) int64 {
diff --git a/internal/route/lfs/route.go b/internal/route/lfs/route.go
@@ -27,7 +27,6 @@ func RegisterRoutes(r *macaron.Router) {
 	r.Group("", func() {
 		r.Post("/objects/batch", authorize(db.AccessModeRead), verifyAccept, verifyContentTypeJSON, serveBatch)
 		r.Group("/objects/basic", func() {
-
 			basic := &basicHandler{
 				defaultStorage: lfsutil.Storage(conf.LFS.Storage),
 				storagers: map[lfsutil.Storage]lfsutil.Storager{
diff --git a/internal/route/repo/pull.go b/internal/route/repo/pull.go
@@ -553,7 +553,6 @@ func PrepareCompareDiff(
 	meta *gitutil.PullRequestMeta,
 	headBranch string,
 ) bool {
-
 	var (
 		repo = c.Repo.Repository
 		err  error

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build pam`
`1`	`2`	`// +build pam`
`2`	`3`
`3`	`4`	`// Copyright 2014 The Gogs Authors. All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build cert`
`1`	`2`	`// +build cert`
`2`	`3`
`3`	`4`	`// Copyright 2009 The Go Authors. All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build minwinsvc`
`1`	`2`	`// +build minwinsvc`
`2`	`3`
`3`	`4`	`// Copyright 2015 The Gogs Authors. All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func getEngine() (*xorm.Engine, error) {`
`83`	`83`	`connStr = fmt.Sprintf("%s:%s@tcp(%s)/%s%scharset=utf8mb4&parseTime=true",`
`84`	`84`	`conf.Database.User, conf.Database.Password, conf.Database.Host, conf.Database.Name, Param)`
`85`	`85`	`}`
`86`		`- var engineParams = map[string]string{"rowFormat": "DYNAMIC"}`
	`86`	`+ engineParams := map[string]string{"rowFormat": "DYNAMIC"}`
`87`	`87`	`return xorm.NewEngineWithParams(conf.Database.Type, connStr, engineParams)`
`88`	`88`
`89`	`89`	`case "postgres":`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ func Test_perms(t *testing.T) {`
`41`	`41`	`})`
`42`	`42`	`}`
`43`	`43`	`}`
	`44`	`+`
`44`	`45`	`func test_perms_AccessMode(t testing.T, db perms) {`
`45`	`46`	`// Set up permissions`
`46`	`47`	`err := db.SetRepoPerms(1, map[int64]AccessMode{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ const (`
`18`	`18`	`DingtalkNotificationTitle = "Gogs Notification"`
`19`	`19`	`)`
`20`	`20`
`21`		`-//Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1`
	`21`	`+// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1`
`22`	`22`	`type DingtalkActionCard struct {`
`23`	`23`	Title string `json:"title"`
`24`	`24`	Text string `json:"text"`
`@@ -28,13 +28,13 @@ type DingtalkActionCard struct {`
`28`	`28`	SingleURL string `json:"singleURL"`
`29`	`29`	`}`
`30`	`30`
`31`		`-//Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1`
	`31`	`+// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1`
`32`	`32`	`type DingtalkAtObject struct {`
`33`	`33`	AtMobiles []string `json:"atMobiles"`
`34`	`34`	IsAtAll bool `json:"isAtAll"`
`35`	`35`	`}`
`36`	`36`
`37`		`-//Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1`
	`37`	`+// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1`
`38`	`38`	`type DingtalkPayload struct {`
`39`	`39`	MsgType string `json:"msgtype"`
`40`	`40`	At DingtalkAtObject `json:"at"`
`@@ -57,7 +57,7 @@ func NewDingtalkActionCard(singleTitle, singleURL string) DingtalkActionCard {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-//TODO: add content`
	`60`	`+// TODO: add content`
`61`	`61`	`func GetDingtalkPayload(p api.Payloader, event HookEventType) (payload *DingtalkPayload, err error) {`
`62`	`62`	`switch event {`
`63`	`63`	`case HOOK_EVENT_CREATE:`
`@@ -255,7 +255,7 @@ func getDingtalkReleasePayload(p api.ReleasePayload) (DingtalkPayload, error)`
`255`	`255`	`return &DingtalkPayload{MsgType: "actionCard", ActionCard: actionCard}, nil`
`256`	`256`	`}`
`257`	`257`
`258`		`-//Format link addr and title into markdown style`
	`258`	`+// Format link addr and title into markdown style`
`259`	`259`	`func MarkdownLinkFormatter(link, text string) string {`
`260`	`260`	`return "[" + text + "](" + link + ")"`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ type Error struct {`
`20`	`20`	`func (e Error) NotFound() bool {`
`21`	`21`	`return IsErrSubmoduleNotExist(e.error) \|\|`
`22`	`22`	`IsErrRevisionNotExist(e.error)`
`23`		`-`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`// NewError wraps given error.`