infoutil: make runc version output consistent with Docker

Eliminate extra fields from `ComponentVersion.Details`

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

Author: AkihiroSuda

pkg/infoutil/infoutil.go

@@ -208,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

@@ -56,3 +56,29 @@ func TestParseBuildctlVersion(t *testing.T) {
 		}
 	}
 }
+
+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)
+		}
+	}
+}