From eb991c18c2a2d4c6a9d58db5681403e996555abc Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 21 Sep 2021 18:02:37 -0400 Subject: [PATCH] fsm: restore the legacy commands and emit a helpful error message. --- agent/consul/fsm/commands_oss.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agent/consul/fsm/commands_oss.go b/agent/consul/fsm/commands_oss.go index ea6c15fcc6..36a7132f1d 100644 --- a/agent/consul/fsm/commands_oss.go +++ b/agent/consul/fsm/commands_oss.go @@ -267,6 +267,9 @@ func (c *FSM) applyACLOperation(buf []byte, index uint64) interface{} { return req.ACL.ID case structs.ACLDelete: return c.state.ACLTokenDeleteBySecret(index, req.ACL.ID, nil) + // Legacy commands that have been removed + case "bootstrap-now", "force-set": + return fmt.Errorf("command %v has been removed with the legacy ACL system", req.Op) default: c.logger.Warn("Invalid ACL operation", "operation", req.Op) return fmt.Errorf("Invalid ACL operation '%s'", req.Op)