foreman_bootdisk 13.0.0 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d43b8549de63eaac53bdccedfed1db1c8c96f9481ee411724686686476e01767
-  data.tar.gz: 30d918f87198e96711e2d75506127bb7ded00cafef415e5eaa176c24810f1a94
+  metadata.gz: dd7cc51c2b0f332b25d13f49d22c813c0ed28fb9b6e34238a7f44cfd40eddda1
+  data.tar.gz: f46b68427bbd016563ef186a9ed2cacbaf8f271c8da421db5f7eefb21eb363c6
 SHA512:
-  metadata.gz: c8d73855b7dbf1f7ed717883a56813917d1fba38ca226cf77fa0c73005b38e44220563bd411c112c636182ba328d52ef336b912c80c7c356f29a4d8bb29687ab
-  data.tar.gz: 832d7248d4bc1364f17507dad46325cd929e719790d3ebe08529459a21762d557987d908c5fca82d632bd8e522df3f4a1ba34b49a24faff60a0f5ebc0c6b5251
+  metadata.gz: cefbdba361acd20cdfb1a9137010da3290b8170fe9bf8bafc9f786f514acb7b81a5b448f4b8f794d5416800f5cdcf3faad55693efd6672fbe454375ae84ecf3c
+  data.tar.gz: b00a6e9af217a60d776508e3e076077729ebd0360cf3bdb246a71be9e307abeef10bc42c46a68f23834153a8fa86123eeb14cfafe007aa29c77b38087a3f612f

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v14.0.0
+* use new medium provider framework
+* droped some unused code
+
 ## v13.0.0
 * static credentials failover
 * Rails 5.2 support

data/README.md

@@ -47,8 +47,9 @@ gPXE images are unsupported due to lack of initrd support.
 | >= 1.15         | ~> 10.0        |
 | >= 1.17         | ~> 11.0        |
 | >= 1.18         | ~> 12.0        |
-| >= 1.19         | ~> 12.0        |
-| >= 1.20         | ~> 13.0        |
+| >= 1.19         | ~> 13.0        |
+| >= 1.20         | ~> 14.0        |
+| >= 1.21         | ~> 15.0        |
 
 # Usage
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module ForemanBootdisk
@@ -7,10 +9,10 @@ module ForemanBootdisk
         include ::Api::Version2
 
         resource_description do
-          api_base_url "/bootdisk/api"
+          api_base_url '/bootdisk/api'
         end
 
-        before_action :find_resource, :only => :host
+        before_action :find_resource, only: :host
         skip_after_action :log_response_body
 
         # no-op, but required for apipie documentation
@@ -20,24 +22,24 @@ module ForemanBootdisk
         api :GET, '/generic', N_('Download generic image')
         def generic
           tmpl = ForemanBootdisk::Renderer.new.generic_template_render
-          ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
-            send_data read_file(iso), :filename => "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
+          ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl) do |iso|
+            send_data read_file(iso), filename: "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
           end
         end
 
         api :GET, '/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
+        param :full, :bool, required: false, desc: N_('True for full, false for basic reusable image')
+        param :host_id, :identifier_dottable, required: true
         def host
           host = @disk
           if params[:full]
             ForemanBootdisk::ISOGenerator.generate_full_host(host) do |iso|
-              send_data read_file(iso), :filename => "#{host.name}#{ForemanBootdisk::ISOGenerator.token_expiry(host)}.iso"
+              send_data read_file(iso), filename: "#{host.name}#{ForemanBootdisk::ISOGenerator.token_expiry(host)}.iso"
             end
           else
             tmpl = host.bootdisk_template_render
-            ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
-              send_data read_file(iso), :filename => "#{host.name}.iso"
+            ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl) do |iso|
+              send_data read_file(iso), filename: "#{host.name}.iso"
             end
           end
         end

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

