From 3fc9dce13bf3b72055f5aeeda745b1a4886ec94a Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Mon, 11 Sep 2017 10:30:59 -0700 Subject: [PATCH] Address @dadgar feedback --- client/client_test.go | 2 +- nomad/fsm_test.go | 2 +- website/source/guides/acl.html.markdown | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index fafd338ad..756823263 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -39,7 +39,7 @@ func testACLServer(t *testing.T, cb func(*nomad.Config)) (*nomad.Server, string, } }) token := mock.ACLManagementToken() - err := server.State().BootstrapACLTokens(1, token) + err := server.State().BootstrapACLTokens(1, 0, token) if err != nil { t.Fatalf("failed to bootstrap ACL token: %v", err) } diff --git a/nomad/fsm_test.go b/nomad/fsm_test.go index 3708c8670..1e1cd65c8 100644 --- a/nomad/fsm_test.go +++ b/nomad/fsm_test.go @@ -1624,7 +1624,7 @@ func TestFSM_BootstrapACLTokens(t *testing.T) { assert.Nil(t, err) assert.NotNil(t, out) - // Teset with reset + // Test with reset token2 := mock.ACLToken() req = structs.ACLTokenBootstrapRequest{ Token: token2, diff --git a/website/source/guides/acl.html.markdown b/website/source/guides/acl.html.markdown index a2f862944..0efa10295 100644 --- a/website/source/guides/acl.html.markdown +++ b/website/source/guides/acl.html.markdown @@ -104,7 +104,7 @@ $ curl \ } ``` -Once the initial bootstrap is performed, it cannot be performed again until [reset](#reseting-acl-bootstrap). Make sure to save this AccessorID and SecretID. +Once the initial bootstrap is performed, it cannot be performed again unless [reset](#reseting-acl-bootstrap). Make sure to save this AccessorID and SecretID. The bootstrap token is a `management` type token, meaning it can perform any operation. It should be used to setup the ACL policies and create additional ACL tokens. The bootstrap token can be deleted and is like any other token, so care should be taken to not revoke all management tokens. ### Enable ACLs on Nomad Clients