internal/server/state: generation on ops cannot be updated

hashicorp · Apr 8, 2021 · 729c504 · 729c504
1 parent 28d182b
commit 729c504
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/internal/server/singleprocess/state/app_operation.go b/internal/server/singleprocess/state/app_operation.go
@@ -422,8 +422,7 @@ func (op *appOperation) dbPut(
  }
 
  // Next, ensure that the fields we want to match are matched.
- matchFields := []string{"Sequence"}
-
+ matchFields := []string{"Generation", "Sequence"}
  for _, name := range matchFields {
  f := op.valueFieldReflect(value, name)
  if !f.IsValid() {

diff --git a/internal/server/singleprocess/state/app_operation_test.go b/internal/server/singleprocess/state/app_operation_test.go
@@ -526,6 +526,20 @@ func TestAppOperation_deploy(t *testing.T) {
  require.NotEmpty(b.Generation)
  require.Equal("other", d.Generation.Id)
  require.Equal(uint64(3), d.Generation.InitialSequence)
+
+ // Cannot update the generation sequence
+ d.Generation.InitialSequence = 42
+ require.NoError(op.Put(s, true, d))
+
+ raw, err = op.Get(s, appOpById("D"))
+ require.NoError(err)
+ require.NotNil(raw)
+ d, ok = raw.(*pb.Deployment)
+ require.True(ok)
+ require.Equal(uint64(3), d.Sequence)
+ require.NotEmpty(b.Generation)
+ require.Equal("other", d.Generation.Id)
+ require.Equal(uint64(3), d.Generation.InitialSequence)
  })
 
  t.Run("does not change generation if set", func(t *testing.T) {