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

Fixed PR #23162 #5

Closed
wants to merge 2 commits into from
Closed

Conversation

ar7z1
Copy link

@ar7z1 ar7z1 commented Apr 10, 2017

In this PR I repaired firewall rule build procedure, fixed failed tests and made $difference string more beautiful.

dagwieers and others added 2 commits April 3, 2017 10:47
This PR includes the following changes:
- an idempotency fix when `profile: any`
- better difference output to debug idempotency issues
- documentation fixes (remove `required: false`)
- Parameter handling fixes
- RDP example that matches default RDP rule
- Renamed parameter 'enable' to 'enabled' (kept alias)
- Renamed parameter 'profile' to 'profiles' (kept alias)
@@ -114,7 +114,7 @@ function getFirewallRule ($fwsettings) {
Continue
} else {
$diff=$true;
$difference+=@("$($fwsetting.Key): $($output.$($fwsetting.Key)) vs $($fwsettings.$($fwsetting.Key))");
$difference+=@("'$($fwsetting.Key.ToLower())': '$($output.$($fwsetting.Key).ToLower())' vs '$($fwsettings.$($fwsetting.Key))'")
Copy link
Author

@ar7z1 ar7z1 Apr 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change from Action: Allow vs block to 'action': 'allow' vs 'block'.

@@ -157,6 +157,10 @@ function createFireWallRule ($fwsettings) {
$key='dir'
} elseif ($fwsetting.key -eq 'Rule Name') {
$key='name'
} elseif ($fwsetting.key -eq 'Enabled') {
Copy link
Author

@ar7z1 ar7z1 Apr 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert firewall rule building procedure. Shippable build failed because of this.

@@ -103,7 +103,7 @@
that:
- add_different_firewall_rule_without_force.failed == true
- add_different_firewall_rule_without_force.changed == false
- add_different_firewall_rule_without_force.difference == ["block"]
- add_different_firewall_rule_without_force.difference == ["'action'{{':'}} 'allow' vs 'block'"]
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the test.

@dagwieers dagwieers force-pushed the wfr_idempotency branch 14 times, most recently from 208e471 to 61aaf1f Compare April 13, 2017 15:18
@ar7z1 ar7z1 closed this Aug 13, 2017
@ar7z1 ar7z1 deleted the wfr_idempotency branch August 13, 2017 08:51
dagwieers pushed a commit that referenced this pull request Feb 12, 2020
* New module zabbix_service (#5)

* new module zabbix_service

* fix type

* fix githubid

* New Zabbix service module (ansible#11)

* new zabbix service module

* fix validate module failure

* Fix algorithm doc and all_childs param name

* Update Ansible version

Co-Authored-By: sky-joker <megane@kurobuti.com>

* remove dump state
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants