lint

aslilac · aslilac · commit ac5fb3e9723f · 2025-05-05T16:17:04.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -11,11 +11,12 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/slog"
 	"github.com/google/uuid"
 	"github.com/open-policy-agent/opa/topdown"
 	"golang.org/x/xerrors"
 
+	"cdr.dev/slog"
+
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/httpapi/httpapiconstraints"
diff --git a/provisioner/terraform/modules.go b/provisioner/terraform/modules.go
@@ -4,7 +4,6 @@ import (
 	"archive/tar"
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -79,7 +78,7 @@ func getModulesArchive(workdir string) ([]byte, error) {
 	modulesDir := getModulesDirectory(workdir)
 	err := filepath.WalkDir(modulesDir, func(filePath string, info fs.DirEntry, err error) error {
 		if err != nil {
-			return xerrors.Errorf("failed to archive modules: %w", err)
+			return xerrors.Errorf("failed to create modules archive: %w", err)
 		}
 		if info.IsDir() {
 			return nil
@@ -90,9 +89,11 @@ func getModulesArchive(workdir string) ([]byte, error) {
 			return xerrors.Errorf("walked invalid file path: %q", filePath)
 		}
 
-		fmt.Println("file: ", archivePath)
 		content, err := os.ReadFile(filePath)
-		w.WriteHeader(&tar.Header{
+		if err != nil {
+			return xerrors.Errorf("failed to read module file while archiving: %w", err)
+		}
+		err = w.WriteHeader(&tar.Header{
 			Name: archivePath,
 			Size: int64(len(content)),
 			Mode: 0o644,
@@ -102,15 +103,17 @@ func getModulesArchive(workdir string) ([]byte, error) {
 		if err != nil {
 			return xerrors.Errorf("failed to add module file to archive: %w", err)
 		}
-		w.Write(content)
+		if _, err = w.Write(content); err != nil {
+			return xerrors.Errorf("failed to write module file to archive: %w", err)
+		}
 		return nil
 	})
 	if err != nil {
 		return nil, err
 	}
 	err = w.Close()
 	if err != nil {
-		return nil, err
+		return nil, xerrors.Errorf("failed to close module files archive: %w", err)
 	}
 	// Don't persist empty tar files in the database
 	if empty {
diff --git a/provisioner/terraform/modules_internal_test.go b/provisioner/terraform/modules_internal_test.go
@@ -9,6 +9,8 @@ import (
 )
 
 func TestGetModulesArchive(t *testing.T) {
+	t.Parallel()
+
 	archive, err := getModulesArchive("testdata/modules-source-caching")
 	require.NoError(t, err)
 	hash := sha256.Sum256(archive)

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestGetModulesArchive(t *testing.T) {`
	`12`	`+ t.Parallel()`
	`13`	`+`
`12`	`14`	`archive, err := getModulesArchive("testdata/modules-source-caching")`
`13`	`15`	`require.NoError(t, err)`
`14`	`16`	`hash := sha256.Sum256(archive)`