foreman_omaha 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d8c9488f648e7425b5ba2acf08a407e653a670247f2d2f0d1e523ed5269f5ca
-  data.tar.gz: 340dae98a746ac79888fb44cb939545bf971e97941034d6edeb0aee250b97a28
+  metadata.gz: 421a748a9a01373e725254764e8ec0eec455da8db499a948d46de2215b9378bf
+  data.tar.gz: 893fd2401152eba58c412e5e87900d9d246fc6f0849f091e94172ea740f32dc8
 SHA512:
-  metadata.gz: accbd7e167c73ed028e36f493fe740cc3a1df3ae175c55c278288d5db23c194ce24b0adbbc37d21c1044a32d0ab3c41a43c656d40c70b079d3ae4d140394fdc8
-  data.tar.gz: 837d798f8867213463f2140b70c20e76b16f21ea88cba53b687547bcde42a41fe02c45ab1f12c91970c3e8f4a87be52912f1f213b96f1bda6f8da2b7e18f5176
+  metadata.gz: '09028f73bcf73132903dfe8318befca2428178f01b9b83138fed7d431a7b51eda6b4268ca3d6cc3851871587391fabd45c7b54c35ee802c2532c970867c25cda'
+  data.tar.gz: 5e5cc0bb9cda50abe5bb9cec5d04ac46711403465928a9fda8e6e8b32fe0d9ab05d6bec380d9077fbf3ee16567ae3fffa3c08186f2ead2ca3e1c2d5c4d0ec2a2

data/README.md

@@ -11,6 +11,7 @@ Foreman core already supports deploying CoreOS hosts and is great for on-premise
 | >= 1.12         | ~> 0.0         |
 | >= 1.17         | ~> 1.0         |
 | >= 1.18         | ~> 2.0         |
+| >= 1.20         | ~> 3.0         |
 
 ## Installation
 

data/app/controllers/omaha_hosts_controller.rb

@@ -14,11 +14,12 @@ class OmahaHostsController < ApplicationController
   end
 
   def welcome
-    if begin
-          resource_base.first.nil?
-        rescue StandardError
-          false
-        end
+    has_entries = begin
+                    resource_base.first.nil?
+                  rescue StandardError
+                    false
+                  end
+    if has_entries
       @welcome = true
       render :welcome
     end

data/app/lib/foreman_omaha/renderer/scope/macros/omaha.rb

@@ -0,0 +1,13 @@
+module ForemanOmaha
+  module Renderer
+    module Scope
+      module Macros
+        module Omaha
+          def transpile_container_linux_config(input)
+            ForemanOmaha::ContainerLinuxConfigTranspiler.new(input).run!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -19,6 +19,7 @@ module ForemanOmaha
 
     def clear_omaha_facet_on_build
       return unless respond_to?(:old) && old && build? && !old.build?
+
       clear_omaha_facet
     end
   end

data/app/models/concerns/foreman_omaha/omaha_facet_host_extensions.rb

@@ -17,7 +17,7 @@ module ForemanOmaha
         :installed => 4, :instance_hold => 5, :error => 6
       }
 
-      scoped_search :on => :name, :relation => :omaha_group, :complete_value => true, :rename => :omaha_group
+      scoped_search :on => :name, :relation => :omaha_group, :complete_value => true, :rename => :omaha_group, :only_explicit => true
     end
   end
 end

data/app/models/foreman_omaha/omaha_facet.rb

@@ -23,11 +23,13 @@ module ForemanOmaha
 
     def major
       return unless version
+
       version.split('.').first
     end
 
     def minor
       return unless version
+
       version.split('.').last(2).join('.')
     end
 

data/app/models/foreman_omaha/omaha_report.rb

@@ -21,6 +21,7 @@ module ForemanOmaha
 
     def operatingsystem
       return if omaha_version.blank?
+
       args = { :type => 'Coreos', :major => osmajor, :minor => osminor }
       Operatingsystem.find_by(args)
     end

data/app/models/host_status/omaha_status.rb

@@ -6,11 +6,13 @@ module HostStatus
 
     def to_status(_options = {})
       return ::ForemanOmaha::OmahaFacet.statuses[:unknown] unless relevant?
