Fixed linting and tests

Author: mrog

pkg/cloud/network.go

@@ -180,7 +180,10 @@ func (c *client) AssociatePublicIPAddress(csCluster *infrav1.CloudStackCluster)
 
 func (c *client) DisassociatePublicIPAddress(csCluster *infrav1.CloudStackCluster) (retErr error) {
 	// Remove the CAPC creation tag, so it won't be there the next time this address is associated.
-	c.DeleteCreatedByCAPCTag(ResourceTypeIPAddress, csCluster.Status.PublicIPID)
+	retErr = c.DeleteCreatedByCAPCTag(ResourceTypeIPAddress, csCluster.Status.PublicIPID)
+	if retErr != nil {
+		return retErr
+	}
 
 	p := c.cs.Address.NewDisassociateIpAddressParams(csCluster.Status.PublicIPID)
 	_, retErr = c.cs.Address.DisassociateIpAddress(p)

pkg/cloud/network_test.go

@@ -87,7 +87,7 @@ var _ = Describe("Network", func() {
 		createTagsParams := &cloudstack.CreateTagsParams{}
 		rs.EXPECT().NewListTagsParams().Return(listTagsParams)
 		rs.EXPECT().ListTags(listTagsParams).Return(&cloudstack.ListTagsResponse{}, nil)
-		rs.EXPECT().NewCreateTagsParams([]string{networkID}, "network", gomock.Any()).Return(createTagsParams)
+		rs.EXPECT().NewCreateTagsParams([]string{networkID}, cloud.ResourceTypeNetwork, gomock.Any()).Return(createTagsParams)
 		rs.EXPECT().CreateTags(createTagsParams).Return(&cloudstack.CreateTagsResponse{}, nil)
 	}