upkeep: byttet ut log med print

Unødvendig med dato og klokkeslett når man skal lage output fra Cli.

Author: Kyrremann

cmd/aivencmd/createcmd.go

@@ -124,7 +124,7 @@ func createCommand() *cli.Command {
 				return fmt.Errorf("an error occurred generating 'AivenApplication': %v", err)
 			}
 
-			fmt.Printf("use the following command to generate configuration secrets:\nnais aiven get %v %v %v\n", service.Name(), aivenApp.Spec.SecretName, aivenApp.Namespace)
+			fmt.Printf("Use the following command to generate configuration secrets:\n\tnais aiven get %v %v %v\n", service.Name(), aivenApp.Spec.SecretName, aivenApp.Namespace)
 
 			return nil
 		},

cmd/cmd.go

@@ -1,19 +1,18 @@
 package cmd
 
 import (
-	"log"
+	"fmt"
 	"os"
 	"os/exec"
 
-	"github.com/nais/cli/cmd/debugcmd"
-
 	"github.com/nais/cli/cmd/aivencmd"
+	"github.com/nais/cli/cmd/debugcmd"
 	"github.com/nais/cli/cmd/devicecmd"
 	"github.com/nais/cli/cmd/kubeconfigcmd"
 	"github.com/nais/cli/cmd/postgrescmd"
 	"github.com/nais/cli/cmd/rootcmd"
 	"github.com/nais/cli/cmd/validatecmd"
-	m "github.com/nais/cli/pkg/metrics"
+	"github.com/nais/cli/pkg/metrics"
 	"github.com/urfave/cli/v2"
 )
 
@@ -47,7 +46,7 @@ func Run() {
 		Commands:             commands(),
 	}
 
-	m.CollectCommandHistogram(app.Commands)
+	metrics.CollectCommandHistogram(app.Commands)
 
 	// first, before running the cli propper we check if the argv[1] contains a
 	// thing that is named nais-argv[1]. if so, we run that with the rest of the
@@ -65,7 +64,8 @@ func Run() {
 
 	err := app.Run(os.Args)
 	if err != nil {
-		log.Fatal(err)
+		fmt.Println(err)
+		os.Exit(1)
 	}
 }
 

cmd/devicecmd/doctor.go

