fixing lint issues for default linters enabled by golangci

Author: M00nF1sh

cmd/main.go

@@ -94,7 +94,9 @@ func main() {
 	mc.Start()
 
 	cloud := aws.New(options.AWSAPIMaxRetries, options.AWSAPIDebug, options.config.ClusterName, mc, cc)
-	controller.Initialize(&options.config, mgr, mc, cloud)
+	if err := controller.Initialize(&options.config, mgr, mc, cloud); err != nil {
+		glog.Fatal(err)
+	}
 
 	mux := http.NewServeMux()
 	if options.ProfilingEnabled {
@@ -130,7 +132,7 @@ func registerHandlers(mux *http.ServeMux) {
 	mux.HandleFunc("/build", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
 		b, _ := json.Marshal(version.String())
-		w.Write(b)
+		_, _ = w.Write(b)
 	})
 
 	mux.HandleFunc("/stop", func(w http.ResponseWriter, r *http.Request) {

cmd/options.go

@@ -108,12 +108,12 @@ func getOptions() (*Options, error) {
 		`Enable profiling via web interface host:port/debug/pprof/`)
 	options.config.BindFlags(flags)
 
-	flags.MarkDeprecated("aws-sync-period", `No longer used, will be removed in next release`)
-	flags.MarkDeprecated("default-backend-service", `No longer used, will be removed in next release`)
+	_ = flags.MarkDeprecated("aws-sync-period", `No longer used, will be removed in next release`)
+	_ = flags.MarkDeprecated("default-backend-service", `No longer used, will be removed in next release`)
 
-	flag.Set("logtostderr", "true")
+	_ = flag.Set("logtostderr", "true")
 	flags.AddGoFlagSet(flag.CommandLine)
-	flags.Parse(os.Args)
+	_ = flags.Parse(os.Args)
 
 	err := configOptionsByEnvironmentVariables(options)
 	if err != nil {
@@ -184,6 +184,6 @@ func validateOptions(options *Options) error {
 
 func generateALBNamePrefix(clusterName string) string {
 	hash := crc32.New(crc32.MakeTable(0xedb88320))
-	hash.Write([]byte(clusterName))
+	_, _ = hash.Write([]byte(clusterName))
 	return hex.EncodeToString(hash.Sum(nil))
 }

internal/alb/generator/name.go

@@ -19,7 +19,7 @@ type NameGenerator struct {
 
 func (gen *NameGenerator) NameLB(namespace string, ingressName string) string {
 	hasher := md5.New()
-	hasher.Write([]byte(namespace + ingressName))
+	_, _ = hasher.Write([]byte(namespace + ingressName))
 	hash := hex.EncodeToString(hasher.Sum(nil))[:4]
 
 	r, _ := regexp.Compile("[[:^alnum:]]")
@@ -40,11 +40,11 @@ func (gen *NameGenerator) NameTG(namespace string, ingressName string, serviceNa
 	LBName := gen.NameLB(namespace, ingressName)
 
 	hasher := md5.New()
-	hasher.Write([]byte(LBName))
-	hasher.Write([]byte(serviceName))
-	hasher.Write([]byte(servicePort))
-	hasher.Write([]byte(protocol))
-	hasher.Write([]byte(targetType))
+	_, _ = hasher.Write([]byte(LBName))
+	_, _ = hasher.Write([]byte(serviceName))
+	_, _ = hasher.Write([]byte(servicePort))
+	_, _ = hasher.Write([]byte(protocol))
+	_, _ = hasher.Write([]byte(targetType))
 
 	return fmt.Sprintf("%.12s-%.19s", gen.ALBNamePrefix, hex.EncodeToString(hasher.Sum(nil)))
 }

internal/alb/lb/loadbalancer.go

@@ -185,7 +185,9 @@ func (controller *defaultController) ensureLBInstance(ctx context.Context, lbCon
 		}
 		return instance, nil
 	}
-	controller.reconcileLBInstance(ctx, instance, lbConfig)
+	if err := controller.reconcileLBInstance(ctx, instance, lbConfig); err != nil {
+		return nil, err
+	}
 	return instance, nil
 }
 
@@ -260,7 +262,7 @@ func (controller *defaultController) reconcileWAF(ctx context.Context, lbArn str
 		if err != nil {
 			return fmt.Errorf("error fetching web acl %v: %v", aws.StringValue(webACLID), err)
 		}
-		if b == false {
+		if !b {
 			return fmt.Errorf("web acl %v does not exist", aws.StringValue(webACLID))
 		}
 	}

internal/alb/lb/loadbalancer_test.go

@@ -12,13 +12,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func ec2Filter(k string, v ...string) *ec2.Filter {
-	return &ec2.Filter{
-		Name:   aws.String(k),
-		Values: aws.StringSlice(v),
-	}
-}
-
 func TestCloud_ResolveSecurityGroupNames(t *testing.T) {
 	idmap := map[string]string{
 		"sg1": "sg-123456",

internal/alb/sg/lb_attachment.go

@@ -3,6 +3,7 @@ package sg
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/util/sets"
 
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/internal/albctx"
 
@@ -40,10 +41,9 @@ func (controller *lbAttachmentController) Reconcile(ctx context.Context, attachm
 		return fmt.Errorf("loadBalancer %s doesn't exists", attachment.LbArn)
 	}
 
-	groupsInLb := aws.StringValueSlice(loadBalancer.SecurityGroups)
-	groupsToAdd := diffStringSet(attachment.GroupIDs, groupsInLb)
-	groupsToDelete := diffStringSet(groupsInLb, attachment.GroupIDs)
-	if len(groupsToAdd) != 0 || len(groupsToDelete) != 0 {
+	desiredGroups := sets.NewString(attachment.GroupIDs...)
+	currentGroups := sets.NewString(aws.StringValueSlice(loadBalancer.SecurityGroups)...)
+	if !desiredGroups.Equal(currentGroups) {
 		albctx.GetLogger(ctx).Infof("modify securityGroup on LoadBalancer %s to be %v", attachment.LbArn, attachment.GroupIDs)
 		_, err := controller.cloud.SetSecurityGroupsWithContext(ctx, &elbv2.SetSecurityGroupsInput{
 			LoadBalancerArn: aws.String(attachment.LbArn),
@@ -65,21 +65,22 @@ func (controller *lbAttachmentController) Delete(ctx context.Context, attachment
 		return fmt.Errorf("loadBalancer %s doesn't exist", attachment.LbArn)
 	}
 
-	groupsInLb := aws.StringValueSlice(loadBalancer.SecurityGroups)
-	groupsShouldRemain := diffStringSet(groupsInLb, attachment.GroupIDs)
-	if len(groupsShouldRemain) != len(groupsInLb) {
-		if len(groupsShouldRemain) == 0 {
+	undesiredGroups := sets.NewString(attachment.GroupIDs...)
+	currentGroups := sets.NewString(aws.StringValueSlice(loadBalancer.SecurityGroups)...)
+	groupsToKeep := currentGroups.Difference(undesiredGroups)
+	if len(groupsToKeep) != len(currentGroups) {
+		if len(groupsToKeep) == 0 {
 			defaultSGID, err := controller.getDefaultSecurityGroupID()
 			if err != nil {
 				return fmt.Errorf("failed to get default securityGroup for current vpc due to %v", err)
 			}
-			groupsShouldRemain = append(groupsShouldRemain, *defaultSGID)
+			groupsToKeep.Insert(defaultSGID)
 		}
-
-		albctx.GetLogger(ctx).Infof("modify securityGroup on LoadBalancer %s to be %v", attachment.LbArn, groupsShouldRemain)
+		desiredGroups := groupsToKeep.List()
+		albctx.GetLogger(ctx).Infof("modify securityGroup on LoadBalancer %s to be %v", attachment.LbArn, desiredGroups)
 		_, err := controller.cloud.SetSecurityGroupsWithContext(ctx, &elbv2.SetSecurityGroupsInput{
 			LoadBalancerArn: aws.String(attachment.LbArn),
-			SecurityGroups:  aws.StringSlice(groupsShouldRemain),
+			SecurityGroups:  aws.StringSlice(desiredGroups),
 		})
 		if err != nil {
 			return err
@@ -88,29 +89,15 @@ func (controller *lbAttachmentController) Delete(ctx context.Context, attachment
 	return nil
 }
 
-func (controller *lbAttachmentController) getDefaultSecurityGroupID() (*string, error) {
+func (controller *lbAttachmentController) getDefaultSecurityGroupID() (string, error) {
 	vpcID, err := controller.cloud.GetVPCID()
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
 	defaultSG, err := controller.cloud.GetSecurityGroupByName(*vpcID, "default")
 	if err != nil {
-		return nil, err
-	}
-	return defaultSG.GroupId, nil
-}
-
-// diffStringSet calcuates the set_difference as source - target
-func diffStringSet(source []string, target []string) (diffs []string) {
-	targetSet := make(map[string]bool)
-	for _, t := range target {
-		targetSet[t] = true
-	}
-	for _, s := range source {
-		if _, ok := targetSet[s]; !ok {
-			diffs = append(diffs, s)
-		}
+		return "", err
 	}
-	return diffs
+	return aws.StringValue(defaultSG.GroupId), nil
 }

internal/alb/sg/namer.go

@@ -15,7 +15,7 @@ type Namer interface {
 type namer struct{}
 
 func (namer *namer) NameLbSG(loadBalancerID string) string {
-	return fmt.Sprintf("%s", loadBalancerID)
+	return loadBalancerID
 }
 
 func (namer *namer) NameInstanceSG(loadBalancerID string) string {

internal/alb/sg/security_group.go

@@ -179,7 +179,7 @@ func diffIPPermissions(source []*ec2.IpPermission, target []*ec2.IpPermission) (
 				break
 			}
 		}
-		if containsInTarget == false {
+		if !containsInTarget {
 			diffs = append(diffs, sPermission)
 		}
 	}
@@ -223,7 +223,7 @@ func diffIPRanges(source []*ec2.IpRange, target []*ec2.IpRange) (diffs []*ec2.Ip
 				break
 			}
 		}
-		if containsInTarget == false {
+		if !containsInTarget {
 			diffs = append(diffs, sRange)
 		}
 	}
@@ -245,7 +245,7 @@ func diffUserIDGroupPairs(source []*ec2.UserIdGroupPair, target []*ec2.UserIdGro
 				break
 			}
 		}
-		if containsInTarget == false {
+		if !containsInTarget {
 			diffs = append(diffs, sPair)
 		}
 	}
@@ -255,8 +255,5 @@ func diffUserIDGroupPairs(source []*ec2.UserIdGroupPair, target []*ec2.UserIdGro
 // userIDGroupPairEquals test whether two UserIdGroupPair equals
 // currently we only check for groupId
 func userIDGroupPairEquals(source *ec2.UserIdGroupPair, target *ec2.UserIdGroupPair) bool {
-	if aws.StringValue(source.GroupId) != aws.StringValue(target.GroupId) {
-		return false
-	}
-	return true
+	return aws.StringValue(source.GroupId) == aws.StringValue(target.GroupId)
 }

internal/alb/tg/targets_test.go

@@ -22,7 +22,6 @@ func Test_NewTargets(t *testing.T) {
 		targetType string
 		ingress    *extensions.Ingress
 		backend    *extensions.IngressBackend
-		output     *Targets
 	}{
 		{
 			name:       "std params",

internal/aws/ec2.go

@@ -14,7 +14,6 @@ import (
 )
 
 const (
-	instSpecifierTag = "instance"
 	ManagedByKey     = "ManagedBy"
 	ManagedByValue   = "alb-ingress"
 

internal/aws/elbv2.go

@@ -10,13 +10,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/elbv2"
 )
 
-const (
-	// Amount of time between each deletion attempt (or reattempt) for a target group
-	deleteTargetGroupReattemptSleep int = 10
-	// Maximum attempts should be made to delete a target group
-	deleteTargetGroupReattemptMax int = 10
-)
-
 type ELBV2API interface {
 	StatusELBV2() func() error
 
@@ -140,9 +133,7 @@ func (c *Cloud) GetRules(ctx context.Context, listenerArn string) ([]*elbv2.Rule
 	}
 	for p.Next() {
 		page := p.Page().(*elbv2.DescribeRulesOutput)
-		for _, rule := range page.Rules {
-			rules = append(rules, rule)
-		}
+		rules = append(rules, page.Rules...)
 	}
 	return rules, p.Err()
 }
@@ -167,9 +158,7 @@ func (c *Cloud) ListListenersByLoadBalancer(ctx context.Context, lbArn string) (
 			if p == nil {
 				return false
 			}
-			for _, listener := range p.Listeners {
-				listeners = append(listeners, listener)
-			}
+			listeners = append(listeners, p.Listeners...)
 			return true
 		})
 	if err != nil {

internal/ingress/backend/endpoint.go

@@ -68,9 +68,9 @@ func (resolver *endpointResolver) resolveInstance(ingress *extensions.Ingress, b
 		instanceID, err := resolver.store.GetNodeInstanceID(node)
 		if err != nil {
 			return nil, err
-		} else if b, err := resolver.cloud.IsNodeHealthy(instanceID); err != nil {
+		} else if healthy, err := resolver.cloud.IsNodeHealthy(instanceID); err != nil {
 			return nil, err
-		} else if b != true {
+		} else if !healthy {
 			continue
 		}
 		result = append(result, &elbv2.TargetDescription{

internal/ingress/controller/store/dummy.go

@@ -63,7 +63,6 @@ func (d Dummy) GetIngressAnnotations(key string) (*annotations.Ingress, error) {
 
 // Run ...
 func (d Dummy) Run(stopCh chan struct{}) {
-	return
 }
 
 // GetConfig ...

internal/ingress/controller/store/store.go

@@ -186,7 +186,7 @@ func New(mgr manager.Manager, cfg *config.Configuration) (Storer, error) {
 			if !class.IsValidIngress(cfg.IngressClass, ing) {
 				return
 			}
-			store.listers.IngressAnnotation.Delete(ing)
+			_ = store.listers.IngressAnnotation.Delete(ing)
 		},
 		UpdateFunc: func(old, cur interface{}) {
 			curIng := cur.(*extensions.Ingress)

pkg/util/types/types.go

@@ -17,7 +17,7 @@ func init() {
 
 func DeepEqual(x, y interface{}) bool {
 	b := awsutil.DeepEqual(x, y)
-	if b == false {
+	if !b {
 		logger.DebugLevelf(3, "DeepEqual(%v, %v) found inequality", log.Prettify(x), log.Prettify(y))
 	}
 	return b