Merge pull request inspektor-gadget#2641 from inspektor-gadget/alban_…

…fix_ownership

pkg/oci: make fixMetadataOwner more generic

pkg/oci/build_metadata.go

@@ -129,7 +129,7 @@ func createOrUpdateMetadataFile(ctx context.Context, opts *BuildGadgetImageOpts)
 
 	// fix owner of created metadata file
 	if !update {
-		if err := fixMetadataOwner(opts); err != nil {
+		if err := fixOwner(opts.MetadataPath, opts.EBPFSourcePath); err != nil {
 			log.Warnf("Failed to fix metadata file owner: %v", err)
 		}
 	}

pkg/oci/build_metadata_linux.go → pkg/oci/fix_owner_linux.go

@@ -21,13 +21,13 @@ import (
 	"syscall"
 )
 
-func fixMetadataOwner(opts *BuildGadgetImageOpts) error {
-	info, err := os.Stat(opts.EBPFSourcePath)
+func fixOwner(targetFile, modelFile string) error {
+	info, err := os.Stat(modelFile)
 	if err != nil {
 		return err
 	}
 	if stat, ok := info.Sys().(*syscall.Stat_t); ok {
-		err := os.Chown(opts.MetadataPath, int(stat.Uid), int(stat.Gid))
+		err := os.Chown(targetFile, int(stat.Uid), int(stat.Gid))
 		if err != nil {
 			return err
 		}

pkg/oci/build_metadata_others.go → pkg/oci/fix_owner_others.go

@@ -18,6 +18,6 @@ package oci
 
 import "fmt"
 
-func fixMetadataOwner(opts *BuildGadgetImageOpts) error {
-	return fmt.Errorf("fixMetadataOwner not implemented on this platform")
+func fixOwner(_, _ string) error {
+	return fmt.Errorf("fixOwner not implemented on this platform")
 }