foreman_omaha 4.0.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63dabb188c95da7706f66c9c5c768225966e51448ce7a40ad2fc1c89871a30ad
-  data.tar.gz: 972b61c7759fc488935792d55bf08aa7fa02a01e91ed14ed6a1d711ee4f51df2
+  metadata.gz: c0ee3bbe2a41f9d5ac5ffac14c72895f5f523ba58691cdbd59c21086638d74b7
+  data.tar.gz: 6348671022cae92df4f7da03f665514234f325be028c523db136ab3c81244eea
 SHA512:
-  metadata.gz: 0bf9bb1350fc0e429917e58b3f5c56cf1e01c44cfdb9a4f641e78fafca08d60b46e20f7abfcc0ad0500c8094b16814ab097811a9a93fb199f1b33c6d3990c068
-  data.tar.gz: 05d0c8e04d6edb7c71d3b9e9b861862fbfa7d4f41cff0c28147bce8f7a48e4571b4b5f568e69daeb921bb5feeebe050baac4dd9d6cd81877eae9c134ab22ca92
+  metadata.gz: b97bae1c564d7745876cae86a16558f986057a63553676e8c55e6199208c810cceeca7f8a588bb637399fc32c485bfac874b61b649dd0e9252752c3226be467c
+  data.tar.gz: adae755d7a4e0859663bea2495c2ccce1041a7d05d478ae4eca3ca2d8910a8aff3bdcca925165e6a28101005612a5ffc980e7af2a1a0fe427a884b9f92f98ebd

data/README.md

@@ -13,6 +13,7 @@ Foreman core already supports deploying CoreOS hosts and is great for on-premise
 | >= 1.18         | ~> 2.0         |
 | >= 1.20         | ~> 3.0         |
 | >= 1.24         | ~> 4.0         |
+| >= 3.0          | ~> 5.0         |
 
 ## Installation
 

data/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -20,7 +22,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 
 Bundler::GemHelper.install_tasks
 
@@ -38,7 +40,7 @@ task default: :test
 begin
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
-rescue => _
+rescue StandardError => _e
   puts 'Rubocop not loaded.'
 end
 

data/app/controllers/omaha_hosts_controller.rb

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

data/app/graphql/concerns/foreman_omaha/types/host_extensions.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ForemanOmaha
+  module Types
+    module HostExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :omaha_reports, ForemanOmaha::Types::OmahaReport
+      end
+    end
+  end
+end

data/app/graphql/foreman_omaha/types/omaha_group.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ForemanOmaha
+  module Types
+    class OmahaGroup < ::Types::BaseObject
+      model_class ForemanOmaha::OmahaGroup
+      description 'An Omaha Group'
+
+      global_id_field :id
+      timestamps
+      field :name, String
+      field :uuid, String
+
+      has_many :hosts, ::Types::Host
+
+      def self.graphql_definition
+        super.tap { |type| type.instance_variable_set(:@name, 'ForemanOmaha::OmahaGroup') }
+      end
+    end
+  end
+end

data/app/graphql/foreman_omaha/types/omaha_report.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ForemanOmaha
+  module Types
+    class OmahaReport < ::Types::BaseObject
+      model_class ForemanOmaha::OmahaReport
+      description 'An Omaha Report'
+
+      global_id_field :id
+      timestamps
+      field :status, ForemanOmaha::Types::OmahaReportStatusEnum
+      field :omaha_version, String
+
+      belongs_to :host, ::Types::Host
+
+      def self.graphql_definition
+        super.tap { |type| type.instance_variable_set(:@name, 'ForemanOmaha::OmahaReport') }
+      end
+    end
+  end
+end

data/app/graphql/foreman_omaha/types/omaha_report_status_enum.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ForemanOmaha
+  module Types
+    class OmahaReportStatusEnum < ::Types::BaseEnum
+      ForemanOmaha::OmahaFacet::VALID_OMAHA_STATUSES.each do |status|
+        value status
+      end
+    end
+  end
+end

data/app/services/foreman_omaha/container_linux_config_transpiler.rb

@@ -5,6 +5,7 @@ require 'open3'
 module ForemanOmaha
   class ContainerLinuxConfigTranspiler
     class TranspilerNotFound < StandardError; end
+
     class TranspileError < StandardError; end
 
     attr_accessor :input, :output, :errors, :status

data/app/services/foreman_omaha/template_renderer_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ForemanOmaha
+  module TemplateRendererHelper
+    def transpile_container_linux_config(input)
+      ForemanOmaha::ContainerLinuxConfigTranspiler.new(input).run!
+    end
+  end
+end

data/lib/foreman_omaha/engine.rb

@@ -11,7 +11,6 @@ module ForemanOmaha
     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"]
-    config.autoload_paths += Dir["#{config.root}/app/graphql"]
 
     # Add any db migrations
     initializer 'foreman_omaha.load_app_instance_data' do |app|
