smart_proxy_container_gateway 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470113167c3182629d62ee7babddf775b3e99e4c21ce0df5a9716894867dad86
-  data.tar.gz: 7adbe20e3c0dda9a9a3704501144c5f4134c7d9c266f36b19f24e83df09ad997
+  metadata.gz: 18efc25667d7b93246b04af0253ff987efa2baca6d20f6b1ca7ee65f3e94dbe5
+  data.tar.gz: a080fe48ebe31b22c4e16df541b42f3799dbd9f555b10bdff6a5254fd7f303b0
 SHA512:
-  metadata.gz: b017c8a19c575d9ddcae254500917089eef21739914b5dc73447ba39af9840679028a4401bf15fd1216ae7299b7da7f55c6200a87830d7553fd8b380bc6c821b
-  data.tar.gz: e37b37684d5eaace152ab018067f4fa9292a5f5663543e030ed07eba894e59d6486c6b43a0c465c11dd7de65af14599b2e54a22882ff541dd5cb45e1ae381776
+  metadata.gz: d574b549219ebe60652ae47f6af6438cb0727fb61d6063cca939295fea68d598f83f50c5d70996d8a1c208ccdec77251bdb2aac68768dd81e62def245fe884be
+  data.tar.gz: c9daa667b3af3337bdea2cfb7fcba4042fd8f0d8a2eb7351d71194b12e05f546f331e113ba289d8b3e0c1ab8537eb5efcf4bb59b3a2e5c44e35c7ae3d0ec27a9

data/lib/smart_proxy_container_gateway/container_gateway_main.rb

@@ -195,29 +195,40 @@ module Proxy
         # Insert all in a single transaction
         database.connection.transaction(isolation: :serializable, retry_on: [Sequel::SerializationFailure]) do
           hosts_repositories.delete
-          hosts_repositories.import(%i[repository_id host_id], entries)
+          hosts_repositories.import(%i[repository_id host_id], entries) unless entries.nil? || entries.empty?
         end
       end
 
       def build_host_repository_mapping(host_repo_maps)
+        return [] if host_repo_maps['hosts'].nil?
+
         hosts = database.connection[:hosts]
         repositories = database.connection[:repositories]
+
         entries = host_repo_maps['hosts'].flat_map do |host_map|
           host_map.filter_map do |host_uuid, repos|
-            host = hosts[{ uuid: host_uuid }]
-            next unless host
-
-            repo_names = repos
-                         .select { |repo| repo['auth_required'].to_s.downcase == "true" }
-                         .map { |repo| repo['repository'] }
-
-            repositories
-              .where(name: repo_names, auth_required: true)
-              .select(:id)
-              .map { |repo| [repo[:id], host[:id]] }
+            build_host_entries(hosts, repositories, host_uuid, repos)
           end
         end
-        entries.flatten!(1)
+        entries&.flatten(1)&.compact
+      end
+
+      def build_host_entries(hosts, repositories, host_uuid, repos)
+        host = hosts[{ uuid: host_uuid }]
+        return unless host
+        return if repos.nil? || repos.empty?
+
+        repo_names = extract_auth_required_repo_names(repos)
+        repositories
+          .where(name: repo_names, auth_required: true)
+          .select(:id)
+          .map { |repo| [repo[:id], host[:id]] }
+      end
+
+      def extract_auth_required_repo_names(repos)
+        repos
+          .select { |repo| repo['auth_required'].to_s.downcase == "true" }
+          .map { |repo| repo['repository'] }
       end
 
       def update_host_repositories(uuid, repositories)

data/lib/smart_proxy_container_gateway/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module ContainerGateway
-    VERSION = '3.4.0'.freeze
+    VERSION = '3.4.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_container_gateway
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Ian Ballou
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Pulp 3 container registry support for Foreman/Katello Smart-Proxy
 test_files: []