Skip to content

Commit 006e179

Browse files
lucacomelucacome
authored
Add errorlint (#1688)
1 parent b4adb71 commit 006e179

File tree

20 files changed

+145
-138
lines changed

20 files changed

+145
-138
lines changed

‎.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ linters:
66
enable:
77
- deadcode
88
- errcheck
9+
- errorlint
910
- gofmt
1011
- goimports
1112
- gosec

‎cmd/nginx-ingress/aws.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func checkAWSEntitlement() error {
4040

4141
cfg, err := config.LoadDefaultConfig(ctx)
4242
if err != nil {
43-
return fmt.Errorf("error loading AWS configuration: %v", err)
43+
return fmt.Errorf("error loading AWS configuration: %w", err)
4444
}
4545

4646
mpm := marketplacemetering.New(marketplacemetering.Options{Region: cfg.Region, Credentials: cfg.Credentials})
@@ -56,16 +56,16 @@ func checkAWSEntitlement() error {
5656

5757
pk, err := base64.StdEncoding.DecodeString(pubKeyString)
5858
if err != nil {
59-
return fmt.Errorf("error decoding Public Key string: %v", err)
59+
return fmt.Errorf("error decoding Public Key string: %w", err)
6060
}
6161
pubKey, err := jwt.ParseRSAPublicKeyFromPEM(pk)
6262
if err != nil {
63-
return fmt.Errorf("error parsing Public Key: %v", err)
63+
return fmt.Errorf("error parsing Public Key: %w", err)
6464
}
6565

6666
token, err := jwt.ParseWithClaims(*out.Signature, &claims{}, jwt.KnownKeyfunc(jwt.SigningMethodPS256, pubKey))
6767
if err != nil {
68-
return fmt.Errorf("error parsing the JWT token: %v", err)
68+
return fmt.Errorf("error parsing the JWT token: %w", err)
6969
}
7070

7171
if claims, ok := token.Claims.(*claims); ok && token.Valid {

‎cmd/nginx-ingress/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -796,15 +796,15 @@ func validateCIDRorIP(cidr string) error {
796796
func getAndValidateSecret(kubeClient *kubernetes.Clientset, secretNsName string) (secret *api_v1.Secret, err error) {
797797
ns, name, err := k8s.ParseNamespaceName(secretNsName)
798798
if err != nil {
799-
return nil, fmt.Errorf("could not parse the %v argument: %v", secretNsName, err)
799+
return nil, fmt.Errorf("could not parse the %v argument: %w", secretNsName, err)
800800
}
801801
secret, err = kubeClient.CoreV1().Secrets(ns).Get(context.TODO(), name, meta_v1.GetOptions{})
802802
if err != nil {
803-
return nil, fmt.Errorf("could not get %v: %v", secretNsName, err)
803+
return nil, fmt.Errorf("could not get %v: %w", secretNsName, err)
804804
}
805805
err = secrets.ValidateTLSSecret(secret)
806806
if err != nil {
807-
return nil, fmt.Errorf("%v is invalid: %v", secretNsName, err)
807+
return nil, fmt.Errorf("%v is invalid: %w", secretNsName, err)
808808
}
809809
return secret, nil
810810
}

‎internal/configs/configurator.go

Lines changed: 64 additions & 64 deletions
Large diffs are not rendered by default.

‎internal/configs/parsing_helpers.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func GetMapKeyAsBool(m map[string]string, key string, context apiObject) (bool,
2323
if str, exists := m[key]; exists {
2424
b, err := ParseBool(str)
2525
if err != nil {
26-
return false, exists, fmt.Errorf("%s %v/%v '%s' contains invalid bool: %v, ignoring", context.GetObjectKind().GroupVersionKind().Kind, context.GetNamespace(), context.GetName(), key, err)
26+
return false, exists, fmt.Errorf("%s %v/%v '%s' contains invalid bool: %w, ignoring", context.GetObjectKind().GroupVersionKind().Kind, context.GetNamespace(), context.GetName(), key, err)
2727
}
2828

2929
return b, exists, nil
@@ -37,7 +37,7 @@ func GetMapKeyAsInt(m map[string]string, key string, context apiObject) (int, bo
3737
if str, exists := m[key]; exists {
3838
i, err := ParseInt(str)
3939
if err != nil {
40-
return 0, exists, fmt.Errorf("%s %v/%v '%s' contains invalid integer: %v, ignoring", context.GetObjectKind().GroupVersionKind().Kind, context.GetNamespace(), context.GetName(), key, err)
40+
return 0, exists, fmt.Errorf("%s %v/%v '%s' contains invalid integer: %w, ignoring", context.GetObjectKind().GroupVersionKind().Kind, context.GetNamespace(), context.GetName(), key, err)
4141
}
4242

4343
return i, exists, nil
@@ -51,7 +51,7 @@ func GetMapKeyAsInt64(m map[string]string, key string, context apiObject) (int64
5151
if str, exists := m[key]; exists {
5252
i, err := ParseInt64(str)
5353
if err != nil {
54-
return 0, exists, fmt.Errorf("%s %v/%v '%s' contains invalid integer: %v, ignoring", context.GetObjectKind().GroupVersionKind().Kind, context.GetNamespace(), context.GetName(), key, err)
54+
return 0, exists, fmt.Errorf("%s %v/%v '%s' contains invalid integer: %w, ignoring", context.GetObjectKind().GroupVersionKind().Kind, context.GetNamespace(), context.GetName(), key, err)
5555
}
5656

5757
return i, exists, nil
@@ -65,7 +65,7 @@ func GetMapKeyAsUint64(m map[string]string, key string, context apiObject, nonZe
6565
if str, exists := m[key]; exists {
6666
i, err := ParseUint64(str)
6767
if err != nil {
68-
return 0, exists, fmt.Errorf("%s %v/%v '%s' contains invalid uint64: %v, ignoring", context.GetObjectKind().GroupVersionKind().Kind, context.GetNamespace(), context.GetName(), key, err)
68+
return 0, exists, fmt.Errorf("%s %v/%v '%s' contains invalid uint64: %w, ignoring", context.GetObjectKind().GroupVersionKind().Kind, context.GetNamespace(), context.GetName(), key, err)
6969
}
7070

7171
if nonZero && i == 0 {
@@ -264,7 +264,7 @@ func ParsePortList(s string) ([]int, error) {
264264
func parsePort(value string) (int, error) {
265265
port, err := strconv.ParseInt(value, 10, 16)
266266
if err != nil {
267-
return 0, fmt.Errorf("Unable to parse port as integer: %s", err)
267+
return 0, fmt.Errorf("Unable to parse port as integer: %w", err)
268268
}
269269

270270
if port <= 0 {
@@ -344,8 +344,10 @@ func parseRewrites(service string) (serviceName string, rewrite string, err erro
344344
return svcNameParts[1], rwPathParts[1], nil
345345
}
346346

347-
var threshEx = regexp.MustCompile(`high=([1-9]|[1-9][0-9]|100) low=([1-9]|[1-9][0-9]|100)\b`)
348-
var threshExR = regexp.MustCompile(`low=([1-9]|[1-9][0-9]|100) high=([1-9]|[1-9][0-9]|100)\b`)
347+
var (
348+
threshEx = regexp.MustCompile(`high=([1-9]|[1-9][0-9]|100) low=([1-9]|[1-9][0-9]|100)\b`)
349+
threshExR = regexp.MustCompile(`low=([1-9]|[1-9][0-9]|100) high=([1-9]|[1-9][0-9]|100)\b`)
350+
)
349351

350352
// VerifyAppProtectThresholds ensures that threshold values are set correctly
351353
func VerifyAppProtectThresholds(value string) bool {

‎internal/k8s/appprotect/app_protect_resources.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func validateRequiredFields(obj *unstructured.Unstructured, fieldsList [][]strin
2727
for _, fields := range fieldsList {
2828
field, found, err := unstructured.NestedMap(obj.Object, fields...)
2929
if err != nil {
30-
return fmt.Errorf("Error checking for required field %v: %v", field, err)
30+
return fmt.Errorf("Error checking for required field %v: %w", field, err)
3131
}
3232
if !found {
3333
return fmt.Errorf("Required field %v not found", field)
@@ -40,7 +40,7 @@ func validateRequiredSlices(obj *unstructured.Unstructured, fieldsList [][]strin
4040
for _, fields := range fieldsList {
4141
field, found, err := unstructured.NestedSlice(obj.Object, fields...)
4242
if err != nil {
43-
return fmt.Errorf("Error checking for required field %v: %v", field, err)
43+
return fmt.Errorf("Error checking for required field %v: %w", field, err)
4444
}
4545
if !found {
4646
return fmt.Errorf("Required field %v not found", field)
@@ -55,7 +55,7 @@ func validateAppProtectPolicy(policy *unstructured.Unstructured) error {
5555

5656
err := validateRequiredFields(policy, appProtectPolicyRequiredFields)
5757
if err != nil {
58-
return fmt.Errorf("Error validating App Protect Policy %v: %v", polName, err)
58+
return fmt.Errorf("Error validating App Protect Policy %v: %w", polName, err)
5959
}
6060

6161
return nil
@@ -66,14 +66,16 @@ func validateAppProtectLogConf(logConf *unstructured.Unstructured) error {
6666
lcName := logConf.GetName()
6767
err := validateRequiredFields(logConf, appProtectLogConfRequiredFields)
6868
if err != nil {
69-
return fmt.Errorf("Error validating App Protect Log Configuration %v: %v", lcName, err)
69+
return fmt.Errorf("Error validating App Protect Log Configuration %v: %w", lcName, err)
7070
}
7171

7272
return nil
7373
}
7474

75-
var logDstEx = regexp.MustCompile(`(?:syslog:server=((?:\d{1,3}\.){3}\d{1,3}|localhost):\d{1,5})|stderr|(?:\/[\S]+)+`)
76-
var logDstFileEx = regexp.MustCompile(`(?:\/[\S]+)+`)
75+
var (
76+
logDstEx = regexp.MustCompile(`(?:syslog:server=((?:\d{1,3}\.){3}\d{1,3}|localhost):\d{1,5})|stderr|(?:\/[\S]+)+`)
77+
logDstFileEx = regexp.MustCompile(`(?:\/[\S]+)+`)
78+
)
7779

7880
// ValidateAppProtectLogDestination validates destination for log configuration
7981
func ValidateAppProtectLogDestination(dstAntn string) error {
@@ -131,7 +133,7 @@ func validateAppProtectUserSig(userSig *unstructured.Unstructured) error {
131133
sigName := userSig.GetName()
132134
err := validateRequiredSlices(userSig, appProtectUserSigRequiredSlices)
133135
if err != nil {
134-
return fmt.Errorf("Error validating App Protect User Signature %v: %v", sigName, err)
136+
return fmt.Errorf("Error validating App Protect User Signature %v: %w", sigName, err)
135137
}
136138

137139
return nil

‎internal/k8s/controller.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,7 +1866,7 @@ func (lbc *LoadBalancerController) updateVirtualServersStatusFromEvents() error
18661866
events, err := lbc.client.CoreV1().Events(vs.Namespace).List(context.TODO(),
18671867
meta_v1.ListOptions{FieldSelector: fmt.Sprintf("involvedObject.name=%v,involvedObject.uid=%v", vs.Name, vs.UID)})
18681868
if err != nil {
1869-
allErrs = append(allErrs, fmt.Errorf("error trying to get events for VirtualServer %v/%v: %v", vs.Namespace, vs.Name, err))
1869+
allErrs = append(allErrs, fmt.Errorf("error trying to get events for VirtualServer %v/%v: %w", vs.Namespace, vs.Name, err))
18701870
break
18711871
}
18721872

@@ -1908,7 +1908,7 @@ func (lbc *LoadBalancerController) updateVirtualServerRoutesStatusFromEvents() e
19081908
events, err := lbc.client.CoreV1().Events(vsr.Namespace).List(context.TODO(),
19091909
meta_v1.ListOptions{FieldSelector: fmt.Sprintf("involvedObject.name=%v,involvedObject.uid=%v", vsr.Name, vsr.UID)})
19101910
if err != nil {
1911-
allErrs = append(allErrs, fmt.Errorf("error trying to get events for VirtualServerRoute %v/%v: %v", vsr.Namespace, vsr.Name, err))
1911+
allErrs = append(allErrs, fmt.Errorf("error trying to get events for VirtualServerRoute %v/%v: %w", vsr.Namespace, vsr.Name, err))
19121912
break
19131913
}
19141914

@@ -1973,7 +1973,7 @@ func (lbc *LoadBalancerController) updateTransportServersStatusFromEvents() erro
19731973
events, err := lbc.client.CoreV1().Events(ts.Namespace).List(context.TODO(),
19741974
meta_v1.ListOptions{FieldSelector: fmt.Sprintf("involvedObject.name=%v,involvedObject.uid=%v", ts.Name, ts.UID)})
19751975
if err != nil {
1976-
allErrs = append(allErrs, fmt.Errorf("error trying to get events for TransportServer %v/%v: %v", ts.Namespace, ts.Name, err))
1976+
allErrs = append(allErrs, fmt.Errorf("error trying to get events for TransportServer %v/%v: %w", ts.Namespace, ts.Name, err))
19771977
break
19781978
}
19791979

@@ -2199,14 +2199,14 @@ func (lbc *LoadBalancerController) getAppProtectLogConfAndDst(ing *networking.In
21992199
for _, logDst := range logDsts {
22002200
err := appprotect.ValidateAppProtectLogDestination(logDst)
22012201
if err != nil {
2202-
return apLogs, fmt.Errorf("Error Validating App Protect Destination Config for Ingress %v: %v", ing.Name, err)
2202+
return apLogs, fmt.Errorf("Error Validating App Protect Destination Config for Ingress %v: %w", ing.Name, err)
22032203
}
22042204
}
22052205

22062206
for i, logConfNsN := range logConfNsNs {
22072207
logConf, err := lbc.appProtectConfiguration.GetAppResource(appprotect.LogConfGVK.Kind, logConfNsN)
22082208
if err != nil {
2209-
return apLogs, fmt.Errorf("Error retrieving App Protect Log Config for Ingress %v: %v", ing.Name, err)
2209+
return apLogs, fmt.Errorf("Error retrieving App Protect Log Config for Ingress %v: %w", ing.Name, err)
22102210
}
22112211
apLogs = append(apLogs, configs.AppProtectLog{
22122212
LogConf: logConf,
@@ -2222,7 +2222,7 @@ func (lbc *LoadBalancerController) getAppProtectPolicy(ing *networking.Ingress)
22222222

22232223
apPolicy, err = lbc.appProtectConfiguration.GetAppResource(appprotect.PolicyGVK.Kind, polNsN)
22242224
if err != nil {
2225-
return nil, fmt.Errorf("Error retrieving App Protect Policy for Ingress %v: %v ", ing.Name, err)
2225+
return nil, fmt.Errorf("Error retrieving App Protect Policy for Ingress %v: %w", ing.Name, err)
22262226
}
22272227

22282228
return apPolicy, nil
@@ -2476,7 +2476,7 @@ func (lbc *LoadBalancerController) getPolicies(policies []conf_v1.PolicyReferenc
24762476

24772477
policyObj, exists, err := lbc.policyLister.GetByKey(policyKey)
24782478
if err != nil {
2479-
errors = append(errors, fmt.Errorf("Failed to get policy %s: %v", policyKey, err))
2479+
errors = append(errors, fmt.Errorf("Failed to get policy %s: %w", policyKey, err))
24802480
continue
24812481
}
24822482

@@ -2489,7 +2489,7 @@ func (lbc *LoadBalancerController) getPolicies(policies []conf_v1.PolicyReferenc
24892489

24902490
err = validation.ValidatePolicy(policy, lbc.isNginxPlus, lbc.enablePreviewPolicies, lbc.appProtectEnabled)
24912491
if err != nil {
2492-
errors = append(errors, fmt.Errorf("Policy %s is invalid: %v", policyKey, err))
2492+
errors = append(errors, fmt.Errorf("Policy %s is invalid: %w", policyKey, err))
24932493
continue
24942494
}
24952495

@@ -2601,7 +2601,7 @@ func (lbc *LoadBalancerController) addWAFPolicyRefs(
26012601

26022602
apPolicy, err := lbc.appProtectConfiguration.GetAppResource(appprotect.PolicyGVK.Kind, apPolKey)
26032603
if err != nil {
2604-
return fmt.Errorf("WAF policy %q is invalid: %v", apPolKey, err)
2604+
return fmt.Errorf("WAF policy %q is invalid: %w", apPolKey, err)
26052605
}
26062606
apPolRef[apPolKey] = apPolicy
26072607
}
@@ -2614,7 +2614,7 @@ func (lbc *LoadBalancerController) addWAFPolicyRefs(
26142614

26152615
logConf, err := lbc.appProtectConfiguration.GetAppResource(appprotect.LogConfGVK.Kind, logConfKey)
26162616
if err != nil {
2617-
return fmt.Errorf("WAF policy %q is invalid: %v", logConfKey, err)
2617+
return fmt.Errorf("WAF policy %q is invalid: %w", logConfKey, err)
26182618
}
26192619
logConfRef[logConfKey] = logConf
26202620
}
@@ -2717,7 +2717,7 @@ func (lbc *LoadBalancerController) createTransportServerEx(transportServer *conf
27172717
func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, upstreamService string, upstreamPort uint16) (endps []podEndpoint, isExternal bool, err error) {
27182718
svc, err := lbc.getServiceForUpstream(namespace, upstreamService, upstreamPort)
27192719
if err != nil {
2720-
return nil, false, fmt.Errorf("Error getting service %v: %v", upstreamService, err)
2720+
return nil, false, fmt.Errorf("Error getting service %v: %w", upstreamService, err)
27212721
}
27222722

27232723
backend := &networking.IngressBackend{
@@ -2727,7 +2727,7 @@ func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, ups
27272727

27282728
endps, isExternal, err = lbc.getEndpointsForIngressBackend(backend, svc)
27292729
if err != nil {
2730-
return nil, false, fmt.Errorf("Error retrieving endpoints for the service %v: %v", upstreamService, err)
2730+
return nil, false, fmt.Errorf("Error retrieving endpoints for the service %v: %w", upstreamService, err)
27312731
}
27322732

27332733
return endps, isExternal, err
@@ -2736,7 +2736,7 @@ func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, ups
27362736
func (lbc *LoadBalancerController) getEndpointsForSubselector(namespace string, upstream conf_v1.Upstream) (endps []podEndpoint, err error) {
27372737
svc, err := lbc.getServiceForUpstream(namespace, upstream.Service, upstream.Port)
27382738
if err != nil {
2739-
return nil, fmt.Errorf("Error getting service %v: %v", upstream.Service, err)
2739+
return nil, fmt.Errorf("Error getting service %v: %w", upstream.Service, err)
27402740
}
27412741

27422742
var targetPort int32
@@ -2745,7 +2745,7 @@ func (lbc *LoadBalancerController) getEndpointsForSubselector(namespace string,
27452745
if port.Port == int32(upstream.Port) {
27462746
targetPort, err = lbc.getTargetPort(port, svc)
27472747
if err != nil {
2748-
return nil, fmt.Errorf("Error determining target port for port %v in service %v: %v", upstream.Port, svc.Name, err)
2748+
return nil, fmt.Errorf("Error determining target port for port %v in service %v: %w", upstream.Port, svc.Name, err)
27492749
}
27502750
break
27512751
}
@@ -2757,7 +2757,7 @@ func (lbc *LoadBalancerController) getEndpointsForSubselector(namespace string,
27572757

27582758
endps, err = lbc.getEndpointsForServiceWithSubselector(targetPort, upstream.Subselector, svc)
27592759
if err != nil {
2760-
return nil, fmt.Errorf("Error retrieving endpoints for the service %v: %v", upstream.Service, err)
2760+
return nil, fmt.Errorf("Error retrieving endpoints for the service %v: %w", upstream.Service, err)
27612761
}
27622762

27632763
return endps, err
@@ -2766,7 +2766,7 @@ func (lbc *LoadBalancerController) getEndpointsForSubselector(namespace string,
27662766
func (lbc *LoadBalancerController) getEndpointsForServiceWithSubselector(targetPort int32, subselector map[string]string, svc *api_v1.Service) (endps []podEndpoint, err error) {
27672767
pods, err := lbc.podLister.ListByNamespace(svc.Namespace, labels.Merge(svc.Spec.Selector, subselector).AsSelector())
27682768
if err != nil {
2769-
return nil, fmt.Errorf("Error getting pods in namespace %v that match the selector %v: %v", svc.Namespace, labels.Merge(svc.Spec.Selector, subselector), err)
2769+
return nil, fmt.Errorf("Error getting pods in namespace %v that match the selector %v: %w", svc.Namespace, labels.Merge(svc.Spec.Selector, subselector), err)
27702770
}
27712771

27722772
svcEps, err := lbc.endpointLister.GetServiceEndpoints(svc)
@@ -2904,7 +2904,7 @@ func (lbc *LoadBalancerController) getEndpointsForPort(endps api_v1.Endpoints, i
29042904
if (ingSvcPort.Type == intstr.Int && port.Port == int32(ingSvcPort.IntValue())) || (ingSvcPort.Type == intstr.String && port.Name == ingSvcPort.String()) {
29052905
targetPort, err = lbc.getTargetPort(port, svc)
29062906
if err != nil {
2907-
return nil, fmt.Errorf("Error determining target port for port %v in Ingress: %v", ingSvcPort, err)
2907+
return nil, fmt.Errorf("Error determining target port for port %v in Ingress: %w", ingSvcPort, err)
29082908
}
29092909
break
29102910
}
@@ -2988,7 +2988,7 @@ func (lbc *LoadBalancerController) getTargetPort(svcPort api_v1.ServicePort, svc
29882988

29892989
pods, err := lbc.podLister.ListByNamespace(svc.Namespace, labels.Set(svc.Spec.Selector).AsSelector())
29902990
if err != nil {
2991-
return 0, fmt.Errorf("Error getting pod information: %v", err)
2991+
return 0, fmt.Errorf("Error getting pod information: %w", err)
29922992
}
29932993

29942994
if len(pods) == 0 {
@@ -2999,7 +2999,7 @@ func (lbc *LoadBalancerController) getTargetPort(svcPort api_v1.ServicePort, svc
29992999

30003000
portNum, err := findPort(pod, svcPort)
30013001
if err != nil {
3002-
return 0, fmt.Errorf("Error finding named port %v in pod %s: %v", svcPort, pod.Name, err)
3002+
return 0, fmt.Errorf("Error finding named port %v in pod %s: %w", svcPort, pod.Name, err)
30033003
}
30043004

30053005
return portNum, nil

‎internal/k8s/controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ func TestGetPolicies(t *testing.T) {
767767
if !reflect.DeepEqual(result, expectedPolicies) {
768768
t.Errorf("lbc.getPolicies() returned \n%v but \nexpected %v", result, expectedPolicies)
769769
}
770-
if !reflect.DeepEqual(errors, expectedErrors) {
771-
t.Errorf("lbc.getPolicies() returned \n%v but expected \n%v", errors, expectedErrors)
770+
if diff := cmp.Diff(expectedErrors, errors, cmp.Comparer(errorComparer)); diff != "" {
771+
t.Errorf("lbc.getPolicies() mismatch (-want +got):\n%s", diff)
772772
}
773773
}
774774

@@ -1173,7 +1173,7 @@ func TestFindPoliciesForSecret(t *testing.T) {
11731173

11741174
func errorComparer(e1, e2 error) bool {
11751175
if e1 == nil || e2 == nil {
1176-
return e1 == e2
1176+
return errors.Is(e1, e2)
11771177
}
11781178

11791179
return e1.Error() == e2.Error()

‎internal/k8s/secrets/store_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var (
5555

5656
func errorComparer(e1, e2 error) bool {
5757
if e1 == nil || e2 == nil {
58-
return e1 == e2
58+
return errors.Is(e1, e2)
5959
}
6060

6161
return e1.Error() == e2.Error()

‎internal/k8s/secrets/validation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func ValidateTLSSecret(secret *api_v1.Secret) error {
3838

3939
_, err := tls.X509KeyPair(secret.Data[api_v1.TLSCertKey], secret.Data[api_v1.TLSPrivateKeyKey])
4040
if err != nil {
41-
return fmt.Errorf("Failed to validate TLS cert and key: %v", err)
41+
return fmt.Errorf("Failed to validate TLS cert and key: %w", err)
4242
}
4343

4444
return nil
@@ -80,7 +80,7 @@ func ValidateCASecret(secret *api_v1.Secret) error {
8080

8181
_, err := x509.ParseCertificate(block.Bytes)
8282
if err != nil {
83-
return fmt.Errorf("Failed to validate certificate: %v", err)
83+
return fmt.Errorf("Failed to validate certificate: %w", err)
8484
}
8585

8686
return nil

0 commit comments

Comments
 (0)