tests round 3

rules/namespace_test.go

@@ -415,3 +415,140 @@ func TestNamespaceTombstoneAlreadyDead(t *testing.T) {
 	err = ns.markTombstoned(4)
 	require.Error(t, err)
 }
+
+func TestNamespaceAdd(t *testing.T) {
+	testNss := &schema.Namespaces{
+		Namespaces: []*schema.Namespace{
+			&schema.Namespace{
+				Name: "foo",
+				Snapshots: []*schema.NamespaceSnapshot{
+					&schema.NamespaceSnapshot{ForRulesetVersion: 1, Tombstoned: true},
+				},
+			},
+		},
+	}
+
+	nss, err := NewNamespaces(1, testNss)
+	require.NoError(t, err)
+
+	err = nss.AddNamespace("bar")
+	require.NoError(t, err)
+
+	ns, err := nss.Namespace("bar")
+	require.NoError(t, err)
+	require.False(t, ns.Tombstoned())
+}
+
+func TestNamespaceAddDup(t *testing.T) {
+	testNss := &schema.Namespaces{
+		Namespaces: []*schema.Namespace{
+			&schema.Namespace{
+				Name: "foo",
+				Snapshots: []*schema.NamespaceSnapshot{
+					&schema.NamespaceSnapshot{ForRulesetVersion: 1, Tombstoned: false},
+				},
+			},
+		},
+	}
+
+	nss, err := NewNamespaces(1, testNss)
+	require.NoError(t, err)
+
+	err = nss.AddNamespace("foo")
+	require.Error(t, err)
+}
+
+func TestNamespaceRevive(t *testing.T) {
+	testNss := &schema.Namespaces{
+		Namespaces: []*schema.Namespace{
+			&schema.Namespace{
+				Name: "foo",
+				Snapshots: []*schema.NamespaceSnapshot{
+					&schema.NamespaceSnapshot{ForRulesetVersion: 1, Tombstoned: false},
+				},
+			},
+		},
+	}
+
+	nss, err := NewNamespaces(1, testNss)
+	require.NoError(t, err)
+	ns, err := nss.Namespace("foo")
+	require.NoError(t, err)
+
+	err = nss.DeleteNamespace("foo", 4)
+	require.NoError(t, err)
+
+	ns, err = nss.Namespace("foo")
+	require.True(t, ns.Tombstoned())
+
+	err = nss.AddNamespace("foo")
+	require.NoError(t, err)
+
+	ns, err = nss.Namespace("foo")
+	require.NoError(t, err)
+	require.Equal(t, ns.snapshots[len(ns.snapshots)-1].forRuleSetVersion, 5)
+	require.Equal(t, len(ns.snapshots), 3)
+}
+
+func TestNamespaceDelete(t *testing.T) {
+	testNss := &schema.Namespaces{
+		Namespaces: []*schema.Namespace{
+			&schema.Namespace{
+				Name: "foo",
+				Snapshots: []*schema.NamespaceSnapshot{
+					&schema.NamespaceSnapshot{ForRulesetVersion: 1, Tombstoned: false},
+				},
+			},
+		},
+	}
+
+	nss, err := NewNamespaces(1, testNss)
+	require.NoError(t, err)
+	ns, err := nss.Namespace("foo")
+	require.NoError(t, err)
+
+	err = nss.DeleteNamespace("foo", 4)
+	require.NoError(t, err)
+	ns, err = nss.Namespace("foo")
+	require.NoError(t, err)
+	require.True(t, ns.Tombstoned())
+	require.Equal(t, ns.snapshots[len(ns.snapshots)-1].forRuleSetVersion, 5)
+}
+
+func TestNamespaceDeleteMissing(t *testing.T) {
+	testNss := &schema.Namespaces{
+		Namespaces: []*schema.Namespace{
+			&schema.Namespace{
+				Name: "foo",
+				Snapshots: []*schema.NamespaceSnapshot{
+					&schema.NamespaceSnapshot{ForRulesetVersion: 1, Tombstoned: false},
+				},
+			},
+		},
+	}
+
+	nss, err := NewNamespaces(1, testNss)
+	require.NoError(t, err)
+
+	err = nss.DeleteNamespace("bar", 4)
+	require.Error(t, err)
+}
+
+func TestNamespaceDeleteTombstoned(t *testing.T) {
+	testNss := &schema.Namespaces{
+		Namespaces: []*schema.Namespace{
+			&schema.Namespace{
+				Name: "foo",
+				Snapshots: []*schema.NamespaceSnapshot{
+					&schema.NamespaceSnapshot{ForRulesetVersion: 1, Tombstoned: true},
+				},
+			},
+		},
+	}
+
+	nss, err := NewNamespaces(1, testNss)
+	require.NoError(t, err)
+
+	err = nss.DeleteNamespace("foo", 4)
+	require.Error(t, err)
+}

rules/ruleset.go

@@ -870,8 +870,6 @@ type MappingRuleData struct {
 // MappingRuleUpdate contains a MappingRuleData along with an ID for a mapping rule.
 // The rule with that ID is meant to updated to the given config.
 type MappingRuleUpdate struct {
-	UpdateMetadata
-
 	Data MappingRuleData `json:"config" validate:"nonzero"`
 	ID   string          `json:"id" validate:"nonzero"`
 }
@@ -889,8 +887,6 @@ type RollupRuleData struct {
 // RollupRuleUpdate is a RollupRuleConfig along with an ID for a rollup rule.
 // The rule with that ID is meant to updated with a given config.
 type RollupRuleUpdate struct {
-	UpdateMetadata
-
 	Data RollupRuleData `json:"data" validate:"nonzero"`
 	ID   string         `json:"id" validate:"nonzero"`
 }
@@ -951,7 +947,7 @@ func (rs *ruleSet) UpdateMappingRule(mru MappingRuleUpdate) error {
 	if err != nil {
 		return fmt.Errorf(ruleActionErrorFmt, "update", mru.ID, err)
 	}
-	meta := mru.UpdateMetadata
+	meta := mrd.UpdateMetadata
 	if err := m.addSnapshot(
 		mrd.Name,
 		mrd.Filters,
@@ -1028,7 +1024,7 @@ func (rs *ruleSet) UpdateRollupRule(rru RollupRuleUpdate) error {
 		return fmt.Errorf(ruleActionErrorFmt, "update", rru.ID, err)
 	}
 
-	meta := rru.UpdateMetadata
+	meta := rrd.UpdateMetadata
 	if err = r.addSnapshot(
 		rrd.Name,
 		rrd.Filters,