[wip] tweaks testing arm (#11)

* testing on arm * add arch command for variant of metadata * try to find consensus between arm/x86 /proc/cpuinfo * disable cpu section for now I am testing on an arm machine and making slight tweaks for bug fixes and other support for extractors Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

cmd/compspec/compspec.go

@@ -40,6 +40,7 @@ func main() {
 
 // Extract arguments
 filename := extractCmd.String("o", "out", &argparse.Options{Help: "Save extraction to json file"})
+allowFail := extractCmd.Flag("f", "allow-fail", &argparse.Options{Help: "Allow any specific extractor to fail (and continue extraction)"})
 
 // Match arguments
 matchFields := matchCmd.StringList("m", "match", &argparse.Options{Help: "One or more key value pairs to match"})
@@ -52,6 +53,7 @@ func main() {
 specname := createCmd.String("i", "in", &argparse.Options{Required: true, Help: "Input yaml that contains spec for creation"})
 specfile := createCmd.String("o", "out", &argparse.Options{Help: "Save compatibility json artifact to this file"})
 mediaType := createCmd.String("m", "media-type", &argparse.Options{Help: "The expected media-type for the compatibility artifact"})
+allowFailCreate := createCmd.Flag("f", "allow-fail", &argparse.Options{Help: "Allow any specific extractor to fail (and continue extraction)"})
 
 // Now parse the arguments
 err := parser.Parse(os.Args)
@@ -62,12 +64,12 @@ func main() {
 }
 
 if extractCmd.Happened() {
-err := extract.Run(*filename, *pluginNames)
+err := extract.Run(*filename, *pluginNames, *allowFail)
 if err != nil {
 log.Fatalf("Issue with extraction: %s\n", err)
 }
 } else if createCmd.Happened() {
-err := create.Run(*specname, *options, *specfile)
+err := create.Run(*specname, *options, *specfile, *allowFailCreate)
 if err != nil {
 log.Fatal(err.Error())
 }

cmd/compspec/create/create.go

@@ -25,7 +25,7 @@ func loadRequest(filename string) (*types.CompatibilityRequest, error) {
 }
 
 // Run will create a compatibility artifact based on a request in YAML
-func Run(specname string, fields []string, saveto string) error {
+func Run(specname string, fields []string, saveto string, allowFail bool) error {
 
 // Cut out early if a spec not provided
 if specname == "" {
@@ -45,7 +45,10 @@ func Run(specname string, fields []string, saveto string) error {
 }
 
 // Finally, add custom fields and extract metadata
-result, err := plugins.Extract()
+result, err := plugins.Extract(allowFail)
+if err != nil {
+return err
+}
 
 // Update with custom fields (either new or overwrite)
 result.AddCustomFields(fields)

cmd/compspec/extract/extract.go

@@ -9,7 +9,7 @@ import (
 )
 
 // Run will run an extraction of host metadata
-func Run(filename string, pluginNames []string) error {
+func Run(filename string, pluginNames []string, allowFail bool) error {
 fmt.Printf("⭐️ Running extract...\n")
 
 // Womp womp, we only support linux! There is no other way.
@@ -26,7 +26,10 @@ func Run(filename string, pluginNames []string) error {
 }
 
 // Extract data for all plugins
-result, err := plugins.Extract()
+result, err := plugins.Extract(allowFail)
+if err != nil {
+return err
+}
 
 // If a filename is provided, save to json
 if filename != "" {

docs/usage.md

@@ -362,6 +362,13 @@ For example, if you want to extract metadata to your local machine, you can use
 ./bin/compspec extract
 ```
 
+If you want to allow failures (good for development):
+
+```bash
+./bin/compspec extract --allow-fail
+```
+
+
 Or use a specific, named extractor. Each extractor is shown below (with example output). The first example (with MPI) demonstrates
 the full ability to specify:
 

go.mod

@@ -4,7 +4,6 @@ go 1.20
 
 require (
 github.com/akamensky/argparse v1.4.0
-github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8
 github.com/converged-computing/jsongraph-go v0.0.0-20231221142916-249fef6889b3
 github.com/jedib0t/go-pretty/v6 v6.5.3
 github.com/moby/moby v25.0.0+incompatible

go.sum

@@ -1,7 +1,5 @@
 github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
 github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
-github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 h1:SjZ2GvvOononHOpK84APFuMvxqsk3tEIaKH/z4Rpu3g=
-github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/converged-computing/jsongraph-go v0.0.0-20231221142916-249fef6889b3 h1:frJJfyARuHmF2eohDCyltBLE6tRJKvA1shuS2aWQaf8=

pkg/utils/utils.go

@@ -35,6 +35,22 @@ func SplitDelimiterList(items []string, delim string) (map[string]string, error)
 return data, nil
 }
 
+// lookup a value, return error if not defined for either
+func LookupValue(
+p map[string]string,
+key1, key2 string,
+) (string, error) {
+
+var value string
+for _, key := range []string{key1, key2} {
+value, ok := p[key]
+if ok {
+return value, nil
+}
+}
+return value, fmt.Errorf("Cannot find keys %s or %s", key1, key2)
+}
+
 // ArrayContainsString determines if a string is in an array
 // We return an array of invalid names in case the calling function needs
 func StringArrayIsSubset(contenders, items []string) ([]string, bool) {

plugins/extractors/kernel/extractors.go

@@ -16,6 +16,7 @@ const (
 kernelBootFile = "/proc/cmdline"
 
 // Full boot configuration (key value pairs) prefix for a kernel version
+// This is not usually present in containers, an empty directory
 kernelConfigPrefix = "/boot/config-"
 
 // Directory with metadata about kernel modules (drivers/versions/params)!

plugins/extractors/system/arch.go

@@ -2,6 +2,7 @@ package system
 
 import (
 "fmt"
+"os/exec"
 
 "github.com/supercontainers/compspec-go/pkg/extractor"
 "github.com/supercontainers/compspec-go/pkg/utils"
@@ -10,10 +11,11 @@ import (
 const (
 linkerAMD64 = "/lib64/ld-linux-x86-64.so.2"
 linkeri386 = "/lib/ld-linux.so.2"
+linkerARM64 = "/lib/ld-linux-aarch64.so.1"
 )
 
 var (
-linkerPaths = map[string]string{"amd64": linkerAMD64, "i386": linkeri386}
+linkerPaths = map[string]string{"amd64": linkerAMD64, "i386": linkeri386, "arm64": linkerARM64}
 )
 
 // getOSArch determines arch based on the ld linux path
@@ -42,5 +44,14 @@ func getArchInformation() (extractor.ExtractorSection, error) {
 return info, err
 }
 info["name"] = arch
+
+// Try to run arch command to get more details, OK if we don't have it
+path, err := exec.LookPath("arch")
+if err == nil {
+output, err := utils.RunCommand([]string{path})
+if err == nil {
+info["arch"] = output
+}
+}
 return info, nil
 }