Skip to content

Commit d2decb7

Browse files
xulunaxuluna
authored
Update goisilon version (#43)
* update version * fix lint * fix lint
1 parent bb823f4 commit d2decb7

File tree

10 files changed

+47
-27
lines changed

10 files changed

+47
-27
lines changed

‎.github/workflows/linters.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: |
2525
go mod vendor
2626
- name: golangci-lint
27-
uses: golangci/golangci-lint-action@v3
27+
uses: golangci/golangci-lint-action@v4
2828
with:
29-
version: v1.53
29+
version: latest
3030
skip-cache: true

‎cmd/metrics-powerscale/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func main() {
124124
updateService(powerScaleSvc, logger)
125125

126126
viper.WatchConfig()
127-
viper.OnConfigChange(func(e fsnotify.Event) {
127+
viper.OnConfigChange(func(_ fsnotify.Event) {
128128
updateLoggingSettings(logger)
129129
updateCollectorAddress(config, exporter, logger)
130130
updatePowerScaleConnection(powerScaleSvc, storageClassFinder, volumeFinder, logger)
@@ -134,7 +134,7 @@ func main() {
134134
})
135135

136136
configFileListener.WatchConfig()
137-
configFileListener.OnConfigChange(func(e fsnotify.Event) {
137+
configFileListener.OnConfigChange(func(_ fsnotify.Event) {
138138
updatePowerScaleConnection(powerScaleSvc, storageClassFinder, volumeFinder, logger)
139139
})
140140

‎go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/dell/csm-metrics-powerscale
33
go 1.22
44

55
require (
6-
github.com/dell/goisilon v1.14.0
6+
github.com/dell/goisilon v1.15.0
77
github.com/fsnotify/fsnotify v1.6.0
88
github.com/golang/mock v1.6.0
99
github.com/gorilla/mux v1.8.0
@@ -23,7 +23,9 @@ require (
2323
)
2424

2525
require (
26+
github.com/PuerkitoBio/goquery v1.8.1 // indirect
2627
github.com/akutz/gournal v0.5.0 // indirect
28+
github.com/andybalholm/cascadia v1.3.1 // indirect
2729
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
2830
github.com/davecgh/go-spew v1.1.1 // indirect
2931
github.com/evanphx/json-patch v4.12.0+incompatible // indirect

‎go.sum

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,14 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
5050
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
5151
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
5252
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
53+
github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
54+
github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
5355
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
5456
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
5557
github.com/akutz/gournal v0.5.0 h1:ELlKqTTp9dmaaadDvO19YxUmdMghYuSi23AxoSL/g98=
5658
github.com/akutz/gournal v0.5.0/go.mod h1:w7Ucz8IOvtgsEL1321IY8bIUoASU/khBjAy/L6doMWc=
59+
github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
60+
github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
5761
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
5862
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
5963
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
@@ -80,8 +84,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
8084
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8185
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8286
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
83-
github.com/dell/goisilon v1.14.0 h1:G3WhObKnMKdt9mnMmu8w9B/JAvw1joVC/bGOJSGPjNA=
84-
github.com/dell/goisilon v1.14.0/go.mod h1:QRHAIdy9lev8BoJiCJYPd9xI8+Xr00tmrEs0B5N3mwI=
87+
github.com/dell/goisilon v1.15.0 h1:GmmQlCzDJar+cYxBf/mUzdB81+OwVj3t42WKMYfkYG8=
88+
github.com/dell/goisilon v1.15.0/go.mod h1:WGF3cnY9OL3tIN+Bv0xYUrqgSmR/YsvsReYvs2Wb5fA=
8589
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
8690
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
8791
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -319,6 +323,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
319323
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
320324
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
321325
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
326+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
322327
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
323328
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
324329
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -353,6 +358,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
353358
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
354359
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
355360
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
361+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
356362
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
357363
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
358364
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -388,6 +394,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
388394
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
389395
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
390396
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
397+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
391398
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
392399
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
393400
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -427,7 +434,10 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
427434
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
428435
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
429436
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
437+
golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
430438
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
439+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
440+
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
431441
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
432442
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
433443
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -456,6 +466,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
456466
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
457467
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
458468
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
469+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
459470
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
460471
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
461472
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -505,12 +516,17 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
505516
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
506517
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
507518
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
519+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
508520
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
521+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
509522
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
523+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
510524
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
511525
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
512526
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
513527
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
528+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
529+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
514530
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
515531
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
516532
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -522,6 +538,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
522538
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
523539
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
524540
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
541+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
525542
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
526543
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
527544
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -583,6 +600,7 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
583600
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
584601
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
585602
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
603+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
586604
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
587605
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
588606
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎internal/common/common_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func getHandler() http.Handler {
107107

108108
func getRouter() http.Handler {
109109
isilonRouter := mux.NewRouter()
110-
isilonRouter.HandleFunc("/platform/latest/", func(w http.ResponseWriter, r *http.Request) {
110+
isilonRouter.HandleFunc("/platform/latest/", func(w http.ResponseWriter, _ *http.Request) {
111111
w.Write([]byte("{\"latest\": \"14\"}"))
112112
})
113113
return isilonRouter

‎internal/k8s/k8sapi_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ func Test_GetPersistentVolumes(t *testing.T) {
3939
type configFn func() (*rest.Config, error)
4040
check := func(fns ...checkFn) []checkFn { return fns }
4141

42-
hasNoError := func(t *testing.T, volumes *corev1.PersistentVolumeList, err error) {
42+
hasNoError := func(t *testing.T, _ *corev1.PersistentVolumeList, err error) {
4343
if err != nil {
4444
t.Fatalf("expected no error")
4545
}
4646
}
4747

4848
checkExpectedOutput := func(expectedOutput *corev1.PersistentVolumeList) func(t *testing.T, volumes *corev1.PersistentVolumeList, err error) {
49-
return func(t *testing.T, volumes *corev1.PersistentVolumeList, err error) {
49+
return func(t *testing.T, volumes *corev1.PersistentVolumeList, _ error) {
5050
assert.Equal(t, expectedOutput, volumes)
5151
}
5252
}
5353

54-
hasError := func(t *testing.T, volumes *corev1.PersistentVolumeList, err error) {
54+
hasError := func(t *testing.T, _ *corev1.PersistentVolumeList, err error) {
5555
if err == nil {
5656
t.Fatalf("expected error")
5757
}
@@ -75,7 +75,7 @@ func Test_GetPersistentVolumes(t *testing.T) {
7575
return connect, nil, check(hasNoError, checkExpectedOutput(volumes))
7676
},
7777
"error connecting": func(*testing.T) (connectFn, configFn, []checkFn) {
78-
connect := func(api *k8s.API) error {
78+
connect := func(_ *k8s.API) error {
7979
return errors.New("error")
8080
}
8181
return connect, nil, check(hasError)
@@ -115,19 +115,19 @@ func Test_GetStorageClasses(t *testing.T) {
115115
type configFn func() (*rest.Config, error)
116116
check := func(fns ...checkFn) []checkFn { return fns }
117117

118-
hasNoError := func(t *testing.T, volumes *v1.StorageClassList, err error) {
118+
hasNoError := func(t *testing.T, _ *v1.StorageClassList, err error) {
119119
if err != nil {
120120
t.Fatalf("expected no error")
121121
}
122122
}
123123

124124
checkExpectedOutput := func(expectedOutput *v1.StorageClassList) func(t *testing.T, volumes *v1.StorageClassList, err error) {
125-
return func(t *testing.T, volumes *v1.StorageClassList, err error) {
125+
return func(t *testing.T, volumes *v1.StorageClassList, _ error) {
126126
assert.Equal(t, expectedOutput, volumes)
127127
}
128128
}
129129

130-
hasError := func(t *testing.T, volumes *v1.StorageClassList, err error) {
130+
hasError := func(t *testing.T, _ *v1.StorageClassList, err error) {
131131
if err == nil {
132132
t.Fatalf("expected error")
133133
}
@@ -159,7 +159,7 @@ func Test_GetStorageClasses(t *testing.T) {
159159
return connect, nil, check(hasNoError, checkExpectedOutput(storageClasses))
160160
},
161161
"error connecting": func(*testing.T) (connectFn, configFn, []checkFn) {
162-
connect := func(api *k8s.API) error {
162+
connect := func(_ *k8s.API) error {
163163
return errors.New("error")
164164
}
165165
return connect, nil, check(hasError)
@@ -212,7 +212,7 @@ func Test_NewForConfigError(t *testing.T) {
212212
oldNewConfigFn := k8s.NewConfigFn
213213
defer func() { k8s.NewConfigFn = oldNewConfigFn }()
214214
expected := "could not create Clientset from KubeConfig"
215-
k8s.NewConfigFn = func(config *rest.Config) (*kubernetes.Clientset, error) {
215+
k8s.NewConfigFn = func(_ *rest.Config) (*kubernetes.Clientset, error) {
216216
return nil, fmt.Errorf(expected)
217217
}
218218

‎internal/k8s/leader_elector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (elect *LeaderElector) InitLeaderElection(endpoint string, namespace string
6363
Callbacks: leaderelection.LeaderCallbacks{
6464
OnStartedLeading: func(context.Context) {},
6565
OnStoppedLeading: func() {},
66-
OnNewLeader: func(identity string) {},
66+
OnNewLeader: func(_ string) {},
6767
},
6868
Lock: &resourcelock.EndpointsLock{
6969
EndpointsMeta: metav1.ObjectMeta{

‎internal/k8s/leader_elector_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func Test_InitLeaderElection(t *testing.T) {
5353
return nil, nil
5454
}
5555

56-
clientset := func(config *rest.Config) (*kubernetes.Clientset, error) {
56+
clientset := func(_ *rest.Config) (*kubernetes.Clientset, error) {
5757
return nil, errors.New("error")
5858
}
5959

@@ -64,11 +64,11 @@ func Test_InitLeaderElection(t *testing.T) {
6464
return nil, nil
6565
}
6666

67-
clientset := func(config *rest.Config) (*kubernetes.Clientset, error) {
67+
clientset := func(_ *rest.Config) (*kubernetes.Clientset, error) {
6868
mockClientset := &kubernetes.Clientset{}
6969
return mockClientset, nil
7070
}
71-
leaderelection := func(lec leaderelection.LeaderElectionConfig) (*leaderelection.LeaderElector, error) {
71+
leaderelection := func(_ leaderelection.LeaderElectionConfig) (*leaderelection.LeaderElector, error) {
7272
return nil, errors.New("error")
7373
}
7474
return configFn, clientset, leaderelection, check(hasError)

‎internal/k8s/storageclass_finder_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ func Test_K8sStorageClassFinder(t *testing.T) {
3535
type checkFn func(*testing.T, []v1.StorageClass, error)
3636
check := func(fns ...checkFn) []checkFn { return fns }
3737

38-
hasNoError := func(t *testing.T, storageClasses []v1.StorageClass, err error) {
38+
hasNoError := func(t *testing.T, _ []v1.StorageClass, err error) {
3939
if err != nil {
4040
t.Fatalf("expected no error")
4141
}
4242
}
4343

4444
checkExpectedOutput := func(expectedOutput []v1.StorageClass) func(t *testing.T, storageClasses []v1.StorageClass, err error) {
45-
return func(t *testing.T, storageClasses []v1.StorageClass, err error) {
45+
return func(t *testing.T, storageClasses []v1.StorageClass, _ error) {
4646
assert.Equal(t, expectedOutput, storageClasses)
4747
}
4848
}
4949

50-
hasError := func(t *testing.T, volumes []v1.StorageClass, err error) {
50+
hasError := func(t *testing.T, _ []v1.StorageClass, err error) {
5151
if err == nil {
5252
t.Fatalf("expected error")
5353
}

‎internal/k8s/volume_finder_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ func Test_K8sPersistentVolumeFinder(t *testing.T) {
3838
type checkFn func(*testing.T, []k8s.VolumeInfo, error)
3939
check := func(fns ...checkFn) []checkFn { return fns }
4040

41-
hasNoError := func(t *testing.T, volumes []k8s.VolumeInfo, err error) {
41+
hasNoError := func(t *testing.T, _ []k8s.VolumeInfo, err error) {
4242
if err != nil {
4343
t.Fatalf("expected no error")
4444
}
4545
}
4646

4747
checkExpectedOutput := func(expectedOutput []k8s.VolumeInfo) func(t *testing.T, volumes []k8s.VolumeInfo, err error) {
48-
return func(t *testing.T, volumes []k8s.VolumeInfo, err error) {
48+
return func(t *testing.T, volumes []k8s.VolumeInfo, _ error) {
4949
assert.Equal(t, expectedOutput, volumes)
5050
}
5151
}
5252

53-
hasError := func(t *testing.T, volumes []k8s.VolumeInfo, err error) {
53+
hasError := func(t *testing.T, _ []k8s.VolumeInfo, err error) {
5454
if err == nil {
5555
t.Fatalf("expected error")
5656
}

0 commit comments

Comments
 (0)