foreman_default_hostgroup 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf9d232426c55fc207fed30c696a03c1268f02df5d481daf7bbaec627867a8b
-  data.tar.gz: b4e30338ca588f25c2ef0f74d383aa432357c5f94f9fae2603445107c55ae382
+  metadata.gz: 8e1266d987eb1c009c18ccbcb3d3b7c93da09b277465cead1fce9436bb7547d4
+  data.tar.gz: 88fe5230bca03cdef1808dd28d8f1778e7942db64b1b8716726f7d744cac9136
 SHA512:
-  metadata.gz: 965c2c192b549c92c474af2d6074a837e8f2ef9fe1241394f083ac519730aaab34732e3ccc99897c8521e97195dc81ab6cc5517f96f5aaa5b4dff4b326ce3209
-  data.tar.gz: 59434c38a0e0a3da2d63160ccebf1d06b08b6b3907df95455ba8229821d1302c7cad7471adae8e44e72c88c98a8265ab4efc88e27f599493b3ae761b40fbdd93
+  metadata.gz: 937af6365b281ddd5cfc5131d7d4251c3d377bf13fa87e37329345e9dd69368ffbdf855cc26a1a11b937a81f9b9347d0a51ecf5e260d147855c04a59058fda58
+  data.tar.gz: 6d618171ba97d86e839d849dcac811f3ce6d42e92f5338c0f9cacf7010be3168fcc6422ec22ce37d83ce25f786fd649f9a97c6fb42cc64c5fdc02963b2f04cdd

data/README.md

@@ -20,6 +20,7 @@ See Foreman's [plugin installation documentation](https://theforeman.org/plugins
 | >= 1.16         |          4.0.1 |
 | >= 1.16         |          5.0.0 |
 | >= 2.2.0        |          6.0.0 |
+| >= 3.0          |          7.0.0 |
 
 ## Usage
 

data/db/migrate/20221103122801_fix_default_hostgroup_settings_category_to_dsl.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class FixDefaultHostgroupSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    # rubocop:disable Rails/SkipsModelValidations
+    Setting.where(category: 'Setting::DefaultHostgroup').update_all(category: 'Setting')
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/lib/default_hostgroup_base_host_patch.rb

@@ -35,7 +35,7 @@ module DefaultHostgroupBaseHostPatch
       return result unless new_hostgroup
 
       self.host.hostgroup = new_hostgroup
-      self.host.environment = new_hostgroup.environment if Setting[:force_host_environment] == true
+      self.host.environment = new_hostgroup.environment if Setting[:force_host_environment] == true and facts[:_type] == :puppet
       self.host.save(validate: false)
       Rails.logger.info "DefaultHostgroupMatch: #{facts["hostname"]} added to #{new_hostgroup}"
 

data/lib/foreman_default_hostgroup/engine.rb

@@ -6,17 +6,34 @@ module ForemanDefaultHostgroup
 
     config.autoload_paths += Dir["#{config.root}/app/models"]
 
-    initializer "foreman_default_hostgroup.load_default_settings",
-                before: :load_config_initializers do
-      require_dependency File.expand_path(
-        "../../app/models/setting/default_hostgroup.rb", __dir__
-      )
+    # Add any db migrations
+    initializer 'foreman_default_hostgroup.load_app_instance_data' do |app|
+      ForemanDefaultHostgroup::Engine.paths['db/migrate'].existent.each do |path|
+        app.config.paths['db/migrate'] << path
+      end
     end
 
     initializer "foreman_default_hostgroup.register_plugin",
                 before: :finisher_hook do
       Foreman::Plugin.register :foreman_default_hostgroup do
-        requires_foreman ">= 2.2"
+        requires_foreman ">= 3.0"
+
+        settings do
+          category(:default_hostgroup, N_('Default Hostgroup')) do
+            setting('force_hostgroup_match',
+                    type: :boolean,
+                    description: 'Apply hostgroup matching even if a host already has one.',
+                    default: false)
+            setting('force_hostgroup_match_only_new',
+                    type: :boolean,
+                    description: 'Apply hostgroup matching only on new hosts',
+                    default: true)
+            setting('force_host_environment',
+                    type: :boolean,
+                    description: "Apply hostgroup's environment to host even if a host already has a different one",
+                    default: true)
+          end
+        end
       end
     end
 

