remove empty and v0 state types, leaving only versioned state

pkg/filetree/loader_test.go

@@ -76,7 +76,7 @@ func TestAferoLoader(t *testing.T) {
 				testResources[resource.Key.(string)] = resource.Value.(string)
 			}
 
-			mockState.EXPECT().TryLoad().Return(state.VersionedState{
+			mockState.EXPECT().TryLoad().Return(state.State{
 				V1: &state.V1{
 					Kustomize: &state.Kustomize{
 						Overlays: map[string]state.Overlay{

pkg/lifecycle/daemon/headless/daemon_test.go

@@ -44,7 +44,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "one group one item, not required, no value",
-			State: []byte(`{"alpha": ""}`),
+			State: []byte(`{"v1":{"config":{"alpha":""}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -68,7 +68,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "one group one item, required, no value",
-			State: []byte(`{"alpha": ""}`),
+			State: []byte(`{"v1":{"config":{"alpha":""}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -188,7 +188,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "one group one item, required, value, not hidden",
-			State: []byte(`{"alpha": "100"}`),
+			State: []byte(`{"v1":{"config":{"alpha": "100"}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -212,7 +212,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "one group one item, not required, no value, not hidden",
-			State: []byte(`{"alpha": ""}`),
+			State: []byte(`{"v1":{"config":{"alpha": ""}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -260,7 +260,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "one group two items, neither required, neither present",
-			State: []byte(`{"alpha": "", "beta": ""}`),
+			State: []byte(`{"v1":{"config":{"alpha": "", "beta": ""}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -291,7 +291,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "one group two items, both required, neither present",
-			State: []byte(`{"alpha": "", "beta": ""}`),
+			State: []byte(`{"v1":{"config":{"alpha": "", "beta": ""}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -322,7 +322,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "one group two items, both required, one present",
-			State: []byte(`{"alpha":"", "beta": ""}`),
+			State: []byte(`{"v1":{"config":{"alpha":"", "beta": ""}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -384,7 +384,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "beta value resolves to alpha value",
-			State: []byte(`{"alpha": "101"}`),
+			State: []byte(`{"v1":{"config":{"alpha": "101"}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -415,7 +415,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "beta value resolves to alpha value when wrong beta value is presented",
-			State: []byte(`{"alpha": "101", "beta":"abc"}`),
+			State: []byte(`{"v1":{"config":{"alpha": "101", "beta":"abc"}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{
@@ -446,7 +446,7 @@ func TestHeadlessDaemon(t *testing.T) {
 		},
 		{
 			Name:  "charlie value resolves to beta value resolves to alpha value",
-			State: []byte(`{"alpha": "100"}`),
+			State: []byte(`{"v1":{"config":{"alpha":"100"}}}`),
 			Release: &api.Release{
 				Spec: api.Spec{
 					Config: api.Config{

pkg/lifecycle/daemon/routes_navcycle.go

@@ -156,7 +156,8 @@ func (d *NavcycleRoutes) getRequiredButIncompleteStepFor(requires []string) (str
 	if err != nil {
 		return "", errors.Wrap(err, "load state")
 	}
-	if currentState.Versioned().V1.Lifecycle != nil &&
+	if currentState.Versioned().V1 != nil &&
+		currentState.Versioned().V1.Lifecycle != nil &&
 		currentState.Versioned().V1.Lifecycle.StepsCompleted != nil {
 		stepsCompleted = currentState.Versioned().V1.Lifecycle.StepsCompleted
 		debug.Log("event", "steps.notEmpty", "completed", fmt.Sprintf("%v", stepsCompleted))

pkg/lifecycle/daemon/routes_navcycle_completestep.go

@@ -72,7 +72,7 @@ func (d *NavcycleRoutes) handleAsync(errChan chan error, debug log.Logger, step
 		return
 	}
 
-	_, err := d.StateManager.StateUpdate(func(currentState state.VersionedState) (state.VersionedState, error) {
+	_, err := d.StateManager.StateUpdate(func(currentState state.State) (state.State, error) {
 		return currentState.WithCompletedStep(step), nil
 	})
 	if err != nil {

pkg/lifecycle/daemon/routes_navcycle_completestep_test.go

@@ -116,7 +116,7 @@ func TestV2CompleteStep(t *testing.T) {
 					ExpectState: &matchers.Is{
 						Describe: "saved state has step foo completed",
 						Test: func(v interface{}) bool {
-							if versioned, ok := v.(state2.VersionedState); ok {
+							if versioned, ok := v.(state2.State); ok {
 								_, ok := versioned.V1.Lifecycle.StepsCompleted["foo"]
 								return ok
 							}
@@ -168,7 +168,7 @@ func TestV2CompleteStep(t *testing.T) {
 					ExpectState: &matchers.Is{
 						Describe: "saved state has step foo completed and bar uncompleted",
 						Test: func(v interface{}) bool {
-							if versioned, ok := v.(state2.VersionedState); ok {
+							if versioned, ok := v.(state2.State); ok {
 								_, fooOk := versioned.V1.Lifecycle.StepsCompleted["foo"]
 								_, barOk := versioned.V1.Lifecycle.StepsCompleted["bar"]
 								return fooOk && !barOk
@@ -197,7 +197,7 @@ func TestV2CompleteStep(t *testing.T) {
 					ExpectState: &matchers.Is{
 						Describe: "saved state has step foo and bar completed",
 						Test: func(v interface{}) bool {
-							if versioned, ok := v.(state2.VersionedState); ok {
+							if versioned, ok := v.(state2.State); ok {
 								_, fooOk := versioned.V1.Lifecycle.StepsCompleted["foo"]
 								_, barOk := versioned.V1.Lifecycle.StepsCompleted["bar"]
 								return fooOk && barOk
@@ -226,7 +226,7 @@ func TestV2CompleteStep(t *testing.T) {
 					ExpectState: &matchers.Is{
 						Describe: "saved state has step foo completed and step bar invalidated",
 						Test: func(v interface{}) bool {
-							if versioned, ok := v.(state2.VersionedState); ok {
+							if versioned, ok := v.(state2.State); ok {
 								_, fooOk := versioned.V1.Lifecycle.StepsCompleted["foo"]
 								_, barOk := versioned.V1.Lifecycle.StepsCompleted["bar"]
 								return fooOk && !barOk
@@ -299,7 +299,7 @@ func TestV2CompleteStep(t *testing.T) {
 					ExpectState: &matchers.Is{
 						Describe: "saved state has step make-the-things completed",
 						Test: func(v interface{}) bool {
-							if versioned, ok := v.(state2.VersionedState); ok {
+							if versioned, ok := v.(state2.State); ok {
 								_, ok := versioned.V1.Lifecycle.StepsCompleted["make-the-things"]
 								return ok
 							}

pkg/lifecycle/daemon/routes_navcycle_getstep_test.go

@@ -227,7 +227,7 @@ func TestV2GetStep(t *testing.T) {
 				StepProgress:   progressmap,
 			}
 
-			fakeState.EXPECT().TryLoad().Return(state2.VersionedState{
+			fakeState.EXPECT().TryLoad().Return(state2.State{
 				V1: &state2.V1{
 					Lifecycle: test.State,
 				},
@@ -442,7 +442,7 @@ func TestHydrateStep(t *testing.T) {
 					},
 				},
 			},
-			state: state2.V0{},
+			state: state2.State{V1: &state2.V1{}},
 			want: &daemontypes.StepResponse{
 				CurrentStep: daemontypes.Step{
 					Source: api.Step{
@@ -492,7 +492,7 @@ func TestHydrateStep(t *testing.T) {
 				},
 				Spec: api.Spec{},
 			},
-			state: state2.VersionedState{
+			state: state2.State{
 				V1: &state2.V1{
 					HelmValues:         "fake: values",
 					ReleaseName:        "fake-releasename",
@@ -563,7 +563,7 @@ func TestHydrateStep(t *testing.T) {
 			mockFs := afero.Afero{Fs: afero.NewMemMapFs()}
 			mockState := state.NewMockManager(mc)
 
-			if test.state != nil {
+			if !test.state.IsEmpty() {
 				mockState.EXPECT().TryLoad().Return(test.state, nil)
 				mockState.EXPECT().TryLoad().Return(test.state, nil)
 			}
@@ -636,7 +636,7 @@ func TestHydrateTemplatedKustomizeStep(t *testing.T) {
 					},
 				},
 			},
-			state: state2.V0{},
+			state: state2.State{V1: &state2.V1{}},
 			want: &daemontypes.StepResponse{
 				CurrentStep: daemontypes.Step{
 					Source: api.Step{
@@ -696,7 +696,7 @@ func TestHydrateTemplatedKustomizeStep(t *testing.T) {
 			progressmap := &daemontypes.ProgressMap{}
 			mockFs := afero.Afero{Fs: afero.NewMemMapFs()}
 			mockState := state.NewMockManager(mc)
-			if test.state != nil {
+			if !test.state.IsEmpty() {
 				mockState.EXPECT().TryLoad().Return(test.state, nil)
 				mockState.EXPECT().TryLoad().Return(test.state, nil)
 				mockState.EXPECT().TryLoad().Return(test.state, nil)

pkg/lifecycle/daemon/routes_navcycle_kustomize_test.go

@@ -147,7 +147,7 @@ func TestV2KustomizeSaveFile(t *testing.T) {
 				StepProgress: progressmap,
 			}
 
-			fakeState.EXPECT().TryLoad().Return(state.VersionedState{
+			fakeState.EXPECT().TryLoad().Return(state.State{
 				V1: &test.InState,
 			}, nil).AnyTimes()
 
@@ -269,7 +269,7 @@ func TestV2KustomizeDeleteFile(t *testing.T) {
 				StepProgress: progressmap,
 			}
 
-			fakeState.EXPECT().TryLoad().Return(state.VersionedState{
+			fakeState.EXPECT().TryLoad().Return(state.State{
 				V1: &test.InState,
 			}, nil).AnyTimes()
 

pkg/lifecycle/kustomize/kustomizer_test.go

@@ -329,7 +329,7 @@ resources:
 			mockDaemon := daemon2.NewMockDaemon(mc)
 			mockState := state2.NewMockManager(mc)
 
-			mockState.EXPECT().TryLoad().Return(state.VersionedState{
+			mockState.EXPECT().TryLoad().Return(state.State{
 				V1: &state.V1{
 					Kustomize: &state.Kustomize{
 						Overlays: map[string]state.Overlay{
@@ -508,7 +508,7 @@ resources:
 				BasePath: constants.KustomizeBasePath,
 			})
 			mockDaemon.EXPECT().KustomizeSavedChan().Return(saveChan)
-			mockState.EXPECT().TryLoad().Return(state.VersionedState{V1: &state.V1{
+			mockState.EXPECT().TryLoad().Return(state.State{V1: &state.V1{
 				Kustomize: test.kustomize,
 			}}, nil).Times(2)
 

pkg/lifecycle/kustomize/patch.go

@@ -79,7 +79,7 @@ func (l *Kustomizer) generateTillerPatches(step api.Kustomize) error {
 	if err != nil {
 		return errors.Wrap(err, "load state")
 	}
-	if state != nil && state.CurrentKustomize() != nil {
+	if state.V1 != nil && state.CurrentKustomize() != nil {
 		excludedBases = state.CurrentKustomize().Ship().ExcludedBases
 	}
 

pkg/lifecycle/kustomize/patch_test.go

@@ -173,7 +173,7 @@ metadata:
 
 			stateManager := state.NewManager(log.NewNopLogger(), mockFs, viper.New())
 
-			err := stateManager.Save(state.VersionedState{V1: &state.V1{Kustomize: &state.Kustomize{}}})
+			err := stateManager.Save(state.State{V1: &state.V1{Kustomize: &state.Kustomize{}}})
 			req.NoError(err)
 
 			l := &Kustomizer{

pkg/lifecycle/kustomize/pre_kustomize_test.go

@@ -392,7 +392,7 @@ spec:
 			req.NoError(err)
 
 			actualLists := make([]util.List, 0)
-			if currentState.Versioned().V1.Metadata != nil {
+			if currentState.V1 != nil && currentState.V1.Metadata != nil {
 				actualLists = currentState.Versioned().V1.Metadata.Lists
 			}
 

pkg/lifecycle/render/helm/template_test.go

@@ -38,7 +38,7 @@ func TestLocalTemplater(t *testing.T) {
 		expectedChannelName string
 		expectHelmOpts      *matchers.Is
 		ontemplate          func(req *require.Assertions, mockFs afero.Afero) func(chartRoot string, args []string) error
-		state               *state2.VersionedState
+		state               *state2.State
 		requirements        *chartutil.Requirements
 		repoAdd             []string
 		namespace           string
@@ -130,7 +130,7 @@ func TestLocalTemplater(t *testing.T) {
 			name:        "helm template with namespace in state",
 			describe:    "template uses namespace from state",
 			expectError: "",
-			state: &state2.VersionedState{
+			state: &state2.State{
 				V1: &state2.V1{
 					Namespace: "test-namespace",
 				},
@@ -172,7 +172,7 @@ func TestLocalTemplater(t *testing.T) {
 			}
 
 			if test.state == nil {
-				mockState.EXPECT().TryLoad().Return(state2.VersionedState{
+				mockState.EXPECT().TryLoad().Return(state2.State{
 					V1: &state2.V1{
 						HelmValues:  "we fake",
 						ReleaseName: channelName,
@@ -787,7 +787,7 @@ something: maybe
 			err := mockFs.WriteFile(tt.defaultValuesPath, []byte(tt.defaultValuesContent), 0755)
 			req.NoError(err)
 
-			mockState.EXPECT().TryLoad().Return(state2.VersionedState{V1: &state2.V1{}}, nil)
+			mockState.EXPECT().TryLoad().Return(state2.State{V1: &state2.V1{}}, nil)
 			f := &LocalTemplater{
 				Logger:       &logger.TestLogger{T: t},
 				FS:           mockFs,

pkg/lifecycle/render/noconfig_test.go

@@ -26,7 +26,7 @@ func TestRenderNoConfig(t *testing.T) {
 
 	tests := loadTestCases(t, filepath.Join("test-cases", "render-inline.yaml"))
 
-	for _, test := range tests[:1] {
+	for _, test := range tests {
 		t.Run(test.Name, func(t *testing.T) {
 			mc := gomock.NewController(t)
 
@@ -57,10 +57,15 @@ func TestRenderNoConfig(t *testing.T) {
 			func() {
 				defer mc.Finish()
 
-				mockState.EXPECT().TryLoad().Return(state.V0(test.ViperConfig), nil)
+				mockState.EXPECT().TryLoad().Return(state.State{V1: &state.V1{Config: test.ViperConfig}}, nil)
+
+				expectedConfig := test.ViperConfig
+				if expectedConfig == nil {
+					expectedConfig = make(map[string]interface{})
+				}
 
 				p.EXPECT().
-					Build("testdir", test.Spec.Assets.V1, test.Spec.Config.V1, gomock.Any(), test.ViperConfig).
+					Build("testdir", test.Spec.Assets.V1, test.Spec.Config.V1, gomock.Any(), expectedConfig).
 					Return(planner.Plan{}, nil)
 
 				p.EXPECT().