Fix change in runc kill all behavior

`runc kill -all` ignores `libcontainer.ErrNotRunning`, but `runc kill`
does not.
Since we used to equate `SIGTERM` and `SIGKILL` with `-all`, restore old
behavior by ignoring `"container not running"` runc errors if those
signals are sent.
See: opencontainers/runc@f8ad20f#diff-ade6035c3e554d7627cdc368b27f475fc0dad83e02382a1dea9cae9b75871087

Additionally, switch to using error strings directly from runc code in
`internal\guest\runtime\runc\utils.go`: they have been available since
runc v1.1.0-rc.1.
Also, add logic to match on container not/still running error strings.
See: opencontainers/runc#3033

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

Author: helsaawy

internal/guest/runtime/runc/container.go

@@ -83,7 +83,10 @@ func (c *container) Kill(signal syscall.Signal) error {
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		runcErr := parseRuncError(string(out))
-		return errors.Wrapf(runcErr, "unknown runc error after kill %v: %s", err, string(out))
+		if (signal == syscall.SIGTERM || signal == syscall.SIGKILL) && errors.Is(runcErr, runtime.ErrContainerNotRunning) {
+			return nil
+		}
+		return errors.Wrapf(runcErr, "runc kill failed with %v: %s", err, string(out))
 	}
 	return nil
 }

internal/guest/runtime/runc/utils.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/opencontainers/runc/libcontainer"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
@@ -124,20 +125,19 @@ func (l *standardLogEntry) asError() (err error) {
 }
 
 func parseRuncError(s string) (err error) {
-	// TODO (helsaawy): match with errors from
-	// https://github.com/opencontainers/runc/blob/master/libcontainer/error.go
 	if strings.HasPrefix(s, "container") && strings.HasSuffix(s, "does not exist") {
-		// currently: "container <container id> does not exist"
+		// match "container %q does not exist" and [libcontainer.ErrNotExist]
 		err = runtime.ErrContainerDoesNotExist
-	} else if strings.Contains(s, "container with id exists") ||
-		strings.Contains(s, "container with given ID already exists") {
+	} else if strings.Contains(s, "container with id exists") || strings.Contains(s, libcontainer.ErrExist.Error()) {
 		err = runtime.ErrContainerAlreadyExists
-	} else if strings.Contains(s, "invalid id format") ||
-		strings.Contains(s, "invalid container ID format") {
+	} else if strings.Contains(s, "invalid id format") || strings.Contains(s, libcontainer.ErrInvalidID.Error()) {
 		err = runtime.ErrInvalidContainerID
-	} else if strings.Contains(s, "container") &&
-		strings.Contains(s, "that is not stopped") {
+	} else if strings.Contains(s, "container") && strings.Contains(s, "that is not stopped") {
 		err = runtime.ErrContainerNotStopped
+	} else if strings.Contains(s, libcontainer.ErrRunning.Error()) {
+		err = runtime.ErrContainerStillRunning
+	} else if strings.Contains(s, libcontainer.ErrNotRunning.Error()) {
+		err = runtime.ErrContainerNotRunning
 	} else {
 		err = errors.New(s)
 	}