remove unnecessary import aliases

Author: mattfenwick

pkg/cli/root.go

@@ -1,17 +1,18 @@
 package cli
 
 import (
+	"os"
+
 	"github.com/mattfenwick/cyclonus/pkg/utils"
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 func RunRootCommand() {
 	command := SetupRootCommand()
 	if err := errors.Wrapf(command.Execute(), "run root command"); err != nil {
-		log.Fatalf("unable to run root command: %+v", err)
+		logrus.Fatalf("unable to run root command: %+v", err)
 		os.Exit(1)
 	}
 }

pkg/connectivity/printer.go

@@ -2,12 +2,13 @@ package connectivity
 
 import (
 	"fmt"
-	"github.com/mattfenwick/collections/pkg/slice"
-	log "github.com/sirupsen/logrus"
-	"golang.org/x/exp/maps"
 	"math"
 	"strings"
 
+	"github.com/mattfenwick/collections/pkg/slice"
+	"github.com/sirupsen/logrus"
+	"golang.org/x/exp/maps"
+
 	"github.com/mattfenwick/cyclonus/pkg/generator"
 	"github.com/mattfenwick/cyclonus/pkg/utils"
 	"github.com/olekukonko/tablewriter"
@@ -37,7 +38,7 @@ func (t *Printer) PrintSummary() {
 	fmt.Printf("Tag results:\n%s\n", t.printMarkdownFeatureTable(summary.TagPrimaryCounts, summary.TagCounts))
 
 	if err := PrintJUnitResults(t.JunitResultsFile, t.Results, t.IgnoreLoopback); err != nil {
-		log.Errorf("unable to dump JUnit test results: %+v", err)
+		logrus.Errorf("unable to dump JUnit test results: %+v", err)
 	}
 }
 

pkg/kube/ipaddress_tests.go

@@ -2,11 +2,12 @@ package kube
 
 import (
 	"fmt"
+	"net"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/networking/v1"
-	"net"
 )
 
 type ipCidrTestCase struct {
@@ -41,7 +42,7 @@ func RunIPAddressTests() {
 				},
 			}
 			for _, c := range testCases {
-				log.Infof("looking at %+v", c)
+				logrus.Infof("looking at %+v", c)
 				isInCidr, err := IsIPInCIDR(c.IP, c.CIDR)
 				Expect(err).To(BeNil())
 				Expect(isInCidr).To(Equal(c.IsMember))
@@ -83,7 +84,7 @@ func RunIPAddressTests() {
 			}
 
 			for _, c := range testCases {
-				log.Infof("looking at %+v", c)
+				logrus.Infof("looking at %+v", c)
 				isInCidr, err := IsIPInCIDR(c.IP, c.CIDR)
 				Expect(err).To(BeNil())
 				Expect(isInCidr).To(Equal(c.IsMember))
@@ -143,7 +144,7 @@ func RunIPAddressTests() {
 				},
 			}
 			for _, c := range testCases {
-				log.Infof("looking at %+v", c)
+				logrus.Infof("looking at %+v", c)
 				isMatch, err := IsIPAddressMatchForIPBlock(c.IP, c.IPBlock)
 				Expect(err).To(BeNil())
 				Expect(isMatch).To(Equal(c.IsMatch))
@@ -182,7 +183,7 @@ func RunIPAddressTests() {
 				},
 			}
 			for _, c := range testCases {
-				log.Infof("looking at %+v", c)
+				logrus.Infof("looking at %+v", c)
 
 				isMatchWithoutExcept, err := IsIPAddressMatchForIPBlock(c.IP, &v1.IPBlock{
 					CIDR:   c.IPBlock.CIDR,

pkg/kube/kubernetes.go

@@ -3,8 +3,9 @@ package kube
 import (
 	"bytes"
 	"context"
+
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -22,7 +23,7 @@ type Kubernetes struct {
 }
 
 func NewKubernetesForContext(context string) (*Kubernetes, error) {
-	log.Debugf("instantiating k8s Clientset for context %s", context)
+	logrus.Debugf("instantiating k8s Clientset for context %s", context)
 	kubeConfig, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
 		clientcmd.NewDefaultClientConfigLoadingRules(),
 		&clientcmd.ConfigOverrides{CurrentContext: context}).ClientConfig()
@@ -70,13 +71,13 @@ func (k *Kubernetes) CreateNamespace(ns *v1.Namespace) (*v1.Namespace, error) {
 }
 
 func (k *Kubernetes) DeleteAllNetworkPoliciesInNamespace(ns string) error {
-	log.Debugf("deleting all network policies in namespace %s", ns)
+	logrus.Debugf("deleting all network policies in namespace %s", ns)
 	netpols, err := k.ClientSet.NetworkingV1().NetworkPolicies(ns).List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
 		return errors.Wrapf(err, "unable to list network policies in ns %s", ns)
 	}
 	for _, np := range netpols.Items {
-		log.Debugf("deleting network policy %s/%s", ns, np.Name)
+		logrus.Debugf("deleting network policy %s/%s", ns, np.Name)
 		err = k.DeleteNetworkPolicy(np.Namespace, np.Name)
 		if err != nil {
 			return err
@@ -99,13 +100,13 @@ func (k *Kubernetes) GetNetworkPoliciesInNamespace(namespace string) ([]networki
 }
 
 func (k *Kubernetes) UpdateNetworkPolicy(policy *networkingv1.NetworkPolicy) (*networkingv1.NetworkPolicy, error) {
-	log.Debugf("updating network policy %s/%s", policy.Namespace, policy.Name)
+	logrus.Debugf("updating network policy %s/%s", policy.Namespace, policy.Name)
 	np, err := k.ClientSet.NetworkingV1().NetworkPolicies(policy.Namespace).Update(context.TODO(), policy, metav1.UpdateOptions{})
 	return np, errors.Wrapf(err, "unable to update network policy %s/%s", policy.Namespace, policy.Name)
 }
 
 func (k *Kubernetes) CreateNetworkPolicy(policy *networkingv1.NetworkPolicy) (*networkingv1.NetworkPolicy, error) {
-	log.Debugf("creating network policy %s/%s", policy.Namespace, policy.Name)
+	logrus.Debugf("creating network policy %s/%s", policy.Namespace, policy.Name)
 
 	createdPolicy, err := k.ClientSet.NetworkingV1().NetworkPolicies(policy.Namespace).Create(context.TODO(), policy, metav1.CreateOptions{})
 	return createdPolicy, errors.Wrapf(err, "unable to create network policy %s/%s", policy.Namespace, policy.Name)
@@ -118,7 +119,7 @@ func (k *Kubernetes) GetService(namespace string, name string) (*v1.Service, err
 
 func (k *Kubernetes) CreateService(svc *v1.Service) (*v1.Service, error) {
 	ns := svc.Namespace
-	log.Debugf("creating service %s/%s", ns, svc.Name)
+	logrus.Debugf("creating service %s/%s", ns, svc.Name)
 	createdService, err := k.ClientSet.CoreV1().Services(ns).Create(context.TODO(), svc, metav1.CreateOptions{})
 	if err != nil {
 		return nil, errors.Wrapf(err, "unable to create service %s/%s", ns, svc.Name)
@@ -127,7 +128,7 @@ func (k *Kubernetes) CreateService(svc *v1.Service) (*v1.Service, error) {
 }
 
 func (k *Kubernetes) DeleteService(namespace string, name string) error {
-	log.Debugf("deleting service %s/%s", namespace, name)
+	logrus.Debugf("deleting service %s/%s", namespace, name)
 	err := k.ClientSet.CoreV1().Services(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
 	return errors.Wrapf(err, "unable to delete service %s/%s", namespace, name)
 }
@@ -165,14 +166,14 @@ func (k *Kubernetes) SetPodLabels(namespace string, podName string, labels map[s
 
 func (k *Kubernetes) CreatePod(pod *v1.Pod) (*v1.Pod, error) {
 	ns := pod.Namespace
-	log.Debugf("creating pod %s/%s", ns, pod.Name)
+	logrus.Debugf("creating pod %s/%s", ns, pod.Name)
 
 	createdPod, err := k.ClientSet.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{})
 	return createdPod, errors.Wrapf(err, "unable to create pod %s/%s", ns, pod.Name)
 }
 
 func (k *Kubernetes) DeletePod(namespace string, podName string) error {
-	log.Debugf("deleting pod %s/%s", namespace, podName)
+	logrus.Debugf("deleting pod %s/%s", namespace, podName)
 	err := k.ClientSet.CoreV1().Pods(namespace).Delete(context.TODO(), podName, metav1.DeleteOptions{})
 	return errors.Wrapf(err, "unable to delete pod %s/%s", namespace, podName)
 }

pkg/utils/resty.go

@@ -3,9 +3,10 @@ package utils
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/go-resty/resty/v2"
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 func IssueRequest(restyClient *resty.Client, verb string, path string, body interface{}, result interface{}) (string, error) {
@@ -16,15 +17,15 @@ func IssueRequest(restyClient *resty.Client, verb string, path string, body inte
 		if err != nil {
 			return "", errors.Wrapf(err, "unable to marshal json")
 		}
-		log.Tracef("request body: %s", string(reqBody))
+		logrus.Tracef("request body: %s", string(reqBody))
 		request = request.SetBody(body)
 	}
 	if result != nil {
 		request = request.SetResult(result)
 	}
 
 	urlPath := fmt.Sprintf("%s/%s", restyClient.HostURL, path)
-	log.Debugf("issuing %s to %s", verb, urlPath)
+	logrus.Debugf("issuing %s to %s", verb, urlPath)
 
 	var resp *resty.Response
 	switch verb {
@@ -44,8 +45,8 @@ func IssueRequest(restyClient *resty.Client, verb string, path string, body inte
 	}
 
 	respBody, statusCode := resp.String(), resp.StatusCode()
-	log.Debugf("response code %d from %s to %s", statusCode, verb, urlPath)
-	log.Tracef("response body: %s", respBody)
+	logrus.Debugf("response code %d from %s to %s", statusCode, verb, urlPath)
+	logrus.Tracef("response body: %s", respBody)
 
 	if !resp.IsSuccess() {
 		return respBody, errors.Errorf("bad status code for %s to path %s: %d, response %s", verb, path, statusCode, respBody)

pkg/worker/cli.go

@@ -2,17 +2,18 @@ package worker
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/mattfenwick/cyclonus/pkg/utils"
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 func Run() {
 	command := SetupRootCommand()
 	if err := errors.Wrapf(command.Execute(), "run root command"); err != nil {
-		log.Fatalf("unable to run root command: %+v", err)
+		logrus.Fatalf("unable to run root command: %+v", err)
 		os.Exit(1)
 	}
 }

pkg/worker/client.go

@@ -2,9 +2,10 @@ package worker
 
 import (
 	"encoding/json"
+
 	"github.com/mattfenwick/cyclonus/pkg/kube"
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 type Client struct {
@@ -17,9 +18,9 @@ func (c *Client) Batch(b *Batch) ([]*Result, error) {
 		return nil, errors.Wrapf(err, "unable to marshal json")
 	}
 	command := []string{"/worker", "--jobs", string(bytes)}
-	log.Infof("issuing %s worker command with %d requests", b.Key(), len(b.Requests))
+	logrus.Infof("issuing %s worker command with %d requests", b.Key(), len(b.Requests))
 	stdout, stderr, commandErr, err := c.Kubernetes.ExecuteRemoteCommand(b.Namespace, b.Pod, b.Container, command)
-	log.Tracef("%s worker stdout:\n%s\nworker stderr:\n%s\n", b.Key(), stdout, stderr)
+	logrus.Tracef("%s worker stdout:\n%s\nworker stderr:\n%s\n", b.Key(), stdout, stderr)
 
 	if err != nil {
 		return nil, err