Reset API intents on every dev cycle to avoid queueing

pkg/skaffold/runner/dev.go

@@ -50,11 +50,15 @@ var (
 )
 
 func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer, logger *kubernetes.LogAggregator, forwarderManager portforward.Forwarder) error {
+	// never queue intents from user, even if they're not used
+	defer r.intents.Reset()
+
 	if r.changeSet.needsReload {
 		return ErrorConfigurationChanged
 	}
 
 	buildIntent, syncIntent, deployIntent := r.intents.GetIntents()
+	logrus.Tracef("dev intents: build %t, sync %t, deploy %t\n", buildIntent, syncIntent, deployIntent)
 	needsSync := syncIntent && len(r.changeSet.needsResync) > 0
 	needsBuild := buildIntent && len(r.changeSet.needsRebuild) > 0
 	needsTest := r.changeSet.needsRetest

pkg/skaffold/runner/dev_test.go

@@ -71,6 +71,10 @@ func (t *TestMonitor) Register(deps func() ([]string, error), onChange func(file
 }
 
 func (t *TestMonitor) Run(bool) error {
+	if t.testBench.intentTrigger {
+		return nil
+	}
+
 	evt := t.events[t.testBench.currentCycle]
 
 	for _, file := range evt.Modified {
@@ -428,6 +432,7 @@ func TestDevAutoTriggers(t *testing.T) {
 		expectedActions []Actions
 		autoTriggers    triggerState // the state of auto triggers
 		singleTriggers  triggerState // the state of single intent triggers at the end of dev loop
+		userIntents     []func(i *intents)
 	}{
 		{
 			description: "build on; sync on; deploy on",
@@ -491,6 +496,46 @@ func TestDevAutoTriggers(t *testing.T) {
 			singleTriggers:  triggerState{false, false, true},
 			expectedActions: []Actions{{}, {}},
 		},
+		{
+			description:     "build off; sync off; deploy off; user requests build, but no change so intent is discarded",
+			watchEvents:     []filemon.Events{},
+			autoTriggers:    triggerState{false, false, false},
+			singleTriggers:  triggerState{false, false, false},
+			expectedActions: []Actions{},
+			userIntents: []func(i *intents){
+				func(i *intents) {
+					i.setBuild(true)
+				},
+			},
+		},
+		{
+			description:     "build off; sync off; deploy off; user requests build, and then sync, but no change so both intents are discarded",
+			watchEvents:     []filemon.Events{},
+			autoTriggers:    triggerState{false, false, false},
+			singleTriggers:  triggerState{false, false, false},
+			expectedActions: []Actions{},
+			userIntents: []func(i *intents){
+				func(i *intents) {
+					i.setBuild(true)
+					i.setSync(true)
+				},
+			},
+		},
+		{
+			description:     "build off; sync off; deploy off; user requests build, and then sync, but no change so both intents are discarded",
+			watchEvents:     []filemon.Events{},
+			autoTriggers:    triggerState{false, false, false},
+			singleTriggers:  triggerState{false, false, false},
+			expectedActions: []Actions{},
+			userIntents: []func(i *intents){
+				func(i *intents) {
+					i.setBuild(true)
+				},
+				func(i *intents) {
+					i.setSync(true)
+				},
+			},
+		},
 	}
 	// first build-test-deploy sequence always happens
 	firstAction := Actions{
@@ -506,6 +551,7 @@ func TestDevAutoTriggers(t *testing.T) {
 			t.Override(&sync.WorkingDir, func(string, docker.Config) (string, error) { return "/", nil })
 			testBench := &TestBench{}
 			testBench.cycles = len(test.watchEvents)
+			testBench.userIntents = test.userIntents
 			artifacts := []*latest.Artifact{
 				{
 					ImageName: "img1",
@@ -522,6 +568,8 @@ func TestDevAutoTriggers(t *testing.T) {
 				testBench: testBench,
 			}, artifacts, &test.autoTriggers)
 
+			testBench.intents = runner.intents
+
 			err := runner.Dev(context.Background(), ioutil.Discard, artifacts)
 
 			t.CheckNoError(err)

pkg/skaffold/runner/intent.go

@@ -39,6 +39,14 @@ func newIntents(autoBuild, autoSync, autoDeploy bool) *intents {
 	return i
 }
 
+func (i *intents) Reset() {
+	i.lock.Lock()
+	i.build = i.autoBuild
+	i.sync = i.autoSync
+	i.deploy = i.autoDeploy
+	i.lock.Unlock()
+}
+
 func (i *intents) resetBuild() {
 	i.lock.Lock()
 	i.build = i.autoBuild

pkg/skaffold/runner/runner_test.go

@@ -49,11 +49,14 @@ type Actions struct {
 }
 
 type TestBench struct {
-	buildErrors  []error
-	syncErrors   []error
-	testErrors   []error
-	deployErrors []error
-	namespaces   []string
+	buildErrors   []error
+	syncErrors    []error
+	testErrors    []error
+	deployErrors  []error
+	namespaces    []string
+	userIntents   []func(*intents)
+	intents       *intents
+	intentTrigger bool
 
 	devLoop        func(context.Context, io.Writer, func() error) error
 	firstMonitor   func(bool) error
@@ -178,6 +181,16 @@ func (t *TestBench) WatchForChanges(ctx context.Context, out io.Writer, doDev fu
 	if err := t.firstMonitor(true); err != nil {
 		return err
 	}
+
+	t.intentTrigger = true
+	for _, intent := range t.userIntents {
+		intent(t.intents)
+		if err := t.devLoop(ctx, out, doDev); err != nil {
+			return err
+		}
+	}
+
+	t.intentTrigger = false
 	for i := 0; i < t.cycles; i++ {
 		t.enterNewCycle()
 		t.currentCycle = i