smart_proxy_pulp 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b877e4d04354d2589c3a051e4723da0e9ab3a1d8e16ff2a27623b250631df05f
-  data.tar.gz: a922da7e9d0981d1a5f90c2a26d81d7d609c25c82f4ffdf1e666ecf92b5eca33
+  metadata.gz: 505ec0472b43a70f2f6c3c27da3586c0d8880665dfec8de14e38f4b5fe61a66c
+  data.tar.gz: 42ca3476e031944a1968e104bc6eee31d8df914c6174c09901964063fa62acfe
 SHA512:
-  metadata.gz: c9356b22cb7f402569342d7fdd3f420af829b0e1fb329b60800f7cb1df0502840c71b596d845491fa21855de88b7094fb92e00e62f053640a4d14ee5b86b51c3
-  data.tar.gz: '095e9ae318f742a89a286beac7167e8d699b874f9adae6846947164c7e5ed6f1c02832c7bf69ea1caded394300d4be0b83aa62771ff8e3ecd0f4e7dd69a3f76a'
+  metadata.gz: 0a83d77270955785b69d3d777b86a089b632c32561eb7072a24e3fcafee382595a438fa6ff6e160f8e358f1d223f3cae98d0772e94272d181fdbe8fcb6031a90
+  data.tar.gz: 874d123e511b960abdd7da9cd70b9a2a743bfcb91173f8b5cf5382f780917f1fdbf3a4f7e740259eb0a874699384d94fb6a09b43e57952ee18e3c63cdb8a9023

data/lib/smart_proxy_pulp.rb

@@ -1,4 +1,4 @@
 require 'smart_proxy_pulp_plugin/version'
 require 'smart_proxy_pulp_plugin/pulp_plugin'
 require 'smart_proxy_pulp_plugin/pulp_node_plugin'
-require 'smart_proxy_pulp_plugin/pulp3_plugin'
+require 'smart_proxy_pulp_plugin/pulpcore_plugin'

data/lib/smart_proxy_pulp_plugin/pulpcore_api.rb

@@ -0,0 +1,20 @@
+require 'sinatra'
+require 'smart_proxy_pulp_plugin/pulpcore_client'
+require 'smart_proxy_pulp_plugin/disk_usage'
+
+module PulpProxy
+  class PulpcoreApi < Sinatra::Base
+    helpers ::Proxy::Helpers
+
+    get '/status' do
+      content_type :json
+      begin
+        result = PulpcoreClient.get("/pulp/api/v3/status/")
+        return result.body if result.is_a?(Net::HTTPSuccess)
+        log_halt result.code, "Pulp server at #{::PulpProxy::Settings.settings.pulp_url} returned an error: '#{result.message}'"
+      rescue SocketError, Errno::ECONNREFUSED => e
+        log_halt 503, "Communication error with '#{URI.parse(::PulpProxy::Settings.settings.pulp_url.to_s).host}': #{e.message}"
+      end
+    end
+  end
+end

data/lib/smart_proxy_pulp_plugin/{pulp3_client.rb → pulpcore_client.rb}

@@ -5,9 +5,9 @@ require 'smart_proxy_pulp_plugin/settings'
 require 'proxy/log'
 
 module PulpProxy
-  class Pulp3Client
+  class PulpcoreClient
     def self.get(path)
-      uri = URI.parse(::PulpProxy::Pulp3Plugin.settings.pulp_url.to_s)
+      uri = URI.parse(::PulpProxy::PulpcorePlugin.settings.pulp_url.to_s)
       req = Net::HTTP::Get.new(URI.join(uri.to_s.chomp('/') + '/', path))
       req.add_field('Accept', 'application/json')
       self.http.request(req)
@@ -26,7 +26,7 @@ module PulpProxy
     end
 
     def self.http
-      uri = URI.parse(::PulpProxy::Pulp3Plugin.settings.pulp_url.to_s)
+      uri = URI.parse(::PulpProxy::PulpcorePlugin.settings.pulp_url.to_s)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = uri.scheme == 'https'
       http

data/lib/smart_proxy_pulp_plugin/pulpcore_http_config.ru

@@ -0,0 +1,5 @@
+require 'smart_proxy_pulp_plugin/pulpcore_api'
+
+map "/pulpcore" do
+  run PulpProxy::PulpcoreApi
+end

data/lib/smart_proxy_pulp_plugin/{pulp3_plugin.rb → pulpcore_plugin.rb}

@@ -1,12 +1,10 @@
 require 'smart_proxy_pulp_plugin/validators/pulp_url_validator'
 
 module PulpProxy
-  class Pulp3Plugin < ::Proxy::Plugin
-    plugin "pulp3", ::PulpProxy::VERSION
+  class PulpcorePlugin < ::Proxy::Plugin
+    plugin "pulpcore", ::PulpProxy::VERSION
     default_settings :pulp_url => 'https://localhost',
                      :content_app_url => 'https://localhost:24816/',
-                     :pulp_dir => '/var/lib/pulp',
-                     :pulp_content_dir => '/var/lib/pulp/content',
                      :mirror => false
 
     load_validators :url => ::PulpProxy::Validators::PulpUrlValidator
@@ -17,9 +15,9 @@ module PulpProxy
     expose_setting :mirror
     expose_setting :content_app_url
     capability( lambda do ||
-      Pulp3Client.capabilities
+      PulpcoreClient.capabilities
     end)
-    http_rackup_path File.expand_path("pulp3_http_config.ru", File.expand_path("../", __FILE__))
-    https_rackup_path File.expand_path("pulp3_http_config.ru", File.expand_path("../", __FILE__))
+    http_rackup_path File.expand_path("pulpcore_http_config.ru", File.expand_path("../", __FILE__))
+    https_rackup_path File.expand_path("pulpcore_http_config.ru", File.expand_path("../", __FILE__))
   end
 end

data/lib/smart_proxy_pulp_plugin/version.rb

@@ -1,3 +1,3 @@
 module PulpProxy
-  VERSION = "1.6.0"
+  VERSION = "2.0.0"
 end

data/settings.d/{pulp3.yml.example → pulpcore.yml.example}

@@ -2,6 +2,4 @@
 :enabled: true
 #:pulp_url: https://localhost/
 #:content_app_url: https://localhost:24816/
-#:pulp_dir: /var/lib/pulp
-#:pulp_content_dir: /var/lib/pulp/content
 #:mirror: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_pulp
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -92,21 +92,21 @@ files:
 - bundler.d/pulp.rb
 - lib/smart_proxy_pulp.rb
 - lib/smart_proxy_pulp_plugin/disk_usage.rb
-- lib/smart_proxy_pulp_plugin/pulp3_api.rb
-- lib/smart_proxy_pulp_plugin/pulp3_client.rb
-- lib/smart_proxy_pulp_plugin/pulp3_http_config.ru
-- lib/smart_proxy_pulp_plugin/pulp3_plugin.rb
 - lib/smart_proxy_pulp_plugin/pulp_api.rb
 - lib/smart_proxy_pulp_plugin/pulp_client.rb
 - lib/smart_proxy_pulp_plugin/pulp_http_config.ru
 - lib/smart_proxy_pulp_plugin/pulp_node_http_config.ru
 - lib/smart_proxy_pulp_plugin/pulp_node_plugin.rb
 - lib/smart_proxy_pulp_plugin/pulp_plugin.rb
+- lib/smart_proxy_pulp_plugin/pulpcore_api.rb
+- lib/smart_proxy_pulp_plugin/pulpcore_client.rb
+- lib/smart_proxy_pulp_plugin/pulpcore_http_config.ru
+- lib/smart_proxy_pulp_plugin/pulpcore_plugin.rb
 - lib/smart_proxy_pulp_plugin/settings.rb
 - lib/smart_proxy_pulp_plugin/validators/pulp_url_validator.rb
 - lib/smart_proxy_pulp_plugin/version.rb
 - settings.d/pulp.yml.example
-- settings.d/pulp3.yml.example
+- settings.d/pulpcore.yml.example
 - settings.d/pulpnode.yml.example
 homepage: https://github.com/theforeman/smart-proxy-pulp-plugin
 licenses:

data/lib/smart_proxy_pulp_plugin/pulp3_api.rb

@@ -1,38 +0,0 @@
-require 'sinatra'
-require 'smart_proxy_pulp_plugin/pulp3_client'
-require 'smart_proxy_pulp_plugin/disk_usage'
-
-module PulpProxy
-  class Pulp3Api < Sinatra::Base
-    helpers ::Proxy::Helpers
-
-    get '/status' do
-      content_type :json
-      begin
-        result = Pulp3Client.get("/pulp/api/v3/status/")
-        return result.body if result.is_a?(Net::HTTPSuccess)
-        log_halt result.code, "Pulp server at #{::PulpProxy::Settings.settings.pulp_url} returned an error: '#{result.message}'"
-      rescue SocketError, Errno::ECONNREFUSED => e
-        log_halt 503, "Communication error with '#{URI.parse(::PulpProxy::Settings.settings.pulp_url.to_s).host}': #{e.message}"
-      end
-    end
-
-    get '/status/disk_usage' do
-      content_type :json
-      if params[:size]
-        size = params[:size] ? params[:size].to_sym : nil
-        log_halt 400, "size parameter must be of: #{DiskUsage::SIZE.keys.join(',')}" unless DiskUsage::SIZE.include?(size)
-      else
-        size = :byte
-      end
-
-      monitor_dirs = Hash[::PulpProxy::Pulp3Plugin.settings.marshal_dump.select { |key, _| key == :pulp_dir || key == :pulp_content_dir }]
-      begin
-        pulp_disk = DiskUsage.new({:path => monitor_dirs, :size => size.to_sym})
-        pulp_disk.to_json
-      rescue ::Proxy::Error::ConfigurationError
-        log_halt 500, 'Could not find df command to evaluate disk space'
-      end
-    end
-  end
-end

data/lib/smart_proxy_pulp_plugin/pulp3_http_config.ru

@@ -1,5 +0,0 @@
-require 'smart_proxy_pulp_plugin/pulp3_api'
-
-map "/pulp3" do
-  run PulpProxy::Pulp3Api
-end