Skip to content

Commit

Permalink
[KRV-21281] Upgrade goclient libraries and fix linting (#125)
Browse files Browse the repository at this point in the history 
* [KRV-21281] Update go.mod and go.sum

* [KRV-21281] Fix lint issues

* [KRV-21281] Add toolchain
  • Loading branch information
@EvgenyUglov
EvgenyUglov authored Mar 1, 2024
1 parent 49ab804 commit 0c1c789
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 28 deletions.
2 changes: 1 addition & 1 deletion cmd/csi-migrator/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (mgr *MigratorManager) processConfigMapChanges(loggerConfig *logrus.Logger)
func (mgr *MigratorManager) setupConfigMapWatcher(loggerConfig *logrus.Logger) {
log.Println("Started ConfigMap Watcher")
viper.WatchConfig()
viper.OnConfigChange(func(e fsnotify.Event) {
viper.OnConfigChange(func(_ fsnotify.Event) {
mgr.processConfigMapChanges(loggerConfig)
})
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/csi-node-rescanner/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (mgr *NodeRescanner) processConfigMapChanges(loggerConfig *logrus.Logger) {
func (mgr *NodeRescanner) setupConfigMapWatcher(loggerConfig *logrus.Logger) {
log.Println("Started ConfigMap Watcher")
viper.WatchConfig()
viper.OnConfigChange(func(e fsnotify.Event) {
viper.OnConfigChange(func(_ fsnotify.Event) {
mgr.processConfigMapChanges(loggerConfig)
})
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/csi-replicator/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (mgr *ReplicatorManager) processConfigMapChanges(loggerConfig *logrus.Logge
func (mgr *ReplicatorManager) setupConfigMapWatcher(loggerConfig *logrus.Logger) {
log.Println("Started ConfigMap Watcher")
viper.WatchConfig()
viper.OnConfigChange(func(e fsnotify.Event) {
viper.OnConfigChange(func(_ fsnotify.Event) {
mgr.processConfigMapChanges(loggerConfig)
})
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/replication-controller/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (mgr *ControllerManager) processConfigMapChanges(loggerConfig *logrus.Logge
func (mgr *ControllerManager) setupConfigMapWatcher(loggerConfig *logrus.Logger) {
log.Println("Started ConfigMap Watcher")
viper.WatchConfig()
viper.OnConfigChange(func(e fsnotify.Event) {
viper.OnConfigChange(func(_ fsnotify.Event) {
mgr.processConfigMapChanges(loggerConfig)
})
}
Expand Down
16 changes: 9 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ module github.com/dell/csm-replication

go 1.22

toolchain go1.22.0

require (
github.com/bombsimon/logrusr/v4 v4.0.0
github.com/dell/dell-csi-extensions/common v1.3.0
github.com/dell/dell-csi-extensions/migration v1.3.0
github.com/dell/dell-csi-extensions/replication v1.6.0
github.com/dell/gobrick v1.9.0
github.com/dell/dell-csi-extensions/common v1.4.0
github.com/dell/dell-csi-extensions/migration v1.4.0
github.com/dell/dell-csi-extensions/replication v1.7.0
github.com/dell/gobrick v1.10.0
github.com/fatih/color v1.15.0
github.com/fsnotify/fsnotify v1.6.0
github.com/go-chi/chi v1.5.4
Expand Down Expand Up @@ -37,8 +39,8 @@ require (
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dell/goiscsi v1.8.0 // indirect
github.com/dell/gonvme v1.5.0 // indirect
github.com/dell/goiscsi v1.9.0 // indirect
github.com/dell/gonvme v1.7.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
Expand Down Expand Up @@ -119,7 +121,7 @@ require (
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
28 changes: 14 additions & 14 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,18 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
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/dell/dell-csi-extensions/common v1.3.0 h1:8QqCaf1E4Y4gJxGk6+wYFbW8uOpNH8vxBvbXOXeU/UM=
github.com/dell/dell-csi-extensions/common v1.3.0/go.mod h1:RLDVq6tz2yVzsX804Daopj/JBB147uqH2NKx6O3G0vA=
github.com/dell/dell-csi-extensions/migration v1.3.0 h1:eyWYQLUNLxna6adpqQHZsBpYsuqwtE4fQNrjkZ0sClw=
github.com/dell/dell-csi-extensions/migration v1.3.0/go.mod h1:qlsRHUJv3cWdIdmgk9S8Ap0WCYDv+cFv1MvaJMyc8uo=
github.com/dell/dell-csi-extensions/replication v1.6.0 h1:KdCstIeI50tKkKT6/OTZG7d3bgb8QZ9r4/BIGmshEDY=
github.com/dell/dell-csi-extensions/replication v1.6.0/go.mod h1:/hdPGCicZU254Ltr4nsvCn4E+XoC+1FDsmCFn9qNoU4=
github.com/dell/gobrick v1.9.0 h1:kx69ygz1QV/uCAyIx9pX9gqiwDK7I4WOv5ZUs2zcfPg=
github.com/dell/gobrick v1.9.0/go.mod h1:NK9V+t6LYMWAgHaT4hJiv8FYQdsWzZDz78hir6GAiTI=
github.com/dell/goiscsi v1.8.0 h1:kocGVOdgnufc6eGpfmwP66hyhY7OVgIafaS/+uM6ogU=
github.com/dell/goiscsi v1.8.0/go.mod h1:PTlQGJaGKYgia95mGwwHSBgvfOr3BfLIjGNh1HT6p+s=
github.com/dell/gonvme v1.5.0 h1:n73WeQSFaVOlAqjhtk5T3pbu7eZgMTLpPo8/8JymOJ8=
github.com/dell/gonvme v1.5.0/go.mod h1:7MFbd7lWSaQwR5pf9ZnVZqhkAKkveSwQEO67jDBZuX0=
github.com/dell/dell-csi-extensions/common v1.4.0 h1:vZcKvr5EEZa4Gh2JRHSMR2xAES4C1yoZ1MMUrmAQwaA=
github.com/dell/dell-csi-extensions/common v1.4.0/go.mod h1:TEVaeIg7Yk1d1HorzFGiHyJhtaIPuSZc/gn1wZM0HhM=
github.com/dell/dell-csi-extensions/migration v1.4.0 h1:3KINn0kRW58YsyFdeEqVz02BtXYvDL7TXK5SngKUKcA=
github.com/dell/dell-csi-extensions/migration v1.4.0/go.mod h1:HeC8UO4P7SMSv6yvAM9u6RJSaPn5wcKGyO+/6fN2OuQ=
github.com/dell/dell-csi-extensions/replication v1.7.0 h1:kBIN91grXev54CyRFB17nVwFUSagG5y1RZB/4WWbATc=
github.com/dell/dell-csi-extensions/replication v1.7.0/go.mod h1:gYaWz/MpCxaXxzXYdXaJqYA7QXIyg4OaFT3vff6d46Y=
github.com/dell/gobrick v1.10.0 h1:qqR2mmgchxRny/LWt2Ic59u3g/GHH8xs0bzQb7oS/DA=
github.com/dell/gobrick v1.10.0/go.mod h1:FmMjKJLH/E/+Awo3QNh+3mhMHSNJQkQLkH8klje8Cmg=
github.com/dell/goiscsi v1.9.0 h1:VvMHbAO4vk80oc/TAbQPYlxysscCqVBW78GyPoUxgik=
github.com/dell/goiscsi v1.9.0/go.mod h1:NI/W/0O1UrMW2zVdMxy4z395Jn0r7utH6RQDFSZiFyQ=
github.com/dell/gonvme v1.7.0 h1:ztJFhKQehZjfaoNv+hTbGbdhLWCAhPE44k1v7x5o2c0=
github.com/dell/gonvme v1.7.0/go.mod h1:ajbuF+fswq+ty2tRTG5FN4ecIMJsG7aDu/bkMynTKAs=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down Expand Up @@ -1064,8 +1064,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
4 changes: 3 additions & 1 deletion repctl/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ module github.com/dell/repctl

go 1.22

toolchain go1.22.0

replace github.com/dell/csm-replication => ../

require (
Expand Down Expand Up @@ -73,7 +75,7 @@ require (
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions repctl/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down

0 comments on commit 0c1c789

Please sign in to comment.