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

Rename obsolete beacon validation function #52201

Merged
merged 2 commits into from Mar 15, 2019

Conversation

@max-arnold
Copy link
Contributor

commented Mar 15, 2019

What does this PR do?

Small follow-up bugfix for #42317 to rename two remaining instances of beacon validation function from __validate__ to validate:

  • Use proper function name in the docs
  • Rename validation function in the aix_account beacon (all other beacons are ok)

Previous Behavior

aix_account beacon validator was ignored

New Behavior

aix_account beacon validator should be called.

Tests written?

No. I don't have any AIX machine at hand :)

@max-arnold

This comment has been minimized.

Copy link
Contributor Author

commented Mar 15, 2019

@garethgreenaway Aside from this fix, it looks like #35374 is no longer used and can be removed. I can try to roll it back if that is true.

@garethgreenaway

This comment has been minimized.

Copy link
Member

commented Mar 15, 2019

@max-arnold Thanks! PR looks good. You are correct, the __validate__ was renamed back to validate as it's called by the various beacon execution & state execution modules when a beacon is added.

@max-arnold

This comment has been minimized.

Copy link
Contributor Author

commented Mar 15, 2019

Do you think it is worth undoing #35374? I can submit it as a separate PR, but I need some reassurance that it is not used somewhere else (like Salt Enterprise).

@garethgreenaway

This comment has been minimized.

Copy link
Member

commented Mar 15, 2019

@max-arnold The changes in that PR should have already been undone. Do you see a change in that PR that still exists somewhere in the code? All the beacons, except for the aix beacon, have their validate functions in the correct state. The only thing that still remains is probably the virtual_funcs, which I think we can safely leave as it might find a use at a later date.

@max-arnold

This comment has been minimized.

Copy link
Contributor Author

commented Mar 15, 2019

Yep, I'm specifically talking about the virtual_funcs. Everything it does could probably be implemented inside an existing __virtual__ function.

@garethgreenaway garethgreenaway merged commit 85be178 into saltstack:2018.3 Mar 15, 2019
8 of 10 checks passed
8 of 10 checks passed
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test 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
Projects
None yet
2 participants
You can’t perform that action at this time.