Merge pull request #1229 from AkihiroSuda/dev

Fix `nerdctl version` output

Author: AkihiroSuda

pkg/infoutil/infoutil.go

@@ -158,30 +158,48 @@ func ServerSemVer(ctx context.Context, client *containerd.Client) (*semver.Versi
 }
 
 func buildctlVersion() dockercompat.ComponentVersion {
-	const buildctl = "buildctl"
 	buildctlBinary, err := buildkitutil.BuildctlBinary()
 	if err != nil {
 		logrus.Warnf("unable to determine buildctl version: %s", err.Error())
-		return dockercompat.ComponentVersion{Name: buildctl}
+		return dockercompat.ComponentVersion{Name: "builctl"}
 	}
 
 	stdout, err := exec.Command(buildctlBinary, "--version").Output()
 	if err != nil {
 		logrus.Warnf("unable to determine buildctl version: %s", err.Error())
-		return dockercompat.ComponentVersion{Name: buildctl}
+		return dockercompat.ComponentVersion{Name: "buildctl"}
 	}
 
-	versionStr := strings.Fields(strings.TrimSpace(string(stdout)))
-	if len(versionStr) != 4 {
-		logrus.Errorf("unable to determine buildctl version got: %s", versionStr)
-		return dockercompat.ComponentVersion{Name: buildctl}
+	v, err := parseBuildctlVersion(stdout)
+	if err != nil {
+		logrus.Warn(err)
+		return dockercompat.ComponentVersion{Name: "buildctl"}
 	}
+	return *v
+}
 
-	return dockercompat.ComponentVersion{
-		Name:    buildctl,
-		Version: versionStr[2],
-		Details: map[string]string{"GitCommit": versionStr[3]},
+func parseBuildctlVersion(buildctlVersionStdout []byte) (*dockercompat.ComponentVersion, error) {
+	fields := strings.Fields(strings.TrimSpace(string(buildctlVersionStdout)))
+	var v *dockercompat.ComponentVersion
+	switch len(fields) {
+	case 4:
+		v = &dockercompat.ComponentVersion{
+			Name:    fields[0],
+			Version: fields[2],
+			Details: map[string]string{"GitCommit": fields[3]},
+		}
+	case 3:
+		v = &dockercompat.ComponentVersion{
+			Name:    fields[0],
+			Version: fields[2],
+		}
+	default:
+		return nil, fmt.Errorf("unable to determine buildctl version, got %q", string(buildctlVersionStdout))
 	}
+	if v.Name != "buildctl" {
+		return nil, fmt.Errorf("unable to determine buildctl version, got %q", string(buildctlVersionStdout))
+	}
+	return v, nil
 }
 
 func runcVersion() dockercompat.ComponentVersion {
@@ -190,30 +208,40 @@ func runcVersion() dockercompat.ComponentVersion {
 		logrus.Warnf("unable to determine runc version: %s", err.Error())
 		return dockercompat.ComponentVersion{Name: "runc"}
 	}
+	v, err := parseRuncVersion(stdout)
+	if err != nil {
+		logrus.Warn(err)
+		return dockercompat.ComponentVersion{Name: "runc"}
+	}
+	return *v
+}
 
-	var versionList = strings.Split(strings.TrimSpace(string(stdout)), "\n")
+func parseRuncVersion(runcVersionStdout []byte) (*dockercompat.ComponentVersion, error) {
+	var versionList = strings.Split(strings.TrimSpace(string(runcVersionStdout)), "\n")
 	firstLine := strings.Fields(versionList[0])
-	if len(firstLine) != 3 {
-		logrus.Errorf("unable to determine runc version, got: %s", firstLine)
-		return dockercompat.ComponentVersion{Name: "runc"}
+	if len(firstLine) != 3 || firstLine[0] != "runc" {
+		return nil, fmt.Errorf("unable to determine runc version, got: %s", string(runcVersionStdout))
 	}
 	version := firstLine[2]
 
 	details := map[string]string{}
 	for _, detailsLine := range versionList[1:] {
-		detail := strings.Split(detailsLine, ": ")
+		detail := strings.SplitN(detailsLine, ":", 2)
 		if len(detail) != 2 {
 			logrus.Warnf("unable to determine one of runc details, got: %s, %d", detail, len(detail))
 			continue
 		}
-		details[detail[0]] = detail[1]
+		switch strings.TrimSpace(detail[0]) {
+		case "commit":
+			details["GitCommit"] = strings.TrimSpace(detail[1])
+		}
 	}
 
-	return dockercompat.ComponentVersion{
+	return &dockercompat.ComponentVersion{
 		Name:    "runc",
 		Version: version,
 		Details: details,
-	}
+	}, nil
 }
 
 //BlockIOWeight return whether Block IO weight is supported or not

pkg/infoutil/infoutil_test.go

@@ -0,0 +1,84 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package infoutil
+
+import (
+	"testing"
+
+	"github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat"
+	"gotest.tools/v3/assert"
+)
+
+func TestParseBuildctlVersion(t *testing.T) {
+	testCases := map[string]*dockercompat.ComponentVersion{
+		"buildctl github.com/moby/buildkit v0.10.3 c8d25d9a103b70dc300a4fd55e7e576472284e31": {
+			Name:    "buildctl",
+			Version: "v0.10.3",
+			Details: map[string]string{
+				"GitCommit": "c8d25d9a103b70dc300a4fd55e7e576472284e31",
+			},
+		},
+		"buildctl github.com/moby/buildkit v0.10.0-380-g874eef9b 874eef9b70dbaf4f074d2bc8f4dc64237f8e83a0": {
+			Name:    "buildctl",
+			Version: "v0.10.0-380-g874eef9b",
+			Details: map[string]string{
+				"GitCommit": "874eef9b70dbaf4f074d2bc8f4dc64237f8e83a0",
+			},
+		},
+		"buildctl github.com/moby/buildkit 0.0.0+unknown": {
+			Name:    "buildctl",
+			Version: "0.0.0+unknown",
+		},
+		"foo bar baz": nil,
+	}
+
+	for s, expected := range testCases {
+		got, err := parseBuildctlVersion([]byte(s))
+		if expected != nil {
+			assert.NilError(t, err)
+			assert.DeepEqual(t, expected, got)
+		} else {
+			assert.Assert(t, err != nil)
+		}
+	}
+}
+
+func TestParseRuncVersion(t *testing.T) {
+	testCases := map[string]*dockercompat.ComponentVersion{
+		`runc version 1.1.2
+commit: v1.1.2-0-ga916309f
+spec: 1.0.2-dev
+go: go1.18.3
+libseccomp: 2.5.1`: {
+			Name:    "runc",
+			Version: "1.1.2",
+			Details: map[string]string{
+				"GitCommit": "v1.1.2-0-ga916309f",
+			},
+		},
+	}
+
+	for s, expected := range testCases {
+		got, err := parseRuncVersion([]byte(s))
+		if expected != nil {
+			assert.NilError(t, err)
+			assert.DeepEqual(t, expected, got)
+		} else {
+			assert.Assert(t, err != nil)
+		}
+	}
+}