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

ansible-galaxy - fix listing specific role and role description #67409

Merged
merged 8 commits into from Apr 15, 2020
Merged

ansible-galaxy - fix listing specific role and role description #67409

merged 8 commits into from Apr 15, 2020

Conversation

samdoran
Copy link
Contributor

@samdoran samdoran commented Feb 13, 2020 •
edited

SUMMARY

If the role was not in the first search path, it was reported as not found.

Get the role description from within galaxy_info and fall back to a top level description key.

Fix logic around reporting whether or not a role exists when displaying info.

Add integration tests.

Fixes #60167

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

lib/ansible/galaxy/role.py

@ansibot ansibot added WIP This issue/PR is a work in progress. Nevertheless it was shared for getting input from peers. affects_2.10 This issue/PR affects Ansible v2.10 bug This issue/PR relates to a bug. needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Feb 13, 2020
@samdoran samdoran changed the title [WIP] ansible-galaxy - fix listing specific role ansible-galaxy - fix listing specific role and role description Feb 17, 2020
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed WIP This issue/PR is a work in progress. Nevertheless it was shared for getting input from peers. labels Feb 17, 2020
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Feb 17, 2020
@samdoran
ansible-galaxy - fix listing specific role
3059be7 
If the role was not in the first search path, it was reported as not found
@samdoran
Properly display role description
d8ef644 
Default to description from within galaxy_info, falling back to top level description
@samdoran
Display proper message when a role does not exist
eabd63e
@samdoran
Add integration tests
6f58188
@samdoran
Use context manager
26ba46f
s-hertel
s-hertel reviewed Feb 20, 2020
View reviewed changes
Copy link
Contributor

@s-hertel s-hertel left a comment

Choose a reason for hiding this comment

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

code changes look good 👍

@s-hertel s-hertel removed the needs_triage Needs a first human triage before being processed. label Feb 20, 2020
@mattclay mattclay added the ci_verified Changes made in this PR are causing tests to fail. label Feb 24, 2020
@ansibot ansibot added the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Mar 3, 2020
s-hertel
s-hertel reviewed Apr 13, 2020
View reviewed changes
lib/ansible/cli/galaxy.py Outdated Show resolved Hide resolved
@s-hertel
Update sed for BSD compatibility
bdbf250 
Update precedence for description location
@ansibot ansibot removed ci_verified Changes made in this PR are causing tests to fail. stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. labels Apr 13, 2020
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Apr 14, 2020
s-hertel
s-hertel approved these changes Apr 15, 2020
View reviewed changes
Copy link
Contributor

@s-hertel s-hertel left a comment

Choose a reason for hiding this comment

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

@samdoran All the tests you added for this are awesome 😀

@s-hertel s-hertel merged commit cdb24e0 into ansible:devel Apr 15, 2020
@ansible ansible locked and limited conversation to collaborators May 13, 2020
@samdoran samdoran deleted the issue/60167-galaxy-info-fix branch May 15, 2020 20:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Akasurde Akasurde Akasurde left review comments

@s-hertel s-hertel s-hertel approved these changes

Assignees
No one assigned
Labels
affects_2.10 This issue/PR affects Ansible v2.10 bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

galaxy-info --offline option doesn't work
5 participants
@samdoran @Akasurde @s-hertel @mattclay @ansibot