From 66a87881a60d29f0abe1a074c9a5640b2f08cc47 Mon Sep 17 00:00:00 2001 From: Casper Gielen Date: Sun, 18 Oct 2020 20:41:04 +0200 Subject: [PATCH 1/6] fix arrays of additional arguments --- lib/puppet/provider/docker_network/ruby.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/puppet/provider/docker_network/ruby.rb b/lib/puppet/provider/docker_network/ruby.rb index a1bf0714..9b0bc325 100644 --- a/lib/puppet/provider/docker_network/ruby.rb +++ b/lib/puppet/provider/docker_network/ruby.rb @@ -28,12 +28,16 @@ def network_conf new_flags = multi_flags.call(values, format) flags.concat(new_flags) end + if resource[:additional_flags].is_a?(String) additional_flags = resource[:additional_flags].split - additional_flags.each do |additional_flag| - flags << additional_flag - end + elsif resource[:additional_flags].is_a?(Array) + additional_flags = resource[:additional_flags] + end + additional_flags.each do |additional_flag| + flags << additional_flag end + flags << resource[:name] end From f4ffef2ea97669bc5aedbc63f5efa04800191f67 Mon Sep 17 00:00:00 2001 From: Casper Gielen Date: Sun, 18 Oct 2020 21:03:03 +0200 Subject: [PATCH 2/6] do not fail when additional_flags is not specified --- lib/puppet/provider/docker_network/ruby.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/puppet/provider/docker_network/ruby.rb b/lib/puppet/provider/docker_network/ruby.rb index 9b0bc325..2fff91b5 100644 --- a/lib/puppet/provider/docker_network/ruby.rb +++ b/lib/puppet/provider/docker_network/ruby.rb @@ -29,13 +29,15 @@ def network_conf flags.concat(new_flags) end - if resource[:additional_flags].is_a?(String) - additional_flags = resource[:additional_flags].split - elsif resource[:additional_flags].is_a?(Array) - additional_flags = resource[:additional_flags] - end - additional_flags.each do |additional_flag| - flags << additional_flag + if defined?(resource[:additional_flags]) + if resource[:additional_flags].is_a?(String) + additional_flags = resource[:additional_flags].split + elsif resource[:additional_flags].is_a?(Array) + additional_flags = resource[:additional_flags] + end + additional_flags.each do |additional_flag| + flags << additional_flag + end end flags << resource[:name] From 4c75c63497388837407ae38f2a87f3d3b54ebeb7 Mon Sep 17 00:00:00 2001 From: Casper Gielen Date: Sun, 18 Oct 2020 21:20:17 +0200 Subject: [PATCH 3/6] whitespace --- lib/puppet/provider/docker_network/ruby.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/docker_network/ruby.rb b/lib/puppet/provider/docker_network/ruby.rb index 2fff91b5..1be22629 100644 --- a/lib/puppet/provider/docker_network/ruby.rb +++ b/lib/puppet/provider/docker_network/ruby.rb @@ -39,7 +39,7 @@ def network_conf flags << additional_flag end end - + flags << resource[:name] end From d4eac1f808eb266679ea0c94f74fafcfd1b2d5ff Mon Sep 17 00:00:00 2001 From: Casper Gielen Date: Sun, 18 Oct 2020 21:52:04 +0200 Subject: [PATCH 4/6] always initialize additional_flags --- lib/puppet/provider/docker_network/ruby.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/puppet/provider/docker_network/ruby.rb b/lib/puppet/provider/docker_network/ruby.rb index 1be22629..5c8df81a 100644 --- a/lib/puppet/provider/docker_network/ruby.rb +++ b/lib/puppet/provider/docker_network/ruby.rb @@ -34,6 +34,8 @@ def network_conf additional_flags = resource[:additional_flags].split elsif resource[:additional_flags].is_a?(Array) additional_flags = resource[:additional_flags] + else + additional_flags = [nil] end additional_flags.each do |additional_flag| flags << additional_flag From f5df8db0566f0480cd2fe9445fb764218ccb0c53 Mon Sep 17 00:00:00 2001 From: Casper Gielen Date: Mon, 19 Oct 2020 00:13:02 +0200 Subject: [PATCH 5/6] preinitialize variable --- lib/puppet/provider/docker_network/ruby.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/puppet/provider/docker_network/ruby.rb b/lib/puppet/provider/docker_network/ruby.rb index 5c8df81a..6e338f84 100644 --- a/lib/puppet/provider/docker_network/ruby.rb +++ b/lib/puppet/provider/docker_network/ruby.rb @@ -30,12 +30,11 @@ def network_conf end if defined?(resource[:additional_flags]) + additional_flags = Array.new if resource[:additional_flags].is_a?(String) additional_flags = resource[:additional_flags].split elsif resource[:additional_flags].is_a?(Array) additional_flags = resource[:additional_flags] - else - additional_flags = [nil] end additional_flags.each do |additional_flag| flags << additional_flag From 4f20f066ffa2e48450c53789a91b16f8a03438b1 Mon Sep 17 00:00:00 2001 From: Casper Gielen Date: Mon, 19 Oct 2020 00:16:24 +0200 Subject: [PATCH 6/6] follow style guide --- lib/puppet/provider/docker_network/ruby.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/docker_network/ruby.rb b/lib/puppet/provider/docker_network/ruby.rb index 6e338f84..cae591ee 100644 --- a/lib/puppet/provider/docker_network/ruby.rb +++ b/lib/puppet/provider/docker_network/ruby.rb @@ -30,7 +30,7 @@ def network_conf end if defined?(resource[:additional_flags]) - additional_flags = Array.new + additional_flags = [] if resource[:additional_flags].is_a?(String) additional_flags = resource[:additional_flags].split elsif resource[:additional_flags].is_a?(Array)