From e638cd029d58a522a01a2e1dfd12d572ff02c5e6 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 30 Jun 2026 12:38:42 +0100
Subject: [PATCH] Fix new cookstyle warnings

---
 cookbooks/mysql/libraries/mysql.rb            | 10 ++++----
 .../networking/resources/firewall_rule.rb     |  4 ++--
 cookbooks/postgresql/libraries/postgresql.rb  | 24 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cookbooks/mysql/libraries/mysql.rb b/cookbooks/mysql/libraries/mysql.rb
index ec9743c94..9b9de41e9 100644
--- a/cookbooks/mysql/libraries/mysql.rb
+++ b/cookbooks/mysql/libraries/mysql.rb
@@ -90,17 +90,17 @@ module OpenStreetMap
       @mysql_users ||= query("SELECT user, host, #{privilege_columns} FROM user").each_with_object({}) do |user, users|
         name = "'#{user[:user]}'@'#{user[:host]}'"
 
-        users[name] = USER_PRIVILEGES.each_with_object({}) do |privilege, privileges|
-          privileges[privilege] = user["#{privilege}_priv".to_sym] == "Y"
+        users[name] = USER_PRIVILEGES.to_h do |privilege|
+          [privilege, user["#{privilege}_priv".to_sym] == "Y"]
         end
       end
     end
 
     def mysql_databases
-      @mysql_databases ||= query("SHOW databases").each_with_object({}) do |database, databases|
-        databases[database[:database]] = {
+      @mysql_databases ||= query("SHOW databases").to_h do |database|
+        [database[:database], {
           :permissions => {}
-        }
+        }]
       end
 
       query("SELECT * FROM db").each do |record|
diff --git a/cookbooks/networking/resources/firewall_rule.rb b/cookbooks/networking/resources/firewall_rule.rb
index 22bde6ca9..737daa71d 100644
--- a/cookbooks/networking/resources/firewall_rule.rb
+++ b/cookbooks/networking/resources/firewall_rule.rb
@@ -128,14 +128,14 @@ action_class do
   end
 
   def format_ports(ports)
-    "{ #{Array(ports).map(&:to_s).join(', ')} }"
+    "{ #{Array(ports).join(', ')} }"
   end
 
   def format_addresses(addresses, ip)
     if addresses.is_a?(Symbol)
       "@#{ip}-#{addresses}-addresses"
     else
-      "{ #{Array(addresses).map(&:to_s).join(', ')} }"
+      "{ #{Array(addresses).join(', ')} }"
     end
   end
 
diff --git a/cookbooks/postgresql/libraries/postgresql.rb b/cookbooks/postgresql/libraries/postgresql.rb
index 598f94344..510ceb0b1 100644
--- a/cookbooks/postgresql/libraries/postgresql.rb
+++ b/cookbooks/postgresql/libraries/postgresql.rb
@@ -83,42 +83,42 @@ module OpenStreetMap
     end
 
     def users
-      @users ||= query("SELECT *, ARRAY(SELECT groname FROM pg_group WHERE usesysid = ANY(grolist)) AS roles FROM pg_user").each_with_object({}) do |user, users|
-        users[user[:usename]] = {
+      @users ||= query("SELECT *, ARRAY(SELECT groname FROM pg_group WHERE usesysid = ANY(grolist)) AS roles FROM pg_user").to_h do |user|
+        [user[:usename], {
           :superuser => user[:usesuper] == "t",
           :createdb => user[:usercreatedb] == "t",
           :createrole => user[:usecatupd] == "t",
           :replication => user[:userepl] == "t",
           :roles => parse_array(user[:roles] || "{}")
-        }
+        }]
       end
     end
 
     def databases
-      @databases ||= query("SELECT d.datname, u.usename, d.encoding, d.datcollate, d.datctype FROM pg_database AS d INNER JOIN pg_user AS u ON d.datdba = u.usesysid").each_with_object({}) do |database, databases|
-        databases[database[:datname]] = {
+      @databases ||= query("SELECT d.datname, u.usename, d.encoding, d.datcollate, d.datctype FROM pg_database AS d INNER JOIN pg_user AS u ON d.datdba = u.usesysid").to_h do |database|
+        [database[:datname], {
           :owner => database[:usename],
           :encoding => database[:encoding],
           :collate => database[:datcollate],
           :ctype => database[:datctype]
-        }
+        }]
       end
     end
 
     def extensions(database)
       @extensions ||= {}
-      @extensions[database] ||= query("SELECT extname, extversion FROM pg_extension", :database => database).each_with_object({}) do |extension, extensions|
-        extensions[extension[:extname]] = {
+      @extensions[database] ||= query("SELECT extname, extversion FROM pg_extension", :database => database).to_h do |extension|
+        [extension[:extname], {
           :version => extension[:extversion]
-        }
+        }]
       end
     end
 
     def tablespaces
-      @tablespaces ||= query("SELECT spcname, usename FROM pg_tablespace AS t INNER JOIN pg_user AS u ON t.spcowner = u.usesysid").each_with_object({}) do |tablespace, tablespaces|
-        tablespaces[tablespace[:spcname]] = {
+      @tablespaces ||= query("SELECT spcname, usename FROM pg_tablespace AS t INNER JOIN pg_user AS u ON t.spcowner = u.usesysid").to_h do |tablespace|
+        [tablespace[:spcname], {
           :owner => tablespace[:usename]
-        }
+        }]
       end
     end
 
-- 
2.47.3