Wrap broken source file as a catalog error

Author: kpaulisse

lib/octocatalog-diff/catalog-util/fileresources.rb

@@ -86,7 +86,12 @@ def self._convert_file_resources(resources, compilation_dir, environment = 'prod
         resources.map! do |resource|
           if resource_convertible?(resource)
             path = file_path(resource['parameters']['source'], modulepaths)
-            raise Errno::ENOENT, "Unable to resolve '#{resource['parameters']['source']}'!" if path.nil?
+            if path.nil?
+              # Pass this through as a wrapped exception, because it's more likely to be something wrong
+              # in the catalog itself than it is to be a broken setup of octocatalog-diff.
+              message = "Errno::ENOENT: Unable to resolve '#{resource['parameters']['source']}'!"
+              raise OctocatalogDiff::Errors::CatalogError, message
+            end
 
             if File.file?(path)
               # If the file is found, read its content. If the content is all ASCII, substitute it into

spec/octocatalog-diff/integration/convert_file_resources_spec.rb

@@ -160,7 +160,7 @@
       )
       expect(result[:exitcode]).to eq(-1)
       expect(result[:exception]).to be_a_kind_of(OctocatalogDiff::Errors::CatalogError)
-      expect(result[:exception].message).to match(/Errno::ENOENT: No such file or directory/)
+      expect(result[:exception].message).to match(/Errno::ENOENT/)
       expect(result[:exception].message).to match(%r{Unable to resolve 'puppet:///modules/test/foo-new'})
     end
   end