foreman_git_templates 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c38324b0492c54b19ee28e823d91e8f18b6d1427f477710e6516544115b7b1a
-  data.tar.gz: 1317ddbf95b8fb0b3601494828e3a6658bdad95a1b656b567edf7617a17378f7
+  metadata.gz: 0477f8453ecbee80aeacc47eca0a8d15e4dfab4c7416a342834682523fe8d620
+  data.tar.gz: 812f5d9a1d5aefce8dfd3fce7c89232c406381d5fcdf1220bf3b949f5efb2e25
 SHA512:
-  metadata.gz: a47d11977a3bbf7a2b86d409ae75a42045c932a96191aa0c4384890171d071588aa26682ef5e75ba889bd64f119ec9ab039d9940a06c524adb9b8d0735d86566
-  data.tar.gz: '054158b459f6a48992f170a3f6f39e54d500a18aef4d4eab1b2c151901cc3ca1e449b2c1cc13cc1ac2d87b09ac464ae08d81817a550cbd0d471931594f69933a'
+  metadata.gz: 3802a1eb148d653a55052f10c87ac215ae044b1b0d883038a75e7c22834ec91df1c4d9ec1f4835e86fa3b68c9a77f89c2e707fa301a9984ae9eb00ae2d4fc531
+  data.tar.gz: 70bd0c85037c17da83cb239a6844d34ccb0fdbb1e4651ab0d6dc8928d7d246bd86dee234c280b97e764221cbde4888890e43047d5137aa9b9ae9f1e58cb1e8b3

data/app/controllers/concerns/foreman_git_templates/unattended_controller_extensions.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ForemanGitTemplates
+  module UnattendedControllerExtensions
+    extend ActiveSupport::Concern
+
+    module Overrides
+      def render_local_boot_template
+        return super unless @host&.repository_path
+
+        return unless verify_found_host
+
+        template = ForemanGitTemplates::DefaultLocalBootRepositoryTemplate.new(name: 'iPXE')
+        safe_render(template)
+      rescue ForemanGitTemplates::RepositoryReader::MissingFileError
+        render_ipxe_message(message: _('iPXE default local boot template not found in repository at templates/iPXE/default_local_boot.erb'))
+      end
+    end
+
+    included do
+      prepend Overrides
+    end
+  end
+end

data/app/models/concerns/foreman_git_templates/host_extensions.rb

@@ -3,9 +3,21 @@
 module ForemanGitTemplates
   module HostExtensions
     def repository_path
-      return unless host_params['template_url']
+      return unless git_template_url
 
-      @repository_path ||= RepositoryFetcher.call(host_params['template_url'])
+      git_template_tmpfile.path
+    end
+
+    private
+
+    def git_template_url
+      @git_template_url ||= host_params['template_url']
+    end
+
+    def git_template_tmpfile
+      return unless git_template_url
+
+      @git_template_tmpfile ||= RepositoryFetcher.call(git_template_url)
     end
   end
 end

data/app/services/foreman_git_templates/repository_fetcher.rb

@@ -9,7 +9,7 @@ module ForemanGitTemplates
     end
 
     def call
-      Down.download(repository_url).path
+      Down.download(repository_url)
     rescue Down::ResponseError => e
       raise RepositoryFetcherError, "Cannot fetch repository from #{repository_url}. Response code: #{e.response.code}"
     rescue Down::Error => e

data/lib/foreman_git_templates/engine.rb

@@ -6,6 +6,7 @@ module ForemanGitTemplates
 
     config.autoload_paths += Dir["#{config.root}/app/lib"]
     config.autoload_paths += Dir["#{config.root}/app/services"]
+    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
 
     initializer 'foreman_git_templates.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_git_templates do
@@ -19,6 +20,7 @@ module ForemanGitTemplates
       Host::Managed.include(ForemanGitTemplates::Hostext::OperatingSystem)
       Host::Managed.include(ForemanGitTemplates::HostExtensions)
       Nic::Managed.include(ForemanGitTemplates::Orchestration::TFTP)
