github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

acl: fix test failures caused by remocving legacy ACLs 

This commit two test failures:

1. Remove check for "in legacy ACL mode", the actual upgrade will be removed in a following commit.
2. Remove the early WaitForLeader in dc2, because with it the test was
   failing with ACL not found.
pull/11126/head
Daniel Nephin 2021-09-29 14:36:55 -04:00
parent 8e9773e20b
commit a1e3fa818c
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/consul/acl_endpoint.go
View File

@ -170,11 +170,6 @@ func (a *ACL) aclPreCheck() error {
if !a.srv.config.ACLsEnabled { if !a.srv.config.ACLsEnabled {
return acl.ErrDisabled return acl.ErrDisabled
} }
if a.srv.UseLegacyACLs() {
return fmt.Errorf("The ACL system is currently in legacy mode.")
}
return nil return nil
} }

1
agent/consul/leader_federation_state_ae_test.go
View File

@ -376,7 +376,6 @@ func TestLeader_FederationStateAntiEntropyPruning_ACLDeny(t *testing.T) {
c.ACLMasterToken = "root" c.ACLMasterToken = "root"
c.ACLResolverSettings.ACLDefaultPolicy = "deny" c.ACLResolverSettings.ACLDefaultPolicy = "deny"
}) })
testrpc.WaitForLeader(t, s2.RPC, "dc2")
defer os.RemoveAll(dir2) defer os.RemoveAll(dir2)
defer s2.Shutdown() defer s2.Shutdown()