foreman_openscap 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb07ec68598ddfebdea1a16d50489cb5ca88cd7e5e0eb0294591704ac41d06d
-  data.tar.gz: 2c9aeed9bd9244263002370796e1439801dbe29183f4f19c99bc33d5aa5168b3
+  metadata.gz: 66351b5753044871382c381df255b7666a31e08fea8512d1012a3a09b63e7378
+  data.tar.gz: 5a7a4cf20c67ae0a27365b5d6f9bdb5874aa4aa19cb792a8aaac348a477de104
 SHA512:
-  metadata.gz: 93afb936e476d4b8ddc3c616ec5820b7609cf8fefc59478ac7011b78edef1e33946d194ba4a47dde89acf19dcbc6d6fd74f6e5ba501502ae9a1ef7663e1b77ed
-  data.tar.gz: c5aeec2a9ceee0c88d40e279dda82316e4a13eeb5e4b31856fa2625b20e994cf10e13b338286b5550e6d9ba107c78de0049d6587610404c31d2c3d5ecbc7b85f
+  metadata.gz: 9e172a8489bd6a8df619438aeb1dafa2166241313d5770da82b889ce15193afad019dff653a4b86f014da6841bd3dfc06993fb2e72441091cd707c22907a2122
+  data.tar.gz: fc59f280bc4614e94dac5d27c7d1806f2cd79b458dce66300eea6f3038533b7a936953a51b91331680b86767846d0b1fcc0f134d45056c2d70284a1b43497bba

data/app/models/foreman_openscap/policy.rb

@@ -312,7 +312,7 @@ module ForemanOpenscap
     end
 
     def assign_ids(ids, class_name)
-      new_assets = ids.reject { |id| id.respond_to?(:empty?) && id.empty? }.reduce([]) do |memo, id|
+      new_assets = ids.uniq.reject { |id| id.respond_to?(:empty?) && id.empty? }.reduce([]) do |memo, id|
         memo << assets.where(:assetable_type => class_name, :assetable_id => id).first_or_initialize
       end
       complimentary_class_name = class_name == 'Host::Base' ? 'Hostgroup' : 'Host::Base'

data/db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb

@@ -0,0 +1,34 @@
+class MigratePortOverridesForAnsible < ActiveRecord::Migration[6.0]
+  def up
+    transform_lookup_values :to_i
+  end
+
+  def down
+    transform_lookup_values :to_s
+  end
+
+  private
+
+  def transform_lookup_values(method)
+    return unless defined?(ForemanAnsible)
+    role = AnsibleRole.find_by :name => 'theforeman.foreman_scap_client'
+    return unless role
+    port_key = role.ansible_variables.find_by :key => 'foreman_scap_client_port'
+    return unless port_key
+    if method == :to_i
+      port_key.key_type =  "integer"
+      port_key.default_value = 8080
+    else
+      port_key.key_type == "string"
+      port_key.default_value = ""
+    end
+
+    port_key.save
+    port_key.lookup_values.in_batches do |batch|
+      batch.each do |lookup_value|
+        lookup_value.value = lookup_value.value.send(method)
+        lookup_value.save
+      end
+    end
+  end
+end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "4.0.1".freeze
+  VERSION = "4.0.2".freeze
 end

data/test/unit/policy_test.rb

@@ -37,6 +37,15 @@ class PolicyTest < ActiveSupport::TestCase
     assert_equal hostgroup, policy.hostgroups.first
   end
 
+  test "should not raise when assiging same host by id" do
+    host1 = FactoryBot.create(:compliance_host)
+    asset = FactoryBot.create(:asset, :assetable_id => host1.id, :assetable_type => 'Host::Base')
+    policy = FactoryBot.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    policy.host_ids = [host1, host1].map(&:id)
+    policy.save!
+    assert_equal 1, policy.hosts.count
+  end
+
   test "should remove associated hostgroup" do
     hg = FactoryBot.create(:hostgroup)
     asset = FactoryBot.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -244,6 +244,7 @@ files:
 - db/migrate/20171016125613_add_content_title_unique_constraint.foreman_openscap.rb
 - 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/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb