update psgo to v1.2.1

* move to go modules
* fix ErrUnkownDescriptor typo
* catch errors of Setns()

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/vendor/github.com/containers/psgo/psgo.go b/vendor/github.com/containers/psgo/psgo.go
index e0f102735..f1936f917 100644
--- a/vendor/github.com/containers/psgo/psgo.go
+++ b/vendor/github.com/containers/psgo/psgo.go
@@ -93,7 +93,7 @@ func translateDescriptors(descriptors []string) ([]aixFormatDescriptor, error) {
 			}
 		}
 		if !found {
-			return nil, errors.Wrapf(ErrUnkownDescriptor, "'%s'", d)
+			return nil, errors.Wrapf(ErrUnknownDescriptor, "'%s'", d)
 		}
 	}
 
@@ -104,8 +104,8 @@ var (
 	// DefaultDescriptors is the `ps -ef` compatible default format.
 	DefaultDescriptors = []string{"user", "pid", "ppid", "pcpu", "etime", "tty", "time", "args"}
 
-	// ErrUnkownDescriptor is returned when an unknown descriptor is parsed.
-	ErrUnkownDescriptor = errors.New("unknown descriptor")
+	// ErrUnknownDescriptor is returned when an unknown descriptor is parsed.
+	ErrUnknownDescriptor = errors.New("unknown descriptor")
 
 	aixFormatDescriptors = []aixFormatDescriptor{
 		{
@@ -327,7 +327,10 @@ func JoinNamespaceAndProcessInfo(pid string, descriptors []string) ([][]string,
 			dataErr = err
 			return
 		}
-		unix.Setns(int(fd.Fd()), unix.CLONE_NEWNS)
+		if err := unix.Setns(int(fd.Fd()), unix.CLONE_NEWNS); err != nil {
+			dataErr = err
+			return
+		}
 
 		// extract all pids mentioned in pid's mount namespace
 		pids, err := proc.GetPIDs()