Merge pull request #911 from remind101/emp-ps-attached-runs

Show attached runs in emp ps.

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 **Features**
 
+* Empire now includes experimental support for showing attached runs in `emp ps`. This can be enabled with the `--x.showattached` flag, or `EMPIRE_X_SHOW_ATTACHED` [#911](https://github.com/remind101/empire/pull/911)
+
 **Improvements**
 
 * The Custom::ECSService custom resource now waits for newly created ECS services to stabilize [#878](https://github.com/remind101/empire/pull/878)

cmd/empire/factories.go

@@ -23,9 +23,9 @@ import (
 	"github.com/remind101/empire/pkg/dockerauth"
 	"github.com/remind101/empire/pkg/dockerutil"
 	"github.com/remind101/empire/pkg/ecsutil"
-	"github.com/remind101/empire/pkg/runner"
 	"github.com/remind101/empire/scheduler"
 	"github.com/remind101/empire/scheduler/cloudformation"
+	"github.com/remind101/empire/scheduler/docker"
 	"github.com/remind101/empire/scheduler/ecs"
 	"github.com/remind101/pkg/logger"
 	"github.com/remind101/pkg/reporter"
@@ -104,12 +104,11 @@ func newEmpire(db *empire.DB, c *cli.Context) (*empire.Empire, error) {
 // Scheduler ============================
 
 func newScheduler(db *empire.DB, c *cli.Context) (scheduler.Scheduler, error) {
-	r, err := newDockerRunner(c)
-	if err != nil {
-		return nil, err
-	}
+	var (
+		s   scheduler.Scheduler
+		err error
+	)
 
-	var s scheduler.Scheduler
 	switch c.String(FlagScheduler) {
 	case "ecs":
 		s, err = newECSScheduler(db, c)
@@ -125,10 +124,14 @@ func newScheduler(db *empire.DB, c *cli.Context) (scheduler.Scheduler, error) {
 		return nil, fmt.Errorf("failed to initialize %s scheduler: %v", c.String(FlagScheduler), err)
 	}
 
-	return &scheduler.AttachedRunner{
-		Scheduler: s,
-		Runner:    r,
-	}, nil
+	d, err := newDockerClient(c)
+	if err != nil {
+		return nil, err
+	}
+
+	a := docker.RunAttachedWithDocker(s, d)
+	a.ShowAttached = c.Bool(FlagXShowAttached)
+	return a, nil
 }
 
 func newMigrationScheduler(db *empire.DB, c *cli.Context) (*cloudformation.MigrationScheduler, error) {
@@ -254,14 +257,6 @@ func newConfigProvider(c *cli.Context) client.ConfigProvider {
 	return p
 }
 
-func newDockerRunner(c *cli.Context) (*runner.Runner, error) {
-	client, err := newDockerClient(c)
-	if err != nil {
-		return nil, err
-	}
-	return runner.NewRunner(client), nil
-}
-
 // DockerClient ========================
 
 func newDockerClient(c *cli.Context) (*dockerutil.Client, error) {

cmd/empire/main.go

@@ -63,6 +63,9 @@ const (
 	FlagLogsStreamer = "logs.streamer"
 
 	FlagEnvironment = "environment"
+
+	// Expiremental flags.
+	FlagXShowAttached = "x.showattached"
 )
 
 // Commands are the subcommands that are available.
@@ -326,6 +329,11 @@ var EmpireFlags = []cli.Flag{
 		Usage:  "If true, messages will be required for empire actions that emit events.",
 		EnvVar: "EMPIRE_MESSAGES_REQUIRED",
 	},
+	cli.BoolFlag{
+		Name:   FlagXShowAttached,
+		Usage:  "If true, attached runs will be shown in `emp ps` output.",
+		EnvVar: "EMPIRE_X_SHOW_ATTACHED",
+	},
 }
 
 func main() {

docker-compose.yml

@@ -14,6 +14,7 @@ server:
     EMPIRE_DATABASE_URL: postgres://postgres:postgres@db/postgres?sslmode=disable
     DOCKER_HOST: unix:///var/run/docker.sock
     EMPIRE_SCHEDULER: cloudformation-migration
+    EMPIRE_X_SHOW_ATTACHED: 'true'
 db:
   image: postgres
   ports:

docs/cloudformation.json

@@ -776,6 +776,10 @@
               {
                 "Name": "EMPIRE_GITHUB_TEAM_ID",
                 "Value": { "Ref": "GitHubTeamId" }
+              },
+              {
+                "Name": "EMPIRE_X_SHOW_ATTACHED",
+                "Value": "true"
               }
             ],
             "Command": ["server", "-automigrate=true"],

scheduler/cloudformation/cloudformation.go

@@ -702,10 +702,10 @@ func (s *Scheduler) Services(appID string) (map[string]string, error) {
 }
 
 // Stop stops the given ECS task.
-func (s *Scheduler) Stop(ctx context.Context, instanceID string) error {
+func (s *Scheduler) Stop(ctx context.Context, taskID string) error {
 	_, err := s.ecs.StopTask(&ecs.StopTaskInput{
 		Cluster: aws.String(s.Cluster),
-		Task:    aws.String(instanceID),
+		Task:    aws.String(taskID),
 	})
 	return err
 }