foreman_openscap 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a1469f7adb801cd2a0546ae4ee61e2fe2161d5
-  data.tar.gz: 5f0e0fb1d2749991765d97548e144df5e837fe35
+  metadata.gz: 9b441309459cd62b0c525d1b51dd856b28bf3b2e
+  data.tar.gz: 2b98addfa0d16368c3f9d9be4af017047ba56036
 SHA512:
-  metadata.gz: 0ef9439800ec792c4982c86e77702a04079bee39797c3ef07de41b9cacd4de64ace28a60f15646ccae66d6eace541bb6c4473aaad3db491a8b18498cfb270f18
-  data.tar.gz: 12600506e0dc3c9abdeda73b14d7f43ab98910ec0c6fe89379a50d84800cfbb2a7401f00d4a2bf8deafb6059b9057049227a832d93938223e9e9a1e295f72dd0
+  metadata.gz: ddae8417386fa6877ce9b2873b94f1750dde15217cf29cc2fbb3d2e5e2ae7f07ee4905da0702a45c00d26b6ad8c20c5b0aa43d89b11becf04344feabba1d7af5
+  data.tar.gz: 6b843df78415ac1c53ee199e06abba468f0d3e0c121c890b0565aec35c38a788d9fde4092fcdd59a4410b97eb6f8c3039b2cc8228787e34866f7d5829e95b630

data/app/controllers/api/v2/compliance/arf_reports_controller.rb

@@ -14,8 +14,8 @@ module Api
         before_action :find_resources_before_create, :only => %w[create]
         skip_after_action :log_response_body, :only => %w[download download_html]
 
-        def resource_name
-          '::ForemanOpenscap::ArfReport'
+        def resource_name(resource = '::ForemanOpenscap::ArfReport')
+          super resource
         end
 
         def get_resource(message = 'no resource loaded')

data/app/controllers/api/v2/compliance/policies_controller.rb

@@ -10,8 +10,8 @@ module Api::V2
 
       skip_after_action :log_response_body, :only => [:content]
 
-      def resource_name
-        '::ForemanOpenscap::Policy'
+      def resource_name(resource = '::ForemanOpenscap::Policy')
+        super resource
       end
 
       def get_resource(message = 'no resource loaded')

data/app/controllers/api/v2/compliance/scap_contents_controller.rb

@@ -4,8 +4,8 @@ module Api::V2
       include Foreman::Controller::Parameters::ScapContent
       before_action :find_resource, :except => %w[index create]
 
-      def resource_name
-        '::ForemanOpenscap::ScapContent'
+      def resource_name(resource = '::ForemanOpenscap::ScapContent')
+        super resource
       end
 
       def get_resource(message = 'no resource loaded')

data/app/controllers/api/v2/compliance/tailoring_files_controller.rb

@@ -5,8 +5,8 @@ module Api::V2
       before_action :find_resource, :except => %w[index create]
       before_action :openscap_proxy_check, :only => %w[create]
 
-      def resource_name
-        '::ForemanOpenscap::TailoringFile'
+      def resource_name(resource = '::ForemanOpenscap::TailoringFile')
+        super resource
       end
 
       def get_resource(message = 'no resource loaded')

data/app/models/concerns/foreman_openscap/host_extensions.rb

@@ -52,7 +52,7 @@ module ForemanOpenscap
     end
 
     def policies=(policies)
-      self.create_asset(:assetable => self) if self.asset.blank?
+      self.build_asset(:assetable => self) if self.asset.blank?
       self.asset.policies = policies
     end
 

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.10.3".freeze
+  VERSION = "0.10.4".freeze
 end

data/test/factories/arf_report_factory.rb

@@ -5,7 +5,6 @@ FactoryBot.define do
     policy_arf_report nil
     sequence(:reported_at) { |n| Time.new(1490 + n, 0o1, 13, 15, 24, 0o0) }
     sequence(:created_at) { |n| Time.new(1490 + n, 0o1, 13, 15, 24, 0o0) }