@@ -22,7 +21,7 @@ module ForemanOmaha
 
     initializer 'foreman_omaha.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_omaha do
-        requires_foreman '>= 1.24'
+        requires_foreman '>= 3.0'
 
         apipie_documented_controllers ["#{ForemanOmaha::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -95,7 +94,14 @@ module ForemanOmaha
         add_controller_action_scope('HostsController', :index) { |base_scope| base_scope.includes(:omaha_facet) }
 
         # add renderer extensions
+        extend_template_helpers ForemanOmaha::TemplateRendererHelper
         allowed_template_helpers :transpile_container_linux_config
+
+        register_graphql_query_field :omaha_group, 'ForemanOmaha::Types::OmahaGroup', :record_field
+        register_graphql_query_field :omaha_groups, 'ForemanOmaha::Types::OmahaGroup', :collection_field
+
+        register_graphql_query_field :omaha_report, 'ForemanOmaha::Types::OmahaReport', :record_field
+        register_graphql_query_field :omaha_reports, 'ForemanOmaha::Types::OmahaReport', :collection_field
       end
 
       # Extend built in permissions
@@ -107,19 +113,20 @@ module ForemanOmaha
 
     # Include concerns in this config.to_prepare block
     config.to_prepare do
-      begin
-        ::FactImporter.register_fact_importer(:foreman_omaha, ForemanOmaha::FactImporter)
-        ::FactParser.register_fact_parser(:foreman_omaha, ForemanOmaha::FactParser)
-
-        ::Host::Managed.include(ForemanOmaha::HostExtensions)
-        ::Host::Managed.include(ForemanOmaha::OmahaFacetHostExtensions)
-        ::HostsHelper.include(ForemanOmaha::HostsHelperExtensions)
-        ::Foreman::Renderer::Scope::Base.include(ForemanOmaha::Renderer::Scope::Macros::Omaha)
-        ::Types::Query.include(Types::Extensions::ForemanOmaha::QueryExtensions)
-        ::Types::Host.include(Types::Extensions::ForemanOmaha::HostExtensions)
-      rescue StandardError => e
-        Rails.logger.warn "ForemanOmaha: skipping engine hook (#{e})"
+      Foreman::Plugin.fact_importer_registry.register(:foreman_omaha, ForemanOmaha::FactImporter, true)
+
+      if Foreman::Plugin.respond_to?(:fact_parser_registry)
+        Foreman::Plugin.fact_parser_registry.register(:foreman_omaha, ForemanOmaha::FactParser, true)
+      else
+        Foreman::Plugin.fact_importer_registry.register(:foreman_omaha, ForemanOmaha::FactParser, true)
       end
+
+      ::Host::Managed.include(ForemanOmaha::HostExtensions)
+      ::Host::Managed.include(ForemanOmaha::OmahaFacetHostExtensions)
+      ::HostsHelper.include(ForemanOmaha::HostsHelperExtensions)
+      ::Types::Host.include(ForemanOmaha::Types::HostExtensions)
+    rescue StandardError => e
+      Rails.logger.warn "ForemanOmaha: skipping engine hook (#{e})"
     end
 
     rake_tasks do

data/lib/foreman_omaha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanOmaha
-  VERSION = '4.0.1'
+  VERSION = '5.0.0'
 end

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

@@ -100,7 +100,7 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
 
     test 'hosts with a registered smart proxy on should create a report successfully' do
       Setting[:restrict_registered_smart_proxies] = true
-      Setting[:require_ssl_smart_proxies] = false
+      Setting[:require_ssl_smart_proxies] = false if Gem::Version.new(SETTINGS[:version].notag) < Gem::Version.new('3.1')
 
       proxy = FactoryBot.create(:smart_proxy, :omaha)
       host = URI.parse(proxy.url).host

data/test/unit/omaha_fact_parser_test.rb

@@ -38,6 +38,11 @@ class OmahaFactsParserTest < ActiveSupport::TestCase
 
   context '#operatingsystem' do
     let(:os) { importer.operatingsystem }
+    let(:expected_os_default_templates) do
+      OsDefaultTemplate.joins(:provisioning_template)
+                       .where(operatingsystem: os)
+                       .where(templates: { name: Setting[:default_host_init_config_template] })
+    end
 
     context 'without distribution fact' do
       setup do
@@ -60,7 +65,7 @@ class OmahaFactsParserTest < ActiveSupport::TestCase
         assert_equal 'stable', os.release_name
         assert_empty os.ptables
         assert_empty os.media
-        assert_empty os.os_default_templates
+        assert_same_elements os.os_default_templates, expected_os_default_templates
       end
     end
 
@@ -78,7 +83,7 @@ class OmahaFactsParserTest < ActiveSupport::TestCase
         assert_equal 'stable', os.release_name
         assert_empty os.ptables
         assert_empty os.media
-        assert_empty os.os_default_templates
+        assert_same_elements os.os_default_templates, expected_os_default_templates
       end
     end
 
@@ -88,23 +93,28 @@ class OmahaFactsParserTest < ActiveSupport::TestCase
                           :major => '899',
                           :minor => '17.0',
                           :title => 'CoreOS 899.17.0')