@@ -1,37 +1,43 @@
-require 'uri'
-
-module ForemanBootdisk::Api::V2
-  class SubnetDisksController < ::Api::V2::BaseController
-    include ::Api::Version2
-
-    resource_description do
-      api_base_url "/bootdisk/api"
-    end
-
-    before_action :find_resource, :only => :subnet
+# frozen_string_literal: true
 
-    skip_after_action :log_response_body
-
-    # no-op, but required for apipie documentation
-    api :GET, '', N_('Subnet boot disks')
-    def index; end
+require 'uri'
 
-    api :GET, '/subnets/:subnet_id', N_('Download subnet generic image')
-    param :subnet_id, :identifier_dottable, :required => true
-    def subnet
-      subnet = @subnet_disk
-      subnet.tftp || raise(::Foreman::Exception.new(N_("TFTP feature not enabled for subnet %s"), subnet.name))
-      tmpl = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
-        name=subnet.name
-        send_data File.read(iso), :filename => "bootdisk_subnet_#{name}.iso"
+module ForemanBootdisk
+  module Api
+    module V2
+      class SubnetDisksController < ::Api::V2::BaseController
+        include ::Api::Version2
+
+        resource_description do
+          api_base_url '/bootdisk/api'
+        end
+
+        before_action :find_resource, only: :subnet
+
+        skip_after_action :log_response_body
+
+        # no-op, but required for apipie documentation
+        api :GET, '', N_('Subnet boot disks')
+        def index; end
+
+        api :GET, '/subnets/:subnet_id', N_('Download subnet generic image')
+        param :subnet_id, :identifier_dottable, required: true
+        def subnet
+          subnet = @subnet_disk
+          subnet.tftp || raise(::Foreman::Exception.new(N_('TFTP feature not enabled for subnet %s'), subnet.name))
+          tmpl = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
+          ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl) do |iso|
+            name = subnet.name
+            send_data File.read(iso), filename: "bootdisk_subnet_#{name}.iso"
+          end
+        end
+
+        private
+
+        def resource_scope
+          Subnet.authorized('view_subnets')
+        end
       end
     end
-
-    private
-
-    def resource_scope
-      Subnet.authorized('view_subnets')
-    end
   end
 end

data/app/controllers/foreman_bootdisk/disks_controller.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module ForemanBootdisk
   class DisksController < ::ApplicationController
-    before_action :find_resource, :only => %w[host full_host subnet]
+    before_action :find_resource, only: %w[host full_host subnet]
 
     # as this engine is isolated, we need to include url helpers from core explicitly
     # to render help page layout
@@ -11,14 +13,14 @@ module ForemanBootdisk
     def generic
       begin
         tmpl = ForemanBootdisk::Renderer.new.generic_template_render
-      rescue => e
+      rescue StandardError => e
         error_rendering(e)
         redirect_back(fallback_location: '/')
         return
       end
 
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
-        send_data read_file(iso), :filename => "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
+      ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl) do |iso|
+        send_data read_file(iso), filename: "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
       end
     end
 
@@ -26,43 +28,42 @@ module ForemanBootdisk
       host = @disk
       begin
         tmpl = host.bootdisk_template_render
-      rescue => e
+      rescue StandardError => e
         error_rendering(e)
         redirect_back(fallback_location: '/')
         return
       end
 
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
-        send_data read_file(iso), :filename => "#{host.name}.iso"
+      ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl) do |iso|
+        send_data read_file(iso), filename: "#{host.name}.iso"
       end
     end
 
     def full_host
       host = @disk
       ForemanBootdisk::ISOGenerator.generate_full_host(host) do |iso|
-        send_data read_file(iso), :filename => "#{host.name}#{ForemanBootdisk::ISOGenerator.token_expiry(host)}.iso"
+        send_data read_file(iso), filename: "#{host.name}#{ForemanBootdisk::ISOGenerator.token_expiry(host)}.iso"
       end
     end
 
     def subnet
       host = @disk
       begin
-        subnet = host.try(:subnet) || raise(::Foreman::Exception.new(N_("Subnet is not assigned to the host %s"), host.name))
-        subnet.tftp || raise(::Foreman::Exception.new(N_("TFTP feature not enabled for subnet %s"), subnet.name))
+        subnet = host.try(:subnet) || raise(::Foreman::Exception.new(N_('Subnet is not assigned to the host %s'), host.name))
+        subnet.tftp || raise(::Foreman::Exception.new(N_('TFTP feature not enabled for subnet %s'), subnet.name))
         tmpl = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
-      rescue => e
+      rescue StandardError => e
         error_rendering(e)
         redirect_back(fallback_location: '/')
         return
       end
 
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
-        send_data read_file(iso), :filename => "bootdisk_subnet_#{subnet.name}.iso"
+      ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl) do |iso|
+        send_data read_file(iso), filename: "bootdisk_subnet_#{subnet.name}.iso"
       end
     end
 
-    def help
-    end
+    def help; end
 
     private
 
@@ -70,14 +71,14 @@ module ForemanBootdisk
       File.read(filename)
     end
 
-    def resource_scope(controller = controller_name)
+    def resource_scope(_controller = controller_name)
       Host::Managed.authorized(:view_hosts)
     end
 
-    def error_rendering(e)
+    def error_rendering(exception)
       msg = _('Failed to render boot disk template')
-      error("#{msg}: #{e.message}")
-      ::Foreman::Logging.exception(msg, e)
+      error("#{msg}: #{exception.message}")
+      ::Foreman::Logging.exception(msg, exception)
     end
   end
 end

data/app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb

