(fixup) Create common skipped and invalid target handling for validat…

…ors.
puppetlabs · Aug 14, 2017 · 534caaf · 534caaf
1 parent c366c2e
commit 534caaf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/lib/pdk/validators/base_validator.rb b/lib/pdk/validators/base_validator.rb
@@ -72,9 +72,7 @@ def self.spinner_text(_targets = nil)
         _('Invoking %{cmd}') % { cmd: cmd }
       end
 
-      def self.invoke(report, options = {})
-        targets, skipped, invalid = parse_targets(options)
-
+      def self.process_skipped(report, skipped = [])
         skipped.each do |skipped_target|
           PDK.logger.debug(_('%{validator}: Skipped \'%{target}\'. Target does not contain any files to validate (%{pattern}).') % { validator: name, target: skipped_target, pattern: pattern })
           report.add_event(
@@ -85,7 +83,9 @@ def self.invoke(report, options = {})
             state:    :skipped,
           )
         end
+      end
 
+      def self.process_invalid(report, invalid = [])
         invalid.each do |invalid_target|
           PDK.logger.debug(_('%{validator}: Skipped \'%{target}\'. Target file not found.') % { validator: name, target: invalid_target })
           report.add_event(
@@ -96,6 +96,14 @@ def self.invoke(report, options = {})
             state:    :error,
           )
         end
+      end
+
+      def self.invoke(report, options = {})
+        targets, skipped, invalid = parse_targets(options)
+
+        process_skipped(report, skipped)
+        process_invalid(report, invalid)
+
         return 0 if targets.empty?
 
         PDK::Util::Bundler.ensure_binstubs!(cmd)

diff --git a/lib/pdk/validators/metadata/metadata_syntax.rb b/lib/pdk/validators/metadata/metadata_syntax.rb
@@ -42,7 +42,10 @@ def self.stop_spinner(exit_code)
       end
 
       def self.invoke(report, options = {})
-        targets, _skipped, _invalid = parse_targets(options)
+        targets, skipped, invalid = parse_targets(options)
+
+        process_skipped(skipped)
+        process_invalid(invalid)
 
         return 0 if targets.empty?
 
@@ -57,18 +60,6 @@ def self.invoke(report, options = {})
         JSON.parser = JSON::Pure::Parser
 
         targets.each do |target|
-          unless File.file?(target)
-            report.add_event(
-              file:     target,
-              source:   name,
-              state:    :failure,
-              severity: 'error',
-              message:  _('not a file'),
-            )
-            return_val = 1
-            next
-          end
-
           unless File.readable?(target)
             report.add_event(
               file: target,