fix lint issues

Author: Rahul Sharma

cloud/linode/instances.go

@@ -104,28 +104,28 @@ func (nc *nodeCache) refreshInstances(ctx context.Context, client client.Client)
 			klog.Errorf("failed updating instances cache for VPC %s. Error: %s", vpcName, err.Error())
 			continue
 		}
-		for _, r := range resp {
-			if r.Address == nil {
+		for _, vpcip := range resp {
+			if vpcip.Address == nil {
 				continue
 			}
-			vpcNodes[r.LinodeID] = append(vpcNodes[r.LinodeID], *r.Address)
+			vpcNodes[vpcip.LinodeID] = append(vpcNodes[vpcip.LinodeID], *vpcip.Address)
 		}
 
 		resp, err = GetVPCIPv6Addresses(ctx, client, vpcName)
 		if err != nil {
 			klog.Errorf("failed updating instances cache for VPC %s. Error: %s", vpcName, err.Error())
 			continue
 		}
-		for _, r := range resp {
-			if len(r.IPv6Addresses) == 0 {
+		for _, vpcip := range resp {
+			if len(vpcip.IPv6Addresses) == 0 {
 				continue
 			}
 			vpcIPv6AddrType := v1.NodeInternalIP
-			if r.IPv6IsPublic != nil && *r.IPv6IsPublic {
+			if vpcip.IPv6IsPublic != nil && *vpcip.IPv6IsPublic {
 				vpcIPv6AddrType = v1.NodeExternalIP
 			}
-			for _, ipv6 := range r.IPv6Addresses {
-				vpcNodes[r.LinodeID] = append(vpcNodes[r.LinodeID], ipv6.SLAACAddress)
+			for _, ipv6 := range vpcip.IPv6Addresses {
+				vpcNodes[vpcip.LinodeID] = append(vpcNodes[vpcip.LinodeID], ipv6.SLAACAddress)
 				vpcIPv6AddrTypes[ipv6.SLAACAddress] = vpcIPv6AddrType
 			}
 		}

cloud/linode/vpc.go

@@ -100,11 +100,11 @@ func GetSubnetID(ctx context.Context, client client.Client, vpcID int, subnetNam
 	return 0, subnetLookupError{subnetName}
 }
 
-// GetVPCIPAddresses returns vpc ip's for given VPC label
-func GetVPCIPAddresses(ctx context.Context, client client.Client, vpcName string) ([]linodego.VPCIP, error) {
+// getVPCIDAndFilter returns the VPC ID and a resultFilter for subnet names (if any)
+func getVPCIDAndFilter(ctx context.Context, client client.Client, vpcName string) (int, string, error) {
 	vpcID, err := GetVPCID(ctx, client, strings.TrimSpace(vpcName))
 	if err != nil {
-		return nil, err
+		return 0, "", err
 	}
 
 	resultFilter := ""
@@ -133,68 +133,48 @@ func GetVPCIPAddresses(ctx context.Context, client client.Client, vpcName string
 		filter, err = json.Marshal(subnetFilter{SubnetID: strings.Join(subnetIDList, ",")})
 		if err != nil {
 			klog.Error("could not create JSON filter for subnet_id")
+		} else {
+			resultFilter = string(filter)
 		}
-		resultFilter = string(filter)
 	}
 
-	resp, err := client.ListVPCIPAddresses(ctx, vpcID, linodego.NewListOptions(0, resultFilter))
+	return vpcID, resultFilter, nil
+}
+
+// handleNotFoundError checks if the error is a '404 Not Found error' and deletes the entry from the cache.
+func handleNotFoundError(err error, vpcName string) error {
+	if linodego.ErrHasStatus(err, http.StatusNotFound) {
+		Mu.Lock()
+		defer Mu.Unlock()
+		klog.Errorf("vpc %s not found. Deleting entry from cache", vpcName)
+		delete(vpcIDs, vpcName)
+	}
+	return err
+}
+
+// GetVPCIPAddresses returns vpc ip's for given VPC label
+func GetVPCIPAddresses(ctx context.Context, client client.Client, vpcName string) ([]linodego.VPCIP, error) {
+	vpcID, resultFilter, err := getVPCIDAndFilter(ctx, client, vpcName)
 	if err != nil {
-		if linodego.ErrHasStatus(err, http.StatusNotFound) {
-			Mu.Lock()
-			defer Mu.Unlock()
-			klog.Errorf("vpc %s not found. Deleting entry from cache", vpcName)
-			delete(vpcIDs, vpcName)
-		}
 		return nil, err
 	}
+
+	resp, err := client.ListVPCIPAddresses(ctx, vpcID, linodego.NewListOptions(0, resultFilter))
+	if err != nil {
+		return nil, handleNotFoundError(err, vpcName)
+	}
 	return resp, nil
 }
 
 func GetVPCIPv6Addresses(ctx context.Context, client client.Client, vpcName string) ([]linodego.VPCIP, error) {
-	vpcID, err := GetVPCID(ctx, client, strings.TrimSpace(vpcName))
+	vpcID, resultFilter, err := getVPCIDAndFilter(ctx, client, vpcName)
 	if err != nil {
 		return nil, err
 	}
 
-	resultFilter := ""
-
-	// Get subnet ID(s) from name(s) if subnet-names is specified
-	if len(Options.SubnetNames) > 0 {
-		// subnetIDList is a slice of strings for ease of use with resultFilter
-		subnetIDList := []string{}
-
-		for _, name := range Options.SubnetNames {
-			// For caching
-			var subnetID int
-			subnetID, err = GetSubnetID(ctx, client, vpcID, name)
-			// Don't filter subnets we can't find
-			if err != nil {
-				klog.Errorf("subnet %s not found due to error: %v. Skipping.", name, err)
-				continue
-			}
-
-			// For use with the JSON filter
-			subnetIDList = append(subnetIDList, strconv.Itoa(subnetID))
-		}
-
-		// Assign the list of IDs to a stringified JSON filter
-		var filter []byte
-		filter, err = json.Marshal(subnetFilter{SubnetID: strings.Join(subnetIDList, ",")})
-		if err != nil {
-			klog.Error("could not create JSON filter for subnet_id")
-		}
-		resultFilter = string(filter)
-	}
-
 	resp, err := client.ListVPCIPv6Addresses(ctx, vpcID, linodego.NewListOptions(0, resultFilter))
 	if err != nil {
-		if linodego.ErrHasStatus(err, http.StatusNotFound) {
-			Mu.Lock()
-			defer Mu.Unlock()
-			klog.Errorf("vpc %s not found. Deleting entry from cache", vpcName)
-			delete(vpcIDs, vpcName)
-		}
-		return nil, err
+		return nil, handleNotFoundError(err, vpcName)
 	}
 	return resp, nil
 }