foreman_bootdisk 21.0.1 → 21.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66231c8d3a35aa4ebbbe3ef624a629c309d74ea4d95a39a009b1b07b60f9ce3f
-  data.tar.gz: 350ccaf1150dd3bfb2e6db920706f6f077783619b2a455f21b9f644a38bda4ca
+  metadata.gz: 73dd028ac8d884cad6c8be76723b7e30842818693cf818181b6ad57e808943c3
+  data.tar.gz: 12c262a0c3df13b954ebd4e617b9cf82c8aead268f2cb938ae5dd4dbdd6a2f49
 SHA512:
-  metadata.gz: '082d9c32af3239beec631cccaf7ff418ce42b74dee910be2fa4ae28cb44fc94193a7d2c6ee3365611823e115f20ac4a311aa196eee3cf98beb4066c116fb2406'
-  data.tar.gz: 8fb0981f8d0cd18d4b40aa7592f15d5f3be3f9acf7c71962491160e4d92527f747ccbb4dbb190c1c4d3b2a70142a1e4e857bae5b47eec321916af644dbc11f7a
+  metadata.gz: bdbb8b993a60425f9541c89c922c374a2d59927c5db934835ded53b6bfe3d770ebbf6ef61c701ffe28e3dac06bbffc91f6d80483d77b94ef1b8d4da9ee05741b
+  data.tar.gz: 13f3eabdc0f14d5bd0aef34843546375765cfac9141b1d69d2c4f95b53bdcde0e972a3aed9b1268f5ac00485b2c04eab119ec7fda245f31d4f1484922eed6ba9

data/app/controllers/foreman_bootdisk/api/v2/disks_controller.rb

@@ -14,10 +14,10 @@ module ForemanBootdisk
         skip_after_action :log_response_body
 
         # no-op, but required for apipie documentation
-        api :GET, '', N_('Boot disks')
+        api :GET, '/bootdisk', N_('Boot disks')
         def index; end
 
-        api :GET, '/generic', N_('Download generic image')
+        api :GET, '/bootdisk/generic', N_('Download generic image')
         def generic
           # EFI not supported for iPXE generic bootdisk
           tmpl = ForemanBootdisk::Renderer.new.generic_template_render
@@ -26,7 +26,7 @@ module ForemanBootdisk
           end
         end
 
-        api :GET, '/hosts/:host_id', N_('Download host image')
+        api :GET, '/bootdisk/hosts/:host_id', N_('Download host image')
         param :full, :bool, required: false, desc: N_('True for full, false for basic reusable image')
         param :host_id, :identifier_dottable, required: true
         def host

data/app/controllers/foreman_bootdisk/api/v2/subnet_disks_controller.rb

@@ -16,10 +16,10 @@ module ForemanBootdisk
         skip_after_action :log_response_body
 
         # no-op, but required for apipie documentation
-        api :GET, '', N_('Subnet boot disks')
+        api :GET, '/bootdisk', N_('Subnet boot disks')
         def index; end
 
-        api :GET, '/subnets/:subnet_id', N_('Download subnet generic image')
+        api :GET, '/bootdisk/subnets/:subnet_id', N_('Download subnet generic image')
         param :subnet_id, :identifier_dottable, required: true
         def subnet
           subnet = @subnet_disk

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -217,7 +217,7 @@ module ForemanBootdisk
           else
             http_object = Net::HTTP
           end
-          http_object.start(uri.host, uri.port) do |http|
+          http_object.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
             request = Net::HTTP::Get.new(uri.request_uri, 'Accept-Encoding' => 'plain')
 
             http.request(request) do |response|

data/config/routes.rb

@@ -14,10 +14,12 @@ ForemanBootdisk::Engine.routes.draw do
 
   namespace :api, defaults: { format: 'json' } do
     scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v1|v2/, constraints: ApiConstraints.new(version: 2, default: true) do
-      get 'generic', to: 'disks#generic'
-      constraints(id: %r{[^/]+}) do
-        get 'hosts/:id', to: 'disks#host'
-        get 'subnets/:id', to: 'subnet_disks#subnet'
+      scope :bootdisk do
+        get 'generic', to: 'disks#generic'
+        constraints(id: %r{[^/]+}) do
+          get 'hosts/:id', to: 'disks#host'
+          get 'subnets/:id', to: 'subnet_disks#subnet'
+        end
       end
     end
   end

data/lib/foreman_bootdisk/engine.rb

@@ -10,7 +10,7 @@ module ForemanBootdisk
     isolate_namespace ForemanBootdisk
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/helpers"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/lib"]
 
@@ -28,6 +28,12 @@ module ForemanBootdisk
       Apipie.configuration.checksum_path += ['/bootdisk/api/']
     end
 
+    # Temporary workaround fix for helpers
+    initializer 'foreman_bootdisk.rails_loading_workaround' do
+      HostsHelper.prepend ForemanBootdisk::HostsHelperExt
+      SubnetsHelper.include ForemanBootdisk::SubnetsHelperExt
+    end
+
     initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_bootdisk do
         requires_foreman '>= 3.4'
@@ -124,7 +130,7 @@ module ForemanBootdisk
               description: N_("Installation media files will be cached for full host images")
 
             setting "bootdisk_allowed_types",
-              type: :string,
+              type: :array,
               default: Setting::Bootdisk.bootdisk_types,
               full_name: N_("Allowed bootdisk types"),
               description: N_("List of allowed bootdisk types, remove type to disable it")
@@ -139,12 +145,6 @@ module ForemanBootdisk
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
-    # Temporary workaround fix for helpers
-    initializer 'foreman_bootdisk.rails_loading_workaround' do
-      HostsHelper.prepend ForemanBootdisk::HostsHelperExt
-      SubnetsHelper.prepend ForemanBootdisk::SubnetsHelperExt
-    end
-
     config.to_prepare do
       begin
         Host::Managed.prepend ForemanBootdisk::HostExt

data/lib/foreman_bootdisk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanBootdisk
-  VERSION = '21.0.1'
+  VERSION = '21.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 21.0.1
+  version: 21.0.3
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman