8 files changed, 44 insertions, 24 deletions
diff --git a/vendor/github.com/containers/psgo/CODE-OF-CONDUCT.md b/vendor/github.com/containers/psgo/CODE-OF-CONDUCT.md
new file mode 100644
index 000000000..1081553f8
--- /dev/null
+++ b/vendor/github.com/containers/psgo/CODE-OF-CONDUCT.md
@@ -0,0 +1,3 @@
+## The psgo Project Community Code of Conduct
+
+The psgo project follows the [Containers Community Code of Conduct](https://github.com/containers/common/blob/master/CODE-OF-CONDUCT.md).
diff --git a/vendor/github.com/containers/psgo/Makefile b/vendor/github.com/containers/psgo/Makefile
index 361820784..831dfa31f 100644
--- a/vendor/github.com/containers/psgo/Makefile
+++ b/vendor/github.com/containers/psgo/Makefile
@@ -16,6 +16,8 @@ ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
 	GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
 endif
 
+GOBIN ?= $(GO)/bin
+
 all: validate build
 
 .PHONY: build
@@ -34,12 +36,7 @@ vendor:
 
 .PHONY: validate
 validate: .install.lint
-	@which gofmt >/dev/null 2>/dev/null || (echo "ERROR: gofmt not found." && false)
-	test -z "$$(gofmt -s -l . | grep -vE 'vendor/' | tee /dev/stderr)"
-	@which golangci-lint >/dev/null 2>/dev/null|| (echo "ERROR: golangci-lint not found." && false)
-	test -z "$$(golangci-lint run)"
-	@go doc cmd/vet >/dev/null 2>/dev/null|| (echo "ERROR: go vet not found." && false)
-	test -z "$$($(GO) vet $$($(GO) list $(PROJECT)/...) 2>&1 | tee /dev/stderr)"
+	$(GOBIN)/golangci-lint run
 
 .PHONY: test
 test: test-unit test-integration
@@ -59,8 +56,7 @@ install:
 
 .PHONY: .install.lint
 .install.lint:
-	# Workaround for https://github.com/golangci/golangci-lint/issues/523
-	go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+	VERSION=1.24.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh
 
 .PHONY: uninstall
 uninstall:
diff --git a/vendor/github.com/containers/psgo/go.mod b/vendor/github.com/containers/psgo/go.mod
index d9d54c5f7..5f3341aa9 100644
--- a/vendor/github.com/containers/psgo/go.mod
+++ b/vendor/github.com/containers/psgo/go.mod
@@ -6,6 +6,6 @@ require (
 	github.com/opencontainers/runc v0.0.0-20190425234816-dae70e8efea4
 	github.com/pkg/errors v0.0.0-20190227000051-27936f6d90f9
 	github.com/sirupsen/logrus v0.0.0-20190403091019-9b3cdde74fbe
-	github.com/stretchr/testify v1.4.0
+	github.com/stretchr/testify v1.5.1
 	golang.org/x/sys v0.0.0-20190425145619-16072639606e
 )
diff --git a/vendor/github.com/containers/psgo/go.sum b/vendor/github.com/containers/psgo/go.sum
index bbdd99730..781b26f2b 100644
--- a/vendor/github.com/containers/psgo/go.sum
+++ b/vendor/github.com/containers/psgo/go.sum
@@ -16,8 +16,8 @@ github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190425145619-16072639606e h1:4ktJgTV34+N3qOZUc5fAaG3Pb11qzMm3PkAoTAgUZ2I=
 golang.org/x/sys v0.0.0-20190425145619-16072639606e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/vendor/github.com/containers/psgo/internal/proc/stat.go b/vendor/github.com/containers/psgo/internal/proc/stat.go
index 866a5cdda..e3286704c 100644
--- a/vendor/github.com/containers/psgo/internal/proc/stat.go
+++ b/vendor/github.com/containers/psgo/internal/proc/stat.go
@@ -15,6 +15,7 @@
 package proc
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"strings"
@@ -112,21 +113,31 @@ type Stat struct {
 }
 
 // readStat is used for mocking in unit tests.
-var readStat = func(path string) ([]string, error) {
-	data, err := ioutil.ReadFile(path)
+var readStat = func(path string) (string, error) {
+	rawData, err := ioutil.ReadFile(path)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return strings.Fields(string(data)), nil
+	return string(rawData), nil
 }
 
 // ParseStat parses the /proc/$pid/stat file and returns a Stat.
 func ParseStat(pid string) (*Stat, error) {
-	fields, err := readStat(fmt.Sprintf("/proc/%s/stat", pid))
+	data, err := readStat(fmt.Sprintf("/proc/%s/stat", pid))
 	if err != nil {
 		return nil, err
 	}
 
+	firstParen := strings.IndexByte(data, '(')
+	lastParen := strings.LastIndexByte(data, ')')
+	if firstParen == -1 || lastParen == -1 {
+		return nil, errors.New("invalid format in stat")
+	}
+	pidstr := data[0 : firstParen-1]
+	comm := data[firstParen+1 : lastParen]
+	rest := strings.Fields(data[lastParen+1:])
+	fields := append([]string{pidstr, comm}, rest...)
+
 	fieldAt := func(i int) string {
 		return fields[i-1]
 	}
diff --git a/vendor/github.com/containers/psgo/internal/process/process.go b/vendor/github.com/containers/psgo/internal/process/process.go
index a936cc4ef..b46a39f46 100644
--- a/vendor/github.com/containers/psgo/internal/process/process.go
+++ b/vendor/github.com/containers/psgo/internal/process/process.go
@@ -192,7 +192,7 @@ func (p *Process) ElapsedTime() (time.Duration, error) {
 	if err != nil {
 		return 0, err
 	}
-	return (time.Now()).Sub(startTime), nil
+	return time.Since(startTime), nil
 }
 
 // StarTime returns the time.Time when process p was started.
diff --git a/vendor/github.com/containers/psgo/psgo.go b/vendor/github.com/containers/psgo/psgo.go
index 30b8b74ce..57132c94e 100644
--- a/vendor/github.com/containers/psgo/psgo.go
+++ b/vendor/github.com/containers/psgo/psgo.go
@@ -306,6 +306,11 @@ var (
 			procFn: processHGROUP,
 		},
 		{
+			normal: "rss",
+			header: "RSS",
+			procFn: processRSS,
+		},
+		{
 			normal: "state",
 			header: "STATE",
 			procFn: processState,
@@ -663,12 +668,7 @@ func processARGS(p *process.Process, ctx *psContext) (string, error) {
 
 // processCOMM returns the command name (i.e., executable name) of process p.
 func processCOMM(p *process.Process, ctx *psContext) (string, error) {
-	// ps (1) returns "[$name]" if command/args are empty
-	if p.CmdLine[0] == "" {
-		return processName(p, ctx)
-	}
-	spl := strings.Split(p.CmdLine[0], "/")
-	return spl[len(spl)-1], nil
+	return p.Stat.Comm, nil
 }
 
 // processNICE returns the nice value of process p.
@@ -867,6 +867,16 @@ func processHGROUP(p *process.Process, ctx *psContext) (string, error) {
 	return "?", nil
 }
 
+// processRSS returns the resident set size of process p in KiB (1024-byte
+// units).
+func processRSS(p *process.Process, ctx *psContext) (string, error) {
+	if p.Status.VMRSS == "" {
+		// probably a kernel thread
+		return "0", nil
+	}
+	return p.Status.VMRSS, nil
+}
+
 // processState returns the process state of process p.
 func processState(p *process.Process, ctx *psContext) (string, error) {
 	return p.Status.State, nil
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 3b45161da..10635baf9 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -142,7 +142,7 @@ github.com/containers/ocicrypt/keywrap/pgp
 github.com/containers/ocicrypt/keywrap/pkcs7
 github.com/containers/ocicrypt/spec
 github.com/containers/ocicrypt/utils
-# github.com/containers/psgo v1.4.0
+# github.com/containers/psgo v1.5.0
 github.com/containers/psgo
 github.com/containers/psgo/internal/capabilities
 github.com/containers/psgo/internal/cgroups