foreman_salt 15.0.0 → 15.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d9aa772eb864b39ab763151da7ca8238f2c7da9a06772353cd95af7a5d395a
-  data.tar.gz: 7e7dd610cef59615ba6cf805499bdbff69faddec9a122b4c980ebd1e0ea34f0e
+  metadata.gz: dceadd793e7c98f49fff2d4c176995a0ed11def096c54133e9d3c8d12368c1f6
+  data.tar.gz: 0cc545f144919677a951bdb770a8eb2a3834c8e16fe3ab4c8c7760372b70ba42
 SHA512:
-  metadata.gz: 31f7da6eaf92919ca5821f98c050701c583d7ee719fe1f1a50d313b2d4821b7088041b6c5f67cb0898ea7fb84a27e14acf875d3cca1cd76d8c8e96900c16978d
-  data.tar.gz: 063771b9e0f2446fb8103c12ee8b642bdaf7c52a00191623e012dad2be8cbac2d04723056a44b57bd1474cac3a4b438abc5372b2967bd13545bb0be38d21ab0b
+  metadata.gz: 13143280af923e4f4e5cadc8ca97988383d8562eafe139adcdce0712bf088c1d2159e1733e8ac17f730abc626642124708ad7399262b0b456f1b404eed04c4ac
+  data.tar.gz: 3154c9e3e6000fad2c96f4ceaaa88801bd49acd7088ee0f76ae82b11b4dc3a1416f9b5f606af2de8dedc979d82a86db216f773f8912b0aed345460ed164762d7

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -108,6 +108,7 @@ module ForemanSalt
       private
 
       def ensure_salt_autosign
+        remove_salt_key
         remove_salt_autosign
         create_salt_autosign
       end

data/db/migrate/20220406185204_fix_salt_setting_category_to_dsl.rb

@@ -0,0 +1,5 @@
+class FixSaltSettingCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::Salt').update_all(category: 'Setting')
+  end
+end

data/lib/foreman_salt/engine.rb

@@ -18,16 +18,6 @@ module ForemanSalt
       ForemanTasks.dynflow.require!
     end
 
-    initializer 'foreman_salt.load_default_settings', before: :load_config_initializers do
-      if begin
-            Setting.table_exists?
-         rescue StandardError
-           (false)
-          end
-        require_dependency File.expand_path('../../app/models/setting/salt.rb', __dir__)
-      end
-    end
-
     initializer 'foreman_salt.register_gettext',
       after: :load_config_initializers do
       locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')

data/lib/foreman_salt/plugin.rb

@@ -3,6 +3,16 @@
 Foreman::Plugin.register :foreman_salt do
   requires_foreman '>= 1.24'
 
+  settings do
+    category(:cfgmgmt, N_('Config Management')) do
+      setting('salt_namespace_pillars',
+        type: :boolean,
+        description: N_("Namespace Foreman pillars under 'foreman' key"),
+        default: false,
+        full_name: N_('Salt namespace pillars'))
+    end
+  end
+
   apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
 
   # Menus

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '15.0.0'.freeze
+  VERSION = '15.1.0'.freeze
 end

data/test/functional/minions_controller_test.rb

@@ -4,7 +4,7 @@ module ForemanSalt
   class MinionsControllerTest < ActionController::TestCase
     setup do
       User.current = User.anonymous_admin
-      Setting::Salt.load_defaults
+      Setting.load_defaults
       Setting[:restrict_registered_smart_proxies] = true
 
       @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)

data/test/integration/hosts_js_test.rb

@@ -16,7 +16,7 @@ module ForemanSalt
         proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
         salt_environment = FactoryBot.create(:salt_environment)
         @host = FactoryBot.create(:host, salt_proxy: proxy, salt_environment: salt_environment)
-        Setting::Salt.load_defaults
+        Setting.load_defaults
       end
     end
 

data/test/unit/host_extensions_test.rb

@@ -62,6 +62,8 @@ module ForemanSalt
         @host.salt_proxy = @proxy
         stub_request(:post, "#{@proxy.url}/salt/autosign_key/asdfasdfasfasdf")
           .to_return(status: 200, body: '', headers: {})
+        stub_request(:delete, "#{@proxy.url}/salt/key/#{@host.name}")
+          .to_return(status: 200, body: '', headers: {})
       end
 
       test 'host autosign is created when host is built' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 15.1.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -120,7 +120,6 @@ files:
 - app/models/foreman_salt/salt_provider.rb
 - app/models/foreman_salt/salt_status.rb
 - app/models/foreman_salt/salt_variable.rb
-- app/models/setting/salt.rb
 - app/overrides/salt_environment_host_selector.rb
 - app/overrides/salt_environment_hostgroup_selector.rb
 - app/overrides/salt_modules_selector.rb
@@ -197,6 +196,7 @@ files:
 - db/migrate/20210312150333_add_salt_autosign_to_host.rb
 - db/migrate/20211108211312_add_missing_permissions.rb
 - db/migrate/20220118160349_drop_salt_hide_run_salt_button_setting.rb
+- db/migrate/20220406185204_fix_salt_setting_category_to_dsl.rb
 - db/seeds.d/75-salt_seeds.rb
 - db/seeds.d/76-job_templates.rb
 - lib/foreman_salt.rb

data/app/models/setting/salt.rb

@@ -1,9 +0,0 @@
-class Setting
-  class Salt < ::Setting
-    def self.default_settings
-      [
-        set('salt_namespace_pillars', N_("Namespace Foreman pillars under 'foreman' key"), false),
-      ]
-    end
-  end
-end