Refactor xattr error handling in exec_binfmt to use a single error handler function

Signed-off-by: Tiger Kaovilai <[email protected]>

Author: kaovilai

solver/llbsolver/ops/exec_binfmt.go

@@ -65,16 +65,15 @@ func (m *staticEmulatorMount) Mount() ([]mount.Mount, func() error, error) {
 	if err := copy.Copy(context.TODO(), filepath.Dir(m.path), filepath.Base(m.path), tmpdir, qemuMountName, func(ci *copy.CopyInfo) {
 		m := 0555
 		ci.Mode = &m
-		ci.XAttrErrorHandler = func(dst, src, xattrKey string, err error) error {
-			// Ignore ENOTSUP (operation not supported) errors when copying xattrs
-			// This is needed for systems with SELinux enabled where security.selinux
-			// xattrs cannot be modified
-			if errors.Is(err, syscall.ENOTSUP) {
-				return nil
-			}
-			return err
+	}, copy.WithChown(uid, gid), copy.WithXAttrErrorHandler(func(dst, src, xattrKey string, err error) error {
+		// Ignore ENOTSUP (operation not supported) errors when copying xattrs
+		// This is needed for systems with SELinux enabled where security.selinux
+		// xattrs cannot be modified
+		if errors.Is(err, syscall.ENOTSUP) {
+			return nil
 		}
-	}, copy.WithChown(uid, gid)); err != nil {
+		return err
+	})); err != nil {
 		return nil, nil, err
 	}
 

solver/llbsolver/ops/exec_binfmt_test.go

@@ -11,40 +11,40 @@ import (
 // TestXAttrErrorHandler tests the XAttrErrorHandler logic used in exec_binfmt.go
 func TestXAttrErrorHandler(t *testing.T) {
 	tests := []struct {
-		name        string
-		inputErr    error
+		name         string
+		inputErr     error
 		shouldIgnore bool
-		description string
+		description  string
 	}{
 		{
-			name:        "ENOTSUP error should be ignored",
-			inputErr:    syscall.ENOTSUP,
+			name:         "ENOTSUP error should be ignored",
+			inputErr:     syscall.ENOTSUP,
 			shouldIgnore: true,
-			description: "ENOTSUP errors occur on SELinux systems and should be ignored",
+			description:  "ENOTSUP errors occur on SELinux systems and should be ignored",
 		},
 		{
-			name:        "errors.Is should work with wrapped ENOTSUP",
-			inputErr:    errors.Wrap(syscall.ENOTSUP, "failed to set xattr"),
+			name:         "errors.Is should work with wrapped ENOTSUP",
+			inputErr:     errors.Wrap(syscall.ENOTSUP, "failed to set xattr"),
 			shouldIgnore: true,
-			description: "Wrapped ENOTSUP errors should also be ignored",
+			description:  "Wrapped ENOTSUP errors should also be ignored",
 		},
 		{
-			name:        "EPERM error should not be ignored",
-			inputErr:    syscall.EPERM,
+			name:         "EPERM error should not be ignored",
+			inputErr:     syscall.EPERM,
 			shouldIgnore: false,
-			description: "Other permission errors should be propagated",
+			description:  "Other permission errors should be propagated",
 		},
 		{
-			name:        "EIO error should not be ignored",
-			inputErr:    syscall.EIO,
+			name:         "EIO error should not be ignored",
+			inputErr:     syscall.EIO,
 			shouldIgnore: false,
-			description: "I/O errors should be propagated",
+			description:  "I/O errors should be propagated",
 		},
 		{
-			name:        "nil error should return nil",
-			inputErr:    nil,
+			name:         "nil error should return nil",
+			inputErr:     nil,
 			shouldIgnore: true,
-			description: "nil errors should return nil",
+			description:  "nil errors should return nil",
 		},
 	}
 
@@ -59,7 +59,7 @@ func TestXAttrErrorHandler(t *testing.T) {
 			}
 
 			result := handler("dst", "src", "security.selinux", tt.inputErr)
-			
+
 			if tt.shouldIgnore {
 				require.NoError(t, result, tt.description)
 			} else {
@@ -68,4 +68,4 @@ func TestXAttrErrorHandler(t *testing.T) {
 			}
 		})
 	}
-}
+}