From 2754e1d8ae8755353041912809118d758938a684 Mon Sep 17 00:00:00 2001 From: Dima Lampsi Date: Tue, 30 Apr 2024 16:19:09 +0300 Subject: [PATCH 1/2] Using the built-in slices library --- go.mod | 4 ---- go.sum | 10 ---------- group.go | 4 ++-- mock.go | 4 ++-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index cd45676..1dc58d5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/dlampsi/adc go 1.19 require ( - github.com/dlampsi/generigo v1.6.0 github.com/go-ldap/ldap/v3 v3.4.8 github.com/stretchr/testify v1.9.0 ) @@ -13,9 +12,6 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect golang.org/x/crypto v0.21.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 1fa40d5..9195983 100644 --- a/go.sum +++ b/go.sum @@ -5,13 +5,10 @@ github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1L github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dlampsi/generigo v1.6.0 h1:gjjN+6Z/VRigb3kPe/uRaLLwCcqzO2VfkjboAlEaMk8= -github.com/dlampsi/generigo v1.6.0/go.mod h1:BQmuRiD0ZNeR35SGgi8J5MBtsd65a2DtbqGUxM5fzSM= github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA= github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-ldap/ldap/v3 v3.4.8 h1:loKJyspcRezt2Q3ZRMq2p/0v8iOurlmeXDPw6fikSvQ= github.com/go-ldap/ldap/v3 v3.4.8/go.mod h1:qS3Sjlu76eHfHGpUdWkAXQTw4beih+cHsco2jXlIXrk= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= @@ -31,18 +28,11 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= diff --git a/group.go b/group.go index e2801bb..3d07614 100644 --- a/group.go +++ b/group.go @@ -3,9 +3,9 @@ package adc import ( "errors" "fmt" + "slices" "sync" - "github.com/dlampsi/generigo" "github.com/go-ldap/ldap/v3" ) @@ -296,7 +296,7 @@ func (cl *Client) DeleteGroupMembers(groupId string, membersIds ...string) (int, func popDelGroupMembers(g *Group, toDel []string) []string { result := []string{} for _, memberDN := range g.MembersDn() { - if !generigo.StringInSlice(memberDN, toDel) { + if !slices.Contains(toDel, memberDN) { result = append(result, memberDN) } } diff --git a/mock.go b/mock.go index 9ea1015..921f86c 100644 --- a/mock.go +++ b/mock.go @@ -4,9 +4,9 @@ import ( "context" "crypto/tls" "errors" + "slices" "time" - "github.com/dlampsi/generigo" "github.com/go-ldap/ldap/v3" ) @@ -165,7 +165,7 @@ func (cl *mockClient) getEntriesByFilter(filter string) ([]*ldap.Entry, error) { var result []*ldap.Entry for id, entry := range cl.entries { filters := entry.GetAttributeValues(mockFiltersAttribute) - if generigo.StringInSlice(filter, filters) { + if slices.Contains(filters, filter) { if id == "entryForErr" { return nil, errors.New("error for tests") } From 2f58921d398340a1d2c328802241c91772824c35 Mon Sep 17 00:00:00 2001 From: Dima Lampsi Date: Tue, 30 Apr 2024 16:21:55 +0300 Subject: [PATCH 2/2] Updating to go 1.21 --- .github/workflows/linter.yml | 2 +- .github/workflows/tests.yml | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 6e8991a..d958c43 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -19,7 +19,7 @@ jobs: - name: Setup uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f654474..84f2f1c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: 1.19 + go-version: 1.21 - name: Checkout uses: actions/checkout@v4 diff --git a/go.mod b/go.mod index 1dc58d5..5030616 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/dlampsi/adc -go 1.19 +go 1.21.1 require ( github.com/go-ldap/ldap/v3 v3.4.8