From 20c878d26db96fa7ea1a182c387f74d227872f9b Mon Sep 17 00:00:00 2001
From: Geoff Franks <geoff.franks@broadcom.com>
Date: Mon, 4 Nov 2024 18:54:59 +0000
Subject: [PATCH] use os.Filemode for type of our ArchiveFile modes and upcast
 to int64, rather than downcast int64 when writing to the filesystem
 permissions

---
 extractor/test_helper/archiver.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extractor/test_helper/archiver.go b/extractor/test_helper/archiver.go
index 1e12769..1d82ee4 100644
--- a/extractor/test_helper/archiver.go
+++ b/extractor/test_helper/archiver.go
@@ -14,7 +14,7 @@ import (
 type ArchiveFile struct {
 	Name   string
 	Body   string
-	Mode   int64
+	Mode   os.FileMode
 	Dir    bool
 	Link   string
 	Xattrs map[string]string
@@ -37,9 +37,9 @@ func CreateZipArchive(filename string, files []ArchiveFile) {
 		}
 
 		if file.Link != "" {
-			header.SetMode(os.FileMode(mode) | os.ModeSymlink)
+			header.SetMode(mode | os.ModeSymlink)
 		} else {
-			header.SetMode(os.FileMode(mode))
+			header.SetMode(mode)
 		}
 
 		f, err := w.CreateHeader(header)
@@ -107,12 +107,12 @@ func WriteTar(destination io.Writer, files []ArchiveFile) {
 				Name:     file.Name,
 				Typeflag: tar.TypeSymlink,
 				Linkname: file.Link,
-				Mode:     file.Mode,
+				Mode:     int64(file.Mode),
 			}
 		} else {
 			header = &tar.Header{
 				Name: file.Name,
-				Mode: mode,
+				Mode: int64(mode),
 				Size: int64(len(file.Body)),
 			}
 		}