CWCOW: Fix rebase conflict

Signed-off-by: Mahati Chamarthy <[email protected]>

Author: MahatiC

pkg/securitypolicy/regopolicy_linux_test.go

@@ -5963,7 +5963,7 @@ func Test_Rego_GetUserInfo_WithEtcPasswdAndGroup(t *testing.T) {
 		t.Fatalf("Failed to write /etc/group: %v", err)
 	}
 
-	regoEnforcer, err := newRegoPolicy(openDoorRego, []oci.Mount{}, []oci.Mount{})
+	regoEnforcer, err := newRegoPolicy(openDoorRego, []oci.Mount{}, []oci.Mount{}, testOSType)
 	if err != nil {
 		t.Errorf("cannot compile open door rego policy: %v", err)
 		return
@@ -6116,7 +6116,7 @@ func Test_Rego_GetUserInfo_WithEtcPasswdAndGroup(t *testing.T) {
 func Test_Rego_GetUserInfo_NoEtc(t *testing.T) {
 	testDir := t.TempDir()
 
-	regoEnforcer, err := newRegoPolicy(openDoorRego, []oci.Mount{}, []oci.Mount{})
+	regoEnforcer, err := newRegoPolicy(openDoorRego, []oci.Mount{}, []oci.Mount{}, testOSType)
 	if err != nil {
 		t.Errorf("cannot compile open door rego policy: %v", err)
 		return
@@ -6197,7 +6197,7 @@ func Test_Rego_GetUserInfo_EtcPasswdOnly(t *testing.T) {
 		t.Fatalf("Failed to write /etc/passwd: %v", err)
 	}
 
-	regoEnforcer, err := newRegoPolicy(openDoorRego, []oci.Mount{}, []oci.Mount{})
+	regoEnforcer, err := newRegoPolicy(openDoorRego, []oci.Mount{}, []oci.Mount{}, testOSType)
 	if err != nil {
 		t.Errorf("cannot compile open door rego policy: %v", err)
 		return

pkg/securitypolicy/securitypolicy_linux.go

@@ -40,28 +40,7 @@ func HugePagesMountsDir(sandboxID string) string {
 	return specInternal.HugePagesMountsDir(sandboxID)
 }
 
-func getUser(passwdPath string, filter func(user.User) bool) (user.User, error) {
-	users, err := user.ParsePasswdFileFilter(passwdPath, filter)
-	if err != nil {
-		return user.User{}, err
-	}
-	if len(users) != 1 {
-		return user.User{}, errors.Errorf("expected exactly 1 user matched '%d'", len(users))
-	}
-	return users[0], nil
-}
-
-func getGroup(groupPath string, filter func(user.Group) bool) (user.Group, error) {
-	groups, err := user.ParseGroupFileFilter(groupPath, filter)
-	if err != nil {
-		return user.Group{}, err
-	}
-	if len(groups) != 1 {
-		return user.Group{}, errors.Errorf("expected exactly 1 group matched '%d'", len(groups))
-	}
-	return groups[0], nil
-}
-func (policy *regoEnforcer) GetAllUserInfo(process *oci.Process, rootPath string) (
+func GetAllUserInfo(process *oci.Process, rootPath string) (
 	userIDName IDName,
 	groupIDNames []IDName,
 	umask string,
@@ -130,7 +109,6 @@ func (policy *regoEnforcer) GetAllUserInfo(process *oci.Process, rootPath string
 			groupIDName.Name = groupInfo.Name
 		} else {
 			checkGroup = false
-			err = nil
 		}
 
 		groupIDNames = []IDName{groupIDName}