@@ -2,7 +2,6 @@ package devicecmd
 
 import (
 	"fmt"
-	"log"
 
 	"github.com/mitchellh/go-ps"
 	"github.com/nais/cli/pkg/doctor"
@@ -59,7 +58,7 @@ func kolideWorker(checkName string) doctor.Worker {
 func isRunning(desiredProc string) (bool, error) {
 	runningProcs, err := ps.Processes()
 	if err != nil {
-		log.Printf("process listing failed: %v\n", err)
+		fmt.Printf("Process listing failed: %v\n", err)
 		return false, err
 	}
 	for _, runningProc := range runningProcs {

pkg/aiven/aiven.go

@@ -3,7 +3,6 @@ package aiven
 import (
 	"context"
 	"fmt"
-	"log"
 	"strings"
 	"time"
 
@@ -110,7 +109,7 @@ func (a Aiven) createOrUpdate(aivenApp *aiven_nais_io_v1.AivenApplication) error
 			if err != nil {
 				return err
 			}
-			log.Default().Printf("AivenApplication: '%v' created.", aivenApp.Name)
+			fmt.Printf("AivenApplication: '%v' created.", aivenApp.Name)
 		}
 	} else {
 		if len(existingAivenApp.GetObjectMeta().GetOwnerReferences()) > 0 {
@@ -122,7 +121,7 @@ func (a Aiven) createOrUpdate(aivenApp *aiven_nais_io_v1.AivenApplication) error
 		if err != nil {
 			return err
 		}
-		log.Default().Printf("AivenApplication: '%v' updated.", aivenApp.Name)
+		fmt.Printf("AivenApplication: '%v' updated.", aivenApp.Name)
 	}
 	return nil
 }

pkg/aiven/secret.go

@@ -3,7 +3,6 @@ package aiven
 import (
 	"context"
 	"fmt"
-	"log"
 	"os"
 
 	"github.com/nais/cli/pkg/aiven/aiven_config"
@@ -57,11 +56,11 @@ func ExtractAndGenerateConfig(service aiven_services.Service, secretName, namesp
 
 	if secret.Service.Is(&aiven_services.OpenSearch{}) {
 		data := secret.Secret.Data
-		log.Default().Printf("OpenSearch dashboard: https://%s (username: %s, password: %s)",
+		fmt.Printf("OpenSearch dashboard: https://%s (username: %s, password: %s)",
 			data[aiven_config.OpenSearchHostKey], data[aiven_config.OpenSearchUsernameKey], data[aiven_config.OpenSearchPasswordKey])
 	}
 
-	log.Default().Printf("configurations from secret '%s' found here:\n%s", existingSecret.Name, dest)
+	fmt.Printf("Configurations from secret '%s' found here:\n%s", existingSecret.Name, dest)
 	return nil
 }
 
@@ -113,7 +112,7 @@ func (s *Secret) CreateOpenSearchConfigs() error {
 }
 
 func (s *Secret) generateConfig() error {
-	log.Default().Printf("generating %v config from secret %v", s.Service.Name(), s.Secret.Name)
+	fmt.Printf("Generating %v config from secret %v", s.Service.Name(), s.Secret.Name)
 	return s.Service.Generate(s)
 }
 

pkg/aiven/tidy.go

@@ -19,14 +19,14 @@ func TidyLocalSecrets() error {
 func tidy(folders []string) error {
 	if len(folders) > 0 {
 		for _, folder := range folders {
-			fmt.Printf("deleting: %s\n", folder)
+			fmt.Printf("Deleting: %s\n", folder)
 			err := os.RemoveAll(folder)
 			if err != nil {
 				return fmt.Errorf("failed deleting %v: %v", folder, err)
 			}
 		}
 	} else {
-		fmt.Println("all tidy")
+		fmt.Println("All tidy")
 	}
 	return nil
 }

pkg/doctor/doctor.go

@@ -28,7 +28,7 @@ type Examination struct {
 }
 
 func (e Examination) Run() map[string]CheckReport {
-	fmt.Printf("running %d check(s)\n", len(e.Checks))
+	fmt.Printf("Running %d check(s)\n", len(e.Checks))
 	resultQueue := make(chan CheckReport, len(e.Checks))
 	results := make(map[string]CheckReport)
 	for _, check := range e.Checks {

pkg/k8s/client.go

@@ -6,11 +6,10 @@ import (
 	"log/slog"
 	"os"
 
-	"k8s.io/client-go/kubernetes"
-
 	"github.com/go-logr/logr"
 	liberatorscheme "github.com/nais/liberator/pkg/scheme"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	ctrl "sigs.k8s.io/controller-runtime/pkg/client"

pkg/kubeconfig/gcpcluster.go

@@ -58,7 +58,7 @@ func getClusters(ctx context.Context, projects []project, options filterOptions)
 	var clusters []k8sCluster
 	for _, project := range projects {
 		if options.verbose {
-			fmt.Println("getting clusters for", project.ID)
+			fmt.Println("Getting clusters for", project.ID)
 		}
 		var cluster []k8sCluster
 		var err error

pkg/kubeconfig/gcpproject.go

@@ -45,7 +45,7 @@ func getProjects(ctx context.Context, tenant string, options filterOptions) ([]p
 	}
 
 	if options.verbose {
-		fmt.Printf("filter: %s\n", filter)
+		fmt.Printf("Filter: %s\n", filter)
 	}
 
 	call := svc.Projects.Search().Query(filter)
@@ -73,7 +73,7 @@ func getProjects(ctx context.Context, tenant string, options filterOptions) ([]p
 		call.PageToken(response.NextPageToken)
 	}
 	if options.verbose {
-		fmt.Printf("projects:\n")
+		fmt.Printf("Projects:\n")
 		for _, p := range projects {
 			fmt.Printf("%s\t%s\t%s\t%v\n", p.ID, p.Tenant, p.Name, p.Kind)
 		}

pkg/metrics/otel.go

@@ -2,7 +2,7 @@ package metrics
 
 import (
 	"context"
-	"log"
+	"fmt"
 	"os"
 	"strings"
 	"time"
@@ -98,7 +98,7 @@ func intersection(list1, list2 []string) []string {
 func CollectCommandHistogram(commands []*cli.Command) {
 	doNotTrack := os.Getenv("DO_NOT_TRACK")
 	if doNotTrack == "1" {
-		log.Default().Println("DO_NOT_TRACK is set, not collecting metrics")
+		fmt.Println("DO_NOT_TRACK is set, not collecting metrics")
 	}
 
 	ctx := context.Background()

pkg/naisdevice/status.go

@@ -57,7 +57,7 @@ func waitForConnectionState(ctx context.Context, client pb.DeviceAgentClient, wa
 		if err != nil {
 			return fmt.Errorf("error while receiving status: %w", err)
 		}
-		fmt.Printf("state: %s\n", status.ConnectionState)
+		fmt.Printf("State: %s\n", status.ConnectionState)
 		if status.ConnectionState == wantedAgentState {
 			return nil
 		}
@@ -105,7 +105,7 @@ func gatewayPrivileged(gw *pb.Gateway) string {
 }
 
 func PrintVerboseStatus(status *pb.AgentStatus) {
-	fmt.Printf("naisdevice status: %s\n", status.ConnectionStateString())
+	fmt.Printf("Naisdevice status: %s\n", status.ConnectionStateString())
 	if status.NewVersionAvailable {
 		fmt.Printf("\nNew version of naisdevice available!\nSee https://doc.nais.io/device/update for upgrade instructions.\n")
 	}

pkg/postgres/proxy.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"os"
 	"os/signal"
@@ -14,9 +13,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/GoogleCloudPlatform/cloudsql-proxy/logging"
-
 	"cloud.google.com/go/cloudsqlconn"
+	"github.com/GoogleCloudPlatform/cloudsql-proxy/logging"
 )
 
 func RunProxy(ctx context.Context, appName, cluster, namespace, host string, port uint, verbose bool) error {
@@ -113,7 +111,7 @@ func runProxy(ctx context.Context, projectID, connectionName, address string, po
 		<-ctx.Done()
 		// TODO: Make this not panic listener.Accept()
 		if err := listener.Close(); err != nil {
-			log.Println("error closing listener", err)
+			fmt.Println("error closing listener", err)
 		}
 	}()
 
@@ -127,10 +125,10 @@ OUTER:
 				break OUTER
 			default:
 			}
-			log.Println("error accepting connection", err)
+			fmt.Println("error accepting connection", err)
 			continue
 		}
-		log.Println("New connection", conn.RemoteAddr())
+		fmt.Println("New connection", conn.RemoteAddr())
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
@@ -141,13 +139,13 @@ OUTER:
 			go func() {
 				<-ctx.Done()
 				if err := conn.Close(); err != nil {
-					log.Println("error closing connection", err)
+					fmt.Println("error closing connection", err)
 				}
 			}()
 
 			conn2, err := d.Dial(ctx, connectionName)
 			if err != nil {
-				log.Println("error dialing connection", err)
+				fmt.Println("error dialing connection", err)
 				return
 			}
 			defer conn2.Close()
@@ -156,7 +154,7 @@ OUTER:
 			go copy(closer, conn2, conn)
 			go copy(closer, conn, conn2)
 			<-closer
-			log.Println("Connection complete", conn.RemoteAddr())
+			fmt.Println("Connection complete", conn.RemoteAddr())
 		}()
 	}
 
@@ -178,7 +176,7 @@ func checkPostgresqlPassword() error {
 
 	dirname, err := os.UserHomeDir()
 	if err != nil {
-		log.Println("could not get home directory, can not check for .pgpass file")
+		fmt.Println("could not get home directory, can not check for .pgpass file")
 		return nil
 	}