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

Fix consul_token usage without accessor_id. #8091

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Fix consul_token usage without accessor_id. #8091

merged 3 commits into from
Mar 14, 2024

Conversation

apollo13
Copy link
Contributor

SUMMARY

Fixes #8089

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

consul_token

ADDITIONAL INFORMATION

@ansibullbot
Copy link
Collaborator

cc @sgargan
click here for bot help

@ansibullbot ansibullbot added WIP Work in progress bug This issue/PR relates to a bug integration tests/integration module module module_utils module_utils plugins plugin (any type) tests tests labels Mar 13, 2024
@apollo13 apollo13 marked this pull request as ready for review March 13, 2024 08:52
@apollo13 apollo13 mentioned this pull request Mar 13, 2024
Closed
1 task
@ansibullbot ansibullbot added has_issue and removed WIP Work in progress labels Mar 13, 2024
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-7 backport-8 Automatically create a backport for the stable-8 branch labels Mar 13, 2024
felixfontein
felixfontein reviewed Mar 13, 2024
View reviewed changes
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for creating this fix!

@felixfontein felixfontein merged commit 67736d7 into ansible-collections:main Mar 14, 2024
124 checks passed
@patchback Patchback
Copy link

patchback bot commented Mar 14, 2024 •
edited
Loading

Backport to stable-7: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 67736d7 on top of patchback/backports/stable-7/67736d796a218f30de6bddfe8f8f36a944db82be/pr-8091

Backporting merged PR #8091 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it: 
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/stable-7/67736d796a218f30de6bddfe8f8f36a944db82be/pr-8091 upstream/stable-7
  4. Now, cherry-pick PR Fix consul_token usage without accessor_id. #8091 contents into that branch: 
    $ git cherry-pick -x 67736d796a218f30de6bddfe8f8f36a944db82be
    If it'll yell at you with something like fatal: Commit 67736d796a218f30de6bddfe8f8f36a944db82be is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x 67736d796a218f30de6bddfe8f8f36a944db82be
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix consul_token usage without accessor_id. #8091 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-7/67736d796a218f30de6bddfe8f8f36a944db82be/pr-8091
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback Patchback
Copy link

patchback bot commented Mar 14, 2024 •
edited
Loading

Backport to stable-8: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-8/67736d796a218f30de6bddfe8f8f36a944db82be/pr-8091

Backported as #8097

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Mar 14, 2024
@apollo13 @patchback
Fix consul_token usage without accessor_id. (#8091)
8d0b9fa 
* Fix consul_token usage without accessor_id.

* Update changelogs/fragments/8091-consul-token-fixes.yaml

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/modules/consul_token.py

Co-authored-by: Felix Fontein <[email protected]>

---------

Co-authored-by: Felix Fontein <[email protected]>
(cherry picked from commit 67736d7)
@patchback patchback bot mentioned this pull request Mar 14, 2024
Merged
@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Mar 14, 2024
@felixfontein
Copy link
Collaborator

@apollo13 thanks for your contribution!

felixfontein pushed a commit that referenced this pull request Mar 14, 2024
@patchback @apollo13
[PR #8091/67736d79 backport][stable-8] Fix consul_token usage without…
12ab33d 
… accessor_id. (#8097)

Fix consul_token usage without accessor_id. (#8091)

* Fix consul_token usage without accessor_id.

* Update changelogs/fragments/8091-consul-token-fixes.yaml

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/modules/consul_token.py

Co-authored-by: Felix Fontein <[email protected]>

---------

Co-authored-by: Felix Fontein <[email protected]>
(cherry picked from commit 67736d7)

Co-authored-by: Florian Apolloner <[email protected]>
Massl123 pushed a commit to Massl123/community.general that referenced this pull request Feb 7, 2025
@apollo13 @felixfontein @Massl123
Fix consul_token usage without accessor_id. (ansible-collections#8091)
9bed194 
* Fix consul_token usage without accessor_id.

* Update changelogs/fragments/8091-consul-token-fixes.yaml

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/modules/consul_token.py

Co-authored-by: Felix Fontein <[email protected]>

---------

Co-authored-by: Felix Fontein <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
backport-8 Automatically create a backport for the stable-8 branch bug This issue/PR relates to a bug has_issue integration tests/integration module_utils module_utils module module plugins plugin (any type) tests tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

consul_token runtime error on simple run
3 participants
@apollo13 @ansibullbot @felixfontein