Merge pull request #1523 from saschagrunert/unnamedResult

Fix `unnamedResult` linter

Author: k8s-ci-robot

.golangci.yml

@@ -186,10 +186,10 @@ linters-settings:
       - typeUnparen
       - uncheckedInlineErr
       - unlabelStmt
+      - unnamedResult
       - unnecessaryBlock
       - unnecessaryDefer
       - weakCond
+      - whyNoLint
       - yodaStyleExpr
       # - hugeParam
-      # - unnamedResult
-      # - whyNoLint

cmd/crictl/image.go

@@ -566,7 +566,7 @@ func ouputImageFsInfoTable(r *pb.ImageFsInfoResponse) {
 	tablePrintFileSystem("Image", r.ImageFilesystems)
 }
 
-func parseCreds(creds string) (string, string, error) {
+func parseCreds(creds string) (username, password string, err error) {
 	if creds == "" {
 		return "", "", errors.New("credentials can't be empty")
 	}
@@ -638,7 +638,7 @@ func normalizeRepoTagPair(repoTags []string, imageName string) (repoTagPairs [][
 	return
 }
 
-func normalizeRepoDigest(repoDigests []string) (string, string) {
+func normalizeRepoDigest(repoDigests []string) (repo, digest string) {
 	if len(repoDigests) == 0 {
 		return "<none>", "<none>"
 	}

pkg/validate/container.go

@@ -504,11 +504,11 @@ func verifyExecSyncOutput(c internalapi.RuntimeService, containerID string, comm
 }
 
 // createHostPath creates the hostPath and flagFile for volume.
-func createHostPath(podID string) (string, string) {
+func createHostPath(podID string) (hostPath, flagFile string) {
 	hostPath, err := os.MkdirTemp("", "test"+podID)
 	framework.ExpectNoError(err, "failed to create TempDir %q: %v", hostPath, err)
 
-	flagFile := "testVolume.file"
+	flagFile = "testVolume.file"
 	_, err = os.Create(filepath.Join(hostPath, flagFile))
 	framework.ExpectNoError(err, "failed to create volume file %q: %v", flagFile, err)
 
@@ -544,7 +544,7 @@ func createVolumeContainer(rc internalapi.RuntimeService, ic internalapi.ImageMa
 }
 
 // createLogContainer creates a container with log and the prefix of containerName.
-func createLogContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, prefix, podID string, podConfig *runtimeapi.PodSandboxConfig) (string, string) {
+func createLogContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, prefix, podID string, podConfig *runtimeapi.PodSandboxConfig) (logPath, containerID string) {
 	By("create a container with log and name")
 	containerName := prefix + framework.NewUUID()
 	path := containerName + ".log"
@@ -558,7 +558,7 @@ func createLogContainer(rc internalapi.RuntimeService, ic internalapi.ImageManag
 }
 
 // createKeepLoggingContainer creates a container keeps logging defaultLog to output.
-func createKeepLoggingContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, prefix, podID string, podConfig *runtimeapi.PodSandboxConfig) (string, string) {
+func createKeepLoggingContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, prefix, podID string, podConfig *runtimeapi.PodSandboxConfig) (logPath, containerID string) {
 	By("create a container with log and name")
 	containerName := prefix + framework.NewUUID()
 	path := containerName + ".log"

pkg/validate/container_linux.go

@@ -168,16 +168,16 @@ var _ = framework.KubeDescribe("Container OOM", func() {
 })
 
 // createHostPath creates the hostPath for mount propagation test.
-func createHostPathForMountPropagation(podID string, propagationOpt runtimeapi.MountPropagation) (string, string, string, func()) {
+func createHostPathForMountPropagation(podID string, propagationOpt runtimeapi.MountPropagation) (mntSource, propagationSrcDir, propagationMntPoint string, clearHostPath func()) {
 	hostPath, err := os.MkdirTemp("", "test"+podID)
 	framework.ExpectNoError(err, "failed to create TempDir %q: %v", hostPath, err)
 
-	mntSource := filepath.Join(hostPath, "mnt")
-	propagationMntPoint := filepath.Join(mntSource, "propagationMnt")
+	mntSource = filepath.Join(hostPath, "mnt")
+	propagationMntPoint = filepath.Join(mntSource, "propagationMnt")
 	err = os.MkdirAll(propagationMntPoint, 0o700)
 	framework.ExpectNoError(err, "failed to create volume dir %q: %v", propagationMntPoint, err)
 
-	propagationSrcDir := filepath.Join(hostPath, "propagationSrcDir")
+	propagationSrcDir = filepath.Join(hostPath, "propagationSrcDir")
 	err = os.MkdirAll(propagationSrcDir, 0o700)
 	framework.ExpectNoError(err, "failed to create volume dir %q: %v", propagationSrcDir, err)
 
@@ -203,7 +203,7 @@ func createHostPathForMountPropagation(podID string, propagationOpt runtimeapi.M
 		framework.ExpectNoError(err, "failed to set \"mntSource\" to \"rprivate\": %v", err)
 	}
 
-	clearHostPath := func() {
+	clearHostPath = func() {
 		By("clean up the TempDir")
 		err := unix.Unmount(propagationMntPoint, unix.MNT_DETACH)
 		framework.ExpectNoError(err, "failed to unmount \"propagationMntPoint\": %v", err)
@@ -429,7 +429,7 @@ func runtimeSupportsRRO(rc internalapi.RuntimeService, runtimeHandlerName string
 // createHostPathForRROMount creates the hostPath for RRO mount test.
 //
 // hostPath contains a "tmpfs" directory with tmpfs mounted on it.
-func createHostPathForRROMount(podID string) (string, func()) {
+func createHostPathForRROMount(podID string) (hostPath string, clearHostPath func()) {
 	hostPath, err := os.MkdirTemp("", "test"+podID)
 	framework.ExpectNoError(err, "failed to create TempDir %q: %v", hostPath, err)
 
@@ -440,7 +440,7 @@ func createHostPathForRROMount(podID string) (string, func()) {
 	err = unix.Mount("none", tmpfsMntPoint, "tmpfs", 0, "")
 	framework.ExpectNoError(err, "failed to mount tmpfs on dir %q: %v", tmpfsMntPoint, err)
 
-	clearHostPath := func() {
+	clearHostPath = func() {
 		By("clean up the TempDir")
 		err := unix.Unmount(tmpfsMntPoint, unix.MNT_DETACH)
 		framework.ExpectNoError(err, "failed to unmount \"tmpfsMntPoint\": %v", err)

pkg/validate/multi_container_linux.go

@@ -108,12 +108,12 @@ var _ = framework.KubeDescribe("Multiple Containers [Conformance]", func() {
 })
 
 // createMultiContainerTestPodSandbox creates a sandbox with log directory and a container port for httpd container.
-func createMultiContainerTestPodSandbox(c internalapi.RuntimeService) (string, *runtimeapi.PodSandboxConfig, string) {
+func createMultiContainerTestPodSandbox(c internalapi.RuntimeService) (sandboxID string, podConfig *runtimeapi.PodSandboxConfig, logDir string) {
 	podSandboxName := "PodSandbox-for-multi-container-test-" + framework.NewUUID()
 	uid := framework.DefaultUIDPrefix + framework.NewUUID()
 	namespace := framework.DefaultNamespacePrefix + framework.NewUUID()
 	logDir, podLogPath := createLogTempDir(podSandboxName)
-	podConfig := &runtimeapi.PodSandboxConfig{
+	podConfig = &runtimeapi.PodSandboxConfig{
 		Metadata:     framework.BuildPodSandboxMetadata(podSandboxName, uid, namespace, framework.DefaultAttempt),
 		LogDirectory: podLogPath,
 		PortMappings: []*runtimeapi.PortMapping{

pkg/validate/pod.go

@@ -158,25 +158,25 @@ func listPodSandbox(c internalapi.RuntimeService, filter *runtimeapi.PodSandboxF
 }
 
 // createLogTempDir creates the log temp directory for podSandbox.
-func createLogTempDir(podSandboxName string) (string, string) {
+func createLogTempDir(podSandboxName string) (hostPath, podLogPath string) {
 	hostPath, err := os.MkdirTemp("", "podLogTest")
 	framework.ExpectNoError(err, "failed to create TempDir %q: %v", hostPath, err)
-	podLogPath := filepath.Join(hostPath, podSandboxName)
+	podLogPath = filepath.Join(hostPath, podSandboxName)
 	err = os.MkdirAll(podLogPath, 0o777)
 	framework.ExpectNoError(err, "failed to create host path %s: %v", podLogPath, err)
 
 	return hostPath, podLogPath
 }
 
 // createPodSandboxWithLogDirectory creates a PodSandbox with log directory.
-func createPodSandboxWithLogDirectory(c internalapi.RuntimeService) (string, *runtimeapi.PodSandboxConfig, string) {
+func createPodSandboxWithLogDirectory(c internalapi.RuntimeService) (sandboxID string, podConfig *runtimeapi.PodSandboxConfig, hostPath string) {
 	By("create a PodSandbox with log directory")
 	podSandboxName := "PodSandbox-with-log-directory-" + framework.NewUUID()
 	uid := framework.DefaultUIDPrefix + framework.NewUUID()
 	namespace := framework.DefaultNamespacePrefix + framework.NewUUID()
 
 	hostPath, podLogPath := createLogTempDir(podSandboxName)
-	podConfig := &runtimeapi.PodSandboxConfig{
+	podConfig = &runtimeapi.PodSandboxConfig{
 		Metadata:     framework.BuildPodSandboxMetadata(podSandboxName, uid, namespace, framework.DefaultAttempt),
 		LogDirectory: podLogPath,
 		Linux: &runtimeapi.LinuxPodSandboxConfig{

pkg/validate/security_context_linux.go

@@ -90,8 +90,8 @@ var _ = framework.KubeDescribe("Security Context", func() {
 
 			By("create nginx container")
 			prefix := "nginx-container-"
-			containerName := prefix + framework.NewUUID()
-			containerID, nginxContainerName, _ := createNamespaceContainer(rc, ic, podID, podConfig, containerName, nginxContainerImage, namespaceOption, nil, "")
+			nginxContainerName := prefix + framework.NewUUID()
+			containerID, _ := createNamespaceContainer(rc, ic, podID, podConfig, nginxContainerName, nginxContainerImage, namespaceOption, nil, "")
 
 			By("start container")
 			startContainer(rc, containerID)
@@ -108,8 +108,8 @@ var _ = framework.KubeDescribe("Security Context", func() {
 			By("create busybox container with hostPID")
 			command = []string{"sh", "-c", "sleep 1000"}
 			prefix = "container-with-HostPID-test-"
-			containerName = prefix + framework.NewUUID()
-			containerID, _, _ = createNamespaceContainer(rc, ic, podID, podConfig, containerName, framework.TestContext.TestImageList.DefaultTestContainerImage, namespaceOption, command, "")
+			containerName := prefix + framework.NewUUID()
+			containerID, _ = createNamespaceContainer(rc, ic, podID, podConfig, containerName, framework.TestContext.TestImageList.DefaultTestContainerImage, namespaceOption, command, "")
 
 			By("start container")
 			startContainer(rc, containerID)
@@ -150,7 +150,7 @@ var _ = framework.KubeDescribe("Security Context", func() {
 			By("create a default container with namespace")
 			prefix := "namespace-container-"
 			containerName := prefix + framework.NewUUID()
-			containerID, _, _ := createNamespaceContainer(rc, ic, podID, podConfig, containerName, framework.TestContext.TestImageList.DefaultTestContainerImage, namespaceOption, pauseCmd, "")
+			containerID, _ := createNamespaceContainer(rc, ic, podID, podConfig, containerName, framework.TestContext.TestImageList.DefaultTestContainerImage, namespaceOption, pauseCmd, "")
 
 			By("start container")
 			startContainer(rc, containerID)
@@ -190,7 +190,7 @@ var _ = framework.KubeDescribe("Security Context", func() {
 			By("create nginx container")
 			prefix := "nginx-container-"
 			containerName := prefix + framework.NewUUID()
-			containerID, _, _ := createNamespaceContainer(rc, ic, podID, podConfig, containerName, nginxContainerImage, namespaceOption, nil, "")
+			containerID, _ := createNamespaceContainer(rc, ic, podID, podConfig, containerName, nginxContainerImage, namespaceOption, nil, "")
 
 			By("start container")
 			startContainer(rc, containerID)
@@ -216,7 +216,7 @@ var _ = framework.KubeDescribe("Security Context", func() {
 			By("create nginx container")
 			prefix := "nginx-container-"
 			containerName := prefix + framework.NewUUID()
-			containerID, _, _ := createNamespaceContainer(rc, ic, podID, podConfig, containerName, nginxContainerImage, namespaceOption, nil, "")
+			containerID, _ := createNamespaceContainer(rc, ic, podID, podConfig, containerName, nginxContainerImage, namespaceOption, nil, "")
 
 			By("start container")
 			startContainer(rc, containerID)
@@ -375,7 +375,7 @@ var _ = framework.KubeDescribe("Security Context", func() {
 
 			By("create container with ReadOnlyRootfs_false")
 			readOnlyRootfs := false
-			logPath, containerID := createReadOnlyRootfsContainer(rc, ic, podID, podConfig, "container-with-ReadOnlyRootfs-false-test-", readOnlyRootfs)
+			containerID, logPath := createReadOnlyRootfsContainer(rc, ic, podID, podConfig, "container-with-ReadOnlyRootfs-false-test-", readOnlyRootfs)
 
 			By("start container")
 			startContainer(rc, containerID)
@@ -393,7 +393,7 @@ var _ = framework.KubeDescribe("Security Context", func() {
 
 			By("create container with ReadOnlyRootfs_true")
 			readOnlyRootfs := true
-			logPath, containerID := createReadOnlyRootfsContainer(rc, ic, podID, podConfig, "container-with-ReadOnlyRootfs-true-test-", readOnlyRootfs)
+			containerID, logPath := createReadOnlyRootfsContainer(rc, ic, podID, podConfig, "container-with-ReadOnlyRootfs-true-test-", readOnlyRootfs)
 
 			By("start container")
 			startContainer(rc, containerID)
@@ -1118,11 +1118,11 @@ func matchContainerOutputRe(podConfig *runtimeapi.PodSandboxConfig, name, patter
 }
 
 // createRunAsUserContainer creates the container with specified RunAsUser in ContainerConfig.
-func createRunAsUserContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, prefix string) (string, string) {
+func createRunAsUserContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, prefix string) (containerID, expectedLogMessage string) {
 	By("create RunAsUser container")
 	var uidV runtimeapi.Int64Value
 	uidV.Value = 1001
-	expectedLogMessage := "1001\n"
+	expectedLogMessage = "1001\n"
 
 	By("create a container with RunAsUser")
 	containerName := prefix + framework.NewUUID()
@@ -1141,10 +1141,10 @@ func createRunAsUserContainer(rc internalapi.RuntimeService, ic internalapi.Imag
 }
 
 // createRunAsUserNameContainer creates the container with specified RunAsUserName in ContainerConfig.
-func createRunAsUserNameContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, prefix string) (string, string) {
+func createRunAsUserNameContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, prefix string) (containerID, expectedLogMessage string) {
 	By("create RunAsUserName container")
 	userName := "nobody"
-	expectedLogMessage := userName + "\n"
+	expectedLogMessage = userName + "\n"
 
 	By("create a container with RunAsUserName")
 	containerName := prefix + framework.NewUUID()
@@ -1162,12 +1162,12 @@ func createRunAsUserNameContainer(rc internalapi.RuntimeService, ic internalapi.
 }
 
 // createRunAsGroupContainer creates the container with specified RunAsGroup in ContainerConfig.
-func createRunAsGroupContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, containerName string) (string, string) {
+func createRunAsGroupContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, containerName string) (containerID, expectedLogMessage string) {
 	By("create RunAsGroup container")
 	var uidV, gidV runtimeapi.Int64Value
 	uidV.Value = 1001
 	gidV.Value = 1002
-	expectedLogMessage := "1001:1002\n"
+	expectedLogMessage = "1001:1002\n"
 
 	By("create a container with RunAsUser and RunAsGroup")
 	containerConfig := &runtimeapi.ContainerConfig{
@@ -1229,7 +1229,7 @@ func createNamespacePodSandbox(rc internalapi.RuntimeService, podSandboxNamespac
 }
 
 // createNamespaceContainer creates container with different NamespaceOption config.
-func createNamespaceContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, containerName, image string, containerNamespace *runtimeapi.NamespaceOption, command []string, path string) (string, string, string) {
+func createNamespaceContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, containerName, image string, containerNamespace *runtimeapi.NamespaceOption, command []string, path string) (containerID, logPath string) {
 	By("create NamespaceOption container")
 	containerConfig := &runtimeapi.ContainerConfig{
 		Metadata: framework.BuildContainerMetadata(containerName, framework.DefaultAttempt),
@@ -1243,11 +1243,11 @@ func createNamespaceContainer(rc internalapi.RuntimeService, ic internalapi.Imag
 		LogPath: path,
 	}
 
-	return framework.CreateContainer(rc, ic, containerConfig, podID, podConfig), containerName, containerConfig.LogPath
+	return framework.CreateContainer(rc, ic, containerConfig, podID, podConfig), containerConfig.LogPath
 }
 
 // createReadOnlyRootfsContainer creates the container with specified ReadOnlyRootfs in ContainerConfig.
-func createReadOnlyRootfsContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, prefix string, readonly bool) (string, string) {
+func createReadOnlyRootfsContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, podID string, podConfig *runtimeapi.PodSandboxConfig, prefix string, readonly bool) (containerID, logPath string) {
 	By("create ReadOnlyRootfs container")
 	containerName := prefix + framework.NewUUID()
 	path := containerName + ".log"
@@ -1263,7 +1263,7 @@ func createReadOnlyRootfsContainer(rc internalapi.RuntimeService, ic internalapi
 		LogPath: path,
 	}
 
-	return containerConfig.LogPath, framework.CreateContainer(rc, ic, containerConfig, podID, podConfig)
+	return framework.CreateContainer(rc, ic, containerConfig, podID, podConfig), containerConfig.LogPath
 }
 
 // checkRootfs checks whether the rootfs parameter of the ContainerConfig is working properly.
@@ -1370,7 +1370,7 @@ func createAndCheckHostNetwork(rc internalapi.RuntimeService, ic internalapi.Ima
 	command := []string{"sh", "-c", "netstat -ln"}
 	containerName := "container-with-HostNetwork-test-" + framework.NewUUID()
 	path := containerName + ".log"
-	containerID, _, logPath := createNamespaceContainer(rc, ic, podID, podConfig, containerName, framework.TestContext.TestImageList.DefaultTestContainerImage, namespaceOptions, command, path)
+	containerID, logPath := createNamespaceContainer(rc, ic, podID, podConfig, containerName, framework.TestContext.TestImageList.DefaultTestContainerImage, namespaceOptions, command, path)
 
 	By("start container")
 	startContainer(rc, containerID)
@@ -1417,7 +1417,7 @@ func createSeccompProfile(profileContents, profileName, hostPath string) (string
 }
 
 // seccompTestContainer creates and starts a seccomp sandbox and a container.
-func seccompTestContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, profile *runtimeapi.SecurityProfile) (string, string) {
+func seccompTestContainer(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, profile *runtimeapi.SecurityProfile) (podID, containerID string) {
 	By("create seccomp sandbox")
 	podSandboxName := "seccomp-sandbox-" + framework.NewUUID()
 	uid := framework.DefaultUIDPrefix + framework.NewUUID()
@@ -1432,7 +1432,7 @@ func seccompTestContainer(rc internalapi.RuntimeService, ic internalapi.ImageMan
 		},
 		Labels: framework.DefaultPodLabels,
 	}
-	podID := framework.RunPodSandbox(rc, podConfig)
+	podID = framework.RunPodSandbox(rc, podConfig)
 
 	By("create container")
 	containerNamePrefix := "seccomp-container-" + framework.NewUUID()
@@ -1447,7 +1447,7 @@ func seccompTestContainer(rc internalapi.RuntimeService, ic internalapi.ImageMan
 			},
 		},
 	}
-	containerID := framework.CreateContainer(rc, ic, containerConfig, podID, podConfig)
+	containerID = framework.CreateContainer(rc, ic, containerConfig, podID, podConfig)
 
 	By("start container")
 	startContainer(rc, containerID)