Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow Operator Generated bootstrap token #12520

Merged
merged 71 commits into from
Jun 3, 2022
Merged

Allow Operator Generated bootstrap token #12520

merged 71 commits into from
Jun 3, 2022

Commits on May 26, 2022

  1. Working MVP - Admin Provided Bootstrap Token 

    Admin Provided Bootstrap Token
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e9f4394 View commit details
    Browse the repository at this point in the history

  2. Update acl.go 

    Check for acl token in request
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    cd62726 View commit details
    Browse the repository at this point in the history

  3. Update acl_bootstrap.go 

    Update the Information for the Autocomplete flags
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    0722f72 View commit details
    Browse the repository at this point in the history

  4. Update acl_bootstrap.go 

    Apply Suggested changes by
S1021: should merge variable declaration with assignment on next line (gosimple)
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    cc0b3a4 View commit details
    Browse the repository at this point in the history

  5. Update the flag name and some comments

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    eb0699a View commit details
    Browse the repository at this point in the history

  6. Updated the header name in the agent

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    67ca953 View commit details
    Browse the repository at this point in the history

  7. Update Header Name Typo 

    Copy Paste Error
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e4a6924 View commit details
    Browse the repository at this point in the history

  8. Validate ProvidedToken is a UUID

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    8b046de View commit details
    Browse the repository at this point in the history

  9. Update acl_endpoint.go 

    Use the built in helper function to test for a valid UUID
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    c435389 View commit details
    Browse the repository at this point in the history

  10. Refactor the ACL Bootstrap token code 

    Removed unnecessary structs.
Refactored the SetHeaders code to use just one secret.
Removed parseACLSectrets function as redundant
Removed the ACLSecrets Struct
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    7143fa2 View commit details
    Browse the repository at this point in the history

  11. Add Additional field to allow current test to pass

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    2198fdf View commit details
    Browse the repository at this point in the history

  12. Working MVP - Admin Provided Bootstrap Token 

    Admin Provided Bootstrap Token
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    57ea2fe View commit details
    Browse the repository at this point in the history

  13. Update the flag name and some comments

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e85c104 View commit details
    Browse the repository at this point in the history

  14. Updated the header name in the agent

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    7a35037 View commit details
    Browse the repository at this point in the history

  15. Update Header Name Typo 

    Copy Paste Error
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e4242ae View commit details
    Browse the repository at this point in the history

  16. Validate ProvidedToken is a UUID

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    111181d View commit details
    Browse the repository at this point in the history

  17. Refactor the ACL Bootstrap token code 

    Removed unnecessary structs.
Refactored the SetHeaders code to use just one secret.
Removed parseACLSectrets function as redundant
Removed the ACLSecrets Struct
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    ec6115d View commit details
    Browse the repository at this point in the history

  18. Update acl_bootstrap_test.go 

    Add command Tests for Valid and Invalid operator supplied bootstrap tokens
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    908544b View commit details
    Browse the repository at this point in the history

  19. WIP: ACL Test for Operator token.

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    8587603 View commit details
    Browse the repository at this point in the history

  20. Working MVP - Admin Provided Bootstrap Token 

    Admin Provided Bootstrap Token
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    865892b View commit details
    Browse the repository at this point in the history

  21. Update acl_bootstrap.go 

    Update the Information for the Autocomplete flags
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    7f5737b View commit details
    Browse the repository at this point in the history

  22. Update the flag name and some comments

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    4af3111 View commit details
    Browse the repository at this point in the history

  23. Updated the header name in the agent

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    7fec7f8 View commit details
    Browse the repository at this point in the history

  24. Update Header Name Typo 

    Copy Paste Error
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    17cabf2 View commit details
    Browse the repository at this point in the history

  25. Refactor the ACL Bootstrap token code 

    Removed unnecessary structs.
Refactored the SetHeaders code to use just one secret.
Removed parseACLSectrets function as redundant
Removed the ACLSecrets Struct
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    bade1e9 View commit details
    Browse the repository at this point in the history

  26. Working MVP - Admin Provided Bootstrap Token 

    Admin Provided Bootstrap Token
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    cb2ae1f View commit details
    Browse the repository at this point in the history

  27. Updated the header name in the agent

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    d25cee1 View commit details
    Browse the repository at this point in the history

  28. Update Header Name Typo 

    Copy Paste Error
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    3c7a0dc View commit details
    Browse the repository at this point in the history

  29. Refactor the ACL Bootstrap token code 

    Removed unnecessary structs.
Refactored the SetHeaders code to use just one secret.
Removed parseACLSectrets function as redundant
Removed the ACLSecrets Struct
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    24117d3 View commit details
    Browse the repository at this point in the history

  30. Update acl_test.go 

    Fix Invalid Token Test
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    46b515e View commit details
    Browse the repository at this point in the history

  31. Update bootstrap.mdx 

    Add some documentation on how to use the -bootstrap-token argument.
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    363eabb View commit details
    Browse the repository at this point in the history

  32. Update api/acl_test.go 

    Add Improvement Tim Suggested

Co-authored-by: Tim Gross <tgross@hashicorp.com>
    @lhaig @tgross
    lhaig and tgross committed May 26, 2022
    Configuration menu
    Copy the full SHA
    59c425b View commit details
    Browse the repository at this point in the history

  33. Update command/acl_bootstrap.go 

    Add Suggestion by Tim

Co-authored-by: Tim Gross <tgross@hashicorp.com>
    @lhaig @tgross
    lhaig and tgross committed May 26, 2022
    Configuration menu
    Copy the full SHA
    8bdbb52 View commit details
    Browse the repository at this point in the history

  34. Update nomad/acl_endpoint.go 

    Apply suggestion by Tim

Co-authored-by: Tim Gross <tgross@hashicorp.com>
    @lhaig @tgross
    lhaig and tgross committed May 26, 2022
    Configuration menu
    Copy the full SHA
    358a8a8 View commit details
    Browse the repository at this point in the history

  35. Update api/acl.go 

    Remove TODO as per suggestion by Tim

Co-authored-by: Tim Gross <tgross@hashicorp.com>
    @lhaig @tgross
    lhaig and tgross committed May 26, 2022
    Configuration menu
    Copy the full SHA
    408940f View commit details
    Browse the repository at this point in the history

  36. Update command/acl_bootstrap_test.go 

    Apply changes as suggested by Tim

Co-authored-by: Tim Gross <tgross@hashicorp.com>
    @lhaig @tgross
    lhaig and tgross committed May 26, 2022
    Configuration menu
    Copy the full SHA
    7af15b4 View commit details
    Browse the repository at this point in the history

  37. Update command/acl_bootstrap_test.go 

    Co-authored-by: Tim Gross <tgross@hashicorp.com>
    @lhaig @tgross
    lhaig and tgross committed May 26, 2022
    Configuration menu
    Copy the full SHA
    15f03e9 View commit details
    Browse the repository at this point in the history

  38. Update acl_bootstrap_test.go 

    Apply changes suggested by Tim
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e46f431 View commit details
    Browse the repository at this point in the history

  39. Separate out the new Bootstrap code into a separate method

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    b3fbae9 View commit details
    Browse the repository at this point in the history

  40. Create 12520.txt 

    Add Changelog Entry
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    867984f View commit details
    Browse the repository at this point in the history

  41. Update acl-tokens.mdx 

    Add additional comments and examples for providing an ACL token as part of the bootstrap request
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    160a81d View commit details
    Browse the repository at this point in the history

  42. Update website/content/api-docs/acl-tokens.mdx 

    Co-authored-by: Tim Gross <tgross@hashicorp.com>
    @lhaig @tgross
    lhaig and tgross committed May 26, 2022
    Configuration menu
    Copy the full SHA
    d48a705 View commit details
    Browse the repository at this point in the history

  43. Add the UUID requirement to the documentation 

    Add that the token should be a UUID and fixed a typo in the curl command.
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    1b40dec View commit details
    Browse the repository at this point in the history

  44. Update acl_bootstrap_test.go 

    Removed commented out code.
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    585ee2b View commit details
    Browse the repository at this point in the history

  45. Change Struct Field Name to be more descriptive 

    Change Struct Filed Name to be more descriptive.
Fix broken test
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e294174 View commit details
    Browse the repository at this point in the history

  46. Remove the need for a header

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    8f360a5 View commit details
    Browse the repository at this point in the history

  47. Remove .vscode/launch.json 

    Removed the launch.json file
and added it to the .gitignore.
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    9c798fa View commit details
    Browse the repository at this point in the history

  48. Update api/acl.go 

    Co-authored-by: Michael Schurter <mschurter@hashicorp.com>
    @lhaig @schmichael
    lhaig and schmichael committed May 26, 2022
    Configuration menu
    Copy the full SHA
    f790c36 View commit details
    Browse the repository at this point in the history

  49. Moved as per request

    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    fc207de View commit details
    Browse the repository at this point in the history

  50. Update acl_bootstrap.go 

    Removed the flag -bootstrap-token and added options to pass in the token with stdin and from a file.
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    d739fbb View commit details
    Browse the repository at this point in the history

  51. Update .gitignore 

    Add .vscode to gitignore
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    2d16aaa View commit details
    Browse the repository at this point in the history

  52. Update acl_bootstrap.go 

    Fix default file behaviour
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e93fc35 View commit details
    Browse the repository at this point in the history

  53. Update acl_bootstrap_test.go 

    Update Tests for using file based token
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    b7aa487 View commit details
    Browse the repository at this point in the history

  54. Update acl_bootstrap_test.go 

    Fix Test Name
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    7bacf6f View commit details
    Browse the repository at this point in the history

  55. Update acl_endpoint_test.go 

    Add Test for the ACL endpoint
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    317ec5e View commit details
    Browse the repository at this point in the history

  56. Update acl-tokens.mdx 

    Update API Docs
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    89b34ec View commit details
    Browse the repository at this point in the history

  57. Update 12520.txt 

    Update changelog Note
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    ae2691c View commit details
    Browse the repository at this point in the history

  58. Update bootstrap.mdx 

    Add documentation for usage with the CLI
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    10289f1 View commit details
    Browse the repository at this point in the history

  59. Update hashistack.tf 

    Revert Terraform Autocorrect
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    e99c9c0 View commit details
    Browse the repository at this point in the history

  60. Update acl_endpoint_test.go 

    Add Operator Token Test
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    2de8f49 View commit details
    Browse the repository at this point in the history

  61. Update acl_endpoint.go 

    Remove Unneeded code. Go Struct initialised empty
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    b138bbd View commit details
    Browse the repository at this point in the history

  62. Update acl_endpoint.go 

    Detect if there is a body in the request before decoding.
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    633cf82 View commit details
    Browse the repository at this point in the history

  63. Update bootstrap.mdx 

    File containing management token should just contain the token
Add examples for stdin usage
    @lhaig
    lhaig committed May 26, 2022
    Configuration menu
    Copy the full SHA
    c973e2d View commit details
    Browse the repository at this point in the history

Commits on May 28, 2022

  1. Update api/acl.go 

    Co-authored-by: Michael Schurter <mschurter@hashicorp.com>
    @lhaig @schmichael
    lhaig and schmichael committed May 28, 2022
    Configuration menu
    Copy the full SHA
    8a0d393 View commit details
    Browse the repository at this point in the history

  2. Update acl_bootstrap.go 

    Remove some old bootstrap-token code.
    @lhaig
    lhaig committed May 28, 2022
    Configuration menu
    Copy the full SHA
    731936c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'f-bootstrap-token' of github.com:hashicorp/nomad into f… 

    …-bootstrap-token
    @lhaig
    lhaig committed May 28, 2022
    Configuration menu
    Copy the full SHA
    5bccf03 View commit details
    Browse the repository at this point in the history

  4. Update acl-tokens.mdx 

    Make it more clear that the root token is based on the JSON above.
    @lhaig
    lhaig committed May 28, 2022
    Configuration menu
    Copy the full SHA
    16ec53b View commit details
    Browse the repository at this point in the history

  5. Update api/acl.go 

    Co-authored-by: Michael Schurter <mschurter@hashicorp.com>
    @lhaig @schmichael
    lhaig and schmichael committed May 28, 2022
    Configuration menu
    Copy the full SHA
    2d7b315 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2022

  1. Revert Back to the ContentLength check

    @lhaig
    lhaig committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    d716f3f View commit details
    Browse the repository at this point in the history

  2. test: manually set contentlength in tests

    @schmichael
    schmichael committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    9ca6c63 View commit details
    Browse the repository at this point in the history

  3. appease hclfmt

    @schmichael
    schmichael committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    772d8ee View commit details
    Browse the repository at this point in the history