mirror of https://github.com/linkerd/linkerd2.git
Upgrade golangci-lint (#7338)
This upgrades golangci-lint from `v1.25.1` to `v1.43.0` and fixes a few new lint errors. Signed-off-by: Kevin Leimkuhler <kleimkuhler@icloud.com>
This commit is contained in:
parent
778bbdfb8f
commit
d147104b29
2
bin/lint
2
bin/lint
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
lintversion=1.25.1
|
lintversion=1.43.0
|
||||||
|
|
||||||
cd "$(pwd -P)"
|
cd "$(pwd -P)"
|
||||||
|
|
||||||
|
|
|
@ -216,6 +216,10 @@ A full list of configurable values can be found at https://www.github.com/linker
|
||||||
|
|
||||||
func newCmdInstall() *cobra.Command {
|
func newCmdInstall() *cobra.Command {
|
||||||
values, err := l5dcharts.NewValues()
|
values, err := l5dcharts.NewValues()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintln(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
var options valuespkg.Options
|
var options valuespkg.Options
|
||||||
|
|
||||||
allStageFlags, allStageFlagSet := makeAllStageFlags(values)
|
allStageFlags, allStageFlagSet := makeAllStageFlags(values)
|
||||||
|
|
|
@ -55,7 +55,7 @@ This command provides all Kubernetes namespace-scoped and cluster-scoped resourc
|
||||||
extensionNames = append(extensionNames, fmt.Sprintf("* %s", v))
|
extensionNames = append(extensionNames, fmt.Sprintf("* %s", v))
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Fprintln(os.Stderr, fmt.Sprintf("Please uninstall the following extensions before uninstalling the control-plane:\n\t%s", strings.Join(extensionNames, "\n\t")))
|
fmt.Fprintf(os.Stderr, "Please uninstall the following extensions before uninstalling the control-plane:\n\t%s\n", strings.Join(extensionNames, "\n\t"))
|
||||||
fail = true
|
fail = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ This command provides all Kubernetes namespace-scoped and cluster-scoped resourc
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(injectedPods) > 0 {
|
if len(injectedPods) > 0 {
|
||||||
fmt.Fprintln(os.Stderr, fmt.Sprintf("Please uninject the following pods before uninstalling the control-plane:\n\t%s", strings.Join(injectedPods, "\n\t")))
|
fmt.Fprintf(os.Stderr, "Please uninject the following pods before uninstalling the control-plane:\n\t%s\n", strings.Join(injectedPods, "\n\t"))
|
||||||
fail = true
|
fail = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ import (
|
||||||
|
|
||||||
var TestHelper *testutil.TestHelper
|
var TestHelper *testutil.TestHelper
|
||||||
|
|
||||||
|
//nolint // The test that uses this is currently skipped.
|
||||||
type testCase struct {
|
type testCase struct {
|
||||||
name string
|
name string
|
||||||
kind string
|
kind string
|
||||||
|
|
|
@ -437,7 +437,7 @@ func renderTapEventJSON(event *tapPb.TapEvent, _ string) string {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Sprintf("{\"error marshalling JSON\": \"%s\"}", err)
|
return fmt.Sprintf("{\"error marshalling JSON\": \"%s\"}", err)
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("%s", e)
|
return string(e[:])
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map public API `TapEvent`s to `displayTapEvent`s
|
// Map public API `TapEvent`s to `displayTapEvent`s
|
||||||
|
|
|
@ -106,7 +106,8 @@ func getServerVizClient(t *testing.T) (*mockGrpcServer, pb.ApiClient) {
|
||||||
}
|
}
|
||||||
err := http.Serve(listener, handler)
|
err := http.Serve(listener, handler)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Could not start server: %v", err)
|
t.Errorf("Could not start server: %v", err)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue