foreman_salt 17.0.0 → 17.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e82fca85dd06aa9b1f00de05d5f9a3a6dc032e61ca62b35a82ea7d7ae6c6397a
-  data.tar.gz: d938b6e1f269fc7c7ac915aa079c37f3bec1bad9657a591efe572d637ffb98b2
+  metadata.gz: 844fdd7edf134c6be722188275d2443e62c1c2735d74670741d953252f41d311
+  data.tar.gz: 83517fb9cd563e61f14dacf0bb7e106c83ba558d13ada6233f00f33363caea81
 SHA512:
-  metadata.gz: b553f0e5ed333b97a30829c67c4c0b410a4067eeb6f8e209d0019b7d692468d08a85f30bcc44ed9921daf692160c830b838cfc5463418d05ec5e6d734449cd25
-  data.tar.gz: 88b64a141a1731adfa1bf066a9ecb27a4af236b99ee18453843eb20f0e6869f2668ca1bf3e6a1eae3f2bcb424bc3f432600c76a7f4e08e41c9b288c5a898840f
+  metadata.gz: 19d930a25245ce6dadeb3abb9b17bd61c884ea9f020f66b2fa837f50b960ae034f2dd4e2a24bb8f90a1c0994897746811fb291b819125a062208c1d8e5210b01
+  data.tar.gz: '092feadf358cdfa2007310c4f95c9c571fe7524eb633e856b81b168e5c16f25f4155ca11a2114e3212a7a71af199ce2ac1e808a9824c036f02cb640c26f3a7f4'

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

@@ -42,8 +42,8 @@ module ForemanSalt
 
         validate :salt_modules_in_host_environment
 
-        after_build :ensure_salt_autosign, if: ->(host) { host.salt_proxy }
-        before_destroy :remove_salt_minion, if: ->(host) { host.salt_proxy }
+        after_validation :queue_ensure_salt_autosign, if: ->(host) { host.salt_proxy }
+        before_destroy :queue_remove_salt_minion, if: ->(host) { host.salt_proxy }
       end
 
       def salt_params
@@ -107,10 +107,32 @@ module ForemanSalt
 
       private
 
+      def queue_ensure_salt_autosign
+        return unless new_record? || build_changed?
+
+        generate_salt_autosign_key
+        queue.create(id: "ensure_salt_autosign_#{id}", name: _('Configure Salt Autosign key for %s') % self,
+                     priority: 101, action: [self, :ensure_salt_autosign])
+      end
+
+      def queue_remove_salt_minion
+        queue.create(id: "queue_remove_salt_minion_#{id}", name: _('Remove Salt Minion for %s') % self,
+                     priority: 101, action: [self, :remove_salt_minion])
+      end
+
+      def generate_salt_autosign_key
+        if salt_autosign_key.nil?
+          Rails.logger.info("Generate salt autosign key for #{fqdn}")
+          self.salt_autosign_key = generate_provisioning_key
+        else
+          Rails.logger.info("Use existing salt autosign key for #{fqdn}")
+        end
+        self.salt_status = ForemanSalt::SaltStatus.minion_auth_waiting
+      end
+
       def ensure_salt_autosign
         remove_salt_key
-        remove_salt_autosign
-        create_salt_autosign
+        configure_salt_autosign
       end
 
       def remove_salt_minion
@@ -140,13 +162,11 @@ module ForemanSalt
         SecureRandom.hex(10)
       end
 
-      def create_salt_autosign
-        Rails.logger.info("Create salt autosign key for host #{fqdn}")
+      def configure_salt_autosign
+        Rails.logger.info("Configure salt autosign key for host #{fqdn} on #{salt_proxy.url}")
         api = ProxyAPI::Salt.new(url: salt_proxy.url)
-        key = generate_provisioning_key
+        key = salt_autosign_key
         api.autosign_create_key(key)
-        update(salt_autosign_key: key)
-        update(salt_status: ForemanSalt::SaltStatus.minion_auth_waiting)
       rescue Foreman::Exception => e
         Rails.logger.warn("Unable to create salt autosign for #{fqdn}: #{e}")
       end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '17.0.0'.freeze
+  VERSION = '17.0.1'.freeze
 end

data/test/integration/salt_variable_test.rb

@@ -18,7 +18,7 @@ module ForemanSalt
 
       assert_new_button(salt_variables_path, 'New Salt Variable', new_salt_variable_path)
       fill_in 'foreman_salt_salt_variable_key', with: 'mykey'
-      select2(state.name, from: 'foreman_salt_salt_variable_salt_module_id')
+      select(state.name, from: 'foreman_salt_salt_variable_salt_module_id')
 
       assert_submit_button(salt_variables_path)
       assert page.has_link? 'mykey'

data/test/unit/host_extensions_test.rb

@@ -64,7 +64,7 @@ module ForemanSalt
 
     context 'autosign handling' do
       before do
-        @host = FactoryBot.create(:host, :managed)
+        @host = FactoryBot.create(:host, salt_autosign_key: 'asdfasdfasfasdf')
         @host.salt_proxy = @proxy
         stub_request(:post, "#{@proxy.url}/salt/autosign_key/asdfasdfasfasdf")
           .to_return(status: 200, body: '', headers: {})
@@ -72,10 +72,9 @@ module ForemanSalt
           .to_return(status: 200, body: '', headers: {})
       end
 
-      test 'host autosign is created when host is built' do
+      test 'host autosign is created before host is provisioned' do
         autosign_key = 'asdfasdfasfasdf'
-        @host.expects(:generate_provisioning_key).returns(autosign_key)
-        @host.build = true
+        @host.build = false
 
         assert @host.save!
         @host.clear_host_parameters_cache!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 17.0.0
+  version: 17.0.1
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -33,7 +33,7 @@ dependencies:
         version: '14.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '15'
+        version: '16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '14.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '15'
+        version: '16'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Foreman Plug-in for Salt