Improve golint (#419)

Author: Karthik-K-N

cloud/scope/cluster.go

@@ -105,13 +105,10 @@ func (s *ClusterScope) CreateVPC() (*vpcv1.VPC, error) {
 	vpc, _, err := s.IBMVPCClients.VPCService.CreateVPC(options)
 	if err != nil {
 		return nil, err
-	} else {
-		if err := s.updateDefaultSG(*vpc.DefaultSecurityGroup.ID); err != nil {
-			return nil, err
-		} else {
-			return vpc, nil
-		}
+	} else if err := s.updateDefaultSG(*vpc.DefaultSecurityGroup.ID); err != nil {
+		return nil, err
 	}
+	return vpc, nil
 }
 
 // DeleteVPC deletes IBM VPC associated with a VPC id
@@ -128,14 +125,13 @@ func (s *ClusterScope) ensureVPCUnique(vpcName string) (*vpcv1.VPC, error) {
 	vpcs, _, err := s.IBMVPCClients.VPCService.ListVpcs(listVpcsOptions)
 	if err != nil {
 		return nil, err
-	} else {
-		for _, vpc := range vpcs.Vpcs {
-			if (*vpc.Name) == vpcName {
-				return &vpc, nil
-			}
+	}
+	for _, vpc := range vpcs.Vpcs {
+		if (*vpc.Name) == vpcName {
+			return &vpc, nil
 		}
-		return nil, nil
 	}
+	return nil, nil
 }
 
 func (s *ClusterScope) updateDefaultSG(sgID string) error {
@@ -181,14 +177,13 @@ func (s *ClusterScope) ensureFIPUnique(fipName string) (*vpcv1.FloatingIP, error
 	floatingIPs, _, err := s.IBMVPCClients.VPCService.ListFloatingIps(listFloatingIpsOptions)
 	if err != nil {
 		return nil, err
-	} else {
-		for _, fip := range floatingIPs.FloatingIps {
-			if *fip.Name == fipName {
-				return &fip, nil
-			}
+	}
+	for _, fip := range floatingIPs.FloatingIps {
+		if *fip.Name == fipName {
+			return &fip, nil
 		}
-		return nil, nil
 	}
+	return nil, nil
 }
 
 // DeleteFloatingIP deletes a Floating IP associated with floating ip id
@@ -253,14 +248,13 @@ func (s *ClusterScope) getSubnetAddrPrefix(vpcID, zone string) (string, error) {
 
 	if err != nil {
 		return "", err
-	} else {
-		for _, addrPrefix := range addrCollection.AddressPrefixes {
-			if *addrPrefix.Zone.Name == zone {
-				return *addrPrefix.CIDR, nil
-			}
+	}
+	for _, addrPrefix := range addrCollection.AddressPrefixes {
+		if *addrPrefix.Zone.Name == zone {
+			return *addrPrefix.CIDR, nil
 		}
-		return "", fmt.Errorf("not found a valid CIDR for VPC %s in zone %s", vpcID, zone)
 	}
+	return "", fmt.Errorf("not found a valid CIDR for VPC %s in zone %s", vpcID, zone)
 }
 
 func (s *ClusterScope) ensureSubnetUnique(subnetName string) (*vpcv1.Subnet, error) {
@@ -269,14 +263,13 @@ func (s *ClusterScope) ensureSubnetUnique(subnetName string) (*vpcv1.Subnet, err
 
 	if err != nil {
 		return nil, err
-	} else {
-		for _, subnet := range subnets.Subnets {
-			if *subnet.Name == subnetName {
-				return &subnet, nil
-			}
+	}
+	for _, subnet := range subnets.Subnets {
+		if *subnet.Name == subnetName {
+			return &subnet, nil
 		}
-		return nil, nil
 	}
+	return nil, nil
 }
 
 // DeleteSubnet deletes a subnet associated with subnet id

cloud/scope/machine.go

@@ -162,14 +162,13 @@ func (m *MachineScope) ensureInstanceUnique(instanceName string) (*vpcv1.Instanc
 
 	if err != nil {
 		return nil, err
-	} else {
-		for _, instance := range instances.Instances {
-			if *instance.Name == instanceName {
-				return &instance, nil
-			}
+	}
+	for _, instance := range instances.Instances {
+		if *instance.Name == instanceName {
+			return &instance, nil
 		}
-		return nil, nil
 	}
+	return nil, nil
 }
 
 // GetMachine returns a machine associated with a machine instanceID

cloud/scope/powervs_clients.go

@@ -23,14 +23,17 @@ import (
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
 )
 
+// TIMEOUT is used while creating IBM Power VS client
 const TIMEOUT = 1 * time.Hour
 
+// IBMPowerVSClient used to store IBM Power VS client information
 type IBMPowerVSClient struct {
 	session        *ibmpisession.IBMPISession
 	InstanceClient *instance.IBMPIInstanceClient
 	NetworkClient  *instance.IBMPINetworkClient
 }
 
+// NewIBMPowerVSClient creates and returns a IBM Power VS client
 func NewIBMPowerVSClient(token, account, cloudInstanceID, region, zone string, debug bool) (_ *IBMPowerVSClient, err error) {
 	client := &IBMPowerVSClient{}
 	client.session, err = ibmpisession.New(token, region, debug, TIMEOUT, account, zone)