refactor: split packages

Makefile

@@ -9,11 +9,25 @@ push-test-container: test-container
 	docker push loilodev/http-server:latest
 version:
 	go run cli/cage/main.go -v | cut -f 3 -d ' '
-mocks: mocks/mock_awsiface/iface.go mocks/mock_cage/iface.go mocks/mock_upgrade/upgrade.go
+mocks: mocks/mock_awsiface/iface.go \
+	mocks/mock_types/iface.go \
+	mocks/mock_upgrade/upgrade.go \
+	mocks/mock_task/task.go \
+	mocks/mock_taskset/taskset.go \
+	mocks/mock_task/factory.go \
+	mocks/mock_rollout/executor.go
 mocks/mock_awsiface/iface.go: awsiface/iface.go
 	$(MOCKGEN) -source=./awsiface/iface.go > mocks/mock_awsiface/iface.go
-mocks/mock_cage/iface.go: cage.go
-	$(MOCKGEN) -source=./cage.go > mocks/mock_cage/cage.go
+mocks/mock_types/iface.go: types/iface.go
+	$(MOCKGEN) -source=./types/iface.go > mocks/mock_types/iface.go
 mocks/mock_upgrade/upgrade.go: cli/cage/upgrade/upgrade.go
 	$(MOCKGEN) -source=./cli/cage/upgrade/upgrade.go > mocks/mock_upgrade/upgrade.go
+mocks/mock_task/task.go: task/task.go
+	$(MOCKGEN) -source=./task/task.go > mocks/mock_task/task.go
+mocks/mock_taskset/taskset.go: taskset/taskset.go
+	$(MOCKGEN) -source=./taskset/taskset.go > mocks/mock_taskset/taskset.go
+mocks/mock_task/factory.go: task/factory.go
+	$(MOCKGEN) -source=./task/factory.go > mocks/mock_task/factory.go
+mocks/mock_rollout/executor.go: rollout/executor.go
+	$(MOCKGEN) -source=./rollout/executor.go > mocks/mock_rollout/executor.go
 .PHONY: mocks

README.md

@@ -113,8 +113,6 @@ By default, `cage rollout` will only update the task definition of the service.
         "ecs:ListTasks",
         "ecs:RunTask",
         "ecs:StopTask",
-        "ecs:ListAttributes",
-        "ecs:PutAttributes",
         "ecs:DescribeTaskDefinition"
       ],
       "Resource": "*"

awsiface/iface.go

@@ -21,8 +21,6 @@ type (
 		ListTasks(ctx context.Context, params *ecs.ListTasksInput, optFns ...func(*ecs.Options)) (*ecs.ListTasksOutput, error)
 		RunTask(ctx context.Context, params *ecs.RunTaskInput, optFns ...func(*ecs.Options)) (*ecs.RunTaskOutput, error)
 		StopTask(ctx context.Context, params *ecs.StopTaskInput, optFns ...func(*ecs.Options)) (*ecs.StopTaskOutput, error)
-		ListAttributes(ctx context.Context, params *ecs.ListAttributesInput, optFns ...func(*ecs.Options)) (*ecs.ListAttributesOutput, error)
-		PutAttributes(ctx context.Context, params *ecs.PutAttributesInput, optFns ...func(*ecs.Options)) (*ecs.PutAttributesOutput, error)
 		DescribeTaskDefinition(ctx context.Context, params *ecs.DescribeTaskDefinitionInput, optFns ...func(*ecs.Options)) (*ecs.DescribeTaskDefinitionOutput, error)
 	}
 	AlbClient interface {

cage.go

@@ -1,54 +1,14 @@
 package cage
 
 import (
-	"context"
-	"time"
-
-	"github.com/loilo-inc/canarycage/awsiface"
-	"github.com/loilo-inc/canarycage/timeout"
+	"github.com/loilo-inc/canarycage/types"
+	"github.com/loilo-inc/logos/di"
 )
 
-type Cage interface {
-	Up(ctx context.Context) (*UpResult, error)
-	Run(ctx context.Context, input *RunInput) (*RunResult, error)
-	RollOut(ctx context.Context, input *RollOutInput) (*RollOutResult, error)
-}
-
-type Time interface {
-	Now() time.Time
-	NewTimer(time.Duration) *time.Timer
-}
-
 type cage struct {
-	*Input
-	Timeout timeout.Manager
-}
-
-type Input struct {
-	Env  *Envars
-	Ecs  awsiface.EcsClient
-	Alb  awsiface.AlbClient
-	Ec2  awsiface.Ec2Client
-	Time Time
+	di *di.D
 }
 
-func NewCage(input *Input) Cage {
-	if input.Time == nil {
-		input.Time = &timeImpl{}
-	}
-	taskRunningWait := (time.Duration)(input.Env.CanaryTaskRunningWait) * time.Second
-	taskHealthCheckWait := (time.Duration)(input.Env.CanaryTaskHealthCheckWait) * time.Second
-	taskStoppedWait := (time.Duration)(input.Env.CanaryTaskStoppedWait) * time.Second
-	serviceStableWait := (time.Duration)(input.Env.ServiceStableWait) * time.Second
-	return &cage{
-		Input: input,
-		Timeout: timeout.NewManager(
-			15*time.Minute,
-			&timeout.Input{
-				TaskRunningWait:     taskRunningWait,
-				TaskHealthCheckWait: taskHealthCheckWait,
-				TaskStoppedWait:     taskStoppedWait,
-				ServiceStableWait:   serviceStableWait,
-			}),
-	}
+func NewCage(di *di.D) types.Cage {
+	return &cage{di}
 }