Update dependencies (#710)

corneliusweig · web-flow · commit a28e95123e69 · 2021-07-10T09:58:46.000-07:00
* Update dependencies

* Switch to k8s.io/klog/v2
diff --git a/cmd/krew/cmd/index.go b/cmd/krew/cmd/index.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/cmd/krew/cmd/internal"
 	"sigs.k8s.io/krew/internal/index/indexoperations"
diff --git a/cmd/krew/cmd/install.go b/cmd/krew/cmd/install.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/cmd/krew/cmd/internal"
 	"sigs.k8s.io/krew/internal/index/indexscanner"
diff --git a/cmd/krew/cmd/internal/fetch_tag.go b/cmd/krew/cmd/internal/fetch_tag.go
@@ -19,7 +19,7 @@ import (
 	"net/http"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const (
diff --git a/cmd/krew/cmd/internal/setup_check.go b/cmd/krew/cmd/internal/setup_check.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/environment"
 	"sigs.k8s.io/krew/internal/installation"
diff --git a/cmd/krew/cmd/root.go b/cmd/krew/cmd/root.go
@@ -27,7 +27,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/cmd/krew/cmd/internal"
 	"sigs.k8s.io/krew/internal/environment"
@@ -73,7 +73,7 @@ You can invoke krew through kubectl: "kubectl krew [command]..."`,
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {
-		if klog.V(1) {
+		if klog.V(1).Enabled() {
 			klog.Fatalf("%+v", err) // with stack trace
 		} else {
 			klog.Fatal(err) // just error message
diff --git a/cmd/krew/cmd/search.go b/cmd/krew/cmd/search.go
@@ -22,7 +22,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sahilm/fuzzy"
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/index/indexoperations"
 	"sigs.k8s.io/krew/internal/index/indexscanner"
diff --git a/cmd/krew/cmd/uninstall.go b/cmd/krew/cmd/uninstall.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/index/validation"
 	"sigs.k8s.io/krew/internal/installation"
diff --git a/cmd/krew/cmd/update.go b/cmd/krew/cmd/update.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/gitutil"
 	"sigs.k8s.io/krew/internal/index/indexoperations"
diff --git a/cmd/krew/cmd/upgrade.go b/cmd/krew/cmd/upgrade.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/cmd/krew/cmd/internal"
 	"sigs.k8s.io/krew/internal/index/indexscanner"
diff --git a/cmd/krew/main.go b/cmd/krew/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/cmd/krew/cmd"
 )
diff --git a/cmd/validate-krew-manifest/main.go b/cmd/validate-krew-manifest/main.go
@@ -28,7 +28,7 @@ import (
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/environment"
 	"sigs.k8s.io/krew/internal/index/indexscanner"
diff --git a/go.mod b/go.mod
@@ -3,16 +3,19 @@ module sigs.k8s.io/krew
 go 1.16
 
 require (
-	github.com/fatih/color v1.10.0
-	github.com/google/go-cmp v0.5.2
+	github.com/fatih/color v1.12.0
+	github.com/google/go-cmp v0.5.6
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/mattn/go-isatty v0.0.12
+	github.com/mattn/go-isatty v0.0.13
 	github.com/pkg/errors v0.9.1
 	github.com/sahilm/fuzzy v0.1.0
-	github.com/spf13/cobra v1.1.1
+	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
-	k8s.io/apimachinery v0.20.1
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
+	k8s.io/apimachinery v0.21.2
 	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.8.0
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 	sigs.k8s.io/yaml v1.2.0
 )
diff --git a/go.sum b/go.sum
diff --git a/internal/download/downloader.go b/internal/download/downloader.go
@@ -27,7 +27,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // download gets a file from the internet in memory and writes it content
diff --git a/internal/download/fetch.go b/internal/download/fetch.go
@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // Fetcher is used to get files from a URI.
diff --git a/internal/download/verifier.go b/internal/download/verifier.go
@@ -22,7 +22,7 @@ import (
 	"io"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // Verifier can check a reader against it's correctness.
diff --git a/internal/environment/environment.go b/internal/environment/environment.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/pkg/errors"
 	"k8s.io/client-go/util/homedir"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/pkg/constants"
 )
diff --git a/internal/gitutil/git.go b/internal/gitutil/git.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // EnsureCloned will clone into the destination path, otherwise will return no error.
@@ -81,7 +81,7 @@ func Exec(pwd string, args ...string) (string, error) {
 	cmd.Dir = pwd
 	buf := bytes.Buffer{}
 	var w io.Writer = &buf
-	if klog.V(2) {
+	if klog.V(2).Enabled() {
 		w = io.MultiWriter(w, os.Stderr)
 	}
 	cmd.Stdout, cmd.Stderr = w, w
diff --git a/internal/index/indexscanner/scanner.go b/internal/index/indexscanner/scanner.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/yaml"
 
 	"sigs.k8s.io/krew/internal/index/validation"
diff --git a/internal/indexmigration/migration.go b/internal/indexmigration/migration.go
@@ -19,7 +19,7 @@ import (
 	"path/filepath"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/environment"
 )
diff --git a/internal/installation/install.go b/internal/installation/install.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/download"
 	"sigs.k8s.io/krew/internal/environment"
diff --git a/internal/installation/move.go b/internal/installation/move.go
@@ -22,7 +22,7 @@ import (
 	"syscall"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/pathutil"
 	"sigs.k8s.io/krew/pkg/index"
diff --git a/internal/installation/platform.go b/internal/installation/platform.go
@@ -22,7 +22,7 @@ import (
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/pkg/index"
 )
diff --git a/internal/installation/upgrade.go b/internal/installation/upgrade.go
@@ -18,7 +18,7 @@ import (
 	"os"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/environment"
 	"sigs.k8s.io/krew/internal/installation/receipt"
diff --git a/internal/installation/util.go b/internal/installation/util.go
@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 
 	"github.com/pkg/errors"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/krew/internal/installation/receipt"
 	"sigs.k8s.io/krew/pkg/constants"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"net/http"`
`20`	`20`
`21`	`21`	`"github.com/pkg/errors"`
`22`		`- "k8s.io/klog"`
	`22`	`+ "k8s.io/klog/v2"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`package main`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "k8s.io/klog"`
	`18`	`+ "k8s.io/klog/v2"`
`19`	`19`
`20`	`20`	`"sigs.k8s.io/krew/cmd/krew/cmd"`
`21`	`21`	`)`