server/streaming: add context to methods

haircommander · haircommander · commit 9f1c91349fa4 · 2023-01-05T13:10:35.000-05:00
Signed-off-by: Peter Hunt~ &lt;pehunt@redhat.com&gt;
diff --git a/server/streaming/streaming.go b/server/streaming/streaming.go
@@ -373,14 +373,14 @@ var (
 	_ portforward.PortForwarder    = &criAdapter{}
 )
 
-func (a *criAdapter) ExecInContainer(podName string, podUID apiTypes.UID, container string, cmd []string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize, timeout time.Duration) error {
+func (a *criAdapter) ExecInContainer(ctx context.Context, podName string, podUID apiTypes.UID, container string, cmd []string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize, timeout time.Duration) error {
 	return a.Runtime.Exec(container, cmd, in, out, err, tty, resize)
 }
 
-func (a *criAdapter) AttachContainer(podName string, podUID apiTypes.UID, container string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) error {
+func (a *criAdapter) AttachContainer(ctx context.Context, podName string, podUID apiTypes.UID, container string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) error {
 	return a.Runtime.Attach(container, in, out, err, tty, resize)
 }
 
-func (a *criAdapter) PortForward(podName string, podUID apiTypes.UID, port int32, stream io.ReadWriteCloser) error {
+func (a *criAdapter) PortForward(ctx context.Context, podName string, podUID apiTypes.UID, port int32, stream io.ReadWriteCloser) error {
 	return a.Runtime.PortForward(podName, port, stream)
 }

Original file line number	Diff line number	Diff line change
`@@ -373,14 +373,14 @@ var (`
`373`	`373`	`_ portforward.PortForwarder = &criAdapter{}`
`374`	`374`	`)`
`375`	`375`
`376`		`-func (a *criAdapter) ExecInContainer(podName string, podUID apiTypes.UID, container string, cmd []string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize, timeout time.Duration) error {`
	`376`	`+func (a *criAdapter) ExecInContainer(ctx context.Context, podName string, podUID apiTypes.UID, container string, cmd []string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize, timeout time.Duration) error {`
`377`	`377`	`return a.Runtime.Exec(container, cmd, in, out, err, tty, resize)`
`378`	`378`	`}`
`379`	`379`
`380`		`-func (a *criAdapter) AttachContainer(podName string, podUID apiTypes.UID, container string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) error {`
	`380`	`+func (a *criAdapter) AttachContainer(ctx context.Context, podName string, podUID apiTypes.UID, container string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) error {`
`381`	`381`	`return a.Runtime.Attach(container, in, out, err, tty, resize)`
`382`	`382`	`}`
`383`	`383`
`384`		`-func (a *criAdapter) PortForward(podName string, podUID apiTypes.UID, port int32, stream io.ReadWriteCloser) error {`
	`384`	`+func (a *criAdapter) PortForward(ctx context.Context, podName string, podUID apiTypes.UID, port int32, stream io.ReadWriteCloser) error {`
`385`	`385`	`return a.Runtime.PortForward(podName, port, stream)`
`386`	`386`	`}`