data/lib/foreman_default_hostgroup/version.rb

@@ -1,3 +1,3 @@
 module ForemanDefaultHostgroup
-  VERSION = '6.0.0'.freeze
+  VERSION = '7.0.0'.freeze
 end

data/test/unit/default_hostgroup_test.rb

@@ -18,20 +18,20 @@ class DefaultHostgroupTest < ActiveSupport::TestCase
     # so we use FactoryBot to re-create it
     FactoryBot.create(:setting,
                       name: 'force_hostgroup_match',
-                      category: 'Setting::DefaultHostgroup')
+                      category: 'Setting')
     FactoryBot.create(:setting,
                       name: 'force_hostgroup_match_only_new',
-                      category: 'Setting::DefaultHostgroup')
+                      category: 'Setting')
     FactoryBot.create(:setting,
                       name: 'force_host_environment',
-                      category: 'Setting::DefaultHostgroup')
+                      category: 'Setting')
     # Set the defaults
     Setting[:force_hostgroup_match] = false
     Setting[:force_hostgroup_match_only_new] = true
     Setting[:force_host_environment] = true
 
     # Mimic plugin config fron config file
-    FactoryBot.create(:hostgroup, :with_environment, name: 'Test Default')
+    FactoryBot.create(:hostgroup, name: 'Test Default')
     SETTINGS[:default_hostgroup] = {}
     SETTINGS[:default_hostgroup][:facts_map] = {
       'Test Default' => { 'hostname' => '.*' }
@@ -69,21 +69,6 @@ class DefaultHostgroupTest < ActiveSupport::TestCase
     end
   end
 
-  context 'force host environment setting' do
-    test 'environment is updated if enabled' do
-      h = FactoryBot.create(:host, :with_environment, created_at: Time.current)
-      h.import_facts(@facts)
-      assert_equal Hostgroup.find_by(name: 'Test Default').environment, h.environment
-    end
-
-    test 'environment not updated if disabled' do
-      Setting[:force_host_environment] = false
-      h = FactoryBot.create(:host, :with_environment, created_at: Time.current)
-      h.import_facts(@facts)
-      assert_not_equal Hostgroup.find_by(name: 'Test Default').environment, h.environment
-    end
-  end
-
   context 'find_match' do
     # takes a config map, returns a group or false
     test 'match a single hostgroup' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_default_hostgroup
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies: []
 description: Adds the option to specify a default hostgroup for new hosts created
   from facts/reports
@@ -21,7 +21,7 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
-- app/models/setting/default_hostgroup.rb
+- db/migrate/20221103122801_fix_default_hostgroup_settings_category_to_dsl.rb
 - default_hostgroup.yaml.example
 - lib/default_hostgroup_base_host_patch.rb
 - lib/foreman_default_hostgroup.rb
@@ -50,11 +50,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Default Hostgroup Plugin for Foreman
 test_files:
 - test/test_plugin_helper.rb
-- test/unit/facts.json
 - test/unit/default_hostgroup_test.rb
+- test/unit/facts.json

data/app/models/setting/default_hostgroup.rb

@@ -1,21 +0,0 @@
-# rubocop:disable Style/ClassAndModuleChildren
-class Setting::DefaultHostgroup < ::Setting
-  # rubocop:enable Style/ClassAndModuleChildren
-  BLANK_ATTRS << 'default_hostgroup'
-
-  def self.load_defaults
-    # Check the table exists
-    return unless ActiveRecord::Base.connection.table_exists?('settings')
-    return unless super
-
-    Setting.transaction do
-      [
-        set('force_hostgroup_match', 'Apply hostgroup matching even if a host already has one.', false),
-        set('force_hostgroup_match_only_new', 'Apply hostgroup matching only on new hosts', true),
-        set('force_host_environment', "Apply hostgroup's environment to host even if a host already has a different one", true)
-      ].compact.each { |s| create s.update(category: 'Setting::DefaultHostgroup') }
-    end
-
-    true
-  end
-end