foreman_openscap 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5074ed6694cddda4b32459825e324df98f9d4ca1425826adeb86a5983b08be2
-  data.tar.gz: aea63d7dfe108a4262909e3110bdb92d83bd3d6aa5eb68da4fbc27f938195118
+  metadata.gz: 416db64a783e7876de13cd98e57b7daea2c0ac9f228f52f85fcb54d4db18e75f
+  data.tar.gz: c5b5c5f22113c4842a83d3255880af2632e12ccd26f1cc8779a36f4ae1910745
 SHA512:
-  metadata.gz: b9dc895ea62f9d607a76a9e81fcedc088f0562c8faa621ec2a5b0a510d472bd59814cf8c05050e65d01a68b50f4f871945bedd257d07328650d05c21cfb2ce3f
-  data.tar.gz: 4ce6250f308c0bd843261d1dc541d65a1901b0e36ab97c46b007d92668201c2387798307695d8eb3173667d69270bb473f39ca093d20f009cbd2cc67d59784eb
+  metadata.gz: e92cbdf9359cc67bb7e7ed1e40da8b78789fbc9daecb7c8559853d1fce03eaa5d2953f8d810ee5176f7f4288f57115c213099ce798229837c1568a09b3a2e1be
+  data.tar.gz: 91263d9e014cadff61bca46fe792cd2584e3c4de5ba828cd5f7e7b46e0e5d4c890e5fdd4894d19566bee31b5cb479ed21dd0b65be2bd499d15251c4d90b58920

data/db/migrate/20201202110213_update_puppet_port_param_type.rb

@@ -0,0 +1,28 @@
+class UpdatePuppetPortParamType < ActiveRecord::Migration[6.0]
+  def up
+    update_port_type :to_i
+  end
+
+  def down
+    update_port_type :to_s
+  end
+
+  private
+
+  def update_port_type(method)
+    puppet_class = Puppetclass.find_by :name => 'foreman_scap_client'
+    return unless puppet_class
+    port_key = puppet_class.class_params.find_by :key => 'port'
+    return unless port_key
+    def_value = port_key.default_value
+
+    if method == :to_i
+      port_key.key_type =  "integer"
+      port_key.default_value = def_value.to_i
+    else
+      port_key.key_type == "string"
+      port_key.default_value = port_key.default_value.to_s
+    end
+    port_key.save!
+  end
+end

data/lib/foreman_openscap/engine.rb

@@ -180,19 +180,6 @@ module ForemanOpenscap
                         :description => proxy_description,
                         :api_description => N_('ID of OpenSCAP Proxy')
 
-        if ForemanOpenscap.with_remote_execution?
-          options = {
-            :description => N_("Run OpenSCAP scan"),
-            :provided_inputs => "policies"
-          }
-
-          if Gem::Version.new(ForemanRemoteExecution::VERSION) >= Gem::Version.new('1.2.3')
-            options[:host_action_button] = true
-          end
-
-          RemoteExecutionFeature.register(:foreman_openscap_run_scans, N_("Run OpenSCAP scan"), options)
-        end
-
         add_controller_action_scope('Api::V2::HostsController', :index) do |base_scope|
           base_scope.preload(:policies)
         end
@@ -231,6 +218,19 @@ module ForemanOpenscap
       Log.send(:include, ForemanOpenscap::LogExtensions)
       BookmarkControllerValidator.send(:prepend, ForemanOpenscap::BookmarkControllerValidatorExtensions)
       ProxyStatus.status_registry.add(ProxyStatus::OpenscapSpool)
+
+      if ForemanOpenscap.with_remote_execution?
+        options = {
+          :description => N_("Run OpenSCAP scan"),
+          :provided_inputs => "policies"
+        }
+
+        if Gem::Version.new(ForemanRemoteExecution::VERSION) >= Gem::Version.new('1.2.3')
+          options[:host_action_button] = true
+        end
+
+        RemoteExecutionFeature.register(:foreman_openscap_run_scans, N_("Run OpenSCAP scan"), options)
+      end
     end
 
     rake_tasks do

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "4.1.0".freeze
+  VERSION = "4.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,6 +246,7 @@ files:
 - db/migrate/20190103093409_add_deployment_option_to_policy.foreman_openscap.rb
 - db/migrate/20200117135424_migrate_port_overrides_to_int.rb
 - db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb
+- db/migrate/20201202110213_update_puppet_port_param_type.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb