Merge pull request #2 from radu-matei/dynamic-options

Create dynamic attach options and stream options based on user define…

Author: Radu Matei

cmd.go

@@ -43,18 +43,6 @@ func Command(cfg Config, name string, arg ...string) *Cmd {
 
 // Start starts the specified command but does not wait for it to complete.
 func (cmd *Cmd) Start() error {
-	if cmd.Stdin == nil {
-		cmd.Stdin = ioutil.NopCloser(nil)
-	}
-
-	if cmd.Stdout == nil {
-		cmd.Stdout = ioutil.Discard
-	}
-
-	if cmd.Stderr == nil {
-		cmd.Stdout = ioutil.Discard
-	}
-
 	pod, err := createPod(cmd.Cfg.Kubeconfig, cmd.Cfg.Namespace, cmd.Cfg.Name, cmd.Cfg.Image, []string{cmd.Path}, cmd.Args)
 	if err != nil {
 		return fmt.Errorf("cannot create pod: %v", err)
@@ -73,12 +61,31 @@ func (cmd *Cmd) Start() error {
 //
 // The command must have been started by Start.
 func (cmd *Cmd) Wait() error {
+	if cmd.Stdin == nil {
+		cmd.Stdin = ioutil.NopCloser(nil)
+	}
+
+	if cmd.Stdout == nil {
+		cmd.Stdout = ioutil.Discard
+	}
+
+	if cmd.Stderr == nil {
+		cmd.Stderr = ioutil.Discard
+	}
 
 	// wait for pod to be running
 	fmt.Printf("waiting for pod to be running\n")
 	watchPod(cmd.Cfg.Kubeconfig, cmd.pod)
 
-	err := attach(cmd.Cfg.Kubeconfig, cmd.pod, cmd.Stdin, cmd.Stdout, cmd.Stderr)
+	attachOptions := &v1.PodAttachOptions{
+		Stdin:  cmd.Stdin != ioutil.NopCloser(nil),
+		Stdout: cmd.Stdout != ioutil.Discard,
+		//Stderr: cmd.Stderr != ioutil.Discard,
+		Stderr: true,
+		TTY:    false,
+	}
+
+	err := attach(cmd.Cfg.Kubeconfig, cmd.pod, attachOptions, cmd.Stdin, cmd.Stdout, cmd.Stderr)
 	if err != nil {
 		return fmt.Errorf("cannot attach: %v", err)
 	}

kube_util.go

@@ -104,7 +104,7 @@ func containerToAttachTo(container string, pod *v1.Pod) (*v1.Container, error) {
 }
 
 // attach attaches to a given pod, outputting to stdout and stderr
-func attach(kubeconfig string, pod *v1.Pod, stdin io.Reader, stdout, stderr io.Writer) error {
+func attach(kubeconfig string, pod *v1.Pod, attachOptions *v1.PodAttachOptions, stdin io.Reader, stdout, stderr io.Writer) error {
 	clientset, config, err := getKubeClient(kubeconfig)
 	if err != nil {
 		log.Fatalf("cannot get clientset: %v", err)
@@ -121,33 +121,26 @@ func attach(kubeconfig string, pod *v1.Pod, stdin io.Reader, stdout, stderr io.W
 		Namespace(pod.Namespace).
 		SubResource("attach")
 
-	req.VersionedParams(&v1.PodAttachOptions{
-		Container: container.Name,
-		Stdin:     true,
-		Stdout:    true,
-		Stderr:    true,
-		TTY:       false,
-	}, scheme.ParameterCodec)
+	attachOptions.Container = container.Name
+	req.VersionedParams(attachOptions, scheme.ParameterCodec)
 
-	err = startStream("POST", req.URL(), config, stdin, stdout, stderr, false)
+	streamOptions := getStreamOptions(attachOptions, stdin, stdout, stderr)
+
+	err = startStream("POST", req.URL(), config, streamOptions)
 	if err != nil {
 		return fmt.Errorf("error executing: %v", err)
 	}
 
 	return nil
 }
 
-func startStream(method string, url *url.URL, config *restclient.Config, stdin io.Reader, stdout, stderr io.Writer, tty bool) error {
+func startStream(method string, url *url.URL, config *restclient.Config, streamOptions remotecommand.StreamOptions) error {
 	exec, err := remotecommand.NewSPDYExecutor(config, method, url)
 	if err != nil {
 		return err
 	}
-	return exec.Stream(remotecommand.StreamOptions{
-		Stdin:  stdin,
-		Stdout: stdout,
-		Stderr: stderr,
-		Tty:    tty,
-	})
+
+	return exec.Stream(streamOptions)
 }
 
 // watchPod waits until the created pod is in running state
@@ -179,3 +172,20 @@ func watchPod(kubeconfig string, pod *v1.Pod) {
 
 	controller.Run(stop)
 }
+
+func getStreamOptions(attachOptions *v1.PodAttachOptions, stdin io.Reader, stdout, stderr io.Writer) remotecommand.StreamOptions {
+	var streamOptions remotecommand.StreamOptions
+	if attachOptions.Stdin {
+		streamOptions.Stdin = stdin
+	}
+
+	if attachOptions.Stdout {
+		streamOptions.Stdout = stdout
+	}
+
+	if attachOptions.Stderr {
+		streamOptions.Stderr = stderr
+	}
+
+	return streamOptions
+}