Support array of sources for file text population

Author: kpaulisse

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

@@ -27,18 +27,22 @@ def self.convert_file_resources(obj, environment = 'production')
       # module path that is specified within the environment.conf file (assuming the default 'modules'
       # directory doesn't exist or the module isn't found in there). If the file can't be found then
       # this returns nil which may trigger an error.
-      # @param src [String] A file reference: puppet:///modules/xxx/yyy
+      # @param src_in [String|Array] A file reference: puppet:///modules/xxx/yyy
       # @param modulepaths [Array] Cached module path
       # @return [String] File system path to referenced file
-      def self.file_path(src, modulepaths)
-        unless src =~ %r{^puppet:///modules/([^/]+)/(.+)}
-          raise ArgumentError, "Bad parameter source #{src}"
+      def self.file_path(src_in, modulepaths)
+        valid_sources = [src_in].flatten.select { |line| line =~ %r{\Apuppet:///modules/([^/]+)/(.+)} }
+        unless valid_sources.any?
+          raise ArgumentError, "Bad parameter source #{src_in}"
         end
 
-        path = File.join(Regexp.last_match(1), 'files', Regexp.last_match(2))
-        modulepaths.each do |mp|
-          file = File.join(mp, path)
-          return file if File.exist?(file)
+        valid_sources.each do |src|
+          src =~ %r{\Apuppet:///modules/([^/]+)/(.+)}
+          path = File.join(Regexp.last_match(1), 'files', Regexp.last_match(2))
+          modulepaths.each do |mp|
+            file = File.join(mp, path)
+            return file if File.exist?(file)
+          end
         end
 
         nil

spec/octocatalog-diff/tests/catalog-util/fileresources_spec.rb

@@ -22,16 +22,59 @@ def catalog_from_fixture(path)
     end
 
     it 'should return path if file is found' do
+      allow(File).to receive(:exist?).and_call_original
       allow(File).to receive(:exist?).with('/a/foo/files/bar').and_return(true)
       result = OctocatalogDiff::CatalogUtil::FileResources.file_path('puppet:///modules/foo/bar', ['/a'])
       expect(result).to eq('/a/foo/files/bar')
     end
 
     it 'should return nil if file is not found' do
+      allow(File).to receive(:exist?).and_call_original
       allow(File).to receive(:exist?).with('/a/foo/files/bar').and_return(false)
       result = OctocatalogDiff::CatalogUtil::FileResources.file_path('puppet:///modules/foo/bar', ['/a'])
       expect(result).to eq(nil)
     end
+
+    it 'should return the first entry from an array if found' do
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with('/a/foo/files/bar').and_return(true)
+      expect(File).not_to receive(:exist?).with('/a/foo/files/baz')
+      tries = ['puppet:///modules/foo/bar', 'puppet:///modules/foo/baz']
+      result = OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])
+      expect(result).to eq('/a/foo/files/bar')
+    end
+
+    it 'should return the first actually found entry from an array' do
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with('/a/foo/files/bar').and_return(false)
+      allow(File).to receive(:exist?).with('/a/foo/files/baz').and_return(true)
+      tries = ['sdfasdf', 'puppet:///modules/foo/bar', 'puppet:///modules/foo/baz']
+      result = OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])
+      expect(result).to eq('/a/foo/files/baz')
+    end
+
+    it 'should return nil if no entries from an array are found' do
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with('/a/foo/files/bar').and_return(false)
+      allow(File).to receive(:exist?).with('/a/foo/files/baz').and_return(false)
+      tries = ['puppet:///modules/foo/bar', 'puppet:///modules/foo/baz']
+      result = OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])
+      expect(result).to be_nil
+    end
+
+    it 'should raise an error if the only entry is malformed' do
+      tries = 'sddfsdfsdf'
+      expect do
+        OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])
+      end.to raise_error(ArgumentError, /Bad parameter source/)
+    end
+
+    it 'should raise an error if the all entries are malformed' do
+      tries = %w[sddfsdfsdf asdfasfdasdf]
+      expect do
+        OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])
+      end.to raise_error(ArgumentError, /Bad parameter source/)
+    end
   end
 
   describe '#module_path' do