fix(cookstyle): Run cookstyle on the codebase (#45)

damacus · web-flow · commit b3cc155ed914 · 2025-10-15T11:43:39.000-05:00
Signed-off-by: Dan Webb &lt;dan.webb@damacus.io&gt;
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,7 +1,6 @@
 {
   "recommendations": [
       "chef-software.chef",
-      "rebornix.ruby",
       "editorconfig.editorconfig"
   ]
 }
diff --git a/libraries/install.rb b/libraries/install.rb
@@ -72,13 +72,13 @@ def default_kea_install_packages
 
         case node['platform_family']
         when 'amazon', 'fedora', 'rhel'
-          if version >= 1.6 && version <= 2.2
+          if version.between?(1.6, 2.2)
             %w(isc-kea isc-kea-devel isc-kea-hooks isc-kea-libs isc-kea-shell)
           else
             %w(isc-kea isc-kea-admin isc-kea-common isc-kea-ctrl-agent isc-kea-devel isc-kea-dhcp-ddns isc-kea-dhcp4 isc-kea-dhcp6 isc-kea-doc isc-kea-hooks isc-kea-perfdhcp)
           end
         when 'debian'
-          if version >= 1.6 && version <= 2.2
+          if version.between?(1.6, 2.2)
             %w(isc-kea-admin isc-kea-common isc-kea-ctrl-agent isc-kea-dev isc-kea-dhcp-ddns-server isc-kea-dhcp4-server isc-kea-dhcp6-server isc-kea-doc)
           else
             %w(isc-kea isc-kea-ctrl-agent isc-kea-dev isc-kea-perfdhcp)
diff --git a/resources/config_dhcp4.rb b/resources/config_dhcp4.rb
@@ -47,14 +47,14 @@ def auto_accumulator_options_override
 
 property :ddns_replace_client_name, [String, Symbol],
           equal_to: %w(never always when-present when-not-present),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :ddns_qualifying_suffix, String
 
 property :ddns_send_updates, [true, false]
 
 property :ddns_ttl_percent, [Float, Integer, String],
-          coerce: proc { |p| p.to_f }
+          coerce: proc(&:to_f)
 
 property :ddns_ttl, Integer
 
@@ -68,7 +68,7 @@ def auto_accumulator_options_override
 
 property :ddns_conflict_resolution_mode, [String, Symbol],
           equal_to: %w(check-with-dhcid no-check-with-dhcid check-exists-with-dhcid no-check-without-dhcid),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :decline_probation_period, Integer
 
diff --git a/resources/config_dhcp4_interfaces.rb b/resources/config_dhcp4_interfaces.rb
@@ -31,10 +31,10 @@ def auto_accumulator_options_override
 
 property :dhcp_socket_type, [String, Symbol],
           equal_to: %w(raw udp),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :outbound_interface, [String, Symbol],
           equal_to: %w(use-routing same-as-inbound),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :re_detect, [true, false]
diff --git a/resources/config_dhcp4_sanity_checks.rb b/resources/config_dhcp4_sanity_checks.rb
@@ -30,4 +30,4 @@ def auto_accumulator_options_override
 
 property :lease_checks, [String, Symbol],
           equal_to: %w(none warn fix fix-del del),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
diff --git a/resources/config_dhcp6.rb b/resources/config_dhcp6.rb
@@ -45,14 +45,14 @@ def auto_accumulator_options_override
 
 property :ddns_replace_client_name, [String, Symbol],
           equal_to: %w(never always when-present when-not-present),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :ddns_qualifying_suffix, String
 
 property :ddns_send_updates, [true, false]
 
 property :ddns_ttl_percent, [Float, Integer, String],
-          coerce: proc { |p| p.to_f }
+          coerce: proc(&:to_f)
 
 property :ddns_ttl, Integer
 
@@ -66,7 +66,7 @@ def auto_accumulator_options_override
 
 property :ddns_conflict_resolution_mode, [String, Symbol],
           equal_to: %w(check-with-dhcid no-check-with-dhcid check-exists-with-dhcid no-check-without-dhcid),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :decline_probation_period, Integer
 
diff --git a/resources/config_dhcp6_sanity_checks.rb b/resources/config_dhcp6_sanity_checks.rb
@@ -30,4 +30,4 @@ def auto_accumulator_options_override
 
 property :lease_checks, [String, Symbol],
           equal_to: %w(none warn fix fix-del del),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
diff --git a/resources/config_dhcp_ddns_tsig_key.rb b/resources/config_dhcp_ddns_tsig_key.rb
@@ -41,7 +41,7 @@ def auto_accumulator_options_override
 
 property :algorithm, String,
           equal_to: %w(HMAC-MD5 HMAC-SHA1 HMAC-SHA224 HMAC-SHA256 HMAC-SHA386 HMAC-SHA512),
-          coerce: proc { |p| p.upcase }
+          coerce: proc(&:upcase)
 
 property :digest_bits, Integer,
           sensitive: true
diff --git a/resources/partial/_config_auto_accumulator_kea.rb b/resources/partial/_config_auto_accumulator_kea.rb
@@ -159,11 +159,11 @@ def auto_accumulator_options
 action :delete do
   case option_config_path_type
   when :array
-    converge_by("Deleting configuration for #{new_resource.declared_type.to_s} #{new_resource.name}") do
+    converge_by("Deleting configuration for #{new_resource.declared_type} #{new_resource.name}") do
       accumulator_config(action: :array_delete)
     end if config_file_config_present?
   when :array_contained
-    converge_by("Deleting configuration for #{new_resource.declared_type.to_s} #{new_resource.name}") do
+    converge_by("Deleting configuration for #{new_resource.declared_type} #{new_resource.name}") do
       accumulator_config(action: :key_delete_match_self, key: accumulator_config_path_containing_key)
     end if config_file_config_present?
   when :hash
@@ -181,7 +181,7 @@ def auto_accumulator_options
       diff_properties.each { |rp| accumulator_config(action: :delete, key: rp) }
     end unless diff_properties.empty?
   when :hash_contained
-    converge_by("Deleting configuration for #{new_resource.declared_type.to_s} #{new_resource.name}") do
+    converge_by("Deleting configuration for #{new_resource.declared_type} #{new_resource.name}") do
       accumulator_config(action: :delete, key: option_config_path_contained_key)
     end if config_file_config_present?
   else
diff --git a/resources/partial/_config_auto_accumulator_stork.rb b/resources/partial/_config_auto_accumulator_stork.rb
@@ -152,11 +152,11 @@ def auto_accumulator_options
 action :delete do
   case option_config_path_type
   when :array
-    converge_by("Deleting configuration for #{new_resource.declared_type.to_s} #{new_resource.name}") do
+    converge_by("Deleting configuration for #{new_resource.declared_type} #{new_resource.name}") do
       accumulator_config(action: :array_delete_match, key: option_config_path_match_key, value: option_config_path_match_value)
     end if accumulator_config_array_present?
   when :array_contained
-    converge_by("Deleting configuration for #{new_resource.declared_type.to_s} #{new_resource.name}") do
+    converge_by("Deleting configuration for #{new_resource.declared_type} #{new_resource.name}") do
       accumulator_config(action: :key_delete_match, key: option_config_path_contained_key)
     end if accumulator_config_array_present?
   when :hash
@@ -179,7 +179,7 @@ def auto_accumulator_options
       diff_properties.each { |rp| accumulator_config(action: :delete, key: rp) }
     end unless diff_properties.empty?
   when :hash_contained
-    converge_by("Deleting configuration for #{new_resource.declared_type.to_s} #{new_resource.name}") do
+    converge_by("Deleting configuration for #{new_resource.declared_type} #{new_resource.name}") do
       accumulator_config(action: :delete, key: option_config_path_contained_key)
     end if accumulator_config_present?(option_config_path_contained_key)
   else
diff --git a/resources/partial/_config_database.rb b/resources/partial/_config_database.rb
@@ -20,7 +20,7 @@
 property :type, [String, Symbol],
           required: true,
           equal_to: %w(memfile mysql postgresql cdl),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :persist, [true, false]
 
diff --git a/resources/partial/_config_dhcp4_parameters_shared_network.rb b/resources/partial/_config_dhcp4_parameters_shared_network.rb
@@ -41,14 +41,14 @@
 
 property :ddns_replace_client_name, [String, Symbol],
           equal_to: %w(never always when-present when-not-present),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :ddns_qualifying_suffix, String
 
 property :ddns_send_updates, [true, false]
 
 property :ddns_ttl_percent, [Float, Integer, String],
-          coerce: proc { |p| p.to_f }
+          coerce: proc(&:to_f)
 
 property :ddns_ttl, Integer
 
@@ -62,7 +62,7 @@
 
 property :ddns_conflict_resolution_mode, [String, Symbol],
           equal_to: %w(check-with-dhcid no-check-with-dhcid check-exists-with-dhcid no-check-without-dhcid),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :hostname_char_set, String
 
diff --git a/resources/partial/_config_dhcp4_parameters_subnet.rb b/resources/partial/_config_dhcp4_parameters_subnet.rb
@@ -50,14 +50,14 @@
 
 property :ddns_replace_client_name, [String, Symbol],
           equal_to: %w(never always when-present when-not-present),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :ddns_qualifying_suffix, String
 
 property :ddns_send_updates, [true, false]
 
 property :ddns_ttl_percent, [Float, Integer, String],
-          coerce: proc { |p| p.to_f }
+          coerce: proc(&:to_f)
 
 property :ddns_ttl, Integer
 
@@ -71,7 +71,7 @@
 
 property :ddns_conflict_resolution_mode, [String, Symbol],
           equal_to: %w(check-with-dhcid no-check-with-dhcid check-exists-with-dhcid no-check-without-dhcid),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :hostname_char_set, String
 
diff --git a/resources/partial/_config_dhcp6_parameters_shared_network.rb b/resources/partial/_config_dhcp6_parameters_shared_network.rb
@@ -37,14 +37,14 @@
 
 property :ddns_replace_client_name, [String, Symbol],
           equal_to: %w(never always when-present when-not-present),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :ddns_qualifying_suffix, String
 
 property :ddns_send_updates, [true, false]
 
 property :ddns_ttl_percent, [Float, Integer, String],
-          coerce: proc { |p| p.to_f }
+          coerce: proc(&:to_f)
 
 property :ddns_ttl, Integer
 
@@ -58,7 +58,7 @@
 
 property :ddns_conflict_resolution_mode, [String, Symbol],
           equal_to: %w(check-with-dhcid no-check-with-dhcid check-exists-with-dhcid no-check-without-dhcid),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :hostname_char_replacement, String
 
diff --git a/resources/partial/_config_dhcp6_parameters_subnet.rb b/resources/partial/_config_dhcp6_parameters_subnet.rb
@@ -38,14 +38,14 @@
 
 property :ddns_replace_client_name, [String, Symbol],
           equal_to: %w(never always when-present when-not-present),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :ddns_qualifying_suffix, String
 
 property :ddns_send_updates, [true, false]
 
 property :ddns_ttl_percent, [Float, Integer, String],
-          coerce: proc { |p| p.to_f }
+          coerce: proc(&:to_f)
 
 property :ddns_ttl, Integer
 
@@ -59,7 +59,7 @@
 
 property :ddns_conflict_resolution_mode, [String, Symbol],
           equal_to: %w(check-with-dhcid no-check-with-dhcid check-exists-with-dhcid no-check-without-dhcid),
-          coerce: proc { |p| p.to_s }
+          coerce: proc(&:to_s)
 
 property :hostname_char_replacement, String
 
diff --git a/resources/service.rb b/resources/service.rb
@@ -63,10 +63,10 @@ def do_service_action(resource_action)
               # declare_resource(:service, new_resource.service_name) { delayed_action(resource_action) }
             rescue Mixlib::ShellOut::ShellCommandFailed
               if new_resource.config_test_fail_action.eql?(:log)
-                Chef::Log.error("Configuration test failed, #{new_resource.service_name} #{resource_action} action aborted!\n\n"\
+                Chef::Log.error("Configuration test failed, #{new_resource.service_name} #{resource_action} action aborted!\n\n" \
                                 "Error\n-----\n#{cmd.stderr}")
               else
-                raise "Configuration test failed, #{new_resource.service_name} #{resource_action} action aborted!\n\n"\
+                raise "Configuration test failed, #{new_resource.service_name} #{resource_action} action aborted!\n\n" \
                       "Error\n-----\nAction: #{resource_action}\n#{cmd.stderr}"
               end
             end
diff --git a/test/cookbooks/isc_kea_test/recipes/config_ddns.rb b/test/cookbooks/isc_kea_test/recipes/config_ddns.rb
@@ -33,19 +33,19 @@
 isc_kea_config_dhcp_ddns_forward_ddns_domain 'example.com.' do
   key_name 'd2.md5.key'
   dns_servers({
-    'ip-address' => '2001:db8:1::10',
-    'port' => 7802,
-    'key-name' => 'd2.sha1.key',
-  })
+                'ip-address' => '2001:db8:1::10',
+                'port' => 7802,
+                'key-name' => 'd2.sha1.key',
+              })
 end
 
 isc_kea_config_dhcp_ddns_reverse_ddns_domain '2.0.192.in-addr.arpa.' do
   key_name 'd2.sha1.key'
   dns_servers({
-    'ip-address' => '172.16.1.1',
-    'port' => 5301,
-    'key-name' => 'd2.md5.key',
-  })
+                'ip-address' => '172.16.1.1',
+                'port' => 5301,
+                'key-name' => 'd2.md5.key',
+              })
 end
 
 isc_kea_config_dhcp_ddns_tsig_key 'd2.md5.key' do

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"recommendations": [`
`3`	`3`	`"chef-software.chef",`
`4`		`- "rebornix.ruby",`
`5`	`4`	`"editorconfig.editorconfig"`
`6`	`5`	`]`
`7`	`6`	`}`