Update runc kill wrapper to take a string for signal

Kathryn Baldauf · Kathryn Baldauf · commit 74d18cfb4b9a · 2021-09-16T20:43:14.000-07:00
Signed-off-by: Kathryn Baldauf &lt;kabaldau@microsoft.com&gt;
diff --git a/runc.go b/runc.go
@@ -327,6 +327,7 @@ func (r *Runc) Delete(context context.Context, id string, opts *DeleteOpts) erro
 type KillOpts struct {
 	All       bool
 	ExtraArgs []string
+	RawSignal string
 }
 
 func (o *KillOpts) args() (out []string) {
@@ -344,10 +345,14 @@ func (r *Runc) Kill(context context.Context, id string, sig int, opts *KillOpts)
 	args := []string{
 		"kill",
 	}
+	killSignal := strconv.Itoa(sig)
 	if opts != nil {
 		args = append(args, opts.args()...)
+		if opts.RawSignal != "" {
+			killSignal = opts.RawSignal
+		}
 	}
-	return r.runOrError(r.command(context, append(args, id, strconv.Itoa(sig))...))
+	return r.runOrError(r.command(context, append(args, id, killSignal)...))
 }
 
 // Stats return the stats for a container like cpu, memory, and io

Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,7 @@ func (r Runc) Delete(context context.Context, id string, opts DeleteOpts) erro`
`327`	`327`	`type KillOpts struct {`
`328`	`328`	`All bool`
`329`	`329`	`ExtraArgs []string`
	`330`	`+ RawSignal string`
`330`	`331`	`}`
`331`	`332`
`332`	`333`	`func (o *KillOpts) args() (out []string) {`
`@@ -344,10 +345,14 @@ func (r Runc) Kill(context context.Context, id string, sig int, opts KillOpts)`
`344`	`345`	`args := []string{`
`345`	`346`	`"kill",`
`346`	`347`	`}`
	`348`	`+ killSignal := strconv.Itoa(sig)`
`347`	`349`	`if opts != nil {`
`348`	`350`	`args = append(args, opts.args()...)`
	`351`	`+ if opts.RawSignal != "" {`
	`352`	`+ killSignal = opts.RawSignal`
	`353`	`+ }`
`349`	`354`	`}`
`350`		`- return r.runOrError(r.command(context, append(args, id, strconv.Itoa(sig))...))`
	`355`	`+ return r.runOrError(r.command(context, append(args, id, killSignal)...))`
`351`	`356`	`}`
`352`	`357`
`353`	`358`	`// Stats return the stats for a container like cpu, memory, and io`