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.

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

openssh_cert - fix full_idempotence for host certificates #396

Conversation

Ajpantuso
Copy link
Collaborator

SUMMARY

Ensures options are only checked for idempotence when the certificate is of type user.

Fixed #395

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

plugins/modules/openssh_cert.py

ADDITIONAL INFORMATION

N/A

@softwarefactory-project-zuul
Copy link

Build succeeded (third-party-check pipeline).

@Ajpantuso Ajpantuso changed the title [WIP] openssh_cert - fix full_idempotence for host certificates openssh_cert - fix full_idempotence for host certificates Feb 4, 2022
@Ajpantuso
Copy link
Collaborator Author

@stephan13360 this should fix the issue you encountered, but if you'd like to confirm by testing locally you can follow this guide.

@softwarefactory-project-zuul
Copy link

Build succeeded (third-party-check pipeline).

@stephan13360
Copy link

I can confirm this fixes it.

@felixfontein felixfontein merged commit a307618 into ansible-collections:main Feb 4, 2022
@patchback
Copy link

patchback bot commented Feb 4, 2022

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

❌ Failed to cleanly apply a307618 on top of patchback/backports/stable-1/a3076188721878f9ce000385a83ab19c1f6aefa5/pr-396

Backporting merged PR #396 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.crypto.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-1/a3076188721878f9ce000385a83ab19c1f6aefa5/pr-396 upstream/stable-1
  4. Now, cherry-pick PR openssh_cert - fix full_idempotence for host certificates #396 contents into that branch:
    $ git cherry-pick -x a3076188721878f9ce000385a83ab19c1f6aefa5
    If it'll yell at you with something like fatal: Commit a3076188721878f9ce000385a83ab19c1f6aefa5 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x a3076188721878f9ce000385a83ab19c1f6aefa5
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR openssh_cert - fix full_idempotence for host certificates #396 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/a3076188721878f9ce000385a83ab19c1f6aefa5/pr-396
  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.

@felixfontein
Copy link
Contributor

@Ajpantuso thanks for fixing this!
@stephan13360 thanks for reporting and testing this!

I'll do a set of new releases this weekend so we'll get this fix out soon.

@felixfontein
Copy link
Contributor

Ok, probably just one release (2.2.1). If this also applies to stable-1, someone will have to backport this manually :)

Ajpantuso added a commit to Ajpantuso/community.crypto that referenced this pull request Feb 4, 2022
…llections#396)

* fixing host cert idempotence

* adding changelog fragment

(cherry picked from commit a307618)
@Ajpantuso
Copy link
Collaborator Author

Ok, probably just one release (2.2.1). If this also applies to stable-1, someone will have to backport this manually :)

Backport to stable-1: #397

@Ajpantuso Ajpantuso deleted the host_cert_full_idempotence_fix branch February 4, 2022 23:51
felixfontein pushed a commit that referenced this pull request Feb 5, 2022
* fixing host cert idempotence

* adding changelog fragment

(cherry picked from commit a307618)
@felixfontein
Copy link
Contributor

2.2.1 and 1.9.11 have been released with this fix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

community.crypto.openssh_cert regenerate: full_idempotence acts the same as regenerate: always
3 participants