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

Integrate ansible-creator and devtools into the developing collections guide #1302

Merged
merged 7 commits into from
May 2, 2024
Merged

Integrate ansible-creator and devtools into the developing collections guide #1302

merged 7 commits into from
May 2, 2024

Conversation

xszabo3
Copy link
Contributor

@xszabo3 xszabo3 commented Apr 21, 2024

This branch adds a section mentioning ansible-creator as a way to generate collection structure. Mentioned in #1294

@ansible-documentation-bot ansible-documentation-bot bot added the new_contributor This PR is the first contribution by a new community member. label Apr 21, 2024
@ansible-documentation-bot
Copy link
Contributor

Thanks for your Ansible docs contribution! We talk about Ansible documentation on matrix at #docs:ansible.im and on libera IRC at #ansible-docs if you ever want to join us and chat about the docs! We meet there on Tuesdays (see the Ansible calendar) and welcome additions to our weekly agenda items - scroll down to find the upcoming agenda and add a comment to put something new on that agenda.

@oraNod oraNod requested review from ssbarnea and cidrblock April 22, 2024 09:04
@oraNod oraNod added backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.14 Automatically create a backport for the stable-2.14 branch backport-2.16 Automatically create a backport for the stable-2.16 branch MUNI tech writers backport-2.17 Automatically create a backport for the stable-2.17 branch labels Apr 22, 2024
Copy link
Contributor

@oraNod oraNod 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 the docs update @xszabo3 I've made a few suggestions for you. Feel free to rewrite and work with them however you see fit.

@oraNod
Copy link
Contributor

oraNod commented Apr 22, 2024

Also @xszabo3 I just realized you opened this PR as a draft. If you're not ready for review comments yet, please just ignore what I put in there.

@xszabo3
Copy link
Contributor Author

xszabo3 commented Apr 22, 2024

Thanks for the feedback @oraNod . I will make the changes when I have time in the following days, I also asked a few questions in the matrix channel after making this draft.

@xszabo3 xszabo3 marked this pull request as ready for review April 25, 2024 21:08
@xszabo3
Copy link
Contributor Author

xszabo3 commented Apr 29, 2024

@oraNod I haven't received an answer on matrix, so I will repeat the questions here:

1:
Which collection creating method should be recommended? (with ansible-creator or the already present method) I could add a note, or change the order so the recommended section will be the first.
1.5 - Will the template_repository stay the recommended in https://docs.ansible.com/ansible/devel/dev_guide/developing_collections_path.html#put-your-content-in-a-collection ?

2:
Found a possible typo in the style guide. At https://docs.ansible.com/ansible/latest/dev_guide/style_guide/index.html#internal-navigation in the note the first ` is missing from the external link.

@oraNod
Copy link
Contributor

oraNod commented Apr 29, 2024

@oraNod I haven't received an answer on matrix, so I will repeat the questions here:

1: Which collection creating method should be recommended? (with ansible-creator or the already present method) I could add a note, or change the order so the recommended section will be the first. 1.5 - Will the template_repository stay the recommended in https://docs.ansible.com/ansible/devel/dev_guide/developing_collections_path.html#put-your-content-in-a-collection ?

2: Found a possible typo in the style guide. At https://docs.ansible.com/ansible/latest/dev_guide/style_guide/index.html#internal-navigation in the note the first ` is missing from the external link.

hey @xszabo3 I might have missed those questions in matrix. as a general rule of thumb it's better to ask questions related to a PR or issue directly in the thread. it's especially helpful to have the full context in one place for historical purposes too.

  1. Maybe let's keep the ansible-creator method more like a hint or tip but not the recommended primary method. It shouldn't come before what is already there.
    1.5 Yes, let's not change that. It is actively maintained by the community and should be recommended for consistency.
  2. Well spotted. Yes, that looks like either a typo or possibly a character that needs to be escaped. Feel like sending a PR to fix it?

@oraNod oraNod requested a review from Andersson007 April 29, 2024 14:16
@oraNod
Copy link
Contributor

oraNod commented Apr 29, 2024

@Andersson007 Hi, I think we should get your perspective on this because we don't want to deviate too much from the collection template repository in community. Could you please take a look and share any opinion on using the ansible-creator tool? Thanks.

@xszabo3
Copy link
Contributor Author

xszabo3 commented Apr 29, 2024

2. Well spotted. Yes, that looks like either a typo or possibly a character that needs to be escaped. Feel like sending a PR to fix it?

Thanks for the response @oraNod , I just opened a PR for the typo.

@xszabo3
Copy link
Contributor Author

xszabo3 commented May 1, 2024

After changing the anchors, I think the first point deserves a rewrite, to include ansible-creator

I have a few suggestions:
1:

Create a new collection, optionally using a custom collection template, with the ansible-galaxy collection init command, or use the ansible-creator tool.

2:

Create a new collection with the ansible-galaxy collection init command, optionally using a custom collection template or using ansible-creator.

3:

Create a new collection, optionally using a custom collection template, either with the ansible-galaxy collection init command or using ansible-creator.

4: Leave it as it is

Which one would be the most ideal, or do you have other ideas @oraNod @samccann ?

Copy link
Contributor

@oraNod oraNod left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the contribution @xszabo3

@oraNod oraNod requested review from webknjaz and samccann May 2, 2024 11:21
@samccann samccann merged commit fd3495a into ansible:devel May 2, 2024
8 checks passed
Copy link

patchback bot commented May 2, 2024

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

❌ Failed to cleanly apply fd3495a on top of patchback/backports/stable-2.15/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302

Backporting merged PR #1302 into devel

  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/ansible-documentation.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-2.15/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302 upstream/stable-2.15
  4. Now, cherry-pick PR Integrate ansible-creator and devtools into the developing collections guide #1302 contents into that branch:
    $ git cherry-pick -x fd3495af6394922cfc81344c42133a0fb62f98c7
    If it'll yell at you with something like fatal: Commit fd3495af6394922cfc81344c42133a0fb62f98c7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x fd3495af6394922cfc81344c42133a0fb62f98c7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Integrate ansible-creator and devtools into the developing collections guide #1302 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.15/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302
  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.

@samccann
Copy link
Contributor

samccann commented May 2, 2024

Thanks @xszabo3 for the Ansible docs fix!

Copy link

patchback bot commented May 2, 2024

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

❌ Failed to cleanly apply fd3495a on top of patchback/backports/stable-2.14/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302

Backporting merged PR #1302 into devel

  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/ansible-documentation.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-2.14/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302 upstream/stable-2.14
  4. Now, cherry-pick PR Integrate ansible-creator and devtools into the developing collections guide #1302 contents into that branch:
    $ git cherry-pick -x fd3495af6394922cfc81344c42133a0fb62f98c7
    If it'll yell at you with something like fatal: Commit fd3495af6394922cfc81344c42133a0fb62f98c7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x fd3495af6394922cfc81344c42133a0fb62f98c7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Integrate ansible-creator and devtools into the developing collections guide #1302 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.14/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302
  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 May 2, 2024

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

❌ Failed to cleanly apply fd3495a on top of patchback/backports/stable-2.16/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302

Backporting merged PR #1302 into devel

  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/ansible-documentation.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-2.16/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302 upstream/stable-2.16
  4. Now, cherry-pick PR Integrate ansible-creator and devtools into the developing collections guide #1302 contents into that branch:
    $ git cherry-pick -x fd3495af6394922cfc81344c42133a0fb62f98c7
    If it'll yell at you with something like fatal: Commit fd3495af6394922cfc81344c42133a0fb62f98c7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x fd3495af6394922cfc81344c42133a0fb62f98c7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Integrate ansible-creator and devtools into the developing collections guide #1302 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.16/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302
  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 May 2, 2024

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/fd3495af6394922cfc81344c42133a0fb62f98c7/pr-1302

Backported as #1399

🤖 @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 May 2, 2024
…s guide (#1302)

* doc: integrate ansible-creator in developing_collections_creating.rst

* doc: corrections based on feedback

* doc: highlight ansible-creator in note

* doc: corrections based on review

* doc: move ansible-creator section, rename anchor

* doc: rewrite ADT note based on suggestion

* doc: change links from github to readthedocs

(cherry picked from commit fd3495a)
@xszabo3
Copy link
Contributor Author

xszabo3 commented May 2, 2024

Thanks @xszabo3 for the Ansible docs fix!

Thank you all for your patience.
I opened PRs for backports (the conflict was with the custom template, I leave it up to you if it needs a backport or not).

samccann pushed a commit that referenced this pull request May 6, 2024
…s guide (#1302) (#1402)

* doc: integrate ansible-creator in developing_collections_creating.rst

* doc: corrections based on feedback

* doc: highlight ansible-creator in note

* doc: corrections based on review

* doc: move ansible-creator section, rename anchor

* doc: rewrite ADT note based on suggestion

* doc: change links from github to readthedocs

(cherry picked from commit fd3495a)
samccann pushed a commit that referenced this pull request May 6, 2024
…s guide (#1302) (#1403)

* doc: integrate ansible-creator in developing_collections_creating.rst

* doc: corrections based on feedback

* doc: highlight ansible-creator in note

* doc: corrections based on review

* doc: move ansible-creator section, rename anchor

* doc: rewrite ADT note based on suggestion

* doc: change links from github to readthedocs

(cherry picked from commit fd3495a)
samccann pushed a commit that referenced this pull request May 6, 2024
…s guide (#1302) (#1401)

* doc: integrate ansible-creator in developing_collections_creating.rst

* doc: corrections based on feedback

* doc: highlight ansible-creator in note

* doc: corrections based on review

* doc: move ansible-creator section, rename anchor

* doc: rewrite ADT note based on suggestion

* doc: change links from github to readthedocs

(cherry picked from commit fd3495a)
samccann pushed a commit that referenced this pull request May 6, 2024
…s guide (#1302) (#1399)

* doc: integrate ansible-creator in developing_collections_creating.rst

* doc: corrections based on feedback

* doc: highlight ansible-creator in note

* doc: corrections based on review

* doc: move ansible-creator section, rename anchor

* doc: rewrite ADT note based on suggestion

* doc: change links from github to readthedocs

(cherry picked from commit fd3495a)

Co-authored-by: xszabo3 <[email protected]>
@xszabo3 xszabo3 deleted the integrate-ansible-creator branch August 10, 2024 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.14 Automatically create a backport for the stable-2.14 branch backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch backport-2.17 Automatically create a backport for the stable-2.17 branch MUNI tech writers new_contributor This PR is the first contribution by a new community member.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants