format with gofumpt (#18184)

* gofumpt -w -l .

* gofumpt -w -l -extra .

* Add linter

* manual fix

* change make fmt

4 files changed, 14 insertions, 11 deletions

diff --git a/modules/auth/openid/discovery_cache_test.go b/modules/auth/openid/discovery_cache_test.go
index 931e5c7945..28546f6031 100644
--- a/modules/auth/openid/discovery_cache_test.go
+++ b/modules/auth/openid/discovery_cache_test.go
@@ -14,9 +14,11 @@ type testDiscoveredInfo struct{}
 func (s *testDiscoveredInfo) ClaimedID() string {
 	return "claimedID"
 }
+
 func (s *testDiscoveredInfo) OpEndpoint() string {
 	return "opEndpoint"
 }
+
 func (s *testDiscoveredInfo) OpLocalID() string {
 	return "opLocalID"
 }
@@ -25,7 +27,7 @@ func TestTimedDiscoveryCache(t *testing.T) {
 	dc := newTimedDiscoveryCache(1 * time.Second)
 
 	// Put some initial values
-	dc.Put("foo", &testDiscoveredInfo{}) //openid.opEndpoint: "a", openid.opLocalID: "b", openid.claimedID: "c"})
+	dc.Put("foo", &testDiscoveredInfo{}) // openid.opEndpoint: "a", openid.opLocalID: "b", openid.claimedID: "c"})
 
 	// Make sure we can retrieve them
 	if di := dc.Get("foo"); di == nil {
diff --git a/modules/auth/openid/openid.go b/modules/auth/openid/openid.go
index 40f38c2d2e..8926fc6d7a 100644
--- a/modules/auth/openid/openid.go
+++ b/modules/auth/openid/openid.go
@@ -17,8 +17,10 @@ import (
 // If you have multiple servers for example, you may need to share at
 // least
 // the nonceStore between them.
-var nonceStore = openid.NewSimpleNonceStore()
-var discoveryCache = newTimedDiscoveryCache(24 * time.Hour)
+var (
+	nonceStore     = openid.NewSimpleNonceStore()
+	discoveryCache = newTimedDiscoveryCache(24 * time.Hour)
+)
 
 // Verify handles response from OpenID provider
 func Verify(fullURL string) (id string, err error) {
diff --git a/modules/auth/pam/pam.go b/modules/auth/pam/pam.go
index 73ecae0c2c..30f13e440b 100644
--- a/modules/auth/pam/pam.go
+++ b/modules/auth/pam/pam.go
@@ -27,7 +27,6 @@ func Auth(serviceName, userName, passwd string) (string, error) {
 		}
 		return "", errors.New("Unrecognized PAM message style")
 	})
-
 	if err != nil {
 		return "", err
 	}
diff --git a/modules/auth/webauthn/webauthn.go b/modules/auth/webauthn/webauthn.go
index 8f380e7c34..e39b6f46d6 100644
--- a/modules/auth/webauthn/webauthn.go
+++ b/modules/auth/webauthn/webauthn.go
@@ -17,10 +17,10 @@ import (
 	"github.com/duo-labs/webauthn/webauthn"
 )
 
-//WebAuthn represents the global WebAuthn instance
+// WebAuthn represents the global WebAuthn instance
 var WebAuthn *webauthn.WebAuthn
 
-//Init initializes the WebAuthn instance from the config.
+// Init initializes the WebAuthn instance from the config.
 func Init() {
 	gob.Register(&webauthn.SessionData{})
 
@@ -42,14 +42,14 @@ func Init() {
 // User represents an implementation of webauthn.User based on User model
 type User user_model.User
 
-//WebAuthnID implements the webauthn.User interface
+// WebAuthnID implements the webauthn.User interface
 func (u *User) WebAuthnID() []byte {
 	id := make([]byte, 8)
 	binary.PutVarint(id, u.ID)
 	return id
 }
 
-//WebAuthnName implements the webauthn.User interface
+// WebAuthnName implements the webauthn.User interface
 func (u *User) WebAuthnName() string {
 	if u.LoginName == "" {
 		return u.Name
@@ -57,17 +57,17 @@ func (u *User) WebAuthnName() string {
 	return u.LoginName
 }
 
-//WebAuthnDisplayName implements the webauthn.User interface
+// WebAuthnDisplayName implements the webauthn.User interface
 func (u *User) WebAuthnDisplayName() string {
 	return (*user_model.User)(u).DisplayName()
 }
 
-//WebAuthnIcon implements the webauthn.User interface
+// WebAuthnIcon implements the webauthn.User interface
 func (u *User) WebAuthnIcon() string {
 	return (*user_model.User)(u).AvatarLink()
 }
 
-//WebAuthnCredentials implementns the webauthn.User interface
+// WebAuthnCredentials implementns the webauthn.User interface
 func (u *User) WebAuthnCredentials() []webauthn.Credential {
 	dbCreds, err := auth.GetWebAuthnCredentialsByUID(u.ID)
 	if err != nil {