Skip to content

Commit 897122b

Browse files
committed
fix(lint): Enable gosec and wrapcheck and fix issues
1 parent 6b9064a commit 897122b

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ linters:
1414
disable:
1515
- goheader
1616
- depguard
17-
- wrapcheck
1817
- mnd
1918
- varnamelen
2019
- testpackage
@@ -30,7 +29,6 @@ linters:
3029
- interfacebloat
3130
- exhaustruct
3231
- lll
33-
- gosec
3432
- gomoddirectives
3533
- godox
3634
- gochecknoinits

cloudstack/cloudstack_loadbalancer.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ func (cs *CSCloud) EnsureLoadBalancer(ctx context.Context, clusterName string, s
252252
network, count, err := lb.Network.GetNetworkByID(lb.networkID, cloudstack.WithProject(lb.projectID))
253253
if err != nil {
254254
if count == 0 {
255-
return nil, err
255+
return nil, fmt.Errorf("could not find network with ID %s: %w", lb.networkID, err)
256256
}
257257

258-
return nil, err
258+
return nil, fmt.Errorf("failed to get network with ID %s: %w", lb.networkID, err)
259259
}
260260

261261
lbSourceRanges, err := getLoadBalancerSourceRanges(service)
@@ -648,7 +648,7 @@ func (cs *CSCloud) listAllVirtualMachines() ([]*cloudstack.VirtualMachine, error
648648

649649
l, err := cs.client.VirtualMachine.ListVirtualMachines(p)
650650
if err != nil {
651-
return nil, err
651+
return nil, fmt.Errorf("failed to list virtual machines: %w", err)
652652
}
653653

654654
allVMs = append(allVMs, l.VirtualMachines...)
@@ -821,8 +821,11 @@ func (lb *loadBalancer) updateLoadBalancerRule(lbRuleName string, protocol LoadB
821821
p.SetProtocol(protocol.CSProtocol())
822822

823823
_, err := lb.LoadBalancer.UpdateLoadBalancerRule(p)
824+
if err != nil {
825+
return fmt.Errorf("failed to update loadbalancer rule with ID %s: %w", lbRule.Id, err)
826+
}
824827

825-
return err
828+
return nil
826829
}
827830

828831
// createLoadBalancerRule creates a new load balancer rule and returns its ID.
@@ -1181,18 +1184,20 @@ func (lb *loadBalancer) deleteFirewallRule(publicIPID string, publicPort int, pr
11811184
}
11821185

11831186
// delete all rules
1187+
var errs error
11841188
deleted := false
11851189
for _, rule := range filtered {
11861190
p := lb.Firewall.NewDeleteFirewallRuleParams(rule.Id)
11871191
_, err = lb.Firewall.DeleteFirewallRule(p)
11881192
if err != nil {
11891193
klog.Errorf("Error deleting old firewall rule %v: %v", rule.Id, err)
1194+
errs = errors.Join(errs, fmt.Errorf("error deleting old firewall rule %v: %w", rule.Id, err))
11901195
} else {
11911196
deleted = true
11921197
}
11931198
}
11941199

1195-
return deleted, err
1200+
return deleted, errs
11961201
}
11971202

11981203
// getLoadBalancerSourceRanges first tries to parse and verify loadBalancerSourceRanges field from a Service object.

0 commit comments

Comments
 (0)