Skip to content

Commit ab663f8

Browse files
committed
fix lint errors and run lint in ci
1 parent 01004e1 commit ab663f8

5 files changed

Lines changed: 21 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
- name: "Docker Image"
3232
run: |
3333
make docker-image
34+
- name: "Lint"
35+
run: |
36+
make lint
3437
- name: "Unit Tests"
3538
run: |
3639
make docker-unit-tests

deb/publish.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,12 +1075,12 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
10751075

10761076
bufWriter, err := indexes.SkelIndex(component, withinComponent).BufWriter()
10771077
if err != nil {
1078-
poolFile.Close()
1078+
_ = poolFile.Close()
10791079
return fmt.Errorf("unable to generate AppStream index: %v", err)
10801080
}
10811081

10821082
_, err = bufio.NewReader(poolFile).WriteTo(bufWriter)
1083-
poolFile.Close()
1083+
_ = poolFile.Close()
10841084
if err != nil {
10851085
return fmt.Errorf("unable to write AppStream file: %v", err)
10861086
}
@@ -1173,15 +1173,15 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
11731173
release["Label"] = p.GetLabel()
11741174
release["Suite"] = p.GetSuite()
11751175
release["Codename"] = p.GetCodename()
1176-
datetime_format := "Mon, 2 Jan 2006 15:04:05 MST"
1176+
datetimeformat := "Mon, 2 Jan 2006 15:04:05 MST"
11771177

11781178
publishDate := time.Now().UTC()
11791179
if epoch := os.Getenv("SOURCE_DATE_EPOCH"); epoch != "" {
11801180
if sec, err := strconv.ParseInt(epoch, 10, 64); err == nil {
11811181
publishDate = time.Unix(sec, 0).UTC()
11821182
}
11831183
}
1184-
release["Date"] = publishDate.Format(datetime_format)
1184+
release["Date"] = publishDate.Format(datetimeformat)
11851185
release["Architectures"] = strings.Join(utils.StrSlicesSubstract(p.Architectures, []string{ArchitectureSource}), " ")
11861186
if p.AcquireByHash {
11871187
release["Acquire-By-Hash"] = "yes"
@@ -1193,7 +1193,7 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
11931193
// is not present or if it is expired."
11941194
release["Signed-By"] = p.SignedBy
11951195
// Let's use a century as a "forever" value.
1196-
release["Valid-Until"] = publishDate.AddDate(100, 0, 0).Format(datetime_format)
1196+
release["Valid-Until"] = publishDate.AddDate(100, 0, 0).Format(datetimeformat)
11971197
}
11981198
if p.Version != "" {
11991199
release["Version"] = p.Version

deb/publish_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ func (s *PublishedRepoSuite) TestPublishAppStream(c *C) {
483483
// Release file should reference AppStream files
484484
rf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/Release"))
485485
c.Assert(err, IsNil)
486-
defer rf.Close()
486+
defer func() { _ = rf.Close() }()
487487

488488
cfr := NewControlFileReader(rf, true, false)
489489
st, err := cfr.ReadStanza()
@@ -512,14 +512,14 @@ func (s *PublishedRepoSuite) TestPublishNoSigner(c *C) {
512512
func (s *PublishedRepoSuite) TestPublishSourceDateEpoch(c *C) {
513513
// Test with SOURCE_DATE_EPOCH set
514514
_ = os.Setenv("SOURCE_DATE_EPOCH", "1234567890")
515-
defer os.Unsetenv("SOURCE_DATE_EPOCH")
515+
defer func() { _ = os.Unsetenv("SOURCE_DATE_EPOCH") }()
516516

517517
err := s.repo.Publish(s.packagePool, s.provider, s.factory, &NullSigner{}, nil, false, "")
518518
c.Assert(err, IsNil)
519519

520520
rf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/Release"))
521521
c.Assert(err, IsNil)
522-
defer rf.Close()
522+
defer func() { _ = rf.Close() }()
523523

524524
cfr := NewControlFileReader(rf, true, false)
525525
st, err := cfr.ReadStanza()
@@ -532,14 +532,14 @@ func (s *PublishedRepoSuite) TestPublishSourceDateEpoch(c *C) {
532532
func (s *PublishedRepoSuite) TestPublishSourceDateEpochInvalid(c *C) {
533533
// Test with invalid SOURCE_DATE_EPOCH (should fallback to current time)
534534
_ = os.Setenv("SOURCE_DATE_EPOCH", "invalid")
535-
defer os.Unsetenv("SOURCE_DATE_EPOCH")
535+
defer func() { _ = os.Unsetenv("SOURCE_DATE_EPOCH") }()
536536

537537
err := s.repo2.Publish(s.packagePool, s.provider, s.factory, nil, nil, false, "")
538538
c.Assert(err, IsNil)
539539

540540
rf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/maverick/Release"))
541541
c.Assert(err, IsNil)
542-
defer rf.Close()
542+
defer func() { _ = rf.Close() }()
543543

544544
cfr := NewControlFileReader(rf, true, false)
545545
st, err := cfr.ReadStanza()

http/gcp_auth_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestGCPAuthTransport_RoundTrip(t *testing.T) {
3030
if err != nil {
3131
t.Fatalf("Failed to make request: %v", err)
3232
}
33-
defer resp.Body.Close()
33+
defer func() { _ = resp.Body.Close() }()
3434

3535
if resp.StatusCode != http.StatusOK {
3636
t.Errorf("Expected status 200, got %d", resp.StatusCode)
@@ -61,7 +61,7 @@ func TestGCPAuthTransport_RoundTrip_with_dummy_tokenSource(t *testing.T) {
6161
if err != nil {
6262
t.Fatalf("Failed to make request: %v", err)
6363
}
64-
defer resp.Body.Close()
64+
defer func(){ _ = resp.Body.Close() }()
6565

6666
if resp.StatusCode != http.StatusOK {
6767
t.Errorf("Expected status 200, got %d", resp.StatusCode)
@@ -79,15 +79,15 @@ func TestGCPAuthTransport_RoundTrip_with_InvalidCredentials(t *testing.T) {
7979
if err != nil {
8080
t.Fatalf("Failed to create temp file: %s", err)
8181
}
82-
defer os.Remove(tmpFile.Name())
82+
defer func() { _ = os.Remove(tmpFile.Name()) }()
8383
if _, err := tmpFile.WriteString(`{"invalid": "data"}`); err != nil {
8484
t.Fatalf("Failed to write to temp file: %s", err)
8585
}
86-
tmpFile.Close()
86+
_ = tmpFile.Close()
8787

8888
defaultEnv := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS")
89-
os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", tmpFile.Name())
90-
defer os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", defaultEnv)
89+
_ = os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", tmpFile.Name())
90+
defer func() { _ = os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", defaultEnv) }()
9191

9292
transport := &gcpRoundTripper{
9393
base: http.DefaultTransport,
@@ -98,7 +98,7 @@ func TestGCPAuthTransport_RoundTrip_with_InvalidCredentials(t *testing.T) {
9898
if err != nil {
9999
t.Fatalf("Failed to make request: %s", err)
100100
}
101-
defer resp.Body.Close()
101+
defer func() { _ = resp.Body.Close() }()
102102

103103
if resp.StatusCode != http.StatusForbidden {
104104
t.Errorf("Expected status 403, got %d", resp.StatusCode)

system/files/corruptdb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func main() {
2020
if err != nil {
2121
log.Fatalf("Error opening DB %q: %s", dbPath, err)
2222
}
23-
defer db.Close()
23+
defer func() { _ = db.Close() }()
2424

2525
keys := db.KeysByPrefix([]byte(prefix))
2626
if len(keys) == 0 {

0 commit comments

Comments
 (0)