-
-
Notifications
You must be signed in to change notification settings - Fork 77
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
modulesync 5.3.0; Drop Puppet 5 support #303
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fails because spec_helper_acceptance needs to be updated to use voxpupuli-acceptance.
That's using the simp helpers so not a trivial conversion. Also not sure if firewalld actually works in containers. |
I disabled acceptance tests for now. this allows us to merge the PR and at least enable unit testing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, but maybe add "Add support for Puppet 7" to the PR title for the changelog?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small nit: the commit 9ff87f3 should be titled migrate to rspec-puppet-facts
.
Overall no objection to merging this but I agree it should mention adding Puppet 7 support.
@@ -12,11 +14,9 @@ | |||
def exists? | |||
builtin = true | |||
|
|||
found_resource = execute_firewall_cmd(['--get-services'], nil).strip.split(' ').include?(@resource[:name]) | |||
found_resource = execute_firewall_cmd(['--get-services'], nil).strip.split.include?(@resource[:name]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this really the same? Doesn't this also split on newlines where it previously didn't?
unless @resource[:ports].include?(:unset) | ||
ports_protos = Array(@resource[:ports]).select { |x| x['port'].nil? }.map { |x| x['protocol'] } | ||
end | ||
ports_protos = Array(@resource[:ports]).select { |x| x['port'].nil? }.map { |x| x['protocol'] } unless @resource[:ports].include?(:unset) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I still think the guard cop here produces a too long line so I opened rubocop/rubocop#10708
@@ -26,6 +28,7 @@ def key_val_opt(opt, resource_param = opt) | |||
def eval_source | |||
args = [] | |||
return [] unless (addr = @resource[:source]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unrelated, but I wonder why this isn't either return args ...
or return [] ...
and then args = []
. Now it's just creating an unused array in some cases.
@ekohl
|
There's been enough drift that it might be worth redoing this PR? |
as stated on the mailinglist: I got the impression that the module is abandoned and I've no plans to work further on it. If someone want's to keep using it I suggest someone tries a new modulesync. |
Somehow my subscription to that list got suspended... Trying in #347 |
modulesync 4.0.0