foreman_openscap 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c549bddac8d76de26371740d282a226a08300f5
-  data.tar.gz: efb9f59e37b0b2bb7351f2ccd62e3dc3dab41aea
+  metadata.gz: e44b157d6a98bde81102199865d962801c45714f
+  data.tar.gz: a68bd3f0a7f14a5b434fb888926feb0d01e266e2
 SHA512:
-  metadata.gz: 07c6aa94f281c2a5617e92667fcb4dd85f4b2fce25ca8bd1fe7a1ed87facb618b75f019a8e9f82d2b8be61010ddf08ad69b4230d019ff90407bc745522e81f50
-  data.tar.gz: 4ff5e641877263dcd2792106893610c7183bb6d15d2b65772600722790475cd4b4d1b1480c5ba741f889310c329605eb8032ebc1e1136fb107a88419b0c3d9e2
+  metadata.gz: 593b4ebec5ef8a449b3263c98fb041f223817ad369c526d17eb2b8626db36176b593c14abea960ea09c354850245ab8fac03984cc8f6876e0e15c37aee0a1496
+  data.tar.gz: ee4bc44b6d03ef9afbefdba3cf194582ffc05cc62df7356f1f3d4ed0a939fd2141cebf8d8a9a3dbd9f987ed62d89737400dea37f00ad412895c03063dbf395f2

data/app/lib/proxy_api/openscap.rb

@@ -51,8 +51,9 @@ module ::ProxyAPI
       begin
         parse(delete("arf/#{report.id}/#{cname}/#{report.reported_at.to_i}/#{report.policy_arf_report.digest}"))
       rescue => e
-        logger.error "Failed to destroy arf report with id #{report.id} on Smart Proxy"
-        logger.debug e.backtrace.join("\n\t")
+        msg = "Failed to destroy arf report with id #{report.id} on Smart Proxy, cause: #{e.message}"
+        logger.error msg
+        report.errors.add(:base, msg)
         false
       end
     end

data/app/models/foreman_openscap/arf_report.rb

@@ -189,18 +189,22 @@ module ForemanOpenscap
     end
 
     def destroy_from_proxy
-      if host
-        begin
-          openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
-        rescue Foreman::Exception => e
-          logger.error "Failed to delete report with id #{id} from proxy, cause: #{e.message}"
-          logger.debug e.backtrace.join("\n\t")
-        end
+      if !host
+        destroy_from_proxy_warning "host"
+      elsif !policy
+        destroy_from_proxy_warning "policy"
+      elsif !openscap_proxy
+        destroy_from_proxy_warning "OpenSCAP proxy"
       else
-        logger.error "Failed to delete report with id #{id} from proxy, no host associated with report"
+        openscap_proxy_api.destroy_report(self, ForemanOpenscap::Helper::find_name_or_uuid_by_host(host))
       end
     end
 
+    def destroy_from_proxy_warning(associated)
+      logger.warn "Skipping deletion of report with id #{id} from proxy, no #{associated} associated with report"
+      true
+    end
+
     def self.newline_to_space(string)
       string.gsub(/ *\n+/, " ")
     end

data/db/migrate/20171011134112_remove_arf_reports_without_policy.rb

@@ -1,8 +1,10 @@
 class RemoveArfReportsWithoutPolicy < ActiveRecord::Migration
   def up
-    ids_to_keep = ForemanOpenscap::ArfReport.unscoped.all.joins(:policy_arf_report).pluck(:id)
-    ForemanOpenscap::ArfReport.unscoped.where.not(:id => ids_to_keep).find_in_batches do |batch|
-      batch.map(&:destroy!)
+    User.as_anonymous_admin do
+      ids_to_keep = ForemanOpenscap::ArfReport.unscoped.all.joins(:policy_arf_report).pluck(:id)
+      ForemanOpenscap::ArfReport.unscoped.where.not(:id => ids_to_keep).find_in_batches do |batch|
+        batch.map(&:destroy!)
+      end
     end
   end
 end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.8.4".freeze
+  VERSION = "0.8.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface