Merge pull request containerd#3407 from apostasie/chore-lint

Lint for other platforms

Author: AkihiroSuda

Makefile

@@ -70,7 +70,9 @@ clean:
 lint: lint-go lint-imports lint-yaml lint-shell
 
 lint-go:
-	cd $(MAKEFILE_DIR) && golangci-lint run $(VERBOSE_FLAG_LONG) ./...
+	cd $(MAKEFILE_DIR) && GOOS=linux golangci-lint run $(VERBOSE_FLAG_LONG) ./... && \
+		GOOS=windows golangci-lint run $(VERBOSE_FLAG_LONG) ./... && \
+		GOOS=freebsd golangci-lint run $(VERBOSE_FLAG_LONG) ./...
 
 lint-imports:
 	cd $(MAKEFILE_DIR) && ./hack/lint-imports.sh

cmd/nerdctl/container/container_cp.go

@@ -17,7 +17,10 @@
 package container
 
 import (
+	"errors"
 	"fmt"
+	"path/filepath"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -131,3 +134,46 @@ func processCpOptions(cmd *cobra.Command, args []string) (types.ContainerCpOptio
 func AddCpCommand(rootCmd *cobra.Command) {
 	rootCmd.AddCommand(newCpCommand())
 }
+
+var errFileSpecDoesntMatchFormat = errors.New("filespec must match the canonical format: [container:]file/path")
+
+func parseCpFileSpec(arg string) (*cpFileSpec, error) {
+	i := strings.Index(arg, ":")
+
+	// filespec starting with a semicolon is invalid
+	if i == 0 {
+		return nil, errFileSpecDoesntMatchFormat
+	}
+
+	if filepath.IsAbs(arg) {
+		// Explicit local absolute path, e.g., `C:\foo` or `/foo`.
+		return &cpFileSpec{
+			Container: nil,
+			Path:      arg,
+		}, nil
+	}
+
+	parts := strings.SplitN(arg, ":", 2)
+
+	if len(parts) == 1 || strings.HasPrefix(parts[0], ".") {
+		// Either there's no `:` in the arg
+		// OR it's an explicit local relative path like `./file:name.txt`.
+		return &cpFileSpec{
+			Path: arg,
+		}, nil
+	}
+
+	return &cpFileSpec{
+		Container: &parts[0],
+		Path:      parts[1],
+	}, nil
+}
+
+type cpFileSpec struct {
+	Container *string
+	Path      string
+}
+
+func cpShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	return nil, cobra.ShellCompDirectiveFilterFileExt
+}

cmd/nerdctl/container/container_cp_linux.go

@@ -32,7 +32,6 @@ import (
 type psTestContainer struct {
 	name    string
 	labels  map[string]string
-	volumes []string
 	network string
 }
 

cmd/nerdctl/container/container_list_windows_test.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"regexp"
 	"strings"
 	"testing"
 
@@ -223,28 +222,3 @@ func baseTestRunPort(t *testing.T, nginxImage string, nginxIndexHTMLSnippet stri
 	}
 
 }
-
-func valuesOfMapStringString(m map[string]string) map[string]struct{} {
-	res := make(map[string]struct{})
-	for _, v := range m {
-		res[v] = struct{}{}
-	}
-	return res
-}
-
-func extractHostPort(portMapping string, port string) (string, error) {
-	// Regular expression to extract host port from port mapping information
-	re := regexp.MustCompile(`(?P<containerPort>\d{1,5})/tcp ->.*?0.0.0.0:(?P<hostPort>\d{1,5}).*?`)
-	portMappingLines := strings.Split(portMapping, "\n")
-	for _, portMappingLine := range portMappingLines {
-		// Find the matches
-		matches := re.FindStringSubmatch(portMappingLine)
-		// Check if there is a match
-		if len(matches) >= 3 && matches[1] == port {
-			// Extract the host port number
-			hostPort := matches[2]
-			return hostPort, nil
-		}
-	}
-	return "", fmt.Errorf("could not extract host port from port mapping: %s", portMapping)
-}

cmd/nerdctl/container/container_run_network_base_test.go

@@ -37,6 +37,31 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
 )
 
+func extractHostPort(portMapping string, port string) (string, error) {
+	// Regular expression to extract host port from port mapping information
+	re := regexp.MustCompile(`(?P<containerPort>\d{1,5})/tcp ->.*?0.0.0.0:(?P<hostPort>\d{1,5}).*?`)
+	portMappingLines := strings.Split(portMapping, "\n")
+	for _, portMappingLine := range portMappingLines {
+		// Find the matches
+		matches := re.FindStringSubmatch(portMappingLine)
+		// Check if there is a match
+		if len(matches) >= 3 && matches[1] == port {
+			// Extract the host port number
+			hostPort := matches[2]
+			return hostPort, nil
+		}
+	}
+	return "", fmt.Errorf("could not extract host port from port mapping: %s", portMapping)
+}
+
+func valuesOfMapStringString(m map[string]string) map[string]struct{} {
+	res := make(map[string]struct{})
+	for _, v := range m {
+		res[v] = struct{}{}
+	}
+	return res
+}
+
 // TestRunInternetConnectivity tests Internet connectivity with `apk update`
 func TestRunInternetConnectivity(t *testing.T) {
 	base := testutil.NewBase(t)

cmd/nerdctl/container/container_run_network_linux_test.go

@@ -126,22 +126,22 @@ func TestHnsEndpointsExistDuringContainerLifecycle(t *testing.T) {
 		"tail", "-f",
 	)
 	t.Logf("Creating HNS lifecycle test container with command: %q", strings.Join(cmd.Command, " "))
-	containerId := strings.TrimSpace(cmd.Run().Stdout())
-	t.Logf("HNS endpoint lifecycle test container ID: %q", containerId)
+	containerID := strings.TrimSpace(cmd.Run().Stdout())
+	t.Logf("HNS endpoint lifecycle test container ID: %q", containerID)
 
 	// HNS endpoints should be allocated on container creation.
-	assertHnsEndpointsExistence(t, true, containerId, testNet.Name)
+	assertHnsEndpointsExistence(t, true, containerID, testNet.Name)
 
 	// Starting and stopping the container should NOT affect/change the endpoints.
-	base.Cmd("start", containerId).AssertOK()
-	assertHnsEndpointsExistence(t, true, containerId, testNet.Name)
+	base.Cmd("start", containerID).AssertOK()
+	assertHnsEndpointsExistence(t, true, containerID, testNet.Name)
 
-	base.Cmd("stop", containerId).AssertOK()
-	assertHnsEndpointsExistence(t, true, containerId, testNet.Name)
+	base.Cmd("stop", containerID).AssertOK()
+	assertHnsEndpointsExistence(t, true, containerID, testNet.Name)
 
 	// Removing the container should remove the HNS endpoints.
-	base.Cmd("rm", containerId).AssertOK()
-	assertHnsEndpointsExistence(t, false, containerId, testNet.Name)
+	base.Cmd("rm", containerID).AssertOK()
+	assertHnsEndpointsExistence(t, false, containerID, testNet.Name)
 }
 
 // Returns a network to be used for testing.

cmd/nerdctl/container/container_run_network_windows_test.go

@@ -29,18 +29,22 @@ func TestImageEncryptJWE(t *testing.T) {
 	testutil.RequiresBuild(t)
 	testutil.DockerIncompatible(t)
 	keyPair := helpers.NewJWEKeyPair(t)
-	defer keyPair.Cleanup()
 	base := testutil.NewBase(t)
 	tID := testutil.Identifier(t)
 	reg := testregistry.NewWithNoAuth(base, 0, false)
+
+	defer keyPair.Cleanup()
 	defer reg.Cleanup(nil)
+
 	base.Cmd("pull", testutil.CommonImage).AssertOK()
 	encryptImageRef := fmt.Sprintf("127.0.0.1:%d/%s:encrypted", reg.Port, tID)
-	defer base.Cmd("rmi", encryptImageRef).Run()
 	base.Cmd("image", "encrypt", "--recipient=jwe:"+keyPair.Pub, testutil.CommonImage, encryptImageRef).AssertOK()
 	base.Cmd("image", "inspect", "--mode=native", "--format={{len .Index.Manifests}}", encryptImageRef).AssertOutExactly("1\n")
 	base.Cmd("image", "inspect", "--mode=native", "--format={{json .Manifest.Layers}}", encryptImageRef).AssertOutContains("org.opencontainers.image.enc.keys.jwe")
 	base.Cmd("push", encryptImageRef).AssertOK()
+
+	defer base.Cmd("rmi", encryptImageRef).Run()
+
 	// remove all local images (in the nerdctl-test namespace), to ensure that we do not have blobs of the original image.
 	helpers.RmiAll(base)
 	base.Cmd("pull", encryptImageRef).AssertFail() // defaults to --unpack=true, and fails due to missing prv key