review: make zip extensions more generic

Author: archandatta

cmd/browsers.go

@@ -1940,7 +1940,7 @@ func (b BrowsersCmd) ExtensionsUpload(ctx context.Context, in BrowsersExtensions
 		tempZipPath := filepath.Join(os.TempDir(), fmt.Sprintf("kernel-ext-%s.zip", extName))
 
 		pterm.Info.Printf("Zipping %s as %s...\n", extPath, extName)
-		if err := util.ZipDirectory(extPath, tempZipPath); err != nil {
+		if err := util.ZipDirectory(extPath, tempZipPath, nil); err != nil {
 			pterm.Error.Printf("Failed to zip %s: %v\n", extPath, err)
 			return nil
 		}

cmd/deploy.go

@@ -236,7 +236,7 @@ func runDeploy(cmd *cobra.Command, args []string) (err error) {
 	}
 	tmpFile := filepath.Join(os.TempDir(), fmt.Sprintf("kernel_%d.zip", time.Now().UnixNano()))
 	logger.Debug("compressing files", logger.Args("sourceDir", sourceDir, "tmpFile", tmpFile))
-	if err := util.ZipDirectory(sourceDir, tmpFile); err != nil {
+	if err := util.ZipDirectory(sourceDir, tmpFile, nil); err != nil {
 		if spinner != nil {
 			spinner.Fail("Failed to compress files")
 		}

cmd/extensions.go

@@ -19,10 +19,28 @@ import (
 )
 
 const (
-	// MaxExtensionSize is the maximum allowed size for extension bundles from API (50MB)
-	MaxExtensionSize = 50 * 1024 * 1024
+	MaxExtensionSizeBytes = 50 * 1024 * 1024 // 50MB
 )
 
+// defaultExtensionExclusions contains patterns for files that are not needed
+// when zipping Chrome extensions
+var defaultExtensionExclusions = util.ZipOptions{
+	ExcludeDirectories: []string{
+		"node_modules",
+		".git",
+		"__tests__",
+		"coverage",
+	},
+	ExcludeFilenamePatterns: []string{
+		"*.test.js",
+		"*.test.ts",
+		"*.spec.js",
+		"*.spec.ts",
+		"*.log",
+		"*.swp",
+	},
+}
+
 // ExtensionsService defines the subset of the Kernel SDK extension client that we use.
 type ExtensionsService interface {
 	List(ctx context.Context, opts ...option.RequestOption) (res *[]kernel.ExtensionListResponse, err error)
@@ -310,30 +328,22 @@ func (e ExtensionsCmd) Upload(ctx context.Context, in ExtensionsUploadInput) err
 		pterm.Info.Println("Zipping extension directory...")
 	}
 
-	// Use new extension-specific zip function
-	stats, err := util.ZipExtensionDirectory(absDir, tmpFile, &util.ExtensionZipOptions{
-		ExcludeDefaults: false, // Apply defaults
-	})
-	if err != nil {
+	if err := util.ZipDirectory(absDir, tmpFile, &defaultExtensionExclusions); err != nil {
 		pterm.Error.Println("Failed to zip directory")
 		return err
 	}
 	defer os.Remove(tmpFile)
 
-	// Get zip file size
 	fileInfo, err := os.Stat(tmpFile)
 	if err != nil {
 		return fmt.Errorf("failed to stat zip: %w", err)
 	}
 
 	if in.Output != "json" {
-		pterm.Success.Printf("Created bundle: %s (%d files)\n",
-			util.FormatBytes(fileInfo.Size()), stats.FilesIncluded)
+		pterm.Success.Printf("Created bundle: %s\n", util.FormatBytes(fileInfo.Size()))
 	}
 
-	// Final size validation
-
-	if fileInfo.Size() > MaxExtensionSize {
+	if fileInfo.Size() > MaxExtensionSizeBytes {
 		pterm.Error.Printf("Extension bundle is too large: %s (max: 50MB)\n",
 			util.FormatBytes(fileInfo.Size()))
 		pterm.Info.Println("\nSuggestions to reduce size:")
@@ -343,14 +353,12 @@ func (e ExtensionsCmd) Upload(ctx context.Context, in ExtensionsUploadInput) err
 		return fmt.Errorf("bundle exceeds maximum size")
 	}
 
-	// Open file for upload
 	f, err := os.Open(tmpFile)
 	if err != nil {
 		return fmt.Errorf("failed to open temp zip: %w", err)
 	}
 	defer f.Close()
 
-	// Upload
 	if in.Output != "json" {
 		pterm.Info.Println("Uploading extension...")
 	}
@@ -365,7 +373,6 @@ func (e ExtensionsCmd) Upload(ctx context.Context, in ExtensionsUploadInput) err
 		return util.CleanedUpSdkError{Err: err}
 	}
 
-	// Display results
 	if in.Output == "json" {
 		return util.PrintPrettyJSON(item)
 	}

pkg/util/zip.go

@@ -11,8 +11,16 @@ import (
 	"github.com/boyter/gocodewalker"
 )
 
+// ZipOptions which directories and files to exclude from the zip
+type ZipOptions struct {
+	// ExcludeDirectories: exact directory names to exclude (case-sensitive)
+	ExcludeDirectories []string
+	// ExcludeFilenamePatterns: glob patterns for filename exclusion (e.g., "*.test.js")
+	ExcludeFilenamePatterns []string
+}
+
 // ZipDirectory compresses the given source directory into the destination file path.
-func ZipDirectory(srcDir, destZip string) error {
+func ZipDirectory(srcDir, destZip string, opts *ZipOptions) error {
 	zipFile, err := os.Create(destZip)
 	if err != nil {
 		return err
@@ -28,9 +36,16 @@ func ZipDirectory(srcDir, destZip string) error {
 	// Include hidden files (to match previous behaviour) but still respect .gitignore rules
 	walker.IncludeHidden = true
 
-	// Start walking in a separate goroutine so we can process files as they arrive
+	// Apply directory exclusions to walker
+	if opts != nil {
+		walker.ExcludeDirectory = append(walker.ExcludeDirectory, opts.ExcludeDirectories...)
+	}
+
+	defer walker.Terminate()
+
+	errChan := make(chan error, 1)
 	go func() {
-		_ = walker.Start()
+		errChan <- walker.Start()
 	}()
 
 	// Track directories we've already added to the zip archive so we don't duplicate entries
@@ -44,6 +59,22 @@ func ZipDirectory(srcDir, destZip string) error {
 		}
 		relPath = filepath.ToSlash(relPath)
 
+		// Check against pattern-based exclusions if provided
+		if opts != nil && len(opts.ExcludeFilenamePatterns) > 0 {
+			filename := filepath.Base(f.Location)
+			shouldExclude := false
+			for _, pattern := range opts.ExcludeFilenamePatterns {
+				matched, err := filepath.Match(pattern, filename)
+				if err == nil && matched {
+					shouldExclude = true
+					break
+				}
+			}
+			if shouldExclude {
+				continue
+			}
+		}
+
 		// Ensure parent directories exist in the archive
 		if dir := filepath.Dir(relPath); dir != "." && dir != "" {
 			// Walk up the directory tree ensuring each level exists
@@ -115,6 +146,10 @@ func ZipDirectory(srcDir, destZip string) error {
 		}
 	}
 
+	if err := <-errChan; err != nil {
+		return fmt.Errorf("directory walk failed: %w", err)
+	}
+
 	return nil
 }