reset deploy state

Author: tejal29

pkg/skaffold/event/event.go

@@ -136,7 +136,8 @@ func emptyState(build latest.BuildConfig) proto.State {
 		DeployState: &proto.DeployState{
 			Status: NotStarted,
 		},
-		ForwardedPorts: make(map[int32]*proto.PortEvent),
+		ForwardedPorts:   make(map[int32]*proto.PortEvent),
+		StatusCheckState: &proto.StatusCheckState{Status: NotStarted},
 	}
 }
 
@@ -282,3 +283,12 @@ func (ev *eventHandler) handle(event *proto.Event) {
 
 	ev.logEvent(*logEntry)
 }
+
+// ResetStateOnDeploy resets the deploy, sync and status check state
+func ResetStateOnDeploy() {
+	newState := handler.getState()
+	newState.DeployState.Status = NotStarted
+	newState.StatusCheckState.Status = NotStarted
+	newState.ForwardedPorts = map[int32]*proto.PortEvent{}
+	handler.setState(newState)
+}

pkg/skaffold/event/event_test.go

@@ -182,3 +182,36 @@ func wait(t *testing.T, condition func() bool) {
 		}
 	}
 }
+
+func TestResetStateOnBuild(t *testing.T) {
+	defer func() { handler = &eventHandler{} }()
+	handler = &eventHandler{
+		state: proto.State{
+			BuildState: &proto.BuildState{
+				Artifacts: map[string]string{
+					"image1": Complete,
+				},
+			},
+			DeployState: &proto.DeployState{Status: Complete},
+			ForwardedPorts: map[int32]*proto.PortEvent{
+				2001: {
+					LocalPort:  2000,
+					RemotePort: 2001,
+					PodName:    "test/pod",
+				},
+			},
+			StatusCheckState: &proto.StatusCheckState{Status: Complete},
+		},
+	}
+	ResetStateOnDeploy()
+	expected := proto.State{
+		BuildState: &proto.BuildState{
+			Artifacts: map[string]string{
+				"image1": Complete,
+			},
+		},
+		DeployState:      &proto.DeployState{Status: NotStarted},
+		StatusCheckState: &proto.StatusCheckState{Status: NotStarted},
+	}
+	testutil.CheckDeepEqual(t, expected, handler.getState())
+}

pkg/skaffold/runner/dev.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/filemon"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
@@ -80,6 +81,7 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error {
 	}
 
 	if needsDeploy {
+		event.ResetStateOnDeploy()
 		defer func() {
 			r.changeSet.resetDeploy()
 			r.intents.resetDeploy()

pkg/skaffold/server/endpoints.go

@@ -49,6 +49,7 @@ func (s *server) Execute(ctx context.Context, intent *proto.UserIntentRequest) (
 	}
 
 	if intent.GetIntent().GetDeploy() {
+		event.ResetStateOnDeploy()
 		go func() {
 			s.deployIntentCallback()
 		}()