improve logging (dependabot#77)

Author: jakecoffman

cmd/dependabot/internal/cmd/root.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"log"
 	"os"
 	"time"
 
@@ -44,6 +45,9 @@ func Execute() {
 }
 
 func init() {
+	log.SetFlags(log.Ldate | log.Ltime | log.LUTC)
+	log.SetPrefix("cli | ")
+
 	rootCmd.PersistentFlags().StringVar(&updaterImage, "updater-image", "", "container image to use for the updater")
 	rootCmd.PersistentFlags().StringVar(&proxyImage, "proxy-image", infra.ProxyImageName, "container image to use for the proxy")
 }

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/docker/cli v23.0.1+incompatible
 	github.com/docker/docker v23.0.1+incompatible
+	github.com/goware/prefixer v0.0.0-20160118172347-395022866408
 	github.com/moby/moby v23.0.1+incompatible
 	github.com/moby/sys/signal v0.7.0
 	github.com/spf13/cobra v1.6.1

go.sum

@@ -26,6 +26,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/goware/prefixer v0.0.0-20160118172347-395022866408 h1:Y9iQJfEqnN3/Nce9cOegemcy/9Ai5k3huT6E80F3zaw=
+github.com/goware/prefixer v0.0.0-20160118172347-395022866408/go.mod h1:PE1ycukgRPJ7bJ9a1fdfQ9j8i/cEcRAoLZzbxYpNB/s=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

internal/infra/proxy.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/goware/prefixer"
+	"io"
 	"math/rand"
 	"os"
 	"path"
@@ -154,7 +156,11 @@ func (p *Proxy) TailLogs(ctx context.Context, cli *client.Client) {
 		return
 	}
 
-	_, _ = stdcopy.StdCopy(os.Stdout, os.Stderr, out)
+	r, w := io.Pipe()
+	go func() {
+		_, _ = io.Copy(os.Stderr, prefixer.New(r, "proxy | "))
+	}()
+	_, _ = stdcopy.StdCopy(w, w, out)
 }
 
 func (p *Proxy) Close() error {

internal/infra/updater.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/goware/prefixer"
 	"io"
 	"os"
 	"path"
@@ -231,10 +232,16 @@ func (u *Updater) RunUpdate(ctx context.Context, proxyURL string, apiPort int) e
 	if err != nil {
 		return fmt.Errorf("failed to start exec: %w", err)
 	}
+
+	r, w := io.Pipe()
+	go func() {
+		_, _ = io.Copy(os.Stderr, prefixer.New(r, "updater | "))
+	}()
+
 	// blocks until update is complete or ctl-c
 	ch := make(chan struct{})
 	go func() {
-		_, _ = stdcopy.StdCopy(os.Stdout, os.Stderr, execResp.Reader)
+		_, _ = stdcopy.StdCopy(w, w, execResp.Reader)
 		ch <- struct{}{}
 	}()