Skip to content

Commit ca3a5a8

Browse files
refactor: golangci-lint
1 parent c309d61 commit ca3a5a8

File tree

7 files changed

+43
-21
lines changed

7 files changed

+43
-21
lines changed

pkg/config/config.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ func NewConfig(c *cli.Context) *Config {
6262
defer f.Close()
6363

6464
src := &BetaRelease{}
65-
json.NewDecoder(f).Decode(src)
65+
if err := json.NewDecoder(f).Decode(src); err != nil {
66+
return conf
67+
}
68+
6669
conf.BetaRelease = *src
6770

6871
return conf

pkg/semrel/github.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (repo *GitHubRepository) GetCommits(sha string) ([]*Commit, error) {
6868

6969
func (repo *GitHubRepository) GetLatestRelease(vrange string, re *regexp.Regexp) (*Release, error) {
7070
allReleases := make(Releases, 0)
71-
opts := &github.ReferenceListOptions{"tags", github.ListOptions{PerPage: 100}}
71+
opts := &github.ReferenceListOptions{Type: "tags", ListOptions: github.ListOptions{PerPage: 100}}
7272
for {
7373
refs, resp, err := repo.Client.Git.ListRefs(repo.Ctx, repo.owner, repo.repo, opts)
7474
if resp != nil && resp.StatusCode == 404 {

pkg/semrel/github_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ var (
5858
}
5959
)
6060

61+
//nolint:errcheck
6162
func githubHandler(w http.ResponseWriter, r *http.Request) {
6263
if r.Header.Get("Authorization") != "Bearer token" {
6364
http.Error(w, "unauthorized", http.StatusUnauthorized)

pkg/semrel/gitlab_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ var (
6060
}
6161
)
6262

63+
//nolint:errcheck
6364
func GitlabHandler(w http.ResponseWriter, r *http.Request) {
6465
// Rate Limit headers
6566
if r.Method == "GET" && r.URL.Path == "/api/v4/" {

pkg/semrel/semrel.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/go-semantic-release/semantic-release/pkg/config"
1313
)
1414

15-
var commitPattern = regexp.MustCompile("^(\\w*)(?:\\((.*)\\))?\\: (.*)$")
15+
var commitPattern = regexp.MustCompile(`^(\w*)(?:\((.*)\))?\: (.*)$`)
1616
var breakingPattern = regexp.MustCompile("BREAKING CHANGES?")
1717

1818
type Change struct {
@@ -133,13 +133,10 @@ func ApplyChange(version *semver.Version, change Change, allowInitialDevelopment
133133
switch {
134134
case change.Major:
135135
newVersion = version.IncMajor()
136-
break
137136
case change.Minor:
138137
newVersion = version.IncMinor()
139-
break
140138
case change.Patch:
141139
newVersion = version.IncPatch()
142-
break
143140
}
144141
return &newVersion
145142
}

pkg/update/package_json.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@ func updateJsonFile(newVersion string, file *os.File) error {
1919
return err
2020
}
2121
data["version"] = json.RawMessage("\"" + newVersion + "\"")
22-
file.Seek(0, 0)
23-
file.Truncate(0)
22+
if _, err := file.Seek(0, 0); err != nil {
23+
return err
24+
}
25+
if err := file.Truncate(0); err != nil {
26+
return err
27+
}
2428
enc := json.NewEncoder(file)
2529
enc.SetIndent("", " ")
2630
if err := enc.Encode(data); err != nil {

pkg/update/package_json_test.go

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,22 @@ func TestPackageJson(t *testing.T) {
1818
nVerJson := []byte("\"" + nVer + "\"")
1919
npmrcPath := "../../test/.npmrc"
2020
os.Remove(npmrcPath)
21-
packageJson(nVer, f)
21+
if err := packageJson(nVer, f); err != nil {
22+
t.Fatal(err)
23+
}
2224
npmfile, err := ioutil.ReadFile(npmrcPath)
23-
if err != nil || bytes.Compare(npmfile, []byte(npmrc)) != 0 {
25+
if err != nil || !bytes.Equal(npmfile, []byte(npmrc)) {
2426
t.Fatal("invalid .npmrc")
2527
}
2628

27-
f.Seek(0, 0)
29+
if _, err := f.Seek(0, 0); err != nil {
30+
t.Fatal(err)
31+
}
2832
var data map[string]json.RawMessage
29-
json.NewDecoder(f).Decode(&data)
30-
if bytes.Compare(data["version"], nVerJson) != 0 {
33+
if err := json.NewDecoder(f).Decode(&data); err != nil {
34+
t.Fatal(err)
35+
}
36+
if !bytes.Equal(data["version"], nVerJson) {
3137
t.Fatal("invalid version")
3238
}
3339

@@ -36,8 +42,10 @@ func TestPackageJson(t *testing.T) {
3642
t.Fatal("fixture package-lock.json missing")
3743
}
3844
var plData map[string]json.RawMessage
39-
json.NewDecoder(plF).Decode(&plData)
40-
if bytes.Compare(plData["version"], nVerJson) != 0 {
45+
if err := json.NewDecoder(plF).Decode(&plData); err != nil {
46+
t.Fatal(err)
47+
}
48+
if !bytes.Equal(plData["version"], nVerJson) {
4149
t.Fatal("invalid version")
4250
}
4351
}
@@ -50,16 +58,24 @@ func TestNpmrc(t *testing.T) {
5058
defer f.Close()
5159
nVer := "1.2.3"
5260
npmrcPath := "../../test/.npmrc"
53-
ioutil.WriteFile(npmrcPath, []byte("TEST"), 0644)
54-
packageJson(nVer, f)
61+
if err := ioutil.WriteFile(npmrcPath, []byte("TEST"), 0644); err != nil {
62+
t.Fatal(err)
63+
}
64+
if err := packageJson(nVer, f); err != nil {
65+
t.Fatal(err)
66+
}
5567
npmfile, err := ioutil.ReadFile(npmrcPath)
56-
if err != nil || bytes.Compare(npmfile, []byte("TEST")) != 0 {
68+
if err != nil || !bytes.Equal(npmfile, []byte("TEST")) {
5769
t.Fatal("invalid .npmrc")
5870
}
59-
f.Seek(0, 0)
71+
if _, err := f.Seek(0, 0); err != nil {
72+
t.Fatal(err)
73+
}
6074
var data map[string]json.RawMessage
61-
json.NewDecoder(f).Decode(&data)
62-
if bytes.Compare(data["version"], []byte("\""+nVer+"\"")) != 0 {
75+
if err := json.NewDecoder(f).Decode(&data); err != nil {
76+
t.Fatal(err)
77+
}
78+
if !bytes.Equal(data["version"], []byte("\""+nVer+"\"")) {
6379
t.Fatal("invalid version")
6480
}
6581
}

0 commit comments

Comments
 (0)