-        @previous = FactoryBot.create(:coreos,
-                                      :with_associations,
-                                      :with_provision,
-                                      :major => '1010',
-                                      :minor => '5.0',
-                                      :title => 'CoreOS 1010.5.0')
+
+        previous.reload
+      end
+
+      let(:previous) do
+        FactoryBot.create(:coreos,
+                          :with_associations,
+                          :with_provision,
+                          :major => '1010',
+                          :minor => '5.0',
+                          :title => 'CoreOS 1010.5.0')
       end
 
       test 'should copy attributes from previous os version' do
         assert_equal '1068', os.major
         assert_equal '9.0', os.minor
-        assert_equal @previous.ptables, os.ptables
-        assert_equal @previous.architectures, os.architectures
-        assert_equal @previous.media, os.media
-        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
+        assert_equal previous.ptables, os.ptables
+        assert_equal previous.architectures, os.architectures
+        assert_equal previous.media, os.media
+        assert_same_elements previous.os_default_templates.map(&:template_kind), os.os_default_templates.map(&:template_kind)
+        assert_same_elements previous.os_default_templates.map(&:provisioning_template), os.os_default_templates.map(&:provisioning_template)
+        assert_same_elements previous.provisioning_templates, os.provisioning_templates
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_omaha
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-matchheight-rails
@@ -42,14 +42,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.80.0
 - !ruby/object:Gem::Dependency
@@ -113,17 +113,15 @@ files:
 - app/controllers/omaha_groups_controller.rb
 - app/controllers/omaha_hosts_controller.rb
 - app/controllers/omaha_reports_controller.rb
-- app/graphql/types/extensions/foreman_omaha/host_extensions.rb
-- app/graphql/types/extensions/foreman_omaha/query_extensions.rb
-- app/graphql/types/omaha_group.rb
-- app/graphql/types/omaha_report.rb
-- app/graphql/types/omaha_report_status_enum.rb
+- app/graphql/concerns/foreman_omaha/types/host_extensions.rb
+- app/graphql/foreman_omaha/types/omaha_group.rb
+- app/graphql/foreman_omaha/types/omaha_report.rb
+- app/graphql/foreman_omaha/types/omaha_report_status_enum.rb
 - app/helpers/concerns/foreman_omaha/hosts_helper_extensions.rb
 - app/helpers/foreman_omaha/application_helper.rb
 - 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
@@ -140,6 +138,7 @@ files:
 - app/services/foreman_omaha/group_version_breakdown.rb
 - app/services/foreman_omaha/omaha_report_importer.rb
 - app/services/foreman_omaha/status_mapper.rb
+- app/services/foreman_omaha/template_renderer_helper.rb
 - app/views/api/v2/omaha_groups/base.json.rabl
 - app/views/api/v2/omaha_groups/index.json.rabl
 - app/views/api/v2/omaha_groups/main.json.rabl
@@ -220,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: This plug-in adds support for the Omaha procotol to The Foreman.

data/app/graphql/types/extensions/foreman_omaha/host_extensions.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Types
-  module Extensions
-    module ForemanOmaha
-      module HostExtensions
-        extend ActiveSupport::Concern
-
-        included do
-          has_many :omaha_reports, Types::OmahaReport
-        end
-      end
-    end
-  end
-end

data/app/graphql/types/extensions/foreman_omaha/query_extensions.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Types
-  module Extensions
-    module ForemanOmaha
-      module QueryExtensions
-        extend ActiveSupport::Concern
-
-        included do
-          record_field :omaha_group, Types::OmahaGroup
-          collection_field :omaha_groups, Types::OmahaGroup
-
-          record_field :omaha_report, Types::OmahaReport
-          collection_field :omaha_reports, Types::OmahaReport
-        end
-      end
-    end
-  end
-end

data/app/graphql/types/omaha_group.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Types
-  class OmahaGroup < BaseObject
-    model_class ::ForemanOmaha::OmahaGroup
-    description 'An Omaha Group'
-
-    global_id_field :id
-    timestamps
-    field :name, String
-    field :uuid, String
-
-    has_many :hosts, Types::Host
-  end
-end

data/app/graphql/types/omaha_report.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Types
-  class OmahaReport < BaseObject
-    model_class ::ForemanOmaha::OmahaReport
-    description 'An Omaha Report'
-
-    global_id_field :id
-    timestamps
-    field :status, Types::OmahaReportStatusEnum
-    field :omaha_version, String
-
-    belongs_to :host, Types::Host
-  end
-end

data/app/graphql/types/omaha_report_status_enum.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Types
-  class OmahaReportStatusEnum < BaseEnum
-    ForemanOmaha::OmahaFacet::VALID_OMAHA_STATUSES.each do |status|
-      value status
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-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