smart_proxy_container_gateway 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a911ad6150f04b74e216b6f23aa6ac56e95d40b9e356a9a10ff371910e3f417
-  data.tar.gz: d4555205824e57baadc3dbadb8e27a417dea5c473d9ad8523d48364a87bc3116
+  metadata.gz: ed0a914e50f04c3851c5ddde3f117ed6ab10d87912c1736cd229d270e44f9043
+  data.tar.gz: cc6e50ca1142aa6e4a8103092033bafb8c0b29e342bc8edb303b7ecf4e53ddf7
 SHA512:
-  metadata.gz: dde5105d42b3b1c566f8713e2e0727dd8af35417266f44bc74b86ea06263c290272f92d2caaa023cc0a23cc7ca9551e2f5b1c7e7b57e1fc061ea13e53aca51ae
-  data.tar.gz: 2710e2eed201d458c22193ae9f06ccd78b3de6e9a669585de93970646d2cdeff2f1f88aee428d4b1c7f9c46108f00f61aa115b2dcfca7ed5b2ee2bb7fbd3aa88
+  metadata.gz: 87a98b19c70679c4e1529adf4b080e8b9c5bd78fdde4db87709f76743eb43ad8b6ee0552a42bfc03465d36679da768e4d4f8c5ef8daca58dcd31d07e256bd9d2
+  data.tar.gz: 470244c840404138894b8f22991cc65cbdb429b0764632ac4e1a87444f7e0d67319a7277c7f9bac22665c3b2808d47e3b0ed05f519aec16bf6081d84878f5ea8

data/lib/smart_proxy_container_gateway/container_gateway.rb

@@ -5,22 +5,24 @@ module Proxy
     class Plugin < ::Proxy::Plugin
       plugin 'container_gateway', Proxy::ContainerGateway::VERSION
 
-      begin
-        SETTINGS = Proxy::Settings.initialize_global_settings
+      default_settings :pulp_endpoint => "https://#{`hostname`.strip}",
+                       :katello_registry_path => '/v2/',
+                       :sqlite_db_path => '/var/lib/foreman-proxy/smart_proxy_container_gateway.db'
 
-        default_settings :pulp_endpoint => "https://#{`hostname`.strip}",
-                         :pulp_client_ssl_ca => SETTINGS.foreman_ssl_ca,
-                         :pulp_client_ssl_cert => SETTINGS.foreman_ssl_cert,
-                         :pulp_client_ssl_key => SETTINGS.foreman_ssl_key,
-                         :katello_registry_path => '/v2/',
-                         :sqlite_db_path => '/var/lib/foreman-proxy/smart_proxy_container_gateway.db'
-      rescue Errno::ENOENT
-        logger.warn("Default settings could not be loaded.  Default certs will not be set.")
-        default_settings :pulp_endpoint => "https://#{`hostname`.strip}",
-                         :katello_registry_path => '/v2/',
-                         :sqlite_db_path => '/var/lib/foreman-proxy/smart_proxy_container_gateway.db'
+      # Load defaults that copy values from SETTINGS. This is done as
+      # programmable settings since SETTINGS isn't initialized during plugin
+      # loading.
+      load_programmable_settings do |settings|
+        settings[:pulp_client_ssl_ca] ||= SETTINGS.foreman_ssl_ca
+        settings[:pulp_client_ssl_cert] ||= SETTINGS.foreman_ssl_cert
+        settings[:pulp_client_ssl_key] ||= SETTINGS.foreman_ssl_key
       end
 
+      # TODO: sqlite_db_path should able be readable or creatable. There's no
+      # test for creatable
+      validate_readable :pulp_client_ssl_ca, :pulp_client_ssl_cert, :pulp_client_ssl_key
+      validate :pulp_endpoint, url: true
+
       rackup_path File.join(__dir__, 'container_gateway_http_config.ru')
     end
   end

data/lib/smart_proxy_container_gateway/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module ContainerGateway
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_container_gateway
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ian Ballou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel