Merge pull request #16 from hashicorp/update-build

build: cleanup go mod file, update go, bump nomad version

README.md

@@ -13,8 +13,8 @@ plugin.
 Requirements
 -------------------
 
-- [Nomad](https://www.nomadproject.io/downloads.html) v0.9+
+- [Go](https://golang.org/doc/install) v1.18 or later (to compile the plugin)
-- [Go](https://golang.org/doc/install) v1.11 or later (to build the plugin)
+- [Nomad](https://www.nomadproject.io/downloads.html) v0.9+ (to run the plugin)
 
 Building the Skeleton Plugin
 -------------------

go.mod

@@ -1,25 +1,105 @@
 // TODO: update the module path below to match your own repository
 module github.com/hashicorp/nomad-skeleton-driver-plugin
 
-go 1.12
+go 1.18
 
 require (
-	github.com/containernetworking/plugins v0.8.3 // indirect
+	github.com/hashicorp/consul-template v0.29.1
-	github.com/hashicorp/consul-template v0.25.2
+	github.com/hashicorp/go-hclog v1.2.1
-	github.com/hashicorp/go-hclog v0.14.1
+	github.com/hashicorp/go-plugin v1.4.4
-	github.com/hashicorp/go-plugin v1.4.0
+	github.com/hashicorp/nomad v1.3.1
-	github.com/hashicorp/nomad v1.1.14
-	github.com/shirou/gopsutil v2.19.11+incompatible // indirect
 )
 
-// use lower-case sirupsen
+require (
-replace github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.2
+	github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5 // indirect
-
+	github.com/Microsoft/go-winio v0.5.2 // indirect
-// don't use shirou/gopsutil, use the hashicorp fork
+	github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
-replace github.com/shirou/gopsutil => github.com/hashicorp/gopsutil v2.17.13-0.20190117153606-62d5761ddb7d+incompatible
+	github.com/armon/go-metrics v0.4.0 // indirect
-
+	github.com/armon/go-radix v1.0.0 // indirect
-// don't use ugorji/go, use the hashicorp fork
+	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
-replace github.com/ugorji/go => github.com/hashicorp/go-msgpack v0.0.0-20190927123313-23165f7bc3c2
+	github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
-
+	github.com/cilium/ebpf v0.9.0 // indirect
-// fix the version of hashicorp/go-msgpack to 96ddbed8d05b
+	github.com/container-storage-interface/spec v1.6.0 // indirect
-replace github.com/hashicorp/go-msgpack => github.com/hashicorp/go-msgpack v0.0.0-20191101193846-96ddbed8d05b
+	github.com/containerd/console v1.0.3 // indirect
+	github.com/containernetworking/plugins v1.1.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/creack/pty v1.1.18 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/hashicorp/consul/api v1.13.0 // indirect
+	github.com/hashicorp/cronexpr v1.1.1 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-msgpack v1.1.5 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
+	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
+	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/hashicorp/hcl v1.0.1-vault-3 // indirect
+	github.com/hashicorp/raft v1.3.9 // indirect
+	github.com/hashicorp/serf v0.9.8 // indirect
+	github.com/hashicorp/vault/api v1.7.2 // indirect
+	github.com/hashicorp/vault/sdk v0.5.2 // indirect
+	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
+	github.com/hpcloud/tail v1.0.1-0.20170814160653-37f427138745 // indirect
+	github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/miekg/dns v1.1.50 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-ps v1.0.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/mitchellh/hashstructure v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/moby/sys/mount v0.3.3 // indirect
+	github.com/moby/sys/mountinfo v0.6.2 // indirect
+	github.com/mrunalp/fileutils v0.5.0 // indirect
+	github.com/oklog/run v1.1.0 // indirect
+	github.com/opencontainers/runc v1.1.3 // indirect
+	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
+	github.com/opencontainers/selinux v1.10.1 // indirect
+	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
+	github.com/ryanuber/go-glob v1.0.0 // indirect
+	github.com/seccomp/libseccomp-golang v0.10.0 // indirect
+	github.com/shirou/gopsutil/v3 v3.22.6 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.5.0 // indirect
+	github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
+	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
+	github.com/vmihailenco/tagparser v0.1.2 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	github.com/zclconf/go-cty v1.10.0 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
+	golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
+	golang.org/x/tools v0.1.11 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20220712132514-bdd2acd4974d // indirect
+	google.golang.org/grpc v1.48.0 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/fsnotify.v1 v1.4.7 // indirect
+	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+)

main.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	log "github.com/hashicorp/go-hclog"
-
 	// TODO: update the path below to match your own repository
 	"github.com/hashicorp/nomad-skeleton-driver-plugin/hello"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/nomad/plugins"
 )
 
@@ -15,6 +14,6 @@ func main() {
 }
 
 // factory returns a new instance of a nomad driver plugin
-func factory(log log.Logger) interface{} {
+func factory(log hclog.Logger) interface{} {
 	return hello.NewPlugin(log)
 }