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

Small updates to ec2 pattern #130

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Conversation

hakbailey
Copy link
Collaborator

Two updates:

  • We can't use the var key_info_result in the pattern playbook, because it gets overwritten by the included role playbook.
  • It's ok to log the ec2_key_info output because that doesn't include the private key, and if there's an error with the key (for example if the user was expecting the key to be present) it's helpful to be able to see what the returned value was.

@hakbailey hakbailey merged commit 1c2b0e9 into redhat-cop:main Dec 13, 2024
23 checks passed
@hakbailey hakbailey deleted the udpate-ec2-pattern branch December 13, 2024 20:25
Copy link

patchback bot commented Jan 24, 2025

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

❌ Failed to cleanly apply 1c2b0e9 on top of patchback/backports/stable-3/1c2b0e9ffaa7eacc783dc790ec822e258fcbd28e/pr-130

Backporting merged PR #130 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/redhat-cop/cloud.aws_ops.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-3/1c2b0e9ffaa7eacc783dc790ec822e258fcbd28e/pr-130 upstream/stable-3
  4. Now, cherry-pick PR Small updates to ec2 pattern #130 contents into that branch:
    $ git cherry-pick -x 1c2b0e9ffaa7eacc783dc790ec822e258fcbd28e
    If it'll yell at you with something like fatal: Commit 1c2b0e9ffaa7eacc783dc790ec822e258fcbd28e is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1c2b0e9ffaa7eacc783dc790ec822e258fcbd28e
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Small updates to ec2 pattern #130 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-3/1c2b0e9ffaa7eacc783dc790ec822e258fcbd28e/pr-130
  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.

Copy link

patchback bot commented Jan 24, 2025

Backport to stable-3: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-3/1c2b0e9ffaa7eacc783dc790ec822e258fcbd28e/pr-130

Backported as #146

🤖 @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 Jan 24, 2025
Small updates to ec2 pattern

(cherry picked from commit 1c2b0e9)
abikouo added a commit that referenced this pull request Jan 27, 2025
…1c2b0e9ffaa7eacc783dc790ec822e258fcbd28e/pr-130

[PR #130/1c2b0e9f backport][stable-3] Small updates to ec2 pattern
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants