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

Fix issue with whitespace in ADML data #55795

Merged
merged 2 commits into from
Jan 7, 2020
Merged

Conversation

twangboy
Copy link
Contributor

@twangboy twangboy commented Jan 6, 2020

What does this PR do?

Fixes an issue with the text field in ADML data containing an extra space at the end.

This happens with the Legacy Templates from Microsoft. The KeepAliveTime value of 300000 or 5 minutes (recommended) has a space at the end. This causes states to report that a change is needed when in fact it the policy is already set.

MSS_KeepAliveTime:
  lgpo.set:
    - computer_policy:
        "MSS: (KeepAliveTime) How often keep-alive packets are sent in milliseconds":
          "KeepAliveTime": '300000 or 5 minutes (recommended)'

When the state does the comparison it is comparing the requested dict:

{'KeepAliveTime': '300000 or 5 minutes (recommended)'}

with the current setting

{'KeepAliveTime': '300000 or 5 minutes (recommended) '}

What issues does this PR fix or reference?

Found in Enterprise

Previous Behavior

test=True will always report a change is necessary.

New Behavior

test=True reports no changes needed

Tests written?

Yes

Commits signed with GPG?

Yes

@twangboy twangboy requested a review from a team as a code owner January 6, 2020 20:11
@ghost ghost requested a review from Ch3LL January 6, 2020 20:11
@twangboy twangboy added the ZRELEASED - Neon retired label label Jan 6, 2020
@dwoz dwoz merged commit 1f50bb2 into saltstack:master Jan 7, 2020
@twangboy twangboy deleted the fix_win_lgpo branch May 26, 2020 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZRELEASED - Neon retired label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants