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

[2019.2] Fixes to utils/nacl.py #51913

Merged
merged 8 commits into from Apr 11, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 28, 2019

What does this PR do?

Correctly handle the situation when with the secret key or public key values are empty.

What issues does this PR fix or reference?

#51818

Previous Behavior

If the secret key or public key values were passed in as empty or None, an exception was raised when an attempt was made to convert them to a string.

New Behavior

Nacl functions as expected.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

… values are empty.
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Feb 28, 2019
@dwoz

This comment has been minimized.

Copy link
Contributor

commented Mar 5, 2019

@garethgreenaway Do we have tests that cover this?

garethgreenaway and others added 5 commits Mar 21, 2019
…ay/salt into 51818_fix_when_sk_is_empty
@garethgreenaway

This comment has been minimized.

Copy link
Member Author

commented Apr 9, 2019

@dwoz A new test has been added.

garethgreenaway and others added 2 commits Apr 9, 2019
@dwoz dwoz added the 2019.2.1 label Apr 11, 2019
@dwoz
dwoz approved these changes Apr 11, 2019
@dwoz dwoz merged commit 7be0428 into saltstack:2019.2 Apr 11, 2019
10 checks passed
10 checks passed
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/py2-windows-2016 The py2-windows-2016 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
jenkins/pr/py3-windows-2016 The py3-windows-2016 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
3 participants
You can’t perform that action at this time.