sync state update

replicatedhq · May 13, 2019 · 5343bec · 5343bec
1 parent 754e2be
commit 5343bec
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/pkg/lifecycle/daemon/routes_navcycle_completestep.go b/pkg/lifecycle/daemon/routes_navcycle_completestep.go
@@ -12,6 +12,7 @@ import (
 	"github.com/replicatedhq/ship/pkg/api"
 	"github.com/replicatedhq/ship/pkg/lifecycle/daemon/daemontypes"
 	"github.com/replicatedhq/ship/pkg/lifecycle/daemon/statusonly"
+	"github.com/replicatedhq/ship/pkg/state"
 	"github.com/replicatedhq/ship/pkg/util/warnings"
 )
 
@@ -67,14 +68,9 @@ func (d *NavcycleRoutes) handleAsync(errChan chan error, debug log.Logger, step
 		return
 	}
 
-	state, err := d.StateManager.TryLoad()
-	if err != nil {
-		level.Error(d.Logger).Log("event", "state.load.fail", "err", err)
-		return
-	}
-
-	newState := state.Versioned().WithCompletedStep(step)
-	err = d.StateManager.Save(newState)
+	_, err := d.StateManager.StateUpdate(func(currentState state.VersionedState) (state.VersionedState, error) {
+		return currentState.WithCompletedStep(step), nil
+	})
 	if err != nil {
 		level.Error(d.Logger).Log("event", "state.save.fail", "err", err, "step.id", stepID)
 		return

diff --git a/pkg/lifecycle/render/config/daemonresolver_test.go b/pkg/lifecycle/render/config/daemonresolver_test.go
@@ -8,10 +8,6 @@ import (
 
 	"github.com/mitchellh/cli"
 	"github.com/replicatedhq/libyaml"
-	"github.com/spf13/afero"
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
-
 	"github.com/replicatedhq/ship/pkg/api"
 	"github.com/replicatedhq/ship/pkg/lifecycle/daemon"
 	"github.com/replicatedhq/ship/pkg/lifecycle/daemon/headless"
@@ -21,6 +17,9 @@ import (
 	templates "github.com/replicatedhq/ship/pkg/templates"
 	"github.com/replicatedhq/ship/pkg/testing/logger"
 	"github.com/replicatedhq/ship/pkg/ui"
+	"github.com/spf13/afero"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
 )
 
 type daemonResolverTestCase struct {

diff --git a/pkg/specs/persist.go b/pkg/specs/persist.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-
 	"github.com/replicatedhq/ship/pkg/state"
 )
 

diff --git a/pkg/specs/replicatedapp/graphql.go b/pkg/specs/replicatedapp/graphql.go
@@ -14,7 +14,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/ship/pkg/api"
 	"github.com/replicatedhq/ship/pkg/state"
-
 	"github.com/spf13/viper"
 )
 

diff --git a/pkg/specs/stategetter/client_test.go b/pkg/specs/stategetter/client_test.go
@@ -6,12 +6,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/replicatedhq/ship/pkg/state"
 	"github.com/replicatedhq/ship/pkg/testing/logger"
-
 	"github.com/spf13/afero"
+	"github.com/stretchr/testify/require"
 )
 
 func TestStateGetter_GetFiles(t *testing.T) {

diff --git a/pkg/state/manager_test.go b/pkg/state/manager_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/replicatedhq/ship/pkg/constants"
 	"github.com/replicatedhq/ship/pkg/testing/logger"
 	"github.com/replicatedhq/ship/pkg/util"
-
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"