Use Cobra command context instead of placeholder .TODO()

Author: tbavelier

cmd/kubectl-datadog/agent/check/check.go

@@ -115,6 +115,7 @@ func (o *options) validate(cmd *cobra.Command) error {
 
 // run runs the check command
 func (o *options) run(cmd *cobra.Command) error {
+	ctx := cmd.Context()
 	var goRoutinesCount int
 	var pods []corev1.Pod
 
@@ -180,7 +181,7 @@ func (o *options) run(cmd *cobra.Command) error {
 				if isCLCRunner(pod) {
 					container = "cluster-checks-runner"
 				}
-				stdOut, stdErr, err := o.execInPod(&pod, statusCmd, container)
+				stdOut, stdErr, err := o.execInPod(ctx, &pod, statusCmd, container)
 				if err != nil {
 					cmd.Println(fmt.Sprintf("Ignoring pod: %s, error: %v", pod.Name, err))
 					continue
@@ -220,7 +221,7 @@ func (o *options) run(cmd *cobra.Command) error {
 }
 
 // execInPod exec a command in an Agent pod
-func (o *options) execInPod(pod *corev1.Pod, cmd []string, container string) (string, string, error) {
+func (o *options) execInPod(ctx context.Context, pod *corev1.Pod, command []string, container string) (string, string, error) {
 	req := o.Clientset.CoreV1().RESTClient().Post().
 		Resource("pods").
 		Name(pod.Name).
@@ -234,7 +235,7 @@ func (o *options) execInPod(pod *corev1.Pod, cmd []string, container string) (st
 
 	parameterCodec := runtime.NewParameterCodec(scheme)
 	req.VersionedParams(&corev1.PodExecOptions{
-		Command:   cmd,
+		Command:   command,
 		Container: container,
 		Stdin:     false,
 		Stdout:    true,
@@ -248,7 +249,7 @@ func (o *options) execInPod(pod *corev1.Pod, cmd []string, container string) (st
 	}
 
 	var stdout, stderr bytes.Buffer
-	err = exec.StreamWithContext(context.TODO(), remotecommand.StreamOptions{
+	err = exec.StreamWithContext(ctx, remotecommand.StreamOptions{
 		Stdin:  nil,
 		Stdout: &stdout,
 		Stderr: &stderr,

cmd/kubectl-datadog/flare/flare.go

@@ -168,6 +168,7 @@ func (o *options) validate() error {
 
 // run runs the flare command
 func (o *options) run(cmd *cobra.Command) error {
+	ctx := cmd.Context()
 	// Prepare base directory
 	baseDir := filepath.Join(os.TempDir(), "datadog-operator")
 	if err := os.MkdirAll(baseDir, os.ModePerm); err != nil {
@@ -206,7 +207,7 @@ func (o *options) run(cmd *cobra.Command) error {
 	}
 
 	// Collect operator version
-	if err = o.createVersionFile(leaderPod, baseDir, cmd); err != nil {
+	if err = o.createVersionFile(ctx, leaderPod, baseDir, cmd); err != nil {
 		cmd.Println(fmt.Sprintf("Couldn't collect operator version: %v", err))
 	}
 
@@ -217,7 +218,7 @@ func (o *options) run(cmd *cobra.Command) error {
 	}
 
 	// Get the operator version
-	version, err := o.getVersion(leaderPod)
+	version, err := o.getVersion(ctx, leaderPod)
 	if err != nil {
 		cmd.Println(fmt.Sprintf("Couldn't get operator version: %v", err))
 
@@ -358,14 +359,14 @@ func (o *options) createStatusFile(pod *corev1.Pod, dir string, cmd *cobra.Comma
 }
 
 // createVersionFile gets the version from the operator pod and stores it in a file
-func (o *options) createVersionFile(pod *corev1.Pod, dir string, cmd *cobra.Command) error {
+func (o *options) createVersionFile(ctx context.Context, pod *corev1.Pod, dir string, cmd *cobra.Command) error {
 	if pod == nil {
 		return errors.New("nil leader pod")
 	}
 
 	// Prepare command and execute it
 	versionCmd := []string{"bash", "-c", "/usr/local/bin/datadog-operator --version --version-format text"}
-	version, err := o.execInPod(versionCmd, pod)
+	version, err := o.execInPod(ctx, versionCmd, pod)
 	if err != nil {
 		return err
 	}
@@ -374,14 +375,14 @@ func (o *options) createVersionFile(pod *corev1.Pod, dir string, cmd *cobra.Comm
 }
 
 // getOperatorVersion gets the version from the operator pod
-func (o *options) getVersion(pod *corev1.Pod) (string, error) {
+func (o *options) getVersion(ctx context.Context, pod *corev1.Pod) (string, error) {
 	if pod == nil {
 		return "", errors.New("nil leader pod")
 	}
 
 	// Prepare command and execute it
 	versionCmd := []string{"bash", "-c", "/usr/local/bin/datadog-operator --version --version-format json"}
-	versionJSON, err := o.execInPod(versionCmd, pod)
+	versionJSON, err := o.execInPod(ctx, versionCmd, pod)
 	if err != nil {
 		return "", err
 	}
@@ -425,7 +426,7 @@ func (o *options) getLeader() (*corev1.Pod, error) {
 }
 
 // execInPod execs a given command in a given pod
-func (o *options) execInPod(command []string, pod *corev1.Pod) ([]byte, error) {
+func (o *options) execInPod(ctx context.Context, command []string, pod *corev1.Pod) ([]byte, error) {
 	req := o.Clientset.CoreV1().RESTClient().Post().
 		Resource("pods").
 		Name(pod.Name).
@@ -458,7 +459,7 @@ func (o *options) execInPod(command []string, pod *corev1.Pod) ([]byte, error) {
 	}
 
 	var stdout bytes.Buffer
-	if err := exec.StreamWithContext(context.TODO(), remotecommand.StreamOptions{Stdout: &stdout}); err != nil {
+	if err := exec.StreamWithContext(ctx, remotecommand.StreamOptions{Stdout: &stdout}); err != nil {
 		return []byte{}, err
 	}