Remove hardwaremodel -f

This hardware figerprint was using github.com/rackn/gohai which has been
archived and which is also using some godmi packages with unspecified
license. The hardware fingerprint is not used any more so it makes sense
to remove these dependencies.

The update of the vendoring seems to require pulling in a new version of
github.com/digitalocean packages, which in turn means a new qmp monitor
version with an additional argument.

Signed-off-by: eriknordmark <[email protected]>

Author: eriknordmark

LICENSE

@@ -205,7 +205,3 @@ under the BSD-style license. For details, see the netclone/README
 
 This product bundles portions of the go httpproxy package, which is
 available under the BSD-style license. For details, see the zedcloud/proxy.go
-
-This product bundles portions of the github.com/rackn/gohai, which is
-available under the Apache License 2.0. For details, see the
-pkg/pillar/cmd/hardwaremodel

pkg/pillar/cmd/hardwaremodel/hardwaremodel.go

@@ -4,20 +4,14 @@
 package hardwaremodel
 
 import (
-	"encoding/json"
 	"flag"
 	"fmt"
 	"io/ioutil"
-	"os"
 
 	"github.com/lf-edge/eve/pkg/pillar/agentbase"
 	"github.com/lf-edge/eve/pkg/pillar/base"
 	"github.com/lf-edge/eve/pkg/pillar/hardware"
 	"github.com/lf-edge/eve/pkg/pillar/pubsub"
-	"github.com/rackn/gohai/plugins/dmi"
-	"github.com/rackn/gohai/plugins/net"
-	"github.com/rackn/gohai/plugins/storage"
-	"github.com/rackn/gohai/plugins/system"
 	"github.com/sirupsen/logrus"
 )
 
@@ -34,54 +28,16 @@ type hardwareModelAgentState struct {
 	// cli options
 	versionPtr    *bool
 	cPtr          *bool
-	hwPtr         *bool
 	outputFilePtr *string
 }
 
 // AddAgentSpecificCLIFlags adds CLI options
 func (state *hardwareModelAgentState) AddAgentSpecificCLIFlags(flagSet *flag.FlagSet) {
 	state.versionPtr = flagSet.Bool("v", false, "Version")
 	state.cPtr = flagSet.Bool("c", false, "No CRLF")
-	state.hwPtr = flagSet.Bool("f", false, "Fingerprint hardware")
 	state.outputFilePtr = flagSet.String("o", "/dev/tty", "file or device for output")
 }
 
-type info interface {
-	Class() string
-}
-
-func hwFp(log *base.LogObject, outputFile string) {
-	infos := map[string]info{}
-	dmiInfo, err := dmi.Gather()
-	if err != nil {
-		log.Fatalf("Failed to gather DMI information: %v", err)
-	}
-	infos[dmiInfo.Class()] = dmiInfo
-	netInfo, err := net.Gather()
-	if err != nil {
-		log.Fatalf("Failed to gather network info: %v", err)
-	}
-	infos[netInfo.Class()] = netInfo
-	sysInfo, err := system.Gather()
-	if err != nil {
-		log.Fatalf("Failed to gather basic OS info: %v", err)
-	}
-	infos[sysInfo.Class()] = sysInfo
-	storInfo, err := storage.Gather()
-	if err != nil {
-		log.Fatalf("Failed to gather storage info: %v", err)
-	}
-	var outfile *os.File
-	infos[storInfo.Class()] = storInfo
-	outfile, err = os.OpenFile(outputFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		log.Fatalf("hwFp error: %s", err)
-	}
-	enc := json.NewEncoder(outfile)
-	enc.SetIndent("", "  ")
-	enc.Encode(infos)
-}
-
 var logger *logrus.Logger
 var log *base.LogObject
 
@@ -98,10 +54,6 @@ func Run(_ *pubsub.PubSub, loggerArg *logrus.Logger, logArg *base.LogObject, arg
 		fmt.Printf("%s: %s\n", agentName, Version)
 		return 0
 	}
-	if *state.hwPtr {
-		hwFp(log, outputFile)
-		return 0
-	}
 	model := hardware.GetHardwareModelNoOverride(log)
 	if *state.cPtr {
 		b := []byte(fmt.Sprintf("%s", model))

pkg/pillar/go.mod

@@ -11,7 +11,8 @@ require (
 	github.com/containerd/containerd v1.6.6
 	github.com/containerd/typeurl v1.0.2
 	github.com/cshari-zededa/eve-tpm2-tools v0.0.4
-	github.com/digitalocean/go-qemu v0.0.0-20181112162955-dd7bb9c771b8
+	github.com/digitalocean/go-libvirt v0.0.0-20221020193630-0d0212f5ead2 // indirect
+	github.com/digitalocean/go-qemu v0.0.0-20220826173844-d5f5e3ceed89
 	github.com/docker/docker v20.10.17+incompatible
 	github.com/eriknordmark/ipinfo v0.0.0-20190220084921-7ee0839158f9
 	github.com/fsnotify/fsnotify v1.5.1
@@ -38,16 +39,16 @@ require (
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 	github.com/packetcap/go-pcap v0.0.0-20221020071412-2b2e94010282
 	github.com/prometheus/procfs v0.7.3
-	github.com/rackn/gohai v0.0.0-20190321191141-5053e7f1fa36
+	github.com/robertkrimen/otto v0.0.0-20221011175642-09fc211e5ab1 // indirect
 	github.com/satori/go.uuid v1.2.1-0.20180404165556-75cca531ea76
 	github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada
 	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.7.2
+	github.com/stretchr/testify v1.8.0
 	github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e
 	github.com/vishvananda/netlink v1.1.1-0.20210924202909-187053b97868
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
-	golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
 	google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect
 	google.golang.org/grpc v1.45.0
 	google.golang.org/protobuf v1.27.1

pkg/pillar/go.sum

@@ -1,6 +1,7 @@
 package hypervisor
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"github.com/digitalocean/go-qemu/qmp"
@@ -95,7 +96,7 @@ func qmpEventHandler(listenerSocket, executorSocket string) {
 	}
 	defer monitor.Disconnect()
 
-	eventChan, err := monitor.Events()
+	eventChan, err := monitor.Events(context.Background())
 	if err != nil {
 		logrus.Errorf("qmpEventHandler: Exception while getting event channel from listenerSocket: %s. %s", listenerSocket, err.Error())
 		return

pkg/pillar/hypervisor/qmp.go

@@ -300,7 +300,6 @@ access_usb() {
             [ ! -f $CONFIGDIR/v2tlsbaseroot-certificates.pem ] || cp -p $CONFIGDIR/v2tlsbaseroot-certificates.pem "$IDENTITYDIR"
             [ ! -f $CONFIGDIR/soft_serial ] || cp -p $CONFIGDIR/soft_serial "$IDENTITYDIR"
             $BINDIR/hardwaremodel -c -o "$IDENTITYDIR/hardwaremodel.dmi"
-            $BINDIR/hardwaremodel -f -o "$IDENTITYDIR/hardwaremodel.txt"
             sync
         fi
         if [ -d /mnt/dump ]; then