+
       ::ForemanOmaha::OmahaFacet.statuses[host.omaha_facet.status]
     end
 
     def to_global(_options = {})
       return ::ForemanOmaha::OmahaFacet.statuses[:unknown] unless relevant?
+
       case host.omaha_facet.status.to_sym
       when :complete, :downloaded, :downloading, :installed
         HostStatus::Global::OK

data/app/services/foreman_omaha/container_linux_config_transpiler.rb

@@ -15,6 +15,7 @@ module ForemanOmaha
       check_transpiler
       transpile
       raise TranspileError, "Could not transpile container linux config to ignition: #{errors}" unless status.success?
+
       output
     end
 

data/app/services/foreman_omaha/fact_parser.rb

@@ -34,15 +34,16 @@ module ForemanOmaha
     def create_coreos_version(attrs)
       previous_version = previous_coreos_version
       return Coreos.create!(attrs) unless previous_coreos_version
+
       os = previous_version.deep_clone(
-        :include => [:ptables, :media, :os_default_templates, :architectures]
+        :include => [:ptables, :media, :os_default_templates, :architectures, :provisioning_templates]
       )
       os.update(attrs)
       os
     end
 
     def previous_coreos_version
-      Coreos.all.sort_by { |os| Gem::Version.new(os.release) }.last
+      Coreos.all.max_by { |os| Gem::Version.new(os.release) }
     end
   end
 end

data/app/services/foreman_omaha/group_version_breakdown.rb

@@ -24,6 +24,7 @@ module ForemanOmaha
 
     def percentage(count)
       return 0 if count.zero? || facets.count.zero?
+
       (count.to_f * 100 / facets.count).round(2)
     end
   end

data/app/services/foreman_omaha/omaha_report_importer.rb

@@ -19,6 +19,7 @@ module ForemanOmaha
     def create_report_and_logs
       super
       return report unless report.persisted?
+
       report.omaha_version = omaha_version
       report.save
       update_omaha_facet!
@@ -31,6 +32,7 @@ module ForemanOmaha
 
     def update_omaha_facet!
       return unless omaha_facet.last_report.nil? || omaha_facet.last_report.utc < time
