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

Backport ini_manage fixes to 2018.3 #48310

Merged
merged 5 commits into from Jul 5, 2018

Conversation

Projects
None yet
3 participants
@mtorromeo
Contributor

mtorromeo commented Jun 26, 2018

What does this PR do?

Backports fixes to the ini_manage.py state and module that is currently broken in 2018.3 since the latest refactor of the DEFAULT_IMPLICIT section handling.

Tests written?

No

Commits signed with GPG?

Yes

@mtorromeo mtorromeo changed the title from Ini manage backports to Backport ini_manage fixes to 2018.3 Jun 26, 2018

@rallytime

This comment has been minimized.

Contributor

rallytime commented Jul 2, 2018

Hi @mtorromeo - Can you explain a little more about what this back-port is fixing? There aren't any associated issues listed above, so it's a little difficult to tell what needs to be fixed. Especially since this looks like a rather large change for a back-port.

@mtorromeo

This comment has been minimized.

Contributor

mtorromeo commented Jul 2, 2018

Sorry for the lack of details.

This PR backports the fix to the issue described here #33668 (comment) that was probably introduced by 7ac43c7 which removed the DEFAULT_IMPLICIT special section but left over some references and more importantly caused a different behavior between testing a state and applying it.

The bulk of the changes are in commit 479c8de (backported as c179b82) which includes the mentioned fix.

I didn't want to create a new distinct fix for that issue since it was already fixed but I agree that the changes are quite large.

Commit 0a32f93 fixes an unreported issue introduced by the previous change.

The "pylint fixes" and "uniformed reports" commits may be skipped but are rather small changes.

@rallytime

This comment has been minimized.

Contributor

rallytime commented Jul 3, 2018

re-run lint

@rallytime

This comment has been minimized.

Contributor

rallytime commented Jul 3, 2018

@mtorromeo Ok, thank you for that explanation. Lint failed in the last run, but the results timed out, so I have started the test again. If you could fix that up with it's finished running, then we can review this. :)

@mtorromeo

This comment has been minimized.

Contributor

mtorromeo commented Jul 3, 2018

The lint is fixed in commit c13e79d. Should I backport that also?

@rallytime

This comment has been minimized.

Contributor

rallytime commented Jul 3, 2018

@mtorromeo Yeah, I think so.

@mtorromeo mtorromeo force-pushed the mtorromeo:ini-manage-backports branch from fff1f8a to 81b4496 Jul 4, 2018

slivik and others added some commits May 23, 2018

Fixes dry run in ini_manage + Fixes related bug - when working with o…
…ptions which are not in section. + Fixes related tests + Fixes pylint warnings

@mtorromeo mtorromeo force-pushed the mtorromeo:ini-manage-backports branch from 81b4496 to 88f80fd Jul 4, 2018

@mtorromeo

This comment has been minimized.

Contributor

mtorromeo commented Jul 4, 2018

Done, I also rebased on 2018.3

@rallytime rallytime merged commit 432cbbb into saltstack:2018.3 Jul 5, 2018

14 of 16 checks passed

default Pull Requests » Salt PR - Main Build - PY2/PY3 #9957
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11200 — ABORTED
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26442 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18478 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6230 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24158 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23114 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20283 — SUCCESS
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment