fixup! chore(coderd): extract fileszip to its own package for reuse

johnstcn · johnstcn · commit 804d9e8f544c · 2024-10-25T13:08:57.000+01:00
diff --git a/cli/templatepull_test.go b/cli/templatepull_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/cli/clitest"
-	"github.com/coder/coder/v2/coderd"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/fileszip"
 	"github.com/coder/coder/v2/provisioner/echo"
 	"github.com/coder/coder/v2/provisionersdk"
 	"github.com/coder/coder/v2/provisionersdk/proto"
@@ -95,7 +95,7 @@ func TestTemplatePull_Stdout(t *testing.T) {
 
 	// Verify .zip format
 	tarReader := tar.NewReader(bytes.NewReader(expected))
-	expectedZip, err := coderd.CreateZipFromTar(tarReader)
+	expectedZip, err := fileszip.CreateZipFromTar(tarReader, int64(len(expected)))
 	require.NoError(t, err)
 
 	inv, root = clitest.New(t, "templates", "pull", "--zip", template.Name)
diff --git a/coderd/files_test.go b/coderd/files_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/v2/coderd"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/fileszip"
 	"github.com/coder/coder/v2/fileszip/filesziptest"
 	"github.com/coder/coder/v2/testutil"
 )
@@ -133,7 +133,7 @@ func TestDownload(t *testing.T) {
 		tarball := filesziptest.TestTarFileBytes()
 
 		tarReader := tar.NewReader(bytes.NewReader(tarball))
-		expectedZip, err := coderd.CreateZipFromTar(tarReader)
+		expectedZip, err := fileszip.CreateZipFromTar(tarReader, 10240)
 		require.NoError(t, err)
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
diff --git a/coderd/fileszip.go b/coderd/fileszip.go
