Merge pull request #75 from NETWAYS/chore/remove-logrus

Remove logrus dependency
NETWAYS · Oct 2, 2023 · 3fac9ac · 3fac9ac
2 parents 0a4ca32 + 4923249
commit 3fac9ac
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 32 deletions.
diff --git a/go.mod b/go.mod
@@ -7,14 +7,12 @@ require (
 	github.com/gosnmp/gosnmp v1.36.1
 	github.com/hashicorp/go-version v1.6.0
 	github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2
-	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.8.4
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -11,20 +11,15 @@ github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2 h1:YocNLcTBdEd
 github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo=
 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/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 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.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

diff --git a/snmp/table.go b/snmp/table.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/gosnmp/gosnmp"
 	"github.com/mcuadros/go-version"
-	log "github.com/sirupsen/logrus"
 )
 
 type Table struct {
@@ -29,10 +28,6 @@ func (t *Table) Reset() {
 func (t *Table) Walk() error {
 	t.Reset()
 
-	log.WithFields(log.Fields{
-		"oid": t.Oid,
-	}).Debug("Starting walk for table")
-
 	if err := t.Client.Walk(t.Oid, t.addWalkValue); err != nil {
 		return err
 	}
@@ -41,10 +36,6 @@ func (t *Table) Walk() error {
 		return fmt.Errorf("no data retrieved in walk for table: %s", t.Oid)
 	}
 
-	log.WithFields(log.Fields{
-		"tableValues": t.Values,
-	}).Debug("read table data from SNMP walk")
-
 	return nil
 }
 
@@ -71,17 +62,10 @@ func (t *Table) addWalkValue(data gosnmp.SnmpPDU) error {
 		return fmt.Errorf("could not identify entry, column and id in oid: %s", data.Name)
 	}
 
-	entry := parts[0]
+	// entry := parts[0]
 	column := parts[1]
 	id := strings.Join(parts[2:], ".")
 
-	log.WithFields(log.Fields{
-		"oid":    data.Name,
-		"entry":  entry,
-		"column": column,
-		"id":     id,
-	}).Debug("Reading PDU data")
-
 	if _, ok := t.Values[id]; !ok {
 		t.Values[id] = TableColumns{}
 	}

diff --git a/snmp/table_test.go b/snmp/table_test.go
@@ -1,17 +1,11 @@
 package snmp
 
 import (
-	log "github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
-)
 
-func init() {
-	if os.Getenv("SNMP_DEBUG") != "" {
-		log.SetLevel(log.DebugLevel)
-	}
-}
+	"github.com/stretchr/testify/assert"
+)
 
 func TestSnmpTable_Walk(t *testing.T) {
 	if os.Getenv("NETWORK_TESTS_ENABLED") == "" {