cmdをreturnするように変更

wim-web · Apr 16, 2023 · 4ea55e5 · 4ea55e5
1 parent 6301ed5
commit 4ea55e5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/internal/handler/exec.go b/internal/handler/exec.go
@@ -27,7 +27,7 @@ func ExecHandler(cmd string) error {
 		return err
 	}
 
-	_, err = command.ExecCommand(
+	exeCmd, err := command.ExecCommand(
 		context.Background(),
 		ecsService,
 		cluster,
@@ -37,5 +37,9 @@ func ExecHandler(cmd string) error {
 		cfg.Region,
 	)
 
-	return err
+	if err != nil {
+		return err
+	}
+
+	return exeCmd.Run()
 }
diff --git a/internal/handler/portforward.go b/internal/handler/portforward.go
@@ -32,7 +32,7 @@ func PortforwardHandler(doc command.DocumentName, params map[string][]string) er
 
 	taskId := strings.Split(*task.TaskArn, "/")[2]
 
-	_, err = command.PortForwardCommand(
+	cmd, err := command.PortForwardCommand(
 		context.Background(),
 		ssmService,
 		cluster,
@@ -43,5 +43,9 @@ func PortforwardHandler(doc command.DocumentName, params map[string][]string) er
 		params,
 	)
 
-	return err
+	if err != nil {
+		return err
+	}
+
+	return cmd.Run()
 }
diff --git a/pkg/command/exec.go b/pkg/command/exec.go
@@ -4,13 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"os"
+	"os/exec"
 
 	"github.com/aws/aws-sdk-go-v2/service/ecs"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/wim-web/tonneeeeel/internal/session_manager"
 )
 
-func ExecCommand(ctx context.Context, c *ecs.Client, cluster string, task string, command string, container *string, region string) ([]byte, error) {
+func ExecCommand(ctx context.Context, c *ecs.Client, cluster string, task string, command string, container *string, region string) (*exec.Cmd, error) {
 	input := &ecs.ExecuteCommandInput{
 		Cluster:     aws.String(cluster),
 		Task:        aws.String(task),
@@ -37,5 +38,5 @@ func ExecCommand(ctx context.Context, c *ecs.Client, cluster string, task string
 	cmd.Stdin = os.Stdin
 	cmd.Stderr = os.Stderr
 
-	return cmd.Output()
+	return cmd, nil
 }
diff --git a/pkg/command/portforward.go b/pkg/command/portforward.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"os/exec"
 
 	"github.com/aws/aws-sdk-go-v2/service/ssm"
 	"github.com/aws/aws-sdk-go/aws"
@@ -18,7 +19,7 @@ const (
 	REMOTE_PORT_FORWARD_DOCUMENT_NAME DocumentName = "AWS-StartPortForwardingSessionToRemoteHost"
 )
 
-func PortForwardCommand(ctx context.Context, c *ssm.Client, cluster string, taskId string, containerId string, region string, doc DocumentName, params map[string][]string) ([]byte, error) {
+func PortForwardCommand(ctx context.Context, c *ssm.Client, cluster string, taskId string, containerId string, region string, doc DocumentName, params map[string][]string) (*exec.Cmd, error) {
 	input := &ssm.StartSessionInput{
 		Target:       aws.String(fmt.Sprintf("ecs:%s_%s_%s", cluster, taskId, containerId)),
 		DocumentName: aws.String(string(doc)),
@@ -43,5 +44,5 @@ func PortForwardCommand(ctx context.Context, c *ssm.Client, cluster string, task
 	cmd.Stdin = os.Stdin
 	cmd.Stderr = os.Stderr
 
-	return cmd.Output()
+	return cmd, nil
 }