From 2852d9f0de7e49a138357b35f1f5c25e0607c15b Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Mon, 5 Apr 2021 10:08:03 -0700
Subject: [PATCH] GHCR: Use reject to remove empty hash values

---
 Library/Homebrew/github_packages.rb | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/Library/Homebrew/github_packages.rb b/Library/Homebrew/github_packages.rb
index 31ba0d1cf9..56014628df 100644
--- a/Library/Homebrew/github_packages.rb
+++ b/Library/Homebrew/github_packages.rb
@@ -206,8 +206,7 @@ class GitHubPackages
       "org.opencontainers.image.url"           => bottle_hash["formula"]["homepage"],
       "org.opencontainers.image.vendor"        => org,
       "org.opencontainers.image.version"       => version,
-    }
-    delete_blank_hash_values(formula_annotations_hash)
+    }.reject { |_, v| v.blank? }
 
     manifests = bottle_hash["bottle"]["tags"].map do |bottle_tag, tag_hash|
       local_file = tag_hash["local_filename"]
@@ -248,8 +247,7 @@ class GitHubPackages
         architecture: architecture,
         os: os,
         "os.version" => os_version,
-      }
-      delete_blank_hash_values(platform_hash)
+      }.reject { |_, v| v.blank? }
 
       tar_sha256 = Digest::SHA256.hexdigest(
         Utils.safe_popen_read("gunzip", "--stdout", "--decompress", local_file),
@@ -268,8 +266,7 @@ class GitHubPackages
         "sh.brew.bottle.digest"             => tar_gz_sha256,
         "sh.brew.bottle.glibc.version"      => glibc_version,
         "sh.brew.tab"                       => tab.to_json,
-      }
-      delete_blank_hash_values(descriptor_annotations_hash)
+      }.reject { |_, v| v.blank? }
 
       annotations_hash = formula_annotations_hash.merge(descriptor_annotations_hash).merge(
         {
@@ -277,8 +274,7 @@ class GitHubPackages
           "org.opencontainers.image.documentation" => documentation,
           "org.opencontainers.image.title"         => "#{formula_full_name} #{tag}",
         },
-      ).sort.to_h
-      delete_blank_hash_values(annotations_hash)
+      ).reject { |_, v| v.blank? }.sort.to_h
 
       image_manifest = {
         schemaVersion: 2,
@@ -386,10 +382,4 @@ class GitHubPackages
 
     [sha256, json.size]
   end
-
-  def delete_blank_hash_values(hash)
-    hash.each do |key, value|
-      hash.delete(key) if value.blank?
-    end
-  end
 end