diff --git a/deb/publish.go b/deb/publish.go index 69ffb545..cc4c2a0f 100644 --- a/deb/publish.go +++ b/deb/publish.go @@ -1075,12 +1075,12 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP bufWriter, err := indexes.SkelIndex(component, withinComponent).BufWriter() if err != nil { - poolFile.Close() + _ = poolFile.Close() return fmt.Errorf("unable to generate AppStream index: %v", err) } _, err = bufio.NewReader(poolFile).WriteTo(bufWriter) - poolFile.Close() + _ = poolFile.Close() if err != nil { return fmt.Errorf("unable to write AppStream file: %v", err) } @@ -1173,7 +1173,7 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP release["Label"] = p.GetLabel() release["Suite"] = p.GetSuite() release["Codename"] = p.GetCodename() - datetime_format := "Mon, 2 Jan 2006 15:04:05 MST" + datetimeformat := "Mon, 2 Jan 2006 15:04:05 MST" publishDate := time.Now().UTC() if epoch := os.Getenv("SOURCE_DATE_EPOCH"); epoch != "" { @@ -1181,7 +1181,7 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP publishDate = time.Unix(sec, 0).UTC() } } - release["Date"] = publishDate.Format(datetime_format) + release["Date"] = publishDate.Format(datetimeformat) release["Architectures"] = strings.Join(utils.StrSlicesSubstract(p.Architectures, []string{ArchitectureSource}), " ") if p.AcquireByHash { release["Acquire-By-Hash"] = "yes" @@ -1193,7 +1193,7 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP // is not present or if it is expired." release["Signed-By"] = p.SignedBy // Let's use a century as a "forever" value. - release["Valid-Until"] = publishDate.AddDate(100, 0, 0).Format(datetime_format) + release["Valid-Until"] = publishDate.AddDate(100, 0, 0).Format(datetimeformat) } if p.Version != "" { release["Version"] = p.Version diff --git a/deb/publish_test.go b/deb/publish_test.go index 37c1525e..125397b2 100644 --- a/deb/publish_test.go +++ b/deb/publish_test.go @@ -483,7 +483,7 @@ func (s *PublishedRepoSuite) TestPublishAppStream(c *C) { // Release file should reference AppStream files rf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/Release")) c.Assert(err, IsNil) - defer rf.Close() + defer func() { _ = rf.Close() }() cfr := NewControlFileReader(rf, true, false) st, err := cfr.ReadStanza() @@ -512,14 +512,14 @@ func (s *PublishedRepoSuite) TestPublishNoSigner(c *C) { func (s *PublishedRepoSuite) TestPublishSourceDateEpoch(c *C) { // Test with SOURCE_DATE_EPOCH set _ = os.Setenv("SOURCE_DATE_EPOCH", "1234567890") - defer os.Unsetenv("SOURCE_DATE_EPOCH") + defer func() { _ = os.Unsetenv("SOURCE_DATE_EPOCH") }() err := s.repo.Publish(s.packagePool, s.provider, s.factory, &NullSigner{}, nil, false, "") c.Assert(err, IsNil) rf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/Release")) c.Assert(err, IsNil) - defer rf.Close() + defer func() { _ = rf.Close() }() cfr := NewControlFileReader(rf, true, false) st, err := cfr.ReadStanza() @@ -532,14 +532,14 @@ func (s *PublishedRepoSuite) TestPublishSourceDateEpoch(c *C) { func (s *PublishedRepoSuite) TestPublishSourceDateEpochInvalid(c *C) { // Test with invalid SOURCE_DATE_EPOCH (should fallback to current time) _ = os.Setenv("SOURCE_DATE_EPOCH", "invalid") - defer os.Unsetenv("SOURCE_DATE_EPOCH") + defer func() { _ = os.Unsetenv("SOURCE_DATE_EPOCH") }() err := s.repo2.Publish(s.packagePool, s.provider, s.factory, nil, nil, false, "") c.Assert(err, IsNil) rf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/maverick/Release")) c.Assert(err, IsNil) - defer rf.Close() + defer func() { _ = rf.Close() }() cfr := NewControlFileReader(rf, true, false) st, err := cfr.ReadStanza() diff --git a/http/gcp_auth_test.go b/http/gcp_auth_test.go index a706bdfe..614a6cf8 100644 --- a/http/gcp_auth_test.go +++ b/http/gcp_auth_test.go @@ -30,7 +30,7 @@ func TestGCPAuthTransport_RoundTrip(t *testing.T) { if err != nil { t.Fatalf("Failed to make request: %v", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() if resp.StatusCode != http.StatusOK { t.Errorf("Expected status 200, got %d", resp.StatusCode) @@ -61,7 +61,7 @@ func TestGCPAuthTransport_RoundTrip_with_dummy_tokenSource(t *testing.T) { if err != nil { t.Fatalf("Failed to make request: %v", err) } - defer resp.Body.Close() + defer func(){ _ = resp.Body.Close() }() if resp.StatusCode != http.StatusOK { t.Errorf("Expected status 200, got %d", resp.StatusCode) @@ -79,15 +79,15 @@ func TestGCPAuthTransport_RoundTrip_with_InvalidCredentials(t *testing.T) { if err != nil { t.Fatalf("Failed to create temp file: %s", err) } - defer os.Remove(tmpFile.Name()) + defer func() { _ = os.Remove(tmpFile.Name()) }() if _, err := tmpFile.WriteString(`{"invalid": "data"}`); err != nil { t.Fatalf("Failed to write to temp file: %s", err) } - tmpFile.Close() + _ = tmpFile.Close() defaultEnv := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS") - os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", tmpFile.Name()) - defer os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", defaultEnv) + _ = os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", tmpFile.Name()) + defer func() { _ = os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", defaultEnv) }() transport := &gcpRoundTripper{ base: http.DefaultTransport, @@ -98,7 +98,7 @@ func TestGCPAuthTransport_RoundTrip_with_InvalidCredentials(t *testing.T) { if err != nil { t.Fatalf("Failed to make request: %s", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() if resp.StatusCode != http.StatusForbidden { t.Errorf("Expected status 403, got %d", resp.StatusCode) diff --git a/system/files/corruptdb.go b/system/files/corruptdb.go index 4febcbc9..15b4e094 100644 --- a/system/files/corruptdb.go +++ b/system/files/corruptdb.go @@ -20,7 +20,7 @@ func main() { if err != nil { log.Fatalf("Error opening DB %q: %s", dbPath, err) } - defer db.Close() + defer func() { _ = db.Close() }() keys := db.KeysByPrefix([]byte(prefix)) if len(keys) == 0 {