Skip to content

Commit 394c675

Browse files
committed
Make the error messages lower cases before comparing them
1 parent e80c291 commit 394c675

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

controllers/utils/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ func IsOwnerDeleted(ctx context.Context, client clientPkg.Client, capiMachine *c
9393
// As such, need to check the deletion timestamp thereof.
9494
if cp, err := getKubeadmControlPlaneFromCAPIMachine(ctx, client, capiMachine); cp != nil && cp.DeletionTimestamp == nil {
9595
return false, nil
96-
} else if err != nil && !strings.Contains(err.Error(), "not found") {
96+
} else if err != nil && !strings.Contains(strings.ToLower(err.Error()), "not found") {
9797
return false, err
9898
}
9999
} else {
100100
// The machineset is deleted immediately, regardless of machine ownership.
101101
// It is sufficient to check for its existence.
102102
if ms, err := getMachineSetFromCAPIMachine(ctx, client, capiMachine); ms != nil {
103103
return false, nil
104-
} else if err != nil && !strings.Contains(err.Error(), "not found") {
104+
} else if err != nil && !strings.Contains(strings.ToLower(err.Error()), "not found") {
105105
return false, err
106106
}
107107
}

pkg/cloud/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func NewClient(ccPath string) (Client, error) {
6969
// TODO: attempt a less clunky client liveliness check (not just listing zones).
7070
c.cs = cloudstack.NewAsyncClient(cfg.APIURL, cfg.APIKey, cfg.SecretKey, cfg.VerifySSL)
7171
_, err := c.cs.Zone.ListZones(c.cs.Zone.NewListZonesParams())
72-
if err != nil && strings.Contains(err.Error(), "i/o timeout") {
72+
if err != nil && strings.Contains(strings.ToLower(err.Error()), "i/o timeout") {
7373
return c, errors.Wrap(err, "Timeout while checking CloudStack API Client connectivity.")
7474
}
7575
return c, errors.Wrap(err, "Error encountered while checking CloudStack API Client connectivity.")

pkg/cloud/instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func (c *client) DestroyVMInstance(csMachine *infrav1.CloudStackMachine) error {
216216
p := c.cs.VirtualMachine.NewDestroyVirtualMachineParams(*csMachine.Spec.InstanceID)
217217
p.SetExpunge(true)
218218
_, err := c.cs.VirtualMachine.DestroyVirtualMachine(p)
219-
if err != nil && strings.Contains(err.Error(), "unable to find UUID for id ") {
219+
if err != nil && strings.Contains(strings.ToLower(err.Error()), "unable to find UUID for id ") {
220220
// VM doesn't exist. So the desired state is in effect. Our work is done here.
221221
return nil
222222
}

pkg/cloud/network.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (c *client) ResolveNetwork(csCluster *infrav1.CloudStackCluster) (retErr er
6161
func (c *client) GetOrCreateNetwork(csCluster *infrav1.CloudStackCluster) (retErr error) {
6262
if retErr = c.ResolveNetwork(csCluster); retErr == nil { // Found network.
6363
return nil
64-
} else if !strings.Contains(retErr.Error(), "no match found") { // Some other error.
64+
} else if !strings.Contains(strings.ToLower(retErr.Error()), "no match found") { // Some other error.
6565
return retErr
6666
} // Network not found.
6767

@@ -147,7 +147,7 @@ func (c *client) AssociatePublicIPAddress(csCluster *infrav1.CloudStackCluster)
147147
func (c *client) OpenFirewallRules(csCluster *infrav1.CloudStackCluster) (retErr error) {
148148
p := c.cs.Firewall.NewCreateEgressFirewallRuleParams(csCluster.Status.NetworkID, NetworkProtocolTCP)
149149
_, retErr = c.cs.Firewall.CreateEgressFirewallRule(p)
150-
if retErr != nil && strings.Contains(retErr.Error(), "there is already") { // Already a firewall rule here.
150+
if retErr != nil && strings.Contains(strings.ToLower(retErr.Error()), "there is already") { // Already a firewall rule here.
151151
retErr = nil
152152
}
153153
return retErr
@@ -175,7 +175,7 @@ func (c *client) ResolveLoadBalancerRuleDetails(csCluster *infrav1.CloudStackClu
175175
func (c *client) GetOrCreateLoadBalancerRule(csCluster *infrav1.CloudStackCluster) (retErr error) {
176176
// Check if rule exists.
177177
if err := c.ResolveLoadBalancerRuleDetails(csCluster); err == nil ||
178-
!strings.Contains(err.Error(), "no load balancer rule found") {
178+
!strings.Contains(strings.ToLower(err.Error()), "no load balancer rule found") {
179179
return err
180180
}
181181

0 commit comments

Comments
 (0)