+
       omaha_facet.update(
         :last_report => time,
         :status => report_status,
@@ -71,6 +73,7 @@ module ForemanOmaha
       minor = version.segments.last(2).join('.')
       os = Coreos.find_by(:major => major, :minor => minor)
       return unless os
+
       ForemanOmaha::OmahaGroup.find_by(:uuid => os.release_name)
     end
   end

data/app/views/omaha_groups/show.html.erb

@@ -1,6 +1,17 @@
 <% javascript 'foreman_omaha/application' %>
 <% javascript 'charts' %>
 <% title @omaha_group.name %>
+<%= breadcrumbs(
+    items: [
+    {
+      caption: _('Omaha Groups'),
+      url: (url_for(hash_for_omaha_groups_path) if authorized_for(hash_for_omaha_groups_path))
+    },
+    {
+      caption: @omaha_group.name
+    }
+  ]
+) %>
 <div class="container-fluid container-cards-pf">
   <!-- status cards -->
   <div class="row row-cards-pf">

data/lib/foreman_omaha/engine.rb

@@ -8,6 +8,7 @@ module ForemanOmaha
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/services"]
+    config.autoload_paths += Dir["#{config.root}/app/lib"]
 
     # Add any db migrations
     initializer 'foreman_omaha.load_app_instance_data' do |app|
@@ -18,7 +19,7 @@ module ForemanOmaha
 
     initializer 'foreman_omaha.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_omaha do
-        requires_foreman '>= 1.18'
+        requires_foreman '>= 1.20'
 
         apipie_documented_controllers ["#{ForemanOmaha::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -90,7 +91,6 @@ module ForemanOmaha
 
         # add renderer extensions
         allowed_template_helpers :transpile_container_linux_config
-        extend_template_helpers ForemanOmaha::RendererMethods
       end
 
       # Extend built in permissions
@@ -109,6 +109,7 @@ module ForemanOmaha
         Host::Managed.send(:include, ForemanOmaha::HostExtensions)
         Host::Managed.send(:include, ForemanOmaha::OmahaFacetHostExtensions)
         HostsHelper.send(:include, ForemanOmaha::HostsHelperExtensions)
+        Foreman::Renderer::Scope::Base.send(:include, ForemanOmaha::Renderer::Scope::Macros::Omaha)
       rescue StandardError => e
         Rails.logger.warn "ForemanOmaha: skipping engine hook (#{e})"
       end

data/lib/foreman_omaha/version.rb

@@ -1,3 +1,3 @@
 module ForemanOmaha
-  VERSION = '2.0.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/test/functional/api/v2/omaha_groups_controller_test.rb

@@ -23,7 +23,7 @@ class Api::V2::OmahaGroupsControllerTest < ActionController::TestCase
       get :show, params: { :id => omaha_group.to_param }
       assert_response :success
       body = ActiveSupport::JSON.decode(@response.body)
-      refute_empty body
+      assert_not_empty body
       assert_equal omaha_group.id, body['id']
       assert_equal omaha_group.name, body['name']
       assert_equal omaha_group.uuid, body['uuid']

data/test/functional/api/v2/omaha_reports_controller_test.rb

@@ -17,7 +17,7 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
     assert_response :success
     assert_not_nil assigns(:omaha_reports)
     reports = ActiveSupport::JSON.decode(@response.body)
-    assert !reports['results'].empty?
+    assert_not reports['results'].empty?
   end
 
   test 'should show individual record' do
@@ -25,7 +25,7 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
     get :show, params: { :id => report.to_param }
     assert_response :success
     show_response = ActiveSupport::JSON.decode(@response.body)
-    assert !show_response.empty?
+    assert_not show_response.empty?
   end
 
   test 'should destroy report' do
@@ -34,7 +34,7 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
       delete :destroy, params: { :id => report.to_param }
     end
     assert_response :success
-    refute Report.find_by(id: report.id)
+    assert_not Report.find_by(id: report.id)
   end
 
   test 'should get reports for given host only' do
@@ -43,7 +43,7 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
     assert_response :success
     assert_not_nil assigns(:omaha_reports)
     reports = ActiveSupport::JSON.decode(@response.body)
-    assert !reports['results'].empty?
+    assert_not reports['results'].empty?
     assert_equal 1, reports['results'].count
   end
 
@@ -63,7 +63,7 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
     assert_response :success
     assert_not_nil assigns(:omaha_report)
     report = ActiveSupport::JSON.decode(@response.body)
-    assert !report.empty?
+    assert_not report.empty?
     assert_equal reports.last, ForemanOmaha::OmahaReport.find(report['id'])
   end
 
@@ -74,7 +74,7 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
     assert_response :success
     assert_not_nil assigns(:omaha_report)
     report = ActiveSupport::JSON.decode(@response.body)
-    assert !report.empty?
+    assert_not report.empty?
     assert_equal main_report, ForemanOmaha::OmahaReport.find(report['id'])
   end
 

data/test/functional/omaha_reports_controller_test.rb

@@ -49,6 +49,6 @@ class OmahaReportsControllerTest < ActionController::TestCase
     report = FactoryBot.create(:omaha_report)
     delete :destroy, params: { :id => report }, session: set_session_user
     assert_redirected_to omaha_reports_url
-    assert !ConfigReport.exists?(report.id)
+    assert_not ConfigReport.exists?(report.id)
   end
 end

data/test/unit/host_test.rb

@@ -49,7 +49,7 @@ class HostTest < ActiveSupport::TestCase
       host.build = true
       assert_valid host
       assert host.save
-      refute host.reload.omaha_facet
+      assert_not host.reload.omaha_facet
     end
   end
 end

data/test/unit/omaha_fact_parser_test.rb

@@ -51,14 +51,12 @@ class OmahaFactsParserTest < ActiveSupport::TestCase
     context 'with old versions' do
       setup do
         FactoryBot.create(:coreos,
-                          :with_associations,
-                          :with_os_defaults,
                           :major => '899',
                           :minor => '17.0',
                           :title => 'CoreOS 899.17.0')
         @previous = FactoryBot.create(:coreos,
                                       :with_associations,
-                                      :with_os_defaults,
+                                      :with_provision,
                                       :major => '1010',
                                       :minor => '5.0',
                                       :title => 'CoreOS 1010.5.0')
@@ -70,7 +68,9 @@ class OmahaFactsParserTest < ActiveSupport::TestCase
         assert_equal @previous.ptables, os.ptables
         assert_equal @previous.architectures, os.architectures
         assert_equal @previous.media, os.media
-        assert_equal @previous.os_default_templates, os.os_default_templates
+        assert_equal @previous.os_default_templates.map(&:provisioning_template), os.os_default_templates.map(&:provisioning_template)
+        assert_equal @previous.os_default_templates.map(&:template_kind), os.os_default_templates.map(&:template_kind)
+        assert_equal @previous.provisioning_templates, os.provisioning_templates
       end
     end
   end

data/test/unit/renderer_test.rb

@@ -2,20 +2,30 @@ require 'test_plugin_helper'
 
 module ForemanOmaha
   class RendererTest < ActiveSupport::TestCase
-    class DummyRenderer
-      attr_accessor :host
+    let(:host) { FactoryBot.create(:host) }
+    let(:template) { OpenStruct.new(name: 'abc', template: "<%= transpile_container_linux_config('---') %>") }
+    let(:source) { Foreman::Renderer::Source::Database.new(template) }
+    let(:scope) { Foreman::Renderer::Scope::Base.new(host: host, source: source) }
+    let(:expected) { '{"ignition":{"config":{},"timeouts":{},"version":"2.1.0"},"networkd":{},"passwd":{},"storage":{},"systemd":{}}' }
 
-      include Foreman::Renderer
-      include ForemanOmaha::RendererMethods
+    setup do
+      ForemanOmaha::ContainerLinuxConfigTranspiler.any_instance.stubs(:run!).returns(expected)
     end
 
-    let(:renderer) { DummyRenderer.new }
+    context 'with safe mode renderer' do
+      let(:renderer) { Foreman::Renderer::SafeModeRenderer }
 
-    test 'should transpile a container linux config' do
-      expected = '{"ignition":{"config":{},"timeouts":{},"version":"2.1.0"},"networkd":{},"passwd":{},"storage":{},"systemd":{}}'
-      ForemanOmaha::ContainerLinuxConfigTranspiler.any_instance.stubs(:run!).returns(expected)
-      transpiled = renderer.transpile_container_linux_config('---')
-      assert_equal expected, transpiled
+      test 'should transpile a container linux config' do
+        assert_equal expected, renderer.render(source, scope)
+      end
+    end
+
+    context 'with unsafe mode renderer' do
+      let(:renderer) { Foreman::Renderer::UnsafeModeRenderer }
+
+      test 'should transpile a container linux config' do
+        assert_equal expected, renderer.render(source, scope)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_omaha
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-matchheight-rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.59.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.59.2
 description: This plug-in adds support for the Omaha procotol to The Foreman. It allows
   you to better manage and update your CoreOS servers.
 email:
@@ -76,6 +76,7 @@ files:
 - app/helpers/foreman_omaha/omaha_groups_helper.rb
 - app/helpers/omaha_hosts_helper.rb
 - app/helpers/omaha_reports_helper.rb
+- app/lib/foreman_omaha/renderer/scope/macros/omaha.rb
 - app/models/concerns/foreman_omaha/host_extensions.rb
 - app/models/concerns/foreman_omaha/omaha_facet_host_extensions.rb
 - app/models/foreman_omaha/fact_name.rb
@@ -91,7 +92,6 @@ files:
 - app/services/foreman_omaha/fact_parser.rb
 - app/services/foreman_omaha/group_version_breakdown.rb
 - app/services/foreman_omaha/omaha_report_importer.rb
-- app/services/foreman_omaha/renderer_methods.rb
 - app/services/foreman_omaha/status_mapper.rb
 - app/views/api/v2/omaha_groups/base.json.rabl
 - app/views/api/v2/omaha_groups/index.json.rabl

data/app/services/foreman_omaha/renderer_methods.rb

@@ -1,7 +0,0 @@
-module ForemanOmaha
-  module RendererMethods
-    def transpile_container_linux_config(input)
-      ForemanOmaha::ContainerLinuxConfigTranspiler.new(input).run!
-    end
-  end
-end