Output version information when called directly

Include version and commit in output when called without the CNI args.

Signed-off-by: Paul Holzinger <[email protected]>

Makefile

@@ -24,6 +24,11 @@ ifeq ($(GOBIN),)
 GOBIN := $(FIRST_GOPATH)/bin
 endif
 
+COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true)
+GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO})
+
+LDFLAGS_MACHINE ?= -X main.gitCommit=$(GIT_COMMIT)
+
 all: binaries
 
 validate: install.tools gofmt .gitvalidation lint
@@ -34,7 +39,7 @@ gofmt:
 
 
 binaries:
-	$(GO_BUILD) -o bin/podman-machine github.com/containers/podman-machine-cni/plugins/meta/podman-machine
+	$(GO_BUILD) -ldflags '$(LDFLAGS_MACHINE)' -o bin/podman-machine github.com/containers/podman-machine-cni/plugins/meta/podman-machine
 
 .PHONY: .gitvalidation
 .gitvalidation:

go.mod

@@ -4,5 +4,4 @@ go 1.16
 
 require (
 	github.com/containernetworking/cni v0.8.1
-	github.com/containernetworking/plugins v0.9.1
 )

plugins/meta/podman-machine/main.go

@@ -28,7 +28,6 @@ import (
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/containernetworking/cni/pkg/version"
-	bv "github.com/containernetworking/plugins/pkg/utils/buildversion"
 )
 
 func cmdAdd(args *skel.CmdArgs) error {
@@ -93,7 +92,7 @@ func cmdDel(args *skel.CmdArgs) error {
 }
 
 func main() {
-	skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("machine"))
+	skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, getVersion())
 }
 
 func cmdCheck(args *skel.CmdArgs) error {

plugins/meta/podman-machine/version.go

@@ -0,0 +1,14 @@
+package main
+
+import "fmt"
+
+// overwritten at build time
+var gitCommit = "unknown"
+
+const machineVersion = "0.1.0-dev"
+
+func getVersion() string {
+	return fmt.Sprintf(`CNI podman-machine plugin
+version: %s
+commit: %s`, machineVersion, gitCommit)
+}

vendor/modules.txt

@@ -6,6 +6,3 @@ github.com/containernetworking/cni/pkg/types/020
 github.com/containernetworking/cni/pkg/types/current
 github.com/containernetworking/cni/pkg/utils
 github.com/containernetworking/cni/pkg/version
-# github.com/containernetworking/plugins v0.9.1
-## explicit
-github.com/containernetworking/plugins/pkg/utils/buildversion