Skip to content

Commit 0432a95

Browse files
jjngxjjngx
authored
Fix issues reported by staticcheck (#6415)
1 parent 06d5e44 commit 0432a95

File tree

7 files changed

+26
-24
lines changed

7 files changed

+26
-24
lines changed

‎internal/certmanager/sync_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ func TestSync(t *testing.T) {
519519
t.Errorf("Not all expected reactors were called: %v", err)
520520
}
521521
if err := b.AllActionsExecuted(); err != nil {
522-
t.Errorf(err.Error())
522+
t.Error(err.Error())
523523
}
524524
}
525525
}

‎internal/certmanager/test_files/context_builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ func (b *Builder) CheckAndFinish(args ...interface{}) {
174174
b.T.Errorf("Not all expected reactors were called: %v", err)
175175
}
176176
if err := b.AllActionsExecuted(); err != nil {
177-
b.T.Errorf(err.Error())
177+
b.T.Error(err.Error())
178178
}
179179
if err := b.AllEventsCalled(); err != nil {
180-
b.T.Errorf(err.Error())
180+
b.T.Error(err.Error())
181181
}
182182

183183
// resync listers before running checks

‎internal/configs/virtualserver_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ func TestGenerateVirtualServerConfigWithBackupForNGINXPlus(t *testing.T) {
14791479

14801480
got, warnings := vsc.GenerateVirtualServerConfig(&virtualServerEx, nil, nil)
14811481
if !cmp.Equal(want, got) {
1482-
t.Errorf(cmp.Diff(want, got))
1482+
t.Error(cmp.Diff(want, got))
14831483
}
14841484
if len(warnings) != 0 {
14851485
t.Errorf("GenerateVirtualServerConfig returned warnings: %v", vsc.warnings)
@@ -1786,7 +1786,7 @@ func TestGenerateVirtualServerConfig_DoesNotGenerateBackupOnMissingBackupNameFor
17861786

17871787
got, warnings := vsc.GenerateVirtualServerConfig(&virtualServerEx, nil, nil)
17881788
if !cmp.Equal(want, got) {
1789-
t.Errorf(cmp.Diff(want, got))
1789+
t.Error(cmp.Diff(want, got))
17901790
}
17911791
if len(warnings) != 0 {
17921792
t.Errorf("GenerateVirtualServerConfig returned warnings: %v", vsc.warnings)
@@ -2092,7 +2092,7 @@ func TestGenerateVirtualServerConfig_DoesNotGenerateBackupOnMissingBackupPortFor
20922092

20932093
got, warnings := vsc.GenerateVirtualServerConfig(&virtualServerEx, nil, nil)
20942094
if !cmp.Equal(want, got) {
2095-
t.Errorf(cmp.Diff(want, got))
2095+
t.Error(cmp.Diff(want, got))
20962096
}
20972097
if len(warnings) != 0 {
20982098
t.Errorf("GenerateVirtualServerConfig returned warnings: %v", vsc.warnings)
@@ -2396,7 +2396,7 @@ func TestGenerateVirtualServerConfig_DoesNotGenerateBackupOnMissingBackupPortAnd
23962396

23972397
got, warnings := vsc.GenerateVirtualServerConfig(&virtualServerEx, nil, nil)
23982398
if !cmp.Equal(want, got) {
2399-
t.Errorf(cmp.Diff(want, got))
2399+
t.Error(cmp.Diff(want, got))
24002400
}
24012401
if len(warnings) != 0 {
24022402
t.Errorf("GenerateVirtualServerConfig returned warnings: %v", vsc.warnings)
@@ -6347,19 +6347,19 @@ func TestGenerateVirtualServerConfigAPIKeyClientMaps(t *testing.T) {
63476347
})
63486348

63496349
if !cmp.Equal(tc.expectedSpecAPIKey, vsConf.Server.APIKey) {
6350-
t.Errorf(cmp.Diff(tc.expectedSpecAPIKey, vsConf.Server.APIKey))
6350+
t.Error(cmp.Diff(tc.expectedSpecAPIKey, vsConf.Server.APIKey))
63516351
}
63526352

63536353
if !cmp.Equal(tc.expectedRoute1APIKey, vsConf.Server.Locations[0].APIKey) {
6354-
t.Errorf(cmp.Diff(tc.expectedRoute1APIKey, vsConf.Server.Locations[0].APIKey))
6354+
t.Error(cmp.Diff(tc.expectedRoute1APIKey, vsConf.Server.Locations[0].APIKey))
63556355
}
63566356

63576357
if !cmp.Equal(tc.expectedRoute2APIKey, vsConf.Server.Locations[1].APIKey) {
6358-
t.Errorf(cmp.Diff(tc.expectedRoute2APIKey, vsConf.Server.Locations[1].APIKey))
6358+
t.Error(cmp.Diff(tc.expectedRoute2APIKey, vsConf.Server.Locations[1].APIKey))
63596359
}
63606360

63616361
if !cmp.Equal(tc.expectedMapList, vsConf.Maps) {
6362-
t.Errorf(cmp.Diff(tc.expectedMapList, vsConf.Maps))
6362+
t.Error(cmp.Diff(tc.expectedMapList, vsConf.Maps))
63636363
}
63646364

63656365
if len(warnings) != 0 {
@@ -7161,7 +7161,7 @@ func TestGeneratePolicies(t *testing.T) {
71617161
result.BundleValidator = nil
71627162

71637163
if !cmp.Equal(tc.expected, result) {
7164-
t.Errorf(cmp.Diff(tc.expected, result))
7164+
t.Error(cmp.Diff(tc.expected, result))
71657165
}
71667166
if len(vsc.warnings) > 0 {
71677167
t.Errorf("generatePolicies() returned unexpected warnings %v for the case of %s", vsc.warnings, tc.msg)
@@ -15803,7 +15803,7 @@ func TestRFC1123ToSnake(t *testing.T) {
1580315803
for _, tt := range tests {
1580415804
t.Run(tt.name, func(t *testing.T) {
1580515805
if !cmp.Equal(rfc1123ToSnake(tt.input), tt.expected) {
15806-
t.Errorf(cmp.Diff(rfc1123ToSnake(tt.input), tt.expected))
15806+
t.Error(cmp.Diff(rfc1123ToSnake(tt.input), tt.expected))
1580715807
}
1580815808
})
1580915809
}

‎internal/externaldns/sync_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ func TestGetValidTargets(t *testing.T) {
8282
t.Fatal(err)
8383
}
8484
if !cmp.Equal(tc.wantTargets, targets) {
85-
t.Errorf(cmp.Diff(tc.wantTargets, targets))
85+
t.Error(cmp.Diff(tc.wantTargets, targets))
8686
}
8787
if recordType != tc.wantRecord {
88-
t.Errorf(cmp.Diff(tc.wantRecord, recordType))
88+
t.Error(cmp.Diff(tc.wantRecord, recordType))
8989
}
9090
})
9191
}

‎internal/k8s/appprotect/app_protect_configuration.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package appprotect
22

33
import (
4+
"errors"
45
"fmt"
56
"sort"
67
"time"
@@ -208,14 +209,14 @@ func createAppProtectPolicyEx(policyObj *unstructured.Unstructured) (*PolicyEx,
208209
err := validation.ValidateAppProtectPolicy(policyObj)
209210
if err != nil {
210211
errMsg := fmt.Sprintf("Error validating policy %s: %v", policyObj.GetName(), err)
211-
return &PolicyEx{Obj: policyObj, IsValid: false, ErrorMsg: failedValidationErrorMsg}, fmt.Errorf(errMsg)
212+
return &PolicyEx{Obj: policyObj, IsValid: false, ErrorMsg: failedValidationErrorMsg}, errors.New(errMsg)
212213
}
213214
sigReqs := []SignatureReq{}
214215
// Check if policy has signature requirement (revision timestamp) and map them to tags
215216
list, found, err := unstructured.NestedSlice(policyObj.Object, "spec", "policy", "signature-requirements")
216217
if err != nil {
217218
errMsg := fmt.Sprintf("Error retrieving Signature requirements from %s: %v", policyObj.GetName(), err)
218-
return &PolicyEx{Obj: policyObj, IsValid: false, ErrorMsg: failedValidationErrorMsg}, fmt.Errorf(errMsg)
219+
return &PolicyEx{Obj: policyObj, IsValid: false, ErrorMsg: failedValidationErrorMsg}, errors.New(errMsg)
219220
}
220221
if found {
221222
for _, req := range list {
@@ -224,7 +225,7 @@ func createAppProtectPolicyEx(policyObj *unstructured.Unstructured) (*PolicyEx,
224225
timeReq, err := buildRevTimes(requirement)
225226
if err != nil {
226227
errMsg := fmt.Sprintf("Error creating time requirements from %s: %v", policyObj.GetName(), err)
227-
return &PolicyEx{Obj: policyObj, IsValid: false, ErrorMsg: invalidTimestampErrorMsg}, fmt.Errorf(errMsg)
228+
return &PolicyEx{Obj: policyObj, IsValid: false, ErrorMsg: invalidTimestampErrorMsg}, errors.New(errMsg)
228229
}
229230
sigReqs = append(sigReqs, SignatureReq{Tag: reqTag.(string), RevTimes: &timeReq})
230231
}
@@ -243,15 +244,15 @@ func buildRevTimes(requirement map[string]interface{}) (RevTimes, error) {
243244
minRevTime, err := time.Parse(timeLayout, minRev.(string))
244245
if err != nil {
245246
errMsg := fmt.Sprintf("Error Parsing time from minRevisionDatetime %v", err)
246-
return timeReq, fmt.Errorf(errMsg)
247+
return timeReq, errors.New(errMsg)
247248
}
248249
timeReq.MinRevTime = &minRevTime
249250
}
250251
if maxRev, ok := requirement["maxRevisionDatetime"]; ok {
251252
maxRevTime, err := time.Parse(timeLayout, maxRev.(string))
252253
if err != nil {
253254
errMsg := fmt.Sprintf("Error Parsing time from maxRevisionDatetime %v", err)
254-
return timeReq, fmt.Errorf(errMsg)
255+
return timeReq, errors.New(errMsg)
255256
}
256257
timeReq.MaxRevTime = &maxRevTime
257258
}
@@ -278,7 +279,7 @@ func createAppProtectUserSigEx(userSigObj *unstructured.Unstructured) (*UserSigE
278279
err := validation.ValidateAppProtectUserSig(userSigObj)
279280
if err != nil {
280281
errMsg := failedValidationErrorMsg
281-
return &UserSigEx{Obj: userSigObj, IsValid: false, Tag: sTag, ErrorMsg: errMsg}, fmt.Errorf(errMsg)
282+
return &UserSigEx{Obj: userSigObj, IsValid: false, Tag: sTag, ErrorMsg: errMsg}, errors.New(errMsg)
282283
}
283284
// Previous validation ensures there will be no errors
284285
tag, found, _ := unstructured.NestedString(userSigObj.Object, "spec", "tag")
@@ -290,7 +291,7 @@ func createAppProtectUserSigEx(userSigObj *unstructured.Unstructured) (*UserSigE
290291
revTime, err := time.Parse(timeLayout, revTimeString)
291292
if err != nil {
292293
errMsg := invalidTimestampErrorMsg
293-
return &UserSigEx{Obj: userSigObj, IsValid: false, ErrorMsg: errMsg}, fmt.Errorf(errMsg)
294+
return &UserSigEx{Obj: userSigObj, IsValid: false, ErrorMsg: errMsg}, errors.New(errMsg)
294295
}
295296
return &UserSigEx{
296297
Obj: userSigObj,

‎internal/k8s/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ var escapedStringsFmtRegexp = regexp.MustCompile("^" + escapedStringsFmt + "$")
968968
func ValidateEscapedString(body string, examples ...string) error {
969969
if !escapedStringsFmtRegexp.MatchString(body) {
970970
msg := validation.RegexError(escapedStringsErrMsg, escapedStringsFmt, examples...)
971-
return fmt.Errorf(msg)
971+
return errors.New(msg)
972972
}
973973
return nil
974974
}

‎pkg/apis/configuration/validation/common.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package validation
22

33
import (
4+
"errors"
45
"fmt"
56
"regexp"
67
"strings"
@@ -21,7 +22,7 @@ var escapedStringsFmtRegexp = regexp.MustCompile("^" + escapedStringsFmt + "$")
2122
func ValidateEscapedString(body string, examples ...string) error {
2223
if !escapedStringsFmtRegexp.MatchString(body) {
2324
msg := validation.RegexError(escapedStringsErrMsg, escapedStringsFmt, examples...)
24-
return fmt.Errorf(msg)
25+
return errors.New(msg)
2526
}
2627
return nil
2728
}

0 commit comments

Comments
 (0)