From 3a31a786ee2a7c937a2f51e5add5747ab6d538e9 Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Thu, 15 Feb 2024 11:07:34 +0100 Subject: [PATCH 1/2] Update golangci-lint to latest available version v1.56.1 Signed-off-by: Mateusz Gozdek --- .github/workflows/ci.yml | 2 +- Makefile | 2 +- cli/flexkube/resource.go | 10 +-- pkg/container/container_test.go | 22 ++--- pkg/container/containers_test.go | 22 ++--- pkg/container/containersstate_test.go | 22 ++--- pkg/container/hostconfiguredcontainer_test.go | 88 +++++++++---------- pkg/container/runtime/docker/docker_test.go | 87 +++++++++--------- pkg/etcd/cluster_test.go | 8 +- pkg/etcd/member_internal_test.go | 36 ++++---- pkg/host/transport/ssh/ssh_test.go | 16 ++-- pkg/kubelet/kubelet_test.go | 6 +- pkg/kubernetes/client/kubeconfig_test.go | 4 +- 13 files changed, 159 insertions(+), 166 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe7c3a05..dec7d517 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: golangci/golangci-lint:v1.56.0 + container: golangci/golangci-lint:v1.56.1 steps: - uses: actions/cache@v2 with: diff --git a/Makefile b/Makefile index 2acf1745..db9425b5 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ GORUN=$(GOCMD) run GOBUILD=$(GOCMD) build -v -ldflags $(LD_FLAGS) -trimpath CC_TEST_REPORTER_ID=6e107e510c5479f40b0ce9166a254f3f1ee0bc547b3e48281bada1a5a32bb56d -GOLANGCI_LINT_VERSION=v1.56.0 +GOLANGCI_LINT_VERSION=v1.56.1 BIN_PATH=$$HOME/bin GO_PACKAGES=./... diff --git a/cli/flexkube/resource.go b/cli/flexkube/resource.go index 352a22b8..e74a9b86 100644 --- a/cli/flexkube/resource.go +++ b/cli/flexkube/resource.go @@ -516,7 +516,7 @@ func (r *Resource) RunAPILoadBalancerPool(name string) error { return fmt.Errorf("getting API Load Balancer pool %q from configuration: %w", name, err) } - saveStateF := func(rs types.Resource) { + saveStateF := func(types.Resource) { if r.State.APILoadBalancerPools == nil { r.State.APILoadBalancerPools = map[string]*container.ContainersState{} } @@ -534,7 +534,7 @@ func (r *Resource) RunControlplane() error { return fmt.Errorf("getting controlplane from the configuration: %w", err) } - saveStateF := func(rs types.Resource) { + saveStateF := func(types.Resource) { r.State.Controlplane = &controlplaneResource.Containers().ToExported().PreviousState } @@ -548,7 +548,7 @@ func (r *Resource) RunEtcd() error { return fmt.Errorf("getting etcd from the configuration: %w", err) } - saveStateF := func(rs types.Resource) { + saveStateF := func(types.Resource) { r.State.Etcd = &etcdResource.Containers().ToExported().PreviousState } @@ -562,7 +562,7 @@ func (r *Resource) RunKubeletPool(name string) error { return fmt.Errorf("getting kubelet pool %q from configuration: %w", name, err) } - saveStateF := func(rs types.Resource) { + saveStateF := func(types.Resource) { if r.State.KubeletPools == nil { r.State.KubeletPools = map[string]*container.ContainersState{} } @@ -600,7 +600,7 @@ func (r *Resource) RunContainers(name string) error { return fmt.Errorf("getting containers group %q from configuration: %w", name, err) } - saveStateF := func(rs types.Resource) { + saveStateF := func(types.Resource) { if r.State.Containers == nil { r.State.Containers = map[string]*container.ContainersState{} } diff --git a/pkg/container/container_test.go b/pkg/container/container_test.go index d8ecd777..85e6587a 100644 --- a/pkg/container/container_test.go +++ b/pkg/container/container_test.go @@ -148,7 +148,7 @@ func TestStatus(t *testing.T) { testContainer := &containerInstance{ base: base{ runtime: runtime.Fake{ - StatusF: func(ID string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, fmt.Errorf("checking status") }, }, @@ -177,7 +177,7 @@ func TestContainerUpdateStatusFail(t *testing.T) { testContainer := &container{ base: base{ runtime: runtime.Fake{ - StatusF: func(ID string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, fmt.Errorf("checking status") }, }, @@ -203,7 +203,7 @@ func TestContainerUpdateStatus(t *testing.T) { testContainer := &container{ base: base{ runtime: runtime.Fake{ - StatusF: func(ID string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return expectedStatus, nil }, }, @@ -244,7 +244,7 @@ func TestContainerStartRuntimeError(t *testing.T) { testContainer := &container{ base: base{ runtime: runtime.Fake{ - StartF: func(ID string) error { + StartF: func(string) error { return fmt.Errorf("starting container failed") }, }, @@ -271,10 +271,10 @@ func TestContainerStart(t *testing.T) { testContainer := &container{ base: base{ runtime: runtime.Fake{ - StartF: func(ID string) error { + StartF: func(string) error { return nil }, - StatusF: func(ID string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return expectedStatus, nil }, }, @@ -315,7 +315,7 @@ func TestContainerStopRuntimeError(t *testing.T) { testContainer := &container{ base: base{ runtime: runtime.Fake{ - StopF: func(ID string) error { + StopF: func(string) error { return fmt.Errorf("starting container failed") }, }, @@ -342,10 +342,10 @@ func TestContainerStop(t *testing.T) { testContainer := &container{ base: base{ runtime: runtime.Fake{ - StopF: func(ID string) error { + StopF: func(string) error { return nil }, - StatusF: func(ID string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return expectedStatus, nil }, }, @@ -386,7 +386,7 @@ func TestContainerDeleteRuntimeError(t *testing.T) { testContainer := &container{ base: base{ runtime: runtime.Fake{ - DeleteF: func(ID string) error { + DeleteF: func(string) error { return fmt.Errorf("starting container failed") }, }, @@ -408,7 +408,7 @@ func TestContainerDelete(t *testing.T) { testContainer := &container{ base: base{ runtime: runtime.Fake{ - DeleteF: func(ID string) error { + DeleteF: func(string) error { return nil }, }, diff --git a/pkg/container/containers_test.go b/pkg/container/containers_test.go index 15990a43..b10b59a7 100644 --- a/pkg/container/containers_test.go +++ b/pkg/container/containers_test.go @@ -508,7 +508,7 @@ func TestEnsureExistsFailCreate(t *testing.T) { t.Parallel() failingCreateRuntime := fakeRuntime() - failingCreateRuntime.CreateF = func(config *types.ContainerConfig) (string, error) { + failingCreateRuntime.CreateF = func(*types.ContainerConfig) (string, error) { return "", fmt.Errorf("create fail") } @@ -1173,13 +1173,13 @@ func TestEnsureConfiguredNoStateUpdateOnFail(t *testing.T) { }, runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, nil }, - CopyF: func(id string, files []*types.File) error { + CopyF: func(string, []*types.File) error { return fmt.Errorf("fail") }, }, @@ -1340,7 +1340,7 @@ func TestUpdateExistingContainersRemoveAllOld(t *testing.T) { t.Parallel() fooRuntime := fakeRuntime() - fooRuntime.StatusF = func(id string) (types.ContainerStatus, error) { + fooRuntime.StatusF = func(string) (types.ContainerStatus, error) { return types.ContainerStatus{ Status: "running", ID: "foo", @@ -1348,7 +1348,7 @@ func TestUpdateExistingContainersRemoveAllOld(t *testing.T) { } barRuntime := fakeRuntime() - barRuntime.StatusF = func(id string) (types.ContainerStatus, error) { + barRuntime.StatusF = func(string) (types.ContainerStatus, error) { return types.ContainerStatus{ Status: "running", ID: "bar", @@ -1480,21 +1480,21 @@ func TestEnsureCurrentContainerNonExisting(t *testing.T) { func fakeRuntime() *runtime.Fake { return &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{ ID: testAnotherContainerID, }, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - StartF: func(id string) error { + StartF: func(string) error { return nil }, - StopF: func(id string) error { + StopF: func(string) error { return nil }, } diff --git a/pkg/container/containersstate_test.go b/pkg/container/containersstate_test.go index 1303c2f5..cd19acf2 100644 --- a/pkg/container/containersstate_test.go +++ b/pkg/container/containersstate_test.go @@ -62,7 +62,7 @@ func TestContainersStateCheckStateFailStatus(t *testing.T) { base: base{ runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, fmt.Errorf("fail") }, }, @@ -100,13 +100,13 @@ func TestContainersStateCheckStateGone(t *testing.T) { base: base{ runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, nil }, }, @@ -143,7 +143,7 @@ func TestRemoveContainerDontStopStopped(t *testing.T) { t.Parallel() failingStopRuntime := failingStopRuntime() - failingStopRuntime.StatusF = func(id string) (types.ContainerStatus, error) { + failingStopRuntime.StatusF = func(string) (types.ContainerStatus, error) { return types.ContainerStatus{ Status: "stopped", ID: "foo", @@ -188,10 +188,10 @@ func TestRemoveContainerDontRemoveMissing(t *testing.T) { }, runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - DeleteF: func(id string) error { + DeleteF: func(string) error { return fmt.Errorf("deleting failed") }, - StopF: func(id string) error { + StopF: func(string) error { return nil }, }, @@ -210,7 +210,7 @@ func TestRemoveContainerPropagateStopError(t *testing.T) { t.Parallel() failingStopRuntime := failingStopRuntime() - failingStopRuntime.StatusF = func(id string) (types.ContainerStatus, error) { + failingStopRuntime.StatusF = func(string) (types.ContainerStatus, error) { return types.ContainerStatus{ Status: "running", ID: "foo", @@ -255,16 +255,16 @@ func TestRemoveContainerPropagateDeleteError(t *testing.T) { }, runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - DeleteF: func(id string) error { + DeleteF: func(string) error { return fmt.Errorf("deleting failed") }, - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{ Status: "running", ID: "foo", }, nil }, - StopF: func(id string) error { + StopF: func(string) error { return nil }, }, diff --git a/pkg/container/hostconfiguredcontainer_test.go b/pkg/container/hostconfiguredcontainer_test.go index ad7c5515..5736314c 100644 --- a/pkg/container/hostconfiguredcontainer_test.go +++ b/pkg/container/hostconfiguredcontainer_test.go @@ -135,7 +135,7 @@ func TestHostConfiguredContainerStatus(t *testing.T) { base: base{ runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, nil }, }, @@ -160,7 +160,7 @@ func TestHostConfiguredContainerCreateConfigurationContainer(t *testing.T) { container: &container{ base: base{ runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return "", fmt.Errorf("creating failed") }, }, @@ -184,7 +184,7 @@ func TestHostConfiguredContainerRemoveConfigurationContainer(t *testing.T) { configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{ ID: expectedContainerID, }, nil @@ -222,7 +222,7 @@ func TestHostConfiguredContainerRemoveConfigurationContainerFailStatus(t *testin configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, fmt.Errorf("checking status failed") }, }, @@ -255,8 +255,8 @@ func TestStatMountsRuntimeError(t *testing.T) { configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { - return map[string]os.FileMode{}, fmt.Errorf("stating failed") + StatF: func(string, []string) (map[string]os.FileMode, error) { + return nil, fmt.Errorf("stating failed") }, }, }, @@ -291,7 +291,7 @@ func TestStatMounts(t *testing.T) { configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { + StatF: func(string, []string) (map[string]os.FileMode, error) { return expectedStatResult, nil }, }, @@ -329,8 +329,8 @@ func TestCreateMissingMountpointsStatFail(t *testing.T) { configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { - return map[string]os.FileMode{}, fmt.Errorf("stat failed") + StatF: func(string, []string) (map[string]os.FileMode, error) { + return nil, fmt.Errorf("stat failed") }, }, }, @@ -361,7 +361,7 @@ func TestCreateMissingMountpointsMountpointFile(t *testing.T) { configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { + StatF: func(string, []string) (map[string]os.FileMode, error) { return map[string]os.FileMode{ path.Join(ConfigMountpoint, "/etc"): os.ModePerm, }, nil @@ -395,7 +395,7 @@ func TestCreateMissingMountpointsNoMountsToCreate(t *testing.T) { configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { + StatF: func(string, []string) (map[string]os.FileMode, error) { return map[string]os.FileMode{ path.Join(ConfigMountpoint, "/etc/"): os.ModeDir, }, nil @@ -430,10 +430,10 @@ func TestCreateMissingMountpointsCopyFail(t *testing.T) { configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { + StatF: func(string, []string) (map[string]os.FileMode, error) { return map[string]os.FileMode{}, nil }, - CopyF: func(id string, files []*types.File) error { + CopyF: func(string, []*types.File) error { return fmt.Errorf("copying failed") }, }, @@ -475,10 +475,10 @@ func TestCreateMissingMountpoints(t *testing.T) { configContainer: &containerInstance{ base: base{ runtime: &runtime.Fake{ - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { + StatF: func(string, []string) (map[string]os.FileMode, error) { return map[string]os.FileMode{}, nil }, - CopyF: func(id string, files []*types.File) error { + CopyF: func(_ string, files []*types.File) error { if diff := cmp.Diff(files, expectedFiles); diff != "" { t.Fatalf("Received files for creating differs from expected: %s", diff) } @@ -623,16 +623,16 @@ func TestHostConfiguredContainerCreateFailMountpoints(t *testing.T) { base{ runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { - return map[string]os.FileMode{}, fmt.Errorf("stat failed") + StatF: func(string, []string) (map[string]os.FileMode, error) { + return nil, fmt.Errorf("stat failed") }, - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, nil }, }, @@ -667,7 +667,7 @@ func TestHostConfiguredContainerCreateFail(t *testing.T) { base{ runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { if fail { return "", fmt.Errorf("2nd create fails") } @@ -676,15 +676,15 @@ func TestHostConfiguredContainerCreateFail(t *testing.T) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { + StatF: func(string, []string) (map[string]os.FileMode, error) { return map[string]os.FileMode{ path.Join(ConfigMountpoint, "/etc/"): os.ModeDir, }, nil }, - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{}, nil }, }, @@ -719,18 +719,18 @@ func TestHostConfiguredContainerCreateFailStatus(t *testing.T) { base{ runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { + StatF: func(string, []string) (map[string]os.FileMode, error) { return map[string]os.FileMode{ path.Join(ConfigMountpoint, "/etc/"): os.ModeDir, }, nil }, - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { if fail { return types.ContainerStatus{}, fmt.Errorf("2nd status fails") } @@ -769,18 +769,18 @@ func TestHostConfiguredContainerCreate(t *testing.T) { base{ runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - StatF: func(ID string, paths []string) (map[string]os.FileMode, error) { + StatF: func(string, []string) (map[string]os.FileMode, error) { return map[string]os.FileMode{ path.Join(ConfigMountpoint, "/etc/"): os.ModeDir, }, nil }, - StatusF: func(id string) (types.ContainerStatus, error) { + StatusF: func(string) (types.ContainerStatus, error) { return types.ContainerStatus{ ID: "bar", }, nil @@ -820,10 +820,10 @@ func TestHostConfiguredContainerUpdateConfigurationStatusNoAction(t *testing.T) base{ runtimeConfig: &runtime.FakeConfig{ Runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, }, @@ -850,13 +850,13 @@ func TestHostConfiguredContainerUpdateConfigurationStatusFileMissing(t *testing. configContainer: &containerInstance{ base{ runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - ReadF: func(id string, srcPath []string) ([]*types.File, error) { + ReadF: func(_ string, srcPath []string) ([]*types.File, error) { if diff := cmp.Diff(srcPath, []string{path.Join(ConfigMountpoint, "/foo")}); diff != "" { t.Fatalf("Unexpected srcPath: %s", diff) } @@ -890,13 +890,13 @@ func TestHostConfiguredContainerUpdateConfigurationStatusNewContent(t *testing.T configContainer: &containerInstance{ base{ runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - ReadF: func(id string, srcPath []string) ([]*types.File, error) { + ReadF: func(string, []string) ([]*types.File, error) { return []*types.File{ { Path: path.Join(ConfigMountpoint, "/foo"), @@ -935,14 +935,14 @@ func TestHostConfiguredContainerUpdateConfigurationStatusReadRuntimeError(t *tes configContainer: &containerInstance{ base{ runtime: &runtime.Fake{ - CreateF: func(config *types.ContainerConfig) (string, error) { + CreateF: func(*types.ContainerConfig) (string, error) { return testContainerID, nil }, - DeleteF: func(id string) error { + DeleteF: func(string) error { return nil }, - ReadF: func(id string, srcPath []string) ([]*types.File, error) { - return []*types.File{}, fmt.Errorf("reading") + ReadF: func(string, []string) ([]*types.File, error) { + return nil, fmt.Errorf("reading") }, }, }, diff --git a/pkg/container/runtime/docker/docker_test.go b/pkg/container/runtime/docker/docker_test.go index 7f0afa30..360b9be5 100644 --- a/pkg/container/runtime/docker/docker_test.go +++ b/pkg/container/runtime/docker/docker_test.go @@ -73,19 +73,16 @@ func TestSanitizeImageName(t *testing.T) { ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ ContainerCreateF: func( - ctx context.Context, - config *containertypes.Config, - hostConfig *containertypes.HostConfig, - networkingConfig *networktypes.NetworkingConfig, - platform *v1.Platform, - containerName string, + context.Context, + *containertypes.Config, + *containertypes.HostConfig, + *networktypes.NetworkingConfig, + *v1.Platform, + string, ) (containertypes.CreateResponse, error) { return containertypes.CreateResponse{}, nil }, - ImageListF: func( - ctx context.Context, - options dockertypes.ImageListOptions, - ) ([]dockertypes.ImageSummary, error) { + ImageListF: func(context.Context, dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { return []dockertypes.ImageSummary{ { ID: "nonemptystring", @@ -95,11 +92,7 @@ func TestSanitizeImageName(t *testing.T) { }, }, nil }, - ImagePullF: func( - ctx context.Context, - ref string, - options dockertypes.ImagePullOptions, - ) (io.ReadCloser, error) { + ImagePullF: func(context.Context, string, dockertypes.ImagePullOptions) (io.ReadCloser, error) { t.Fatalf("Unexpected call to image pull") return nil, nil @@ -129,12 +122,12 @@ func TestSanitizeImageNameWithTag(t *testing.T) { ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ ContainerCreateF: func( - ctx context.Context, + _ context.Context, config *containertypes.Config, - hostConfig *containertypes.HostConfig, - networkingConfig *networktypes.NetworkingConfig, - platform *v1.Platform, - containerName string, + _ *containertypes.HostConfig, + _ *networktypes.NetworkingConfig, + _ *v1.Platform, + _ string, ) (containertypes.CreateResponse, error) { if config.Image != "foo:v0.1.0" { t.Fatal() @@ -169,7 +162,7 @@ func TestStatus(t *testing.T) { testConfig := &docker.Config{ ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ - ContainerInspectF: func(ctx context.Context, id string) (dockertypes.ContainerJSON, error) { + ContainerInspectF: func(context.Context, string) (dockertypes.ContainerJSON, error) { return dockertypes.ContainerJSON{ ContainerJSONBase: &dockertypes.ContainerJSONBase{ State: &dockertypes.ContainerState{ @@ -207,7 +200,7 @@ func TestStatusNotFound(t *testing.T) { testConfig := &docker.Config{ ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ - ContainerInspectF: func(ctx context.Context, id string) (dockertypes.ContainerJSON, error) { + ContainerInspectF: func(context.Context, string) (dockertypes.ContainerJSON, error) { return dockertypes.ContainerJSON{}, errdefs.NotFound(fmt.Errorf("not found")) }, }, nil @@ -235,7 +228,7 @@ func TestStatusRuntimeError(t *testing.T) { testConfig := &docker.Config{ ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ - ContainerInspectF: func(ctx context.Context, id string) (dockertypes.ContainerJSON, error) { + ContainerInspectF: func(context.Context, string) (dockertypes.ContainerJSON, error) { return dockertypes.ContainerJSON{}, fmt.Errorf("can't check status of container") }, }, nil @@ -474,11 +467,11 @@ func TestFilesToTar(t *testing.T) { ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ CopyToContainerF: func( - ctx context.Context, - container, - path string, + _ context.Context, + _, + _ string, r io.Reader, - options dockertypes.CopyToContainerOptions, + _ dockertypes.CopyToContainerOptions, ) error { tr := tar.NewReader(r) @@ -532,11 +525,11 @@ func TestFilesToTarNumericUserGroup(t *testing.T) { ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ CopyToContainerF: func( - ctx context.Context, - container, - path string, + _ context.Context, + _, + _ string, r io.Reader, - options dockertypes.CopyToContainerOptions, + _ dockertypes.CopyToContainerOptions, ) error { tr := tar.NewReader(r) @@ -584,8 +577,8 @@ func TestCreatePullImageFail(t *testing.T) { testConfig := &docker.Config{ ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ - ImageListF: func(ctx context.Context, options dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { - return []dockertypes.ImageSummary{}, fmt.Errorf("runtime error") + ImageListF: func(context.Context, dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { + return nil, fmt.Errorf("runtime error") }, }, nil }, @@ -625,11 +618,11 @@ func TestCreateSetUser(t *testing.T) { return containertypes.CreateResponse{}, nil }, - ImagePullF: func(ctx context.Context, ref string, options dockertypes.ImagePullOptions) (io.ReadCloser, error) { + ImagePullF: func(context.Context, string, dockertypes.ImagePullOptions) (io.ReadCloser, error) { return io.NopCloser(strings.NewReader("")), nil }, - ImageListF: func(ctx context.Context, options dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { - return []dockertypes.ImageSummary{}, nil + ImageListF: func(context.Context, dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { + return nil, nil }, }, nil }, @@ -672,11 +665,11 @@ func TestCreateSetUserGroup(t *testing.T) { return containertypes.CreateResponse{}, nil }, - ImagePullF: func(ctx context.Context, ref string, options dockertypes.ImagePullOptions) (io.ReadCloser, error) { + ImagePullF: func(context.Context, string, dockertypes.ImagePullOptions) (io.ReadCloser, error) { return io.NopCloser(strings.NewReader("")), nil }, - ImageListF: func(ctx context.Context, options dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { - return []dockertypes.ImageSummary{}, nil + ImageListF: func(context.Context, dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { + return nil, nil }, }, nil }, @@ -708,11 +701,11 @@ func TestCreateRuntimeFail(t *testing.T) { ) (containertypes.CreateResponse, error) { return containertypes.CreateResponse{}, fmt.Errorf("runtime error") }, - ImagePullF: func(ctx context.Context, ref string, options dockertypes.ImagePullOptions) (io.ReadCloser, error) { + ImagePullF: func(context.Context, string, dockertypes.ImagePullOptions) (io.ReadCloser, error) { return io.NopCloser(strings.NewReader("")), nil }, - ImageListF: func(ctx context.Context, options dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { - return []dockertypes.ImageSummary{}, nil + ImageListF: func(context.Context, dockertypes.ImageListOptions) ([]dockertypes.ImageSummary, error) { + return nil, nil }, }, nil }, @@ -785,12 +778,12 @@ func TestConvertContainerConfigEnvVariables(t *testing.T) { ClientGetter: func(...client.Opt) (docker.Client, error) { return &docker.FakeClient{ ContainerCreateF: func( - ctx context.Context, + _ context.Context, config *containertypes.Config, - hostConfig *containertypes.HostConfig, - networkingConfig *networktypes.NetworkingConfig, - platform *v1.Platform, - containerName string, + _ *containertypes.HostConfig, + _ *networktypes.NetworkingConfig, + _ *v1.Platform, + _ string, ) (containertypes.CreateResponse, error) { if !reflect.DeepEqual(config.Env, expectedEnvVariables) { t.Fatalf("Configured environment variables should be included in container configuration") diff --git a/pkg/etcd/cluster_test.go b/pkg/etcd/cluster_test.go index 42e7a03c..37bb558a 100644 --- a/pkg/etcd/cluster_test.go +++ b/pkg/etcd/cluster_test.go @@ -442,7 +442,7 @@ func TestUpdateMembersRemoveMember(t *testing.T) { } testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(_ context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{ { @@ -453,7 +453,7 @@ func TestUpdateMembersRemoveMember(t *testing.T) { }, }, nil }, - memberRemoveF: func(context context.Context, id uint64) (*clientv3.MemberRemoveResponse, error) { + memberRemoveF: func(context.Context, uint64) (*clientv3.MemberRemoveResponse, error) { return nil, fmt.Errorf("expected") }, } @@ -495,12 +495,12 @@ func TestUpdateMembersAddMember(t *testing.T) { } testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{}, }, nil }, - memberAddF: func(context context.Context, peerURLs []string) (*clientv3.MemberAddResponse, error) { + memberAddF: func(context.Context, []string) (*clientv3.MemberAddResponse, error) { return nil, fmt.Errorf("expected") }, } diff --git a/pkg/etcd/member_internal_test.go b/pkg/etcd/member_internal_test.go index 329f7867..23445bc9 100644 --- a/pkg/etcd/member_internal_test.go +++ b/pkg/etcd/member_internal_test.go @@ -134,7 +134,7 @@ func TestGetIDFailToListMembers(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return nil, fmt.Errorf("expected") }, } @@ -150,7 +150,7 @@ func TestGetIDNotFound(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{}, nil }, } @@ -171,7 +171,7 @@ func TestGetIDByName(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{ { @@ -203,7 +203,7 @@ func TestGetIDByPeerURL(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{ { @@ -273,7 +273,7 @@ func TestRemove(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{ { @@ -284,7 +284,7 @@ func TestRemove(t *testing.T) { }, }, nil }, - memberRemoveF: func(context context.Context, id uint64) (*clientv3.MemberRemoveResponse, error) { + memberRemoveF: func(context.Context, uint64) (*clientv3.MemberRemoveResponse, error) { return &clientv3.MemberRemoveResponse{}, nil }, } @@ -304,12 +304,12 @@ func TestRemoveNonExistent(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{}, }, nil }, - memberRemoveF: func(context context.Context, id uint64) (*clientv3.MemberRemoveResponse, error) { + memberRemoveF: func(context.Context, uint64) (*clientv3.MemberRemoveResponse, error) { return &clientv3.MemberRemoveResponse{}, nil }, } @@ -325,7 +325,7 @@ func TestRemoveMemberFail(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{ { @@ -336,7 +336,7 @@ func TestRemoveMemberFail(t *testing.T) { }, }, nil }, - memberRemoveF: func(context context.Context, id uint64) (*clientv3.MemberRemoveResponse, error) { + memberRemoveF: func(context.Context, uint64) (*clientv3.MemberRemoveResponse, error) { return nil, fmt.Errorf("expected") }, } @@ -360,7 +360,7 @@ func TestRemoveGetIDFail(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return nil, fmt.Errorf("expected") }, } @@ -377,7 +377,7 @@ func TestAddMember(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{ { @@ -388,7 +388,7 @@ func TestAddMember(t *testing.T) { }, }, nil }, - memberAddF: func(context context.Context, peerURLs []string) (*clientv3.MemberAddResponse, error) { + memberAddF: func(context.Context, []string) (*clientv3.MemberAddResponse, error) { return &clientv3.MemberAddResponse{}, nil }, } @@ -406,7 +406,7 @@ func TestAddMemberAlreadyExists(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{ { @@ -417,7 +417,7 @@ func TestAddMemberAlreadyExists(t *testing.T) { }, }, nil }, - memberAddF: func(context context.Context, peerURLs []string) (*clientv3.MemberAddResponse, error) { + memberAddF: func(context.Context, []string) (*clientv3.MemberAddResponse, error) { return nil, fmt.Errorf("expected") }, } @@ -437,7 +437,7 @@ func TestAddMemberFail(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: []*etcdserverpb.Member{ { @@ -448,7 +448,7 @@ func TestAddMemberFail(t *testing.T) { }, }, nil }, - memberAddF: func(context context.Context, peerURLs []string) (*clientv3.MemberAddResponse, error) { + memberAddF: func(context.Context, []string) (*clientv3.MemberAddResponse, error) { return nil, fmt.Errorf("expected") }, } @@ -466,7 +466,7 @@ func TestAddGetIDFail(t *testing.T) { t.Parallel() testClient := &fakeClient{ - memberListF: func(context context.Context) (*clientv3.MemberListResponse, error) { + memberListF: func(context.Context) (*clientv3.MemberListResponse, error) { return nil, fmt.Errorf("expected") }, } diff --git a/pkg/host/transport/ssh/ssh_test.go b/pkg/host/transport/ssh/ssh_test.go index 5a7d1794..2d9a7eca 100644 --- a/pkg/host/transport/ssh/ssh_test.go +++ b/pkg/host/transport/ssh/ssh_test.go @@ -53,7 +53,7 @@ func TestNewSetPassword(t *testing.T) { testConfig := newTestConfig(t) testConfig.PrivateKey = "" - testConfig.Dialer = func(network, address string, config *gossh.ClientConfig) (Dialer, error) { + testConfig.Dialer = func(_, _ string, config *gossh.ClientConfig) (Dialer, error) { if len(config.Auth) != authMethods { t.Fatalf("Unexpected auth methods, expected %d, got %v", authMethods, config.Auth) } @@ -78,7 +78,7 @@ func TestNewSetPrivateKey(t *testing.T) { testConfig := newTestConfig(t) testConfig.Password = "" - testConfig.Dialer = func(network, address string, config *gossh.ClientConfig) (Dialer, error) { + testConfig.Dialer = func(_, _ string, config *gossh.ClientConfig) (Dialer, error) { if len(config.Auth) != authMethods { t.Fatalf("Unexpected auth methods, expected %d, got %v", authMethods, config.Auth) } @@ -503,7 +503,7 @@ func TestConnect(t *testing.T) { RetryInterval: "1s", Port: Port, PrivateKey: generateRSAPrivateKey(t), - Dialer: func(n, a string, config *gossh.ClientConfig) (Dialer, error) { + Dialer: func(string, string, *gossh.ClientConfig) (Dialer, error) { return &gossh.Client{}, nil }, } @@ -532,7 +532,7 @@ func TestConnectFail(t *testing.T) { RetryInterval: "1s", Port: Port, PrivateKey: generateRSAPrivateKey(t), - Dialer: func(n, a string, config *gossh.ClientConfig) (Dialer, error) { + Dialer: func(string, string, *gossh.ClientConfig) (Dialer, error) { return nil, fmt.Errorf("expected") }, } @@ -553,7 +553,7 @@ func TestForwardTCP(t *testing.T) { connected := testNewConnected(t) - connected.listener = func(n, a string) (net.Listener, error) { + connected.listener = func(string, string) (net.Listener, error) { l, err := net.Listen("tcp", "127.0.0.1:0") if err != nil { t.Fatalf("Unable to listen on random TCP port: %v", err) @@ -572,7 +572,7 @@ func TestForwardTCPFailListen(t *testing.T) { connected := testNewConnected(t) - connected.listener = func(n, a string) (net.Listener, error) { + connected.listener = func(string, string) (net.Listener, error) { return nil, fmt.Errorf("expected") } @@ -586,7 +586,7 @@ func TestForwardTCPValidateAddress(t *testing.T) { connected := testNewConnected(t) - connected.listener = func(n, a string) (net.Listener, error) { + connected.listener = func(string, string) (net.Listener, error) { return nil, fmt.Errorf("expected") } @@ -615,7 +615,7 @@ func TestForwardUnixSocketCantListen(t *testing.T) { connected := testNewConnected(t) - connected.listener = func(n, a string) (net.Listener, error) { + connected.listener = func(string, string) (net.Listener, error) { return nil, fmt.Errorf("expected") } diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 143ec55b..3bf4fa72 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -84,7 +84,7 @@ func TestKubeletValidate(t *testing.T) { //nolint:funlen,cyclop // There are jus TestF func(t *testing.T, er error) }{ { - MutationF: func(k *kubelet.Kubelet) {}, + MutationF: func(*kubelet.Kubelet) {}, TestF: func(t *testing.T, err error) { //nolint:thelper // Actual test code. if err != nil { t.Fatalf("Validation of kubelet should pass, got: %v", err) @@ -100,8 +100,8 @@ func TestKubeletValidate(t *testing.T) { //nolint:funlen,cyclop // There are jus }, }, { - MutationF: func(k *kubelet.Kubelet) {}, - TestF: func(t *testing.T, err error) {}, //nolint:thelper // Actual test code. + MutationF: func(*kubelet.Kubelet) {}, + TestF: func(*testing.T, error) {}, }, { MutationF: func(k *kubelet.Kubelet) { k.KubernetesCACertificate = "" }, diff --git a/pkg/kubernetes/client/kubeconfig_test.go b/pkg/kubernetes/client/kubeconfig_test.go index 591bb77d..c5e04094 100644 --- a/pkg/kubernetes/client/kubeconfig_test.go +++ b/pkg/kubernetes/client/kubeconfig_test.go @@ -106,7 +106,7 @@ func TestToYAMLStringNew(t *testing.T) { //nolint:funlen // Just many test cases }, }, { - func(c *client.Config) {}, + func(*client.Config) {}, func(t *testing.T, err error) { //nolint:thelper // Actual test code. if err != nil { t.Errorf("Valid config shouldn't return error, got: %v", err) @@ -239,7 +239,7 @@ func TestValidate(t *testing.T) { //nolint:funlen // There are just many test ca }, { - func(c *client.Config) {}, + func(*client.Config) {}, func(t *testing.T, err error) { //nolint:thelper // Actual test code. if err != nil { t.Errorf("Valid config shouldn't return error, got: %v", err) From d317d9b92629f49ac9f8df7f470cf2bc6da54d62 Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Thu, 15 Feb 2024 11:08:29 +0100 Subject: [PATCH 2/2] Update default Kubernetes version to latest available v1.29.2 Signed-off-by: Mateusz Gozdek --- e2e/main_test.go | 6 +++--- pkg/defaults/defaults.go | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/e2e/main_test.go b/e2e/main_test.go index defa7cf8..d1e026a7 100644 --- a/e2e/main_test.go +++ b/e2e/main_test.go @@ -99,15 +99,15 @@ func defaultE2EConfig(t *testing.T) e2eConfig { Charts: charts{ KubeAPIServer: chart{ Source: "flexkube/kube-apiserver", - Version: "0.9.1", + Version: "0.9.2", }, Kubernetes: chart{ Source: "flexkube/kubernetes", - Version: "0.10.1", + Version: "0.10.2", }, KubeProxy: chart{ Source: "flexkube/kube-proxy", - Version: "0.9.1", + Version: "0.9.2", }, TLSBootstrapping: chart{ Source: "flexkube/tls-bootstrapping", diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index 770de446..9bcb3b71 100644 --- a/pkg/defaults/defaults.go +++ b/pkg/defaults/defaults.go @@ -7,22 +7,22 @@ const ( // KubeAPIServerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeAPIServerImage = "registry.k8s.io/kube-apiserver:v1.29.1" + KubeAPIServerImage = "registry.k8s.io/kube-apiserver:v1.29.2" // KubeControllerManagerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeControllerManagerImage = "registry.k8s.io/kube-controller-manager:v1.29.1" + KubeControllerManagerImage = "registry.k8s.io/kube-controller-manager:v1.29.2" // KubeSchedulerImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeSchedulerImage = "registry.k8s.io/kube-scheduler:v1.29.1" + KubeSchedulerImage = "registry.k8s.io/kube-scheduler:v1.29.2" // KubeletImage points to a default Docker image, which will be used for // running kube-apiserver. - KubeletImage = "quay.io/flexkube/kubelet:v1.29.1" + KubeletImage = "quay.io/flexkube/kubelet:v1.29.2" // HAProxyImage is a default container image for APILoadBalancer. - HAProxyImage = "haproxy:2.9.3-alpine" + HAProxyImage = "haproxy:2.9.4-alpine" // DockerAPIVersion is a default API version used when talking to Docker runtime. DockerAPIVersion = "v1.38"