aboutsummaryrefslogtreecommitdiffstats
path: root/models/asymkey
diff options
context:
space:
mode:
authorWim <wim@42.be>2022-06-20 12:02:49 +0200
committerGitHub <noreply@github.com>2022-06-20 12:02:49 +0200
commitcb50375e2b6abf0c79d4891e5e1ea775b9759cd2 (patch)
tree938af0f442baf79cebd114692aff5ad6af37f987 /models/asymkey
parent3289abcefc563d6ea16c1dbd19680b874a58a6d3 (diff)
downloadgitea-cb50375e2b6abf0c79d4891e5e1ea775b9759cd2.tar.gz
gitea-cb50375e2b6abf0c79d4891e5e1ea775b9759cd2.zip
Add more linters to improve code readability (#19989)
Add nakedret, unconvert, wastedassign, stylecheck and nolintlint linters to improve code readability - nakedret - https://github.com/alexkohler/nakedret - nakedret is a Go static analysis tool to find naked returns in functions greater than a specified function length. - unconvert - https://github.com/mdempsky/unconvert - Remove unnecessary type conversions - wastedassign - https://github.com/sanposhiho/wastedassign - wastedassign finds wasted assignment statements. - notlintlint - Reports ill-formed or insufficient nolint directives - stylecheck - https://staticcheck.io/docs/checks/#ST - keep style consistent - excluded: [ST1003 - Poorly chosen identifier](https://staticcheck.io/docs/checks/#ST1003) and [ST1005 - Incorrectly formatted error string](https://staticcheck.io/docs/checks/#ST1005)
Diffstat (limited to 'models/asymkey')
-rw-r--r--models/asymkey/gpg_key_commit_verification.go2
-rw-r--r--models/asymkey/ssh_key_test.go6
2 files changed, 4 insertions, 4 deletions
diff --git a/models/asymkey/gpg_key_commit_verification.go b/models/asymkey/gpg_key_commit_verification.go
index 2f66863091..d5b06f83fd 100644
--- a/models/asymkey/gpg_key_commit_verification.go
+++ b/models/asymkey/gpg_key_commit_verification.go
@@ -520,5 +520,5 @@ func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_
}
}
- return
+ return err
}
diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go
index 71c8860f1c..adffedd0b6 100644
--- a/models/asymkey/ssh_key_test.go
+++ b/models/asymkey/ssh_key_test.go
@@ -317,7 +317,7 @@ func TestFromOpenSSH(t *testing.T) {
td := t.TempDir()
data := []byte("hello, ssh world")
- dataPath := write(t, []byte(data), td, "data")
+ dataPath := write(t, data, td, "data")
privPath := write(t, []byte(tt.priv), td, "id")
write(t, []byte(tt.pub), td, "id.pub")
@@ -372,14 +372,14 @@ func TestToOpenSSH(t *testing.T) {
td := t.TempDir()
data := []byte("hello, ssh world")
- write(t, []byte(data), td, "data")
+ write(t, data, td, "data")
armored, err := sshsig.Sign([]byte(tt.priv), bytes.NewReader(data), "file")
if err != nil {
t.Fatal(err)
}
- sigPath := write(t, []byte(armored), td, "oursig")
+ sigPath := write(t, armored, td, "oursig")
// Create an allowed_signers file with two keys to check against.
allowedSigner := "test@rekor.dev " + tt.pub + "\n"