rules kv store write all returns stale data error

rules/store/kv/store.go

@@ -97,12 +97,7 @@ func (s *store) WriteRuleSet(rs rules.MutableRuleSet) error {
 	}
 	conditions, ops := []kv.Condition{rsCond}, []kv.Op{rsOp}
 	_, err = s.kvStore.Commit(conditions, ops)
-	switch err {
-	case kv.ErrConditionCheckFailed:
-		return merrors.NewStaleDataError(err.Error())
-	default:
-		return err
-	}
+	return wrapWriteError(err)
 }
 
 func (s *store) WriteAll(nss *rules.Namespaces, rs rules.MutableRuleSet) error {
@@ -130,7 +125,7 @@ func (s *store) WriteAll(nss *rules.Namespaces, rs rules.MutableRuleSet) error {
 	conditions = append(conditions, namespacesCond)
 	ops = append(ops, namespacesOp)
 	_, err = s.kvStore.Commit(conditions, ops)
-	return err
+	return wrapWriteError(err)
 }
 
 func (s *store) Close() {
@@ -182,3 +177,13 @@ func (s *store) namespacesTransaction(nss *rules.Namespaces) (kv.Condition, kv.O
 
 	return namespacesCond, kv.NewSetOp(namespacesKey, nssSchema), nil
 }
+
+func wrapWriteError(err error) error {
+	if err == kv.ErrConditionCheckFailed {
+		return merrors.NewStaleDataError(
+			fmt.Sprintf("stale write request: %s", err.Error()),
+		)
+	}
+
+	return err
+}

rules/store/kv/store_test.go

@@ -523,7 +523,7 @@ func TestWriteRuleSetError(t *testing.T) {
 	require.Error(t, err)
 }
 
-func TestWriteRuleSetMismatchError(t *testing.T) {
+func TestWriteRuleSetStaleDataError(t *testing.T) {
 	s := testStore()
 	defer s.Close()
 
@@ -572,6 +572,23 @@ func TestWriteAllNoNamespace(t *testing.T) {
 	require.Equal(t, nss.Version(), 1)
 	require.Equal(t, rs.Version(), 2)
 }
+func TestWriteAllStaleDataError(t *testing.T) {
+	s := testStore()
+	defer s.Close()
+
+	mutable := newMutableRuleSetFromSchema(t, 0, testRuleSet)
+	namespaces, err := rules.NewNamespaces(0, testNamespaces)
+	require.NoError(t, err)
+
+	err = s.WriteAll(&namespaces, mutable)
+	require.NoError(t, err)
+
+	jumpNamespaces, err := rules.NewNamespaces(5, testNamespaces)
+	require.NoError(t, err)
+	err = s.WriteAll(&jumpNamespaces, mutable)
+	require.Error(t, err)
+	require.IsType(t, merrors.NewStaleDataError(""), err)
+}
 
 func testStore() rules.Store {
 	return testStoreWithValidator(nil)