From 0b9cf4e7b708accb11cf6e16c1b9648ad15f62c2 Mon Sep 17 00:00:00 2001 From: Lance Haig Date: Tue, 22 Aug 2023 09:06:15 +0200 Subject: [PATCH] Deprecate the Original Bootstrap Token Code (#17792) --- api/acl.go | 3 ++- internal/testing/apitests/api_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/acl.go b/api/acl.go index 78d47895e..d18181323 100644 --- a/api/acl.go +++ b/api/acl.go @@ -77,8 +77,9 @@ func (c *Client) ACLTokens() *ACLTokens { return &ACLTokens{client: c} } -// DEPRECATED: will be removed in Nomad 1.5.0 // Bootstrap is used to get the initial bootstrap token +// +// See BootstrapOpts to set ACL bootstrapping options. func (a *ACLTokens) Bootstrap(q *WriteOptions) (*ACLToken, *WriteMeta, error) { var resp ACLToken wm, err := a.client.put("/v1/acl/bootstrap", nil, &resp, q) diff --git a/internal/testing/apitests/api_test.go b/internal/testing/apitests/api_test.go index d39aaf0a3..7d67f23de 100644 --- a/internal/testing/apitests/api_test.go +++ b/internal/testing/apitests/api_test.go @@ -29,7 +29,7 @@ func makeACLClient(t *testing.T, cb1 configCallback, }) // Get the root token - root, _, err := client.ACLTokens().Bootstrap(nil) + root, _, err := client.ACLTokens().BootstrapOpts("", nil) if err != nil { t.Fatalf("failed to bootstrap ACLs: %v", err) }