smart_proxy_container_gateway 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18efc25667d7b93246b04af0253ff987efa2baca6d20f6b1ca7ee65f3e94dbe5
-  data.tar.gz: a080fe48ebe31b22c4e16df541b42f3799dbd9f555b10bdff6a5254fd7f303b0
+  metadata.gz: 715c97cadccbfc6c3c06c9aeb85e2b17115d10f045ee042d73eb8c236e669b43
+  data.tar.gz: d3b12b7ba4bb3c32afe6fe11926cc749b721f0cbcbe1f1b587ef6bfaf5222c03
 SHA512:
-  metadata.gz: d574b549219ebe60652ae47f6af6438cb0727fb61d6063cca939295fea68d598f83f50c5d70996d8a1c208ccdec77251bdb2aac68768dd81e62def245fe884be
-  data.tar.gz: c9daa667b3af3337bdea2cfb7fcba4042fd8f0d8a2eb7351d71194b12e05f546f331e113ba289d8b3e0c1ab8537eb5efcf4bb59b3a2e5c44e35c7ae3d0ec27a9
+  metadata.gz: 6b3a173a1d5bacb8962effdd385b2513abea50c367f6b69f316a3e2b6a52d9f251319b6046c2cc7d3499a04abe9114229c537320b1bbb384a852d0cafc66966f
+  data.tar.gz: 13c04e0b4e0cc47af5fc53e9321bba2e3ae55cf681194e50bc4a08b8a0495a495985be5081843aed823a383a82d0a29dc8f8cbf46ade1a01d2d4acbd248076b8

data/lib/smart_proxy_container_gateway/container_gateway.rb

@@ -7,7 +7,9 @@ module Proxy
 
       default_settings :pulp_endpoint => "https://#{`hostname`.strip}",
                        :katello_registry_path => '/v2/',
-                       :sqlite_timeout => 30_000
+                       :sqlite_timeout => 30_000,
+                       :db_max_connections => 30,
+                       :db_pool_timeout => 30
 
       # Load defaults that copy values from SETTINGS. This is done as
       # programmable settings since SETTINGS isn't initialized during plugin
@@ -36,7 +38,10 @@ module Proxy
             "sqlite://#{settings[:sqlite_db_path]}?timeout=#{settings[:sqlite_timeout]}"
           end
 
-          Proxy::ContainerGateway::Database.new(connection_string, settings[:sqlite_db_path])
+          Proxy::ContainerGateway::Database.new(connection_string,
+                                                settings[:db_max_connections],
+                                                settings[:db_pool_timeout],
+                                                settings[:sqlite_db_path])
         end)
         container_instance.singleton_dependency :container_gateway_main_impl, (lambda do
           Proxy::ContainerGateway::ContainerGatewayMain.new(

data/lib/smart_proxy_container_gateway/container_gateway_api.rb

@@ -262,7 +262,8 @@ module Proxy
         database.connection.transaction(isolation: :serializable, retry_on: [Sequel::SerializationFailure]) do
           hosts_table = database.connection[:hosts]
           hosts_table.delete
-          hosts_table.import(%i[uuid], hosts.map { |host| [host['uuid']] })
+          valid_hosts = hosts.filter_map { |host| [host['uuid']] if host['uuid'].present? }
+          hosts_table.import(%i[uuid], valid_hosts) unless valid_hosts.empty?
         end
         {}
       end
@@ -277,6 +278,8 @@ module Proxy
         do_authorize_any
         params['hosts'].flat_map do |host_map|
           host_map.filter_map do |host_uuid, repos|
+            next if host_uuid.nil? || host_uuid.to_s.strip.empty?
+
             if repos.nil? || repos.empty?
               repo_names = []
             else

data/lib/smart_proxy_container_gateway/container_gateway_main.rb

@@ -214,6 +214,8 @@ module Proxy
       end
 
       def build_host_entries(hosts, repositories, host_uuid, repos)
+        return if host_uuid.nil? || host_uuid.to_s.strip.empty?
+
         host = hosts[{ uuid: host_uuid }]
         return unless host
         return if repos.nil? || repos.empty?
@@ -232,7 +234,11 @@ module Proxy
       end
 
       def update_host_repositories(uuid, repositories)
+        return if uuid.nil? || uuid.to_s.strip.empty?
+
         host = find_or_create_host(uuid)
+        return unless host
+
         hosts_repositories = database.connection[:hosts_repositories]
         database.connection.transaction(isolation: :serializable,
                                         retry_on: [Sequel::SerializationFailure],

data/lib/smart_proxy_container_gateway/database.rb

@@ -4,9 +4,9 @@ module Proxy
     class Database
       attr_reader :connection
 
-      def initialize(connection_string, prior_sqlite_db_path = nil)
+      def initialize(connection_string, db_max_connections, db_pool_timeout, prior_sqlite_db_path = nil)
         Sequel.default_timezone = :local
-        @connection = Sequel.connect(connection_string)
+        @connection = Sequel.connect(connection_string, max_connections: db_max_connections, pool_timeout: db_pool_timeout)
         if connection_string.start_with?('sqlite://')
           @connection.run("PRAGMA foreign_keys = ON;")
           @connection.run("PRAGMA journal_mode = wal;")

data/lib/smart_proxy_container_gateway/version.rb

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

data/settings.d/container_gateway.yml.example

@@ -9,6 +9,8 @@
 #:katello_registry_path: '/v2/'
 
 #:db_connection_string: postgresql:///container_gateway
+#:db_max_connections: 30
+#:db_pool_timeout: 30
 
 # Legacy options
 #:sqlite_db_path: '/var/lib/foreman-proxy/smart_proxy_container_gateway.db'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_container_gateway
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Ian Ballou
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="