Skip to content

Uses correct zero value for lgpo LockoutDuration #56408

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

Merged
merged 2 commits into from
Apr 22, 2020

Conversation

lorengordon
Copy link

What does this PR do?

Updates win_lgpo execution module to use the correct zero value for LockoutDuration

What issues does this PR fix or reference?

Fixes #56406

Previous Behavior

Setting the LockoutDuration to 0 with certain combinations of LockoutThreshold and LockoutWindow would throw a CommandExecutionError.

New Behavior

The LockoutDuration zero value is set correctly.

Tests written?

Yes

Commits signed with GPG?

Yes

@lorengordon lorengordon requested a review from a team as a code owner March 18, 2020 15:37
@ghost ghost requested a review from twangboy March 18, 2020 15:37
twangboy
twangboy previously approved these changes Mar 20, 2020
twangboy
twangboy previously approved these changes Apr 2, 2020
@Ch3LL Ch3LL removed the Merge Ready label Apr 15, 2020
@Ch3LL
Copy link
Contributor

Ch3LL commented Apr 15, 2020

There is a merge conflict here that needs to be resolved and pre-commit is failing.

@lorengordon lorengordon force-pushed the lockoutduration branch 2 times, most recently from f1088ca to efd3d1a Compare April 15, 2020 18:56
@lorengordon
Copy link
Author

@Ch3LL I believe I fixed it up, but I do not use pre-commit and don't plan to start just for this project. If the test outputs the diff it wants, I'll be happy to apply it.

@lorengordon lorengordon requested a review from twangboy April 15, 2020 18:57
@Ch3LL
Copy link
Contributor

Ch3LL commented Apr 15, 2020

yep it does. you can see it here:

https://jenkinsci.saltstack.com/job/pr-pre-commit/job/PR-56408/2/console

@lorengordon
Copy link
Author

Ok, resolved the conflict, and pre-commit is good now!

@lorengordon
Copy link
Author

@Ch3LL here's a nifty looking github action that might simplify the black requirement for prs... https://github.com/cclauss/autoblack

@Ch3LL
Copy link
Contributor

Ch3LL commented Apr 16, 2020

thanks for updating with that diff, appreciate it.

thanks for linking that tool. It does look like that tool will edit the code for the user. ping @s0undt3ch and @waynew i know you two were stewarding the black project. I faintly remember there being a reason we didn't want to automatically edit the code for the user?

@s0undt3ch
Copy link
Collaborator

https://github.com/cclauss/autoblack#tldr-it-does-not-work

@Ch3LL
Copy link
Contributor

Ch3LL commented Apr 16, 2020

ping @twangboy this is awaiting your re-review

@lorengordon
Copy link
Author

@s0undt3ch well that's a bummer. I dug a little more and found a solution using comments to dispatch and process commands. Looks rather a bit more involved to setup. But still would be a lot of value for a project with as many contributors as salt. Maybe some chatbot, or your own Jenkins server, could do it?

@dwoz dwoz merged commit 569426f into saltstack:master Apr 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZRelease-Sodium retired label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CommandExecutionError in lgpo.set due to bad zero value for LockoutDuration
6 participants