Merge branch 'main' into fix-tar-gz-edge-case

egibs · web-flow · commit f270dc9b67f3 · 2024-12-20T08:12:27.000-06:00
diff --git a/pkg/archive/rpm.go b/pkg/archive/rpm.go
@@ -13,6 +13,7 @@ import (
 	"github.com/cavaliergopher/cpio"
 	"github.com/cavaliergopher/rpm"
 	"github.com/chainguard-dev/clog"
+	"github.com/klauspost/compress/zstd"
 	"github.com/ulikunitz/xz"
 )
 
@@ -60,6 +61,12 @@ func ExtractRPM(ctx context.Context, d, f string) error {
 			return fmt.Errorf("failed to create xz reader: %w", err)
 		}
 		cr = cpio.NewReader(xzStream)
+	case "zstd":
+		zstdStream, err := zstd.NewReader(rpmFile)
+		if err != nil {
+			return fmt.Errorf("failed to create zstd reader: %w", err)
+		}
+		cr = cpio.NewReader(zstdStream)
 	default:
 		return fmt.Errorf("unsupported compression format: %s", compression)
 	}

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`"github.com/cavaliergopher/cpio"`
`14`	`14`	`"github.com/cavaliergopher/rpm"`
`15`	`15`	`"github.com/chainguard-dev/clog"`
	`16`	`+ "github.com/klauspost/compress/zstd"`
`16`	`17`	`"github.com/ulikunitz/xz"`
`17`	`18`	`)`
`18`	`19`
`@@ -60,6 +61,12 @@ func ExtractRPM(ctx context.Context, d, f string) error {`
`60`	`61`	`return fmt.Errorf("failed to create xz reader: %w", err)`
`61`	`62`	`}`
`62`	`63`	`cr = cpio.NewReader(xzStream)`
	`64`	`+ case "zstd":`
	`65`	`+ zstdStream, err := zstd.NewReader(rpmFile)`
	`66`	`+ if err != nil {`
	`67`	`+ return fmt.Errorf("failed to create zstd reader: %w", err)`
	`68`	`+ }`
	`69`	`+ cr = cpio.NewReader(zstdStream)`
`63`	`70`	`default:`
`64`	`71`	`return fmt.Errorf("unsupported compression format: %s", compression)`
`65`	`72`	`}`