From b42cb3ec0295906600981e11c4cecf33c73d0aa6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 16 May 2022 10:02:30 +0000 Subject: [PATCH 1/3] bump golint versions --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d8f957d0e7..e20f08a8c9 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 4.19.235 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.45.2 +GOLINT_VERSION ?= v1.46.1 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 53fdfb286c4d98ba9c6cf9729aa0e11ada3f3aee Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 16 May 2022 12:48:41 -0700 Subject: [PATCH 2/3] implement lint fixes --- cmd/minikube/cmd/service.go | 2 +- pkg/drivers/qemu/qemu.go | 15 ++++++--------- test/integration/functional_test.go | 13 +++++-------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index d6b48f3d19..bc1b7198ae 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -109,7 +109,7 @@ var serviceCmd = &cobra.Command{ services = newServices } - if services == nil || len(services) == 0 { + if len(services) == 0 { exit.Message(reason.SvcNotFound, `Service '{{.service}}' was not found in '{{.namespace}}' namespace. You may select another namespace by using 'minikube service {{.service}} -n '. Or list out all the services using 'minikube service list'`, out.V{"service": args[0], "namespace": namespace}) } diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 08ceb5441d..ecc1caf5ac 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -79,10 +79,8 @@ type Driver struct { DiskPath string CacheMode string IOMode string - connectionString string // conn *libvirt.Connect // VM *libvirt.Domain - vmLoaded bool UserDataFile string CloudConfigRoot string LocalPorts string @@ -275,19 +273,19 @@ func parsePortRange(rawPortRange string) (int, int, error) { minPort, err := strconv.Atoi(portRange[0]) if err != nil { - return 0, 0, fmt.Errorf("Invalid port range") + return 0, 0, fmt.Errorf("invalid port range") } maxPort, err := strconv.Atoi(portRange[1]) if err != nil { - return 0, 0, fmt.Errorf("Invalid port range") + return 0, 0, fmt.Errorf("invalid port range") } if maxPort < minPort { - return 0, 0, fmt.Errorf("Invalid port range") + return 0, 0, fmt.Errorf("invalid port range") } if maxPort-minPort < 2 { - return 0, 0, fmt.Errorf("Port range must be minimum 2 ports") + return 0, 0, fmt.Errorf("port range must be minimum 2 ports") } return minPort, maxPort, nil @@ -327,7 +325,7 @@ func getAvailableTCPPortFromRange(minPort int, maxPort int) (int, error) { port = p return port, nil } - time.Sleep(1) + time.Sleep(1 * time.Second) } return 0, fmt.Errorf("unable to allocate tcp port") } @@ -368,9 +366,8 @@ func (d *Driver) Start() error { startCmd = append(startCmd, "-display", d.DisplayType, ) - } else { - // Use the default graphic output } + // else use the default graphic output } else { if d.Nographic { startCmd = append(startCmd, diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index b04df234f5..a3109b1b70 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -49,7 +49,7 @@ import ( "github.com/blang/semver/v4" "github.com/elazarl/goproxy" "github.com/hashicorp/go-retryablehttp" - "github.com/otiai10/copy" + cp "github.com/otiai10/copy" "github.com/phayes/freeport" "github.com/pkg/errors" "golang.org/x/build/kubernetes/api" @@ -480,10 +480,7 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) { defer cancel() command := make([]string, len(tc.commandPrefix)+1) - // Would use "copy" built-in here, but that is shadowed by "copy" package - for i, v := range tc.commandPrefix { - command[i] = v - } + copy(command, tc.commandPrefix) formattedArg := fmt.Sprintf(tc.formatArg, Target(), profile) @@ -1783,7 +1780,7 @@ func setupFileSync(ctx context.Context, t *testing.T, profile string) { p := localSyncTestPath() t.Logf("local sync path: %s", p) syncFile := filepath.Join(*testdataDir, "sync.test") - err := copy.Copy(syncFile, p) + err := cp.Copy(syncFile, p) if err != nil { t.Fatalf("failed to copy testdata/sync.test: %v", err) } @@ -1792,7 +1789,7 @@ func setupFileSync(ctx context.Context, t *testing.T, profile string) { // Write to a temp file for an atomic write tmpPem := localTestCertPath() + ".pem" - if err := copy.Copy(testPem, tmpPem); err != nil { + if err := cp.Copy(testPem, tmpPem); err != nil { t.Fatalf("failed to copy %s: %v", testPem, err) } @@ -1816,7 +1813,7 @@ func setupFileSync(ctx context.Context, t *testing.T, profile string) { testPem2 := filepath.Join(*testdataDir, "minikube_test2.pem") tmpPem2 := localTestCertFilesPath() + ".pem" - if err := copy.Copy(testPem2, tmpPem2); err != nil { + if err := cp.Copy(testPem2, tmpPem2); err != nil { t.Fatalf("failed to copy %s: %v", testPem2, err) } From 288f5ef815f81cad9be5267991af2787340937dc Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 16 May 2022 12:59:25 -0700 Subject: [PATCH 3/3] more lint fixes --- pkg/drivers/kic/oci/cgroups_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/cgroups_linux.go b/pkg/drivers/kic/oci/cgroups_linux.go index c31c87284c..103d731e26 100644 --- a/pkg/drivers/kic/oci/cgroups_linux.go +++ b/pkg/drivers/kic/oci/cgroups_linux.go @@ -44,7 +44,7 @@ func IsCgroup2UnifiedMode() (bool, error) { func findCgroupMountpoints() (map[string]string, error) { cgMounts, err := cgroups.GetCgroupMounts(false) if err != nil { - return nil, fmt.Errorf("Failed to parse cgroup information: %v", err) + return nil, fmt.Errorf("failed to parse cgroup information: %v", err) } mps := make(map[string]string) for _, m := range cgMounts {