Merge pull request #282 from dexhorthy/entrypoint/cleanup

fix entrypoint for navigate-lifecycle, add clean shutdown to other ship tasks

pkg/lifecycle/daemon/daemon.go

@@ -38,6 +38,10 @@ type ShipDaemon struct {
 	*V2Routes
 }
 
+func (d *ShipDaemon) AwaitShutdown() error {
+	return <-d.ExitChan
+}
+
 // "this is fine"
 func (d *ShipDaemon) EnsureStarted(ctx context.Context, release *api.Release) chan error {
 

pkg/lifecycle/daemon/daemontypes/types.go

@@ -36,6 +36,7 @@ type Daemon interface {
 	TerraformConfirmedChan() chan bool
 	KustomizeSavedChan() chan interface{}
 	GetCurrentConfig() map[string]interface{}
+	AwaitShutdown() error
 }
 
 const StepNameMessage = "message"

pkg/lifecycle/daemon/headless/daemon.go

@@ -24,6 +24,10 @@ type HeadlessDaemon struct {
 	ResolvedConfig map[string]interface{}
 }
 
+func (d *HeadlessDaemon) AwaitShutdown() error {
+	return nil
+}
+
 func NewHeadlessDaemon(
 	ui cli.Ui,
 	logger log.Logger,

pkg/ship/kustomize.go

@@ -80,6 +80,8 @@ func (s *Ship) Update(ctx context.Context) error {
 
 func (s *Ship) Watch(ctx context.Context) error {
 	debug := level.Debug(log.With(s.Logger, "method", "watch"))
+	ctx, cancelFunc := context.WithCancel(ctx)
+	defer s.Shutdown(cancelFunc)
 
 	for {
 		existingState, err := s.State.TryLoad()
@@ -118,6 +120,8 @@ func (s *Ship) Watch(ctx context.Context) error {
 
 func (s *Ship) Init(ctx context.Context) error {
 	debug := level.Debug(log.With(s.Logger, "method", "init"))
+	ctx, cancelFunc := context.WithCancel(ctx)
+	defer s.Shutdown(cancelFunc)
 
 	if s.Viper.GetString("raw") != "" {
 		release := s.fakeKustomizeRawRelease()

pkg/ship/ship.go

@@ -164,8 +164,16 @@ func (s *Ship) execute(ctx context.Context, release *api.Release, selector *spec
 	runResultCh := make(chan error)
 	go func() {
 		defer close(runResultCh)
-		err := s.Runner.Run(ctx, release)
-		s.Daemon.AllStepsDone(ctx)
+		var err error
+		// *wince* dex do this better
+		if viper.GetBool("navigate-lifecycle") {
+			s.Daemon.EnsureStarted(ctx, release)
+			err = s.Daemon.AwaitShutdown()
+		} else {
+			err = s.Runner.Run(ctx, release)
+			s.Daemon.AllStepsDone(ctx)
+		}
+
 		if err != nil {
 			level.Error(s.Logger).Log("event", "shutdown", "reason", "error", "err", err)
 		} else {