Replace funk package by custom utility

Co-authored-by: Sven Seeberg <[email protected]>
Co-authored-by: Giuliano Mele <[email protected]>

Author: melegiul

go.mod

@@ -106,7 +106,6 @@ require (
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
-	github.com/thoas/go-funk v0.8.0
 	github.com/tstranex/u2f v1.0.0
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/unknwon/com v1.0.1

go.sum

@@ -1018,8 +1018,6 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/thoas/go-funk v0.8.0 h1:JP9tKSvnpFVclYgDM0Is7FD9M4fhPvqA0s0BsXmzSRQ=
-github.com/thoas/go-funk v0.8.0/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=

modules/auth/ldap/ldap.go

@@ -14,9 +14,9 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/util"
 
 	"github.com/go-ldap/ldap/v3"
-	"github.com/thoas/go-funk"
 )
 
 // SecurityProtocol protocol type
@@ -273,7 +273,7 @@ func (ls *Source) mapLdapGroupsToTeams() map[string]map[string][]string {
 	ldapGroupsToTeams := make(map[string]map[string][]string)
 	err := json.Unmarshal([]byte(ls.TeamGroupMap), &ldapGroupsToTeams)
 	if err != nil {
-		log.Debug("Failed to unmarshall LDAP teams map: %v", err)
+		log.Error("Failed to unmarshall LDAP teams map: %v", err)
 		return ldapGroupsToTeams
 	}
 	return ldapGroupsToTeams
@@ -287,11 +287,11 @@ func (ls *Source) getMappedTeams(l *ldap.Conn, uid string) (map[string][]string,
 	// unmarshall LDAP group team map from configs
 	ldapGroupsToTeams := ls.mapLdapGroupsToTeams()
 	// select all LDAP groups from settings
-	allLdapGroups := funk.Keys(ldapGroupsToTeams).([]string)
+	allLdapGroups := util.KeysString(ldapGroupsToTeams).([]string)
 	// contains LDAP config groups, which the user is a member of
-	usersLdapGroupsToAdd := funk.IntersectString(allLdapGroups, usersLdapGroups)
+	usersLdapGroupsToAdd := util.IntersectString(allLdapGroups, usersLdapGroups)
 	// contains LDAP config groups, which the user is not a member of
-	usersLdapGroupToRemove, _ := funk.DifferenceString(allLdapGroups, usersLdapGroups)
+	usersLdapGroupToRemove := util.DifferenceString(allLdapGroups, usersLdapGroups)
 	for _, groupToAdd := range usersLdapGroupsToAdd {
 		for k, v := range ldapGroupsToTeams[groupToAdd] {
 			teamsToAdd[k] = v

modules/util/map.go

@@ -0,0 +1,26 @@
+// Copyright 2021 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package util
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// KeysString returns a slice of keys from a map, dict must be a map
+func KeysString(dict interface{}) interface{} {
+	value := reflect.ValueOf(dict)
+	valueType := value.Type()
+	if value.Kind() == reflect.Map {
+		keys := value.MapKeys()
+		length := len(keys)
+		resultSlice := reflect.MakeSlice(reflect.SliceOf(valueType.Key()), length, length)
+		for i, key := range keys {
+			resultSlice.Index(i).Set(key)
+		}
+		return resultSlice.Interface()
+	}
+	panic(fmt.Sprintf("Type %s is not supported by KeysString", valueType.String()))
+}

modules/util/slice.go

@@ -0,0 +1,27 @@
+// Copyright 2021 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package util
+
+// IntersectString returns the intersection of the two string slices
+func IntersectString(a, b []string) []string {
+	var intersection []string
+	for _, v := range a {
+		if ExistsInSlice(v, b) && !ExistsInSlice(v, intersection) {
+			intersection = append(intersection, v)
+		}
+	}
+	return intersection
+}
+
+// DifferenceString returns all elements of slice a which are not present in slice b
+func DifferenceString(a, b []string) []string {
+	var difference []string
+	for _, v := range a {
+		if !ExistsInSlice(v, b) && !ExistsInSlice(v, difference) {
+			difference = append(difference, v)
+		}
+	}
+	return difference
+}