-    logs []
     status 0
     metrics({})
     openscap_proxy nil

data/test/unit/arf_report_test.rb

@@ -11,50 +11,57 @@ module ForemanOpenscap
       @host = FactoryBot.create(:compliance_host)
       @failed_source = FactoryBot.create(:source)
       @passed_source = FactoryBot.create(:source)
-      @log_1 = FactoryBot.create(:compliance_log, :result => "pass", :source => @passed_source)
-      @log_2 = FactoryBot.create(:compliance_log, :result => "fail", :source => @failed_source)
-      @log_3 = FactoryBot.create(:compliance_log, :result => "pass", :source => @passed_source)
+
+      @passed_log_params = { :result => "pass", :source => @passed_source }
+      @failed_log_params = { :result => "fail", :source => @failed_source }
       @status = { :passed => 5, :failed => 1, :othered => 7 }.with_indifferent_access
     end
 
     test 'equal? should return true when there is no change in report results' do
-      log_4 = FactoryBot.create(:compliance_log, :result => "fail", :source => @failed_source)
-      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3, log_4])
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      create_logs_for_report(report_1, [@passed_log_params, @failed_log_params])
+      create_logs_for_report(report_2, [@passed_log_params, @failed_log_params])
 
       assert(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when there is change in report results' do
       new_source = FactoryBot.create(:source)
-      log_4 = FactoryBot.build(:compliance_log, :result => "pass", :source => new_source)
-      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3, log_4])
+
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      create_logs_for_report(report_1, [@passed_log_params, @failed_log_params])
+      create_logs_for_report(report_2, [@passed_log_params, @passed_log_params])
 
       refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different sets of rules' do
-      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_3])
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      create_logs_for_report(report_1, [@passed_log_params, @failed_log_params])
+      create_logs_for_report(report_2, [@passed_log_params])
 
       refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different hosts' do
       host = FactoryBot.create(:compliance_host)
-      log_4 = FactoryBot.create(:compliance_log, :result => "fail", :source => @failed_source)
-      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => host.id, :logs => [@log_3, log_4])
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      report_2 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => host.id)
+      create_logs_for_report(report_1, [@passed_log_params, @failed_log_params])
+      create_logs_for_report(report_2, [@passed_log_params, @failed_log_params])
 
       refute(report_1.equal?(report_2))
     end
 
     test 'equal? should return false when reports have different policies' do
       policy = FactoryBot.create(:policy)
-      log_4 = FactoryBot.create(:compliance_log, :result => "fail", :source => @failed_source)
-      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
-      report_2 = FactoryBot.create(:arf_report, :policy => policy, :host_id => @host.id, :logs => [@log_3, log_4])
+      report_1 = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      report_2 = FactoryBot.create(:arf_report, :policy => policy, :host_id => @host.id)
+      create_logs_for_report(report_1, [@passed_log_params, @failed_log_params])
+      create_logs_for_report(report_2, [@passed_log_params, @failed_log_params])
 
       refute(report_1.equal?(report_2))
     end
@@ -151,9 +158,19 @@ module ForemanOpenscap
       openscap_proxy_api.stubs(:destroy_report).returns(true)
       ForemanOpenscap::Helper.stubs(:find_name_or_uuid_by_host).returns("abcde")
       ForemanOpenscap::ArfReport.any_instance.stubs(:openscap_proxy_api).returns(openscap_proxy_api)
-      report = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id, :logs => [@log_1, @log_2])
+      report = FactoryBot.create(:arf_report, :policy => @policy, :host_id => @host.id)
+      create_logs_for_report(report, [@passed_log_params, @failed_log_params])
+
       report.destroy
       refute ForemanOpenscap::ArfReport.all.include? report
     end
+
+    private
+
+    def create_logs_for_report(report, log_params)
+      log_params.each do |param_group|
+        FactoryBot.create(:compliance_log, param_group.merge(:report_id => report.id))
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface