foreman_bootdisk 21.0.0 → 21.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 637d590cf13dbcf6512da5bd13ccb380304c0affff50e1528581bf61ca0603e6
-  data.tar.gz: 315c48d5f916315f6893bb3c69d4dae17567d4b8c7a073eb887ffbe80ecedeb4
+  metadata.gz: 1af794db64199b1cb16cc9ddc7c9effc086930bba2ce77ccb890a3db932f3450
+  data.tar.gz: 71645b371a4f7ada01b3630e977e5ffa109d2111845963569b46e88f8cab5923
 SHA512:
-  metadata.gz: 79b5f0a3d831e29ef08539710a39f5557d11122a44b2ebfbc0fbc0c9c9a9b9753816affdaf7450e82780aaa03c60eda8daae47e4d79cf183442566d67a68705e
-  data.tar.gz: c8a27d561bcfe068088b895468cbca4b8834946d27d74bf6bc873a9213ae8deab625a5eb4975e50e3c49c3ed5d081080e8f0311e8977f9ed46ce1eaff76e6f8f
+  metadata.gz: 274f768d29de9360586a51f07ae5f8c142457c0548a71438a7b136dc5dcb165eaa65def7fdb479fac5fead9bca0240deec1ca3f5ae55095198e06204eb6f9b0f
+  data.tar.gz: 29304e2d2a0048e22b6bc7027dd8135f27d9a65b25f26df293da4484cecb7917176771c732656897f192cf6da7cb5d0560f25e5161cfb7383bc410b82fa6fdab

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/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/db/migrate/20221102105354_fix_bootdisk_settings_category_to_dsl.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FixBootdiskSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::Bootdisk').update_all(category: 'Setting')
+  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'
@@ -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.0'
+  VERSION = '21.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 21.0.0
+  version: 21.0.2
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -84,6 +84,7 @@ files:
 - db/migrate/20131021095100_edit_host_bootdisk_template_dns_secondary.rb
 - db/migrate/20140522185700_change_templatekind_to_bootdisk.rb
 - db/migrate/20171009225200_remove_duplicate_bootdisk_templates.rb
+- db/migrate/20221102105354_fix_bootdisk_settings_category_to_dsl.rb
 - lib/foreman_bootdisk.rb
 - lib/foreman_bootdisk/engine.rb
 - lib/foreman_bootdisk/version.rb