lib/bolt/apply_result.rb in bolt-1.19.0 vs lib/bolt/apply_result.rb in bolt-1.20.0

@@ -63,11 +63,11 @@
     end
 
     def initialize(target, error: nil, report: nil)
       @target = target
       @value = {}
-      @type = 'apply'
+      @action = 'apply'
       value['report'] = report if report
       value['_error'] = error if error
       value['_output'] = metrics_message if metrics_message
     end
 
@@ -75,29 +75,16 @@
       if (events = value.dig('report', 'metrics', 'resources', 'values'))
         events.each_with_object({}) { |ev, h| h[ev[0]] = ev[2] }
       end
     end
 
-    # TODO: We've gotten requests for this type of logging but I'm not sure
-    # what we shold do with it exactly.
-    def log_events
-      logger = Logging.logger[target.name]
-      if (logs = value.dig('report', 'logs'))
-        logs.each do |log|
-          case log["level"]
-          when 'err'
-            logger.error(log['message'])
-          when 'warn'
-            logger.info(log['message'])
-          when 'notice'
-            logger.notice(log['message'])
-          when 'info'
-            logger.info(log['message'])
-          else
-            logger.debug(log["message"])
-          end
-        end
-      end
+    def logs
+      value.dig('report', 'logs') || []
+    end
+
+    # Return only log messages associated with resources
+    def resource_logs
+      logs.reject { |log| log['source'] == 'Puppet' }
     end
 
     def metrics_message
       if (metrics = event_metrics)
         changed = metrics['changed']