Adds Resource Trigger Hotkey to HUD/TUI (#6039)

* add 't' hotkey to trigger resource update in HUD/TUI mode Signed-off-by: bshore <[email protected]> * minor cleanup, re-generate goldenfiles Signed-off-by: bshore <[email protected]> * move AppendToTriggerQueueAction to internal/store and update references Signed-off-by: bshore <[email protected]> --------- Signed-off-by: bshore <[email protected]>
tilt-dev · Feb 10, 2023 · dcc0d08 · dcc0d08
1 parent 53d7a76
commit dcc0d08
Show file tree

Hide file tree

Showing 60 changed files with 38 additions and 29 deletions.
diff --git a/internal/engine/buildcontroller_test.go b/internal/engine/buildcontroller_test.go
@@ -15,7 +15,6 @@ import (
 
  "github.com/tilt-dev/tilt/internal/container"
  "github.com/tilt-dev/tilt/internal/controllers/apis/uibutton"
- "github.com/tilt-dev/tilt/internal/hud/server"
  "github.com/tilt-dev/tilt/internal/k8s"
  "github.com/tilt-dev/tilt/internal/k8s/testyaml"
  "github.com/tilt-dev/tilt/internal/store"
@@ -72,7 +71,7 @@ func TestBuildControllerManualTriggerBuildReasonInit(t *testing.T) {
 
  // make sure there's a first build
  if !manifest.TriggerMode.AutoInitial() {
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: mName})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: mName})
  }
 
  f.nextCallComplete()
@@ -169,7 +168,7 @@ func TestBuildControllerImageBuildTrigger(t *testing.T) {
  f.assertNoCall("even tho there are pending changes, manual manifest shouldn't build w/o explicit trigger")
  }
 
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: mName})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: mName})
  call := f.nextCallComplete()
  state := call.oneImageState()
  assert.Equal(t, expectedFiles, state.FilesChanged())
@@ -222,11 +221,11 @@ func TestBuildQueueOrdering(t *testing.T) {
  })
  f.assertNoCall("even tho there are pending changes, manual manifest shouldn't build w/o explicit trigger")
 
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: "manifest1"})
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: "manifest2"})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: "manifest1"})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: "manifest2"})
  time.Sleep(10 * time.Millisecond)
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: "manifest3"})
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: "manifest4"})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: "manifest3"})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: "manifest4"})
 
  for i := range manifests {
  expName := fmt.Sprintf("manifest%d", i+1)
@@ -278,13 +277,13 @@ func TestBuildQueueAndAutobuildOrdering(t *testing.T) {
  })
  f.assertNoCall("even tho there are pending changes, manual manifest shouldn't build w/o explicit trigger")
 
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: "manifest1"})
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: "manifest2"})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: "manifest1"})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: "manifest2"})
  // make our one auto-trigger manifest build - should be evaluated LAST, after
  // all the manual manifests waiting in the queue
  f.fsWatcher.Events <- watch.NewFileEvent(f.JoinPath("dirAuto/main.go"))
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: "manifest3"})
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: "manifest4"})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: "manifest3"})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: "manifest4"})
 
  for i := range manifests {
  call := f.nextCall()
@@ -904,7 +903,7 @@ func TestManifestsWithCommonAncestorAndTrigger(t *testing.T) {
  call = f.nextCall("m2 build1")
  assert.Equal(t, m2.K8sTarget(), call.k8s())
 
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: m1.Name})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: m1.Name})
  f.waitForCompletedBuildCount(3)
 
  // Make sure that only one build was triggered.

diff --git a/internal/engine/upper.go b/internal/engine/upper.go
@@ -146,8 +146,6 @@ func upperReducerFn(ctx context.Context, state *store.EngineState, action store.
  ctrltiltfile.HandleConfigsReloadStarted(ctx, state, action)
  case ctrltiltfile.ConfigsReloadedAction:
  ctrltiltfile.HandleConfigsReloaded(ctx, state, action)
- case server.AppendToTriggerQueueAction:
- state.AppendToTriggerQueue(action.Name, action.Reason)
  case hud.DumpEngineStateAction:
  handleDumpEngineStateAction(ctx, state)
  case store.AnalyticsUserOptAction:
@@ -160,6 +158,8 @@ func upperReducerFn(ctx context.Context, state *store.EngineState, action store.
  handlePanicAction(state, action)
  case store.LogAction:
  handleLogAction(state, action)
+ case store.AppendToTriggerQueueAction:
+ state.AppendToTriggerQueue(action.Name, action.Reason)
  case sessions.SessionStatusUpdateAction:
  sessions.HandleSessionStatusUpdateAction(state, action)
  case prompt.SwitchTerminalModeAction:

diff --git a/internal/engine/upper_test.go b/internal/engine/upper_test.go
@@ -2921,7 +2921,7 @@ func TestHandleTiltfileTriggerQueue(t *testing.T) {
  assert.Equal(t, model.BuildReasonNone, st.MainTiltfileState().TriggerReason,
  "initial state should not have Tiltfile trigger reason")
  })
- action := server.AppendToTriggerQueueAction{Name: model.MainTiltfileManifestName, Reason: 123}
+ action := store.AppendToTriggerQueueAction{Name: model.MainTiltfileManifestName, Reason: 123}
  f.store.Dispatch(action)
 
  f.WaitUntil("Tiltfile trigger processed", func(st store.EngineState) bool {
@@ -3076,7 +3076,7 @@ func TestDisabledResourceRemovedFromTriggerQueue(t *testing.T) {
 
  f.bc.DisableForTesting()
 
- f.store.Dispatch(server.AppendToTriggerQueueAction{Name: m.Name, Reason: model.BuildReasonFlagTriggerCLI})
+ f.store.Dispatch(store.AppendToTriggerQueueAction{Name: m.Name, Reason: model.BuildReasonFlagTriggerCLI})
 
  f.WaitUntil("in trigger queue", func(state store.EngineState) bool {
  return state.ManifestInTriggerQueue(m.Name)

diff --git a/internal/hud/hud.go b/internal/hud/hud.go
@@ -174,6 +174,10 @@ func (h *Hud) handleScreenEvent(ctx context.Context, dispatch func(action store.
  escape()
  case r == 'R': // hidden key for recovering from printf junk during demos
  h.r.screen.Sync()
+ case r == 't': // [T]rigger resource update
+ _, selected := h.selectedResource()
+ h.recordInteraction("trigger_resource")
+ dispatch(store.AppendToTriggerQueueAction{Name: selected.Name, Reason: model.BuildReasonFlagTriggerHUD})
  case r == 'x':
  h.recordInteraction("cycle_view_log_state")
  h.currentViewState.CycleViewLogState()

diff --git a/internal/hud/renderer.go b/internal/hud/renderer.go
@@ -132,6 +132,8 @@ func renderPaneHeader(isMax bool) rty.Component {
  l := rty.NewLine()
  l.Add(rty.NewFillerString(' '))
  l.Add(rty.TextString(fmt.Sprintf(" %s ", s)))
+ l.Add(rty.TextString("| "))
+ l.Add(rty.TextString("t: trigger update"))
  return l
 }
 

diff --git a/internal/hud/server/actions.go b/internal/hud/server/actions.go
@@ -4,13 +4,6 @@ import (
  "github.com/tilt-dev/tilt/pkg/model"
 )
 
-type AppendToTriggerQueueAction struct {
- Name model.ManifestName
- Reason model.BuildReason
-}
-
-func (AppendToTriggerQueueAction) Action() {}
-
 // TODO: a way to clear an override
 type OverrideTriggerModeAction struct {
  ManifestNames []model.ManifestName

diff --git a/internal/hud/server/server.go b/internal/hud/server/server.go
@@ -272,7 +272,7 @@ func (s *HeadsUpServer) HandleTrigger(w http.ResponseWriter, req *http.Request)
  } else if ms != nil && ms.DisableState == v1alpha1.DisableStateDisabled {
  _, _ = fmt.Fprintf(w, "resource %q is currently disabled", mn)
  } else {
- s.store.Dispatch(AppendToTriggerQueueAction{Name: mn, Reason: payload.BuildReason})
+ s.store.Dispatch(store.AppendToTriggerQueueAction{Name: mn, Reason: payload.BuildReason})
  }
 }
 

diff --git a/internal/hud/server/server_test.go b/internal/hud/server/server_test.go
@@ -167,13 +167,13 @@ func TestHandleTriggerTiltfileOK(t *testing.T) {
  assert.Equal(t, "", resp)
  assert.Equal(t, http.StatusOK, status)
 
- a := store.WaitForAction(t, reflect.TypeOf(server.AppendToTriggerQueueAction{}), f.getActions)
- action, ok := a.(server.AppendToTriggerQueueAction)
+ a := store.WaitForAction(t, reflect.TypeOf(store.AppendToTriggerQueueAction{}), f.getActions)
+ action, ok := a.(store.AppendToTriggerQueueAction)
  if !ok {
  t.Fatalf("Action was not of type 'AppendToTriggreQueueAction': %+v", action)
  }
 
- expected := server.AppendToTriggerQueueAction{
+ expected := store.AppendToTriggerQueueAction{
  Name: model.MainTiltfileManifestName,
  Reason: model.BuildReasonFlagTriggerWeb,
  }
@@ -212,8 +212,8 @@ func TestHandleTriggerNonTiltfileManifest(t *testing.T) {
  assert.Equal(t, "", resp)
  assert.Equal(t, http.StatusOK, status)
 
- a := store.WaitForAction(t, reflect.TypeOf(server.AppendToTriggerQueueAction{}), f.getActions)
- action, ok := a.(server.AppendToTriggerQueueAction)
+ a := store.WaitForAction(t, reflect.TypeOf(store.AppendToTriggerQueueAction{}), f.getActions)
+ action, ok := a.(store.AppendToTriggerQueueAction)
  if !ok {
  t.Fatalf("Action was not of type 'AppendToTriggerQueueAction': %+v", action)
  }

diff --git a/internal/hud/testdata/Completed is a good status.gob b/internal/hud/testdata/Completed is a good status.gob
diff --git a/internal/hud/testdata/Tiltfile resource first run.gob b/internal/hud/testdata/Tiltfile resource first run.gob
diff --git a/internal/hud/testdata/Tiltfile resource no run.gob b/internal/hud/testdata/Tiltfile resource no run.gob
diff --git a/internal/hud/testdata/Tiltfile resource pending.gob b/internal/hud/testdata/Tiltfile resource pending.gob
diff --git a/internal/hud/testdata/Tiltfile resource with warning.gob b/internal/hud/testdata/Tiltfile resource with warning.gob
diff --git a/internal/hud/testdata/alert message.gob b/internal/hud/testdata/alert message.gob
diff --git a/internal/hud/testdata/all the data at once 10w.gob b/internal/hud/testdata/all the data at once 10w.gob
diff --git a/internal/hud/testdata/all the data at once 50w.gob b/internal/hud/testdata/all the data at once 50w.gob
diff --git a/internal/hud/testdata/all the data at once.gob b/internal/hud/testdata/all the data at once.gob
diff --git a/internal/hud/testdata/build in progress.gob b/internal/hud/testdata/build in progress.gob
diff --git a/internal/hud/testdata/collapse-auto-bad.gob b/internal/hud/testdata/collapse-auto-bad.gob
diff --git a/internal/hud/testdata/collapse-auto-good.gob b/internal/hud/testdata/collapse-auto-good.gob
diff --git a/internal/hud/testdata/collapse-no-good.gob b/internal/hud/testdata/collapse-no-good.gob
diff --git a/internal/hud/testdata/collapse-yes-bad.gob b/internal/hud/testdata/collapse-yes-bad.gob
diff --git a/internal/hud/testdata/default collapse unresourced yaml manifest.gob b/internal/hud/testdata/default collapse unresourced yaml manifest.gob
diff --git a/internal/hud/testdata/detected docker compose build crash auto expand.gob b/internal/hud/testdata/detected docker compose build crash auto expand.gob
diff --git a/internal/hud/testdata/detected docker compose build crash expanded.gob b/internal/hud/testdata/detected docker compose build crash expanded.gob
diff --git a/internal/hud/testdata/detected docker compose build crash not expanded.gob b/internal/hud/testdata/detected docker compose build crash not expanded.gob
diff --git a/internal/hud/testdata/docker-compose up expanded.gob b/internal/hud/testdata/docker-compose up expanded.gob
diff --git a/internal/hud/testdata/edited files narrow term.gob b/internal/hud/testdata/edited files narrow term.gob
diff --git a/internal/hud/testdata/edited files normal term.gob b/internal/hud/testdata/edited files normal term.gob
diff --git a/internal/hud/testdata/edited files wide term.gob b/internal/hud/testdata/edited files wide term.gob
diff --git a/internal/hud/testdata/escaped nbsp.gob b/internal/hud/testdata/escaped nbsp.gob
diff --git a/internal/hud/testdata/failed build local resource.gob b/internal/hud/testdata/failed build local resource.gob
diff --git a/internal/hud/testdata/finished local resource.gob b/internal/hud/testdata/finished local resource.gob
diff --git a/internal/hud/testdata/inline build log with wrapping.gob b/internal/hud/testdata/inline build log with wrapping.gob
diff --git a/internal/hud/testdata/inline build log.gob b/internal/hud/testdata/inline build log.gob
diff --git a/internal/hud/testdata/line wrapping in inline error.gob b/internal/hud/testdata/line wrapping in inline error.gob
diff --git a/internal/hud/testdata/local resource errored serve.gob b/internal/hud/testdata/local resource errored serve.gob
diff --git a/internal/hud/testdata/log tab build.gob b/internal/hud/testdata/log tab build.gob
diff --git a/internal/hud/testdata/log tab default.gob b/internal/hud/testdata/log tab default.gob
diff --git a/internal/hud/testdata/log tab pod.gob b/internal/hud/testdata/log tab pod.gob
diff --git a/internal/hud/testdata/manifest error and build error.gob b/internal/hud/testdata/manifest error and build error.gob
diff --git a/internal/hud/testdata/multiple build history entries.gob b/internal/hud/testdata/multiple build history entries.gob
diff --git a/internal/hud/testdata/narration message.gob b/internal/hud/testdata/narration message.gob
diff --git a/internal/hud/testdata/no collapse unresourced yaml manifest.gob b/internal/hud/testdata/no collapse unresourced yaml manifest.gob
diff --git a/...al/hud/testdata/non-crashing pod displays no logs inline even if crash log if present.gob b/...al/hud/testdata/non-crashing pod displays no logs inline even if crash log if present.gob
diff --git a/internal/hud/testdata/one undeployed resource.gob b/internal/hud/testdata/one undeployed resource.gob
diff --git a/internal/hud/testdata/pending build with manual trigger.gob b/internal/hud/testdata/pending build with manual trigger.gob
diff --git a/internal/hud/testdata/pending build.gob b/internal/hud/testdata/pending build.gob
diff --git a/internal/hud/testdata/pending pod no status.gob b/internal/hud/testdata/pending pod no status.gob
diff --git a/internal/hud/testdata/pending pod pending status.gob b/internal/hud/testdata/pending pod pending status.gob
diff --git a/internal/hud/testdata/pod log displayed inline.gob b/internal/hud/testdata/pod log displayed inline.gob
diff --git a/internal/hud/testdata/pod log with inline wrapping.gob b/internal/hud/testdata/pod log with inline wrapping.gob
diff --git a/internal/hud/testdata/status bar after intentional DC restart.gob b/internal/hud/testdata/status bar after intentional DC restart.gob
diff --git a/internal/hud/testdata/text in brackets.gob b/internal/hud/testdata/text in brackets.gob
diff --git a/internal/hud/testdata/tilt log full screen.gob b/internal/hud/testdata/tilt log full screen.gob
diff --git a/internal/hud/testdata/tilt log half screen.gob b/internal/hud/testdata/tilt log half screen.gob
diff --git a/internal/hud/testdata/tilt log.gob b/internal/hud/testdata/tilt log.gob
diff --git a/internal/hud/testdata/unfinished local resource.gob b/internal/hud/testdata/unfinished local resource.gob
diff --git a/internal/store/actions.go b/internal/store/actions.go
@@ -141,3 +141,10 @@ type PanicAction struct {
 }
 
 func (PanicAction) Action() {}
+
+type AppendToTriggerQueueAction struct {
+ Name model.ManifestName
+ Reason model.BuildReason
+}
+
+func (AppendToTriggerQueueAction) Action() {}
diff --git a/pkg/model/build_reason.go b/pkg/model/build_reason.go
@@ -25,6 +25,7 @@ const (
 
  BuildReasonFlagTriggerWeb
  BuildReasonFlagTriggerCLI
+ BuildReasonFlagTriggerHUD
  BuildReasonFlagTriggerUnknown
 
  // An external process called `tilt args`
@@ -73,6 +74,7 @@ var translations = map[BuildReason]string{
  BuildReasonFlagInit: "Initial Build",
  BuildReasonFlagTriggerWeb: "Web Trigger",
  BuildReasonFlagTriggerCLI: "CLI Trigger",
+ BuildReasonFlagTriggerHUD: "HUD Trigger",
  BuildReasonFlagTriggerUnknown: "Unknown Trigger",
  BuildReasonFlagTiltfileArgs: "Tilt Args",
  BuildReasonFlagChangedDeps: "Dependency Updated",
@@ -81,6 +83,7 @@ var translations = map[BuildReason]string{
 var triggerBuildReasons = []BuildReason{
  BuildReasonFlagTriggerWeb,
  BuildReasonFlagTriggerCLI,
+ BuildReasonFlagTriggerHUD,
  BuildReasonFlagTriggerUnknown,
 }
 
@@ -91,6 +94,7 @@ var allBuildReasons = []BuildReason{
  BuildReasonFlagCrashDeprecated,
  BuildReasonFlagTriggerWeb,
  BuildReasonFlagTriggerCLI,
+ BuildReasonFlagTriggerHUD,
  BuildReasonFlagChangedDeps,
  BuildReasonFlagTriggerUnknown,
  BuildReasonFlagTiltfileArgs,