drop stdin for exec sync

as i don't think there's a way it can be passed in Signed-off-by: Peter Hunt~ <[email protected]>
containers · Sep 22, 2022 · b72a78b · b72a78b
1 parent 0ad3325
commit b72a78b
Show file tree

Hide file tree

Showing 5 changed files with 139 additions and 160 deletions.
diff --git a/conmon-rs/common/proto/conmon.capnp b/conmon-rs/common/proto/conmon.capnp
@@ -65,7 +65,6 @@ interface Conmon {
         timeoutSec @1 :UInt64;
         command @2 :List(Text);
         terminal @3 :Bool;
-        stdin @4 :Bool;
     }
 
     struct ExecSyncContainerResponse {

diff --git a/conmon-rs/server/src/rpc.rs b/conmon-rs/server/src/rpc.rs
@@ -202,12 +202,11 @@ impl conmon::Server for Server {
 
         let command = pry!(req.get_command());
         let args = pry_err!(self.generate_exec_sync_args(&id, &pidfile, &container_io, &command));
-        let stdin = req.get_stdin();
 
         Promise::from_future(
             async move {
                 match child_reaper
-                    .create_child(&runtime, &args, stdin, &mut container_io, &pidfile)
+                    .create_child(&runtime, &args, false, &mut container_io, &pidfile)
                     .await
                 {
                     Ok((grandchild_pid, token)) => {

diff --git a/internal/proto/conmon.capnp.go b/internal/proto/conmon.capnp.go
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -666,9 +666,6 @@ type ExecSyncConfig struct {
 
 	// Terminal specifies if a tty should be used.
 	Terminal bool
-
-	// Stdin indicates if stdin should be available or not.
-	Stdin bool
 }
 
 // ExecContainerResult is the result for calling the ExecSyncContainer method.
@@ -709,7 +706,6 @@ func (c *ConmonClient) ExecSyncContainer(ctx context.Context, cfg *ExecSyncConfi
 			return err
 		}
 		req.SetTerminal(cfg.Terminal)
-		req.SetStdin(cfg.Stdin)
 		if err := p.SetRequest(req); err != nil {
 			return fmt.Errorf("set request: %w", err)
 		}

diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -273,7 +273,6 @@ var _ = Describe("ConmonClient", func() {
 							ID:       tr.ctrID,
 							Command:  []string{"/busybox", "echo", "-n", "hello", "world", fmt.Sprintf("%d", i)},
 							Terminal: terminal,
-							Stdin:    true,
 							Timeout:  timeoutUnlimited,
 						})
 						Expect(err).To(BeNil())
@@ -301,7 +300,6 @@ var _ = Describe("ConmonClient", func() {
 						ID:       tr.ctrID,
 						Command:  []string{"/busybox", "echo", "-n", "hello", "world", fmt.Sprintf("%d", i)},
 						Terminal: terminal,
-						Stdin:    true,
 						Timeout:  timeoutUnlimited,
 					})
 
@@ -333,7 +331,6 @@ var _ = Describe("ConmonClient", func() {
 					ID:       tr.ctrID,
 					Command:  []string{"/busybox", "echo", "-n", "hello", "world"},
 					Timeout:  timeoutUnlimited,
-					Stdin:    true,
 					Terminal: terminal,
 				})
 
@@ -362,7 +359,6 @@ var _ = Describe("ConmonClient", func() {
 					Command:  []string{"/busybox", "echo", "-n", "hello", "world"},
 					Timeout:  10,
 					Terminal: terminal,
-					Stdin:    true,
 				})
 
 				Expect(err).To(BeNil())
@@ -383,7 +379,6 @@ var _ = Describe("ConmonClient", func() {
 					Command:  []string{"/busybox", "invalid"},
 					Timeout:  timeoutUnlimited,
 					Terminal: terminal,
-					Stdin:    true,
 				})
 
 				Expect(err).To(BeNil())
@@ -414,7 +409,6 @@ var _ = Describe("ConmonClient", func() {
 					Command:  []string{"/busybox", "sleep", "5"},
 					Timeout:  3,
 					Terminal: terminal,
-					Stdin:    true,
 				})
 
 				Expect(err).To(BeNil())