payloads are pointers

hashicorp · Dec 9, 2020 · 2c34da4 · 2c34da4
1 parent b908250
commit 2c34da4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/nomad/state/events.go b/nomad/state/events.go
@@ -73,7 +73,7 @@ func eventFromChange(change memdb.Change) (structs.Event, bool) {
 			return structs.Event{
 				Topic: structs.TopicACLPolicy,
 				Key:   before.Name,
-				Payload: structs.ACLPolicyEvent{
+				Payload: &structs.ACLPolicyEvent{
 					ACLPolicy: before,
 				},
 			}, true
@@ -121,7 +121,7 @@ func eventFromChange(change memdb.Change) (structs.Event, bool) {
 		return structs.Event{
 			Topic: structs.TopicACLPolicy,
 			Key:   after.Name,
-			Payload: structs.ACLPolicyEvent{
+			Payload: &structs.ACLPolicyEvent{
 				ACLPolicy: after,
 			},
 		}, true

diff --git a/nomad/stream/event_broker.go b/nomad/stream/event_broker.go
@@ -188,7 +188,7 @@ func (e *EventBroker) handleACLUpdates(ctx context.Context) {
 			return
 		case update := <-e.aclCh:
 			switch payload := update.Payload.(type) {
-			case structs.ACLTokenEvent:
+			case *structs.ACLTokenEvent:
 				tokenSecretID := payload.SecretID()
 
 				// Token was deleted
@@ -213,7 +213,7 @@ func (e *EventBroker) handleACLUpdates(ctx context.Context) {
 					return !aclAllowsSubscription(aclObj, sub.req)
 				})
 
-			case structs.ACLPolicyEvent:
+			case *structs.ACLPolicyEvent:
 				// Re-evaluate each subscriptions permissions since a policy
 				// change may or may not affect the subscription
 				e.checkSubscriptionsAgainstPolicyChange()

diff --git a/nomad/stream/event_broker_test.go b/nomad/stream/event_broker_test.go
@@ -116,7 +116,7 @@ func TestEventBroker_EmptyReqToken_DistinctSubscriptions(t *testing.T) {
 	require.Equal(t, subscriptionStateOpen, atomic.LoadUint32(&sub2.state))
 }
 
-func TestEventBroker_handleACLUpdates_tokendeleted(t *testing.T) {
+func TestEventBroker_handleACLUpdates_TokenDeleted(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
@@ -133,13 +133,9 @@ func TestEventBroker_handleACLUpdates_tokendeleted(t *testing.T) {
 	defer sub1.Unsubscribe()
 
 	aclEvent := structs.Event{
-		Topic: structs.TopicACLToken,
-		Type:  structs.TypeACLTokenDeleted,
-		Payload: structs.ACLTokenEvent{
-			ACLToken: &structs.ACLToken{
-				SecretID: "foo",
-			},
-		},
+		Topic:   structs.TopicACLToken,
+		Type:    structs.TypeACLTokenDeleted,
+		Payload: structs.NewACLTokenEvent("foo", &structs.ACLToken{}),
 	}
 
 	publisher.Publish(&structs.Events{Index: 100, Events: []structs.Event{aclEvent}})