Introduce log library

go.mod

@@ -3,6 +3,7 @@ module github.com/alenkacz/cert-manager-verifier
 go 1.15
 
 require (
+	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.1.1
 	k8s.io/apimachinery v0.19.4
 	k8s.io/cli-runtime v0.19.4

pkg/cmd/verify/deployments.go

@@ -8,6 +8,7 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"os"
+	"github.com/sirupsen/logrus"
 )
 
 type Options struct {
@@ -51,6 +52,9 @@ func NewCmd() *cobra.Command {
 }
 
 func (o *Options) Execute() error {
+	logrus.SetOutput(o.Streams.Out)
+	logrus.SetFormatter(SimpleFormatter{})
+
 	if o.ConfigFlags.Namespace == nil {
 		cmn := "cert-manager"
 		o.ConfigFlags.Namespace = &cmn
@@ -69,19 +73,19 @@ func (o *Options) Execute() error {
 	}
 
 	deployments := verify.DeploymentDefinitionDefault()
-	_, _ = fmt.Fprintf(o.Streams.Out, "Waiting for following deployments in namespace %s:\n%s", deployments.Namespace, formatDeploymentNames(deployments.Names))
+	logrus.Infof("Waiting for following deployments in namespace %s:\n%s", deployments.Namespace, formatDeploymentNames(deployments.Names))
 	result := verify.DeploymentsReady(kubeClient, deployments)
-	_, _ = fmt.Fprintf(o.Streams.Out, formatDeploymentResult(result))
+	logrus.Infof(formatDeploymentResult(result))
 
 	if !allReady(result) {
 		return fmt.Errorf("FAILED! Not all deployments are ready.")
 	}
 	err = verify.WaitForTestCertificate(dynamicClient)
 	if err != nil {
-		_, _ = fmt.Fprintf(o.Streams.Out, "error when waiting for certificate to be ready: %v", err)
+		logrus.Infof("error when waiting for certificate to be ready: %v", err)
 		return err
 	}
-	_, _ = fmt.Fprint(o.Streams.Out, "ヽ(•‿•)ノ Cert-manager is READY!")
+	logrus.Info("ヽ(•‿•)ノ Cert-manager is READY!")
 	return nil
 }
 
@@ -114,3 +118,9 @@ func formatDeploymentResult(result []verify.DeploymentResult) string {
 	}
 	return formattedResult
 }
+
+type SimpleFormatter struct {}
+
+func (SimpleFormatter) Format(entry *logrus.Entry) ([]byte, error) {
+	return []byte(entry.Message), nil
+}

pkg/verify/certificate.go

@@ -3,6 +3,7 @@ package verify
 import (
 	"context"
 	"fmt"
+	"github.com/sirupsen/logrus"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -36,7 +37,7 @@ var namespace = &unstructured.Unstructured{
 func WaitForTestCertificate(dynamicClient dynamic.Interface) error {
 	cert := certificate("cert-manager-test", group, version)
 	resources := []*unstructured.Unstructured{namespace, issuer("cert-manager-test", group, version), cert}
-	defer cleanupTestResources(dynamicClient, resources)
+	// defer cleanupTestResources(dynamicClient, resources)
 
 	for _, res := range resources {
 		err := createResource(dynamicClient, res)
@@ -91,7 +92,7 @@ func createResource(dynamicClient dynamic.Interface, resource *unstructured.Unst
 		Resource: fmt.Sprintf("%ss", strings.ToLower(gvk.Kind)), // since we know what kinds are we dealing with here, this is OK
 	}).Namespace(resource.GetNamespace()).Create(context.TODO(), resource, metav1.CreateOptions{})
 	if errors.IsAlreadyExists(err) {
-		fmt.Printf("resource %s already exists\n", resource.GetName())
+		logrus.Debugf("resource %s already exists\n", resource.GetName())
 	} else if err != nil {
 		return fmt.Errorf("error when creating resource %s/%s. %v", resource.GetName(), resource.GetNamespace(), err)
 	}
@@ -106,7 +107,7 @@ func deleteResource(dynamicClient dynamic.Interface, resource *unstructured.Unst
 		Resource: fmt.Sprintf("%ss", strings.ToLower(gvk.Kind)), // since we know what kinds are we dealing with here, this is OK
 	}).Namespace(resource.GetNamespace()).Delete(context.TODO(), resource.GetName(), metav1.DeleteOptions{})
 	if errors.IsNotFound(err) {
-		fmt.Printf("resource %s already deleted\n", resource.GetName())
+		logrus.Debugf("resource %s already deleted\n", resource.GetName())
 	} else if err != nil {
 		return fmt.Errorf("error when creating resource %s/%s. %v", resource.GetName(), resource.GetNamespace(), err)
 	}