@@ -1,58 +1,99 @@
-module ForemanBootdisk::HostsHelperExt
-  def host_title_actions(*args)
-    if @host.bootdisk_downloadable?
-      title_actions(
-        button_group(
-          select_action_button(_('Boot disk'), {:class => 'btn btn-group'},
-            display_bootdisk_link_if_authorized(_("Host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'host', :id => @host}, :class=>'la'),
-            display_bootdisk_link_if_authorized(_("Full host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'full_host', :id => @host}, :class=>'la'),
-            content_tag(:li, "", :class => "divider"),
-            display_bootdisk_link_if_authorized(_("Generic image"), {:controller => 'foreman_bootdisk/disks', :action => 'generic'}, :class=>'la'),
-            display_bootdisk_for_subnet,
-            content_tag(:li, "", :class => "divider"),
-            display_bootdisk_link_if_authorized(_("Help"), {:controller => 'foreman_bootdisk/disks', :action => 'help'}, :class=>'la')
+# frozen_string_literal: true
+
+module ForemanBootdisk
+  module HostsHelperExt
+    def host_title_actions(*args)
+      if @host.bootdisk_downloadable?
+        title_actions(
+          button_group(
+            select_action_button(
+              _('Boot disk'), { class: 'btn btn-group' },
+              display_bootdisk_link_if_authorized(
+                _("Host '%s' image") % @host.name.split('.')[0],
+                {
+                  controller: 'foreman_bootdisk/disks',
+                  action: 'host',
+                  id: @host
+                },
+                class: 'la'
+              ),
+              display_bootdisk_link_if_authorized(
+                _("Full host '%s' image") % @host.name.split('.')[0],
+                {
+                  controller: 'foreman_bootdisk/disks',
+                  action: 'full_host',
+                  id: @host
+                },
+                class: 'la'
+              ),
+              content_tag(:li, '', class: 'divider'),
+              display_bootdisk_link_if_authorized(
+                _('Generic image'),
+                {
+                  controller: 'foreman_bootdisk/disks',
+                  action: 'generic'
+                },
+                class: 'la'
+              ),
+              display_bootdisk_for_subnet,
+              content_tag(:li, '', class: 'divider'),
+              display_bootdisk_link_if_authorized(
+                _('Help'), {
+                  controller: 'foreman_bootdisk/disks',
+                  action: 'help'
+                },
+                class: 'la'
+              )
+            )
           )
         )
-      )
-    else
-      bootdisk_button_disabled
-    end
+      else
+        bootdisk_button_disabled
+      end
 
-    super
-  end
+      super
+    end
 
-  def bootdisk_button_disabled
-    title_actions(
-      button_group(
-        link_to(_("Boot disk"), '#', :disabled => true, :class => 'btn btn-default',
-                :title => _("Boot disk download not available for %s architecture") % @host.architecture.name)
+    def bootdisk_button_disabled
+      title_actions(
+        button_group(
+          link_to(_('Boot disk'), '#', disabled: true, class: 'btn btn-default',
+                                       title: _('Boot disk download not available for %s architecture') % @host.architecture.name)
+        )
       )
-    )
-  end
+    end
 
-  # need to wrap this one in a test for template proxy presence
-  def display_bootdisk_for_subnet
-    if (proxy = @host.try(:subnet).try(:tftp)) && proxy.has_feature?('Templates')
-      display_bootdisk_link_if_authorized(_("Subnet '%s' generic image") % @host.subnet.name, {:controller => 'foreman_bootdisk/disks', :action => 'subnet', :id => @host}, :class=>'la')
-    else
-      ""
+    # need to wrap this one in a test for template proxy presence
+    def display_bootdisk_for_subnet
+      if (proxy = @host.try(:subnet).try(:tftp)) && proxy.has_feature?('Templates')
+        display_bootdisk_link_if_authorized(
+          _("Subnet '%s' generic image") % @host.subnet.name, {
+            controller: 'foreman_bootdisk/disks',
+            action: 'subnet',
+            id: @host
+          },
+          class: 'la'
+        )
+      else
+        ''
+      end
     end
-  end
 
-  # Core Foreman helpers can't look up a URL against a mounted engine
-  def display_bootdisk_link_if_authorized(name, options = {}, html_options = {})
-    if bootdisk_authorized_for(options)
-      link_to(name, bootdisk_url(options), html_options)
-    else
-      ""
+    # Core Foreman helpers can't look up a URL against a mounted engine
+    def display_bootdisk_link_if_authorized(name, options = {}, html_options = {})
+      if bootdisk_authorized_for(options)
+        link_to(name, bootdisk_url(options), html_options)
+      else
+        ''
+      end
     end
-  end
 
-  def bootdisk_url(options)
-    ForemanBootdisk::Engine.routes.url_for(options.merge(:only_path => true, :script_name => foreman_bootdisk_path))
-  end
+    def bootdisk_url(options)
+      ForemanBootdisk::Engine.routes.url_for(options.merge(only_path: true, script_name: foreman_bootdisk_path))
+    end
 
-  def bootdisk_authorized_for(options)
-    User.current.allowed_to?(options)
+    def bootdisk_authorized_for(options)
+      User.current.allowed_to?(options)
+    end
   end
 end

data/app/lib/foreman_bootdisk/scope/bootdisk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanBootdisk
   module Scope
     class Bootdisk < ::Foreman::Renderer::Scope::Provisioning

data/app/lib/foreman_bootdisk/scope/full_host_bootdisk.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ForemanBootdisk
+  module Scope
+    class FullHostBootdisk < Bootdisk
+      def kernel(medium_provider)
+        ForemanBootdisk::ISOGenerator.iso9660_filename(super)
+      end
+
+      def initrd(medium_provider)
+        ForemanBootdisk::ISOGenerator.iso9660_filename(super)
+      end
+    end
+  end
+end

data/app/models/concerns/foreman_bootdisk/compute_resources/vmware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanBootdisk
   module ComputeResources
     module Vmware
@@ -6,10 +8,10 @@ module ForemanBootdisk
       end
 
       def parse_args(args = {})
-        args = super
+        args = super(args)
         if args[:provision_method] == 'bootdisk'
           args[:cdroms] = [new_cdrom]
-          args[:boot_order] = ['cdrom', 'disk']
+          args[:boot_order] = %w[cdrom disk]
           args[:boot_retry] = 10
         end
         args