-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow Operator Generated bootstrap token #12520
Merged
Merged
Changes from all commits
Commits
Show all changes
71 commits
Select commit
Hold shift + click to select a range
e9f4394
Working MVP - Admin Provided Bootstrap Token
lhaig cd62726
Update acl.go
lhaig 0722f72
Update acl_bootstrap.go
lhaig cc0b3a4
Update acl_bootstrap.go
lhaig eb0699a
Update the flag name and some comments
lhaig 67ca953
Updated the header name in the agent
lhaig e4a6924
Update Header Name Typo
lhaig 8b046de
Validate ProvidedToken is a UUID
lhaig c435389
Update acl_endpoint.go
lhaig 7143fa2
Refactor the ACL Bootstrap token code
lhaig 2198fdf
Add Additional field to allow current test to pass
lhaig 57ea2fe
Working MVP - Admin Provided Bootstrap Token
lhaig e85c104
Update the flag name and some comments
lhaig 7a35037
Updated the header name in the agent
lhaig e4242ae
Update Header Name Typo
lhaig 111181d
Validate ProvidedToken is a UUID
lhaig ec6115d
Refactor the ACL Bootstrap token code
lhaig 908544b
Update acl_bootstrap_test.go
lhaig 8587603
WIP: ACL Test for Operator token.
lhaig 865892b
Working MVP - Admin Provided Bootstrap Token
lhaig 7f5737b
Update acl_bootstrap.go
lhaig 4af3111
Update the flag name and some comments
lhaig 7fec7f8
Updated the header name in the agent
lhaig 17cabf2
Update Header Name Typo
lhaig bade1e9
Refactor the ACL Bootstrap token code
lhaig cb2ae1f
Working MVP - Admin Provided Bootstrap Token
lhaig d25cee1
Updated the header name in the agent
lhaig 3c7a0dc
Update Header Name Typo
lhaig 24117d3
Refactor the ACL Bootstrap token code
lhaig 46b515e
Update acl_test.go
lhaig 363eabb
Update bootstrap.mdx
lhaig 59c425b
Update api/acl_test.go
lhaig 8bdbb52
Update command/acl_bootstrap.go
lhaig 358a8a8
Update nomad/acl_endpoint.go
lhaig 408940f
Update api/acl.go
lhaig 7af15b4
Update command/acl_bootstrap_test.go
lhaig 15f03e9
Update command/acl_bootstrap_test.go
lhaig e46f431
Update acl_bootstrap_test.go
lhaig b3fbae9
Separate out the new Bootstrap code into a separate method
lhaig 867984f
Create 12520.txt
lhaig 160a81d
Update acl-tokens.mdx
lhaig d48a705
Update website/content/api-docs/acl-tokens.mdx
lhaig 1b40dec
Add the UUID requirement to the documentation
lhaig 585ee2b
Update acl_bootstrap_test.go
lhaig e294174
Change Struct Field Name to be more descriptive
lhaig 8f360a5
Remove the need for a header
lhaig 9c798fa
Remove .vscode/launch.json
lhaig f790c36
Update api/acl.go
lhaig fc207de
Moved as per request
lhaig d739fbb
Update acl_bootstrap.go
lhaig 2d16aaa
Update .gitignore
lhaig e93fc35
Update acl_bootstrap.go
lhaig b7aa487
Update acl_bootstrap_test.go
lhaig 7bacf6f
Update acl_bootstrap_test.go
lhaig 317ec5e
Update acl_endpoint_test.go
lhaig 89b34ec
Update acl-tokens.mdx
lhaig ae2691c
Update 12520.txt
lhaig 10289f1
Update bootstrap.mdx
lhaig e99c9c0
Update hashistack.tf
lhaig 2de8f49
Update acl_endpoint_test.go
lhaig b138bbd
Update acl_endpoint.go
lhaig 633cf82
Update acl_endpoint.go
lhaig c973e2d
Update bootstrap.mdx
lhaig 8a0d393
Update api/acl.go
lhaig 731936c
Update acl_bootstrap.go
lhaig 5bccf03
Merge branch 'f-bootstrap-token' of github.com:hashicorp/nomad into f…
lhaig 16ec53b
Update acl-tokens.mdx
lhaig 2d7b315
Update api/acl.go
lhaig d716f3f
Revert Back to the ContentLength check
lhaig 9ca6c63
test: manually set contentlength in tests
schmichael 772d8ee
appease hclfmt
schmichael File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
```release-note:improvement | ||
bootstrap: Added option to allow for an operator generated bootstrap token to be passed to the `acl bootstrap` command | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -76,8 +76,10 @@ GNUMakefile.local | |
|
||
rkt-* | ||
|
||
# Common editor config | ||
./idea | ||
*.iml | ||
.vscode | ||
|
||
# UI rules | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow this took me a while to figure out: since we're never actually writing this HTTP request, the stdlib code that sets ContentLength is never set!
Therefore in tests we need to set ContentLength to some nonzero value since tests do not use a real HTTP server.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am glad it is finally solved it kept me up a few nights :-)