imjasonh/terraform-playground
1
0
Fork 0
mirror of https://github.com/imjasonh/terraform-playground synced 2026-07-07 23:35:16 +00:00
Code Activity

Fix golangci-lint v2 findings (errcheck Close, staticcheck)

Browse source 
Co-authored-by: Jason Hall <imjasonh@users.noreply.github.com>
This commit is contained in:
Cursor Agent 2026-06-10 11:44:08 +00:00
parent 28337b0d62
commit 4c4d834ff3
No known key found for this signature in database
6 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
py-image-builder/e2e/e2e_test.go
View file

@ -307,7 +307,7 @@ func pythonTag(t *testing.T, py string) string {
func extract(t *testing.T, img v1.Image, dest string) {
t.Helper()
rc := mutate.Extract(img)
defer rc.Close()
defer func() { _ = rc.Close() }()
tr := tar.NewReader(rc)
for {
h, err := tr.Next()
@ -332,10 +332,10 @@ func extract(t *testing.T, img v1.Image, dest string) {
t.Fatal(err)
}
if _, err := io.Copy(f, tr); err != nil {
f.Close()
_ = f.Close()
t.Fatal(err)
}
f.Close()
_ = f.Close()
}
}
}

2
py-image-builder/internal/build/build.go
View file

@ -161,7 +161,7 @@ func wheelFiles(rw wheelhouse.ResolvedWheel, layout wheel.Layout) ([]ptar.File,
if err != nil {
return nil, err
}
defer w.Close()
defer func() { _ = w.Close() }()
return w.Files(layout)
}

4
py-image-builder/internal/build/build_test.go
View file

@ -22,7 +22,7 @@ func layerPaths(t *testing.T, l v1.Layer) map[string]bool {
if err != nil {
t.Fatal(err)
}
defer rc.Close()
defer func() { _ = rc.Close() }()
names := map[string]bool{}
tr := tar.NewReader(rc)
for {
@ -140,7 +140,7 @@ func TestConfigAndLayerCount(t *testing.T) {
if c.Labels["org.test"] != "yes" {
t.Errorf("label not set: %v", c.Labels)
}
if !cf.Created.Time.Equal(epoch()) {
if !cf.Created.Equal(epoch()) {
t.Errorf("config Created = %v, want epoch", cf.Created)
}
}

2
py-image-builder/internal/lock/lock.go
View file

@ -46,7 +46,7 @@ func ParseFile(path string) ([]Requirement, error) {
if err != nil {
return nil, err
}
defer f.Close()
defer func() { _ = f.Close() }()
return Parse(f)
}

4
py-image-builder/internal/wheel/wheel.go
View file

@ -88,7 +88,7 @@ func Open(filename string) (*Wheel, error) {
}
}
if w.distInfo == "" {
z.Close()
_ = z.Close()
return nil, fmt.Errorf("wheel: %q has no .dist-info directory", filename)
}
base := strings.TrimSuffix(w.distInfo, ".dist-info")
@ -250,7 +250,7 @@ func readZip(f *zip.File) ([]byte, error) {
if err != nil {
return nil, err
}
defer rc.Close()
defer func() { _ = rc.Close() }()
return io.ReadAll(rc)
}

9
py-image-builder/internal/wheel/wheel_test.go
View file

@ -43,7 +43,7 @@ func TestFilesLayout(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer w.Close()
defer func() { _ = w.Close() }()
if w.Name != "examplepkg" || w.Version != "1.2.3" {
t.Fatalf("parsed name/version = %q %q", w.Name, w.Version)
@ -92,7 +92,7 @@ func TestFilesDeterministic(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer w.Close()
defer func() { _ = w.Close() }()
files, err := w.Files(layout)
if err != nil {
t.Fatal(err)
@ -107,7 +107,8 @@ func TestFilesDeterministic(t *testing.T) {
}
return d.String()
}
if digest() != digest() {
t.Fatal("wheel layer digest is not deterministic")
d1, d2 := digest(), digest()
if d1 != d2 {
t.Fatalf("wheel layer digest is not deterministic: %s != %s", d1, d2)
}
}