+      UnattendedController.include(ForemanGitTemplates::UnattendedControllerExtensions)
     rescue StandardError => e
       Rails.logger.warn "ForemanGitTemplates: skipping engine hook (#{e})"
     end

data/lib/foreman_git_templates/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanGitTemplates
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/test/controllers/unattended_controller_test.rb

@@ -3,7 +3,7 @@
 require 'test_plugin_helper'
 
 class UnattendedControllerTest < ActionController::TestCase
-  let(:os) { FactoryBot.create(:operatingsystem, :with_archs, :with_ptables, type: 'Redhat') }
+  let(:os) { FactoryBot.create(:operatingsystem, :with_associations, type: 'Redhat') }
   let(:host) do
     FactoryBot.create(:host, :managed, :with_template_url, operatingsystem: os, ptable: os.ptables.first)
   end
@@ -68,4 +68,49 @@ class UnattendedControllerTest < ActionController::TestCase
       assert_equal 'foo bar', response.body.strip
     end
   end
+
+  describe 'iPXE templates' do
+    context 'host not in build mode' do
+      test 'should render iPXE local boot template from repository' do
+        assert_not_nil host.params['template_url']
+
+        Dir.mktmpdir do |dir|
+          kind = 'iPXE'
+
+          stub_repository host.params['template_url'], "#{dir}/repo.tar.gz" do |tar|
+            tar.add_file_simple("templates/#{kind}/default_local_boot.erb", 644, 5) { |io| io.write('local') }
+            tar.add_file_simple("templates/#{kind}/template.erb", 644, host.name.length) { |io| io.write(host.name) }
+          end
+
+          get :host_template, params: { kind: kind, hostname: host.name }, session: set_session_user
+          assert_response :success
+          assert_equal 'local', response.body.strip
+        end
+      end
+    end
+
+    context 'host in build mode' do
+      setup do
+        host.update!(build: true)
+      end
+
+      test 'should render iPXE template from repository' do
+        host.reload
+        assert_not_nil host.params['template_url']
+
+        Dir.mktmpdir do |dir|
+          kind = 'iPXE'
+
+          stub_repository host.params['template_url'], "#{dir}/repo.tar.gz" do |tar|
+            tar.add_file_simple("templates/#{kind}/default_local_boot.erb", 644, 5) { |io| io.write('local') }
+            tar.add_file_simple("templates/#{kind}/template.erb", 644, host.name.length) { |io| io.write(host.name) }
+          end
+
+          get :host_template, params: { kind: kind, hostname: host.name }, session: set_session_user
+          assert_response :success
+          assert_equal host.name, response.body.strip
+        end
+      end
+    end
+  end
 end

data/test/models/foreman_git_templates/host_test.rb

@@ -6,11 +6,12 @@ module ForemanGitTemplates
   class HostTest < ActiveSupport::TestCase
     describe '#repository_path' do
       context 'with template_url parameter' do
-        let(:repo_path) { '/tmp/repo.tar.gz' }
+        let(:repo_tempfile) { Tempfile.new }
+        let(:repo_path) { repo_tempfile.path }
         let(:host) { FactoryBot.create(:host, :managed, :with_template_url) }
 
         it 'returns path to the repository' do
-          ForemanGitTemplates::RepositoryFetcher.expects(:call).once.with(host.params['template_url']).returns(repo_path)
+          ForemanGitTemplates::RepositoryFetcher.expects(:call).once.with(host.params['template_url']).returns(repo_tempfile)
           assert_equal repo_path, host.repository_path
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_git_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - dmTECH GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -62,6 +62,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/foreman_git_templates/unattended_controller_extensions.rb
 - app/lib/foreman_git_templates/renderer.rb
 - app/lib/foreman_git_templates/renderer/source/repository.rb
 - app/lib/foreman_git_templates/tar.rb
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Adds support for using templates from Git repositories