Allow convert_file_resources to work even in absence of environments/production

Author: Kevin Paulisse

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

@@ -29,7 +29,14 @@ def self._convert_file_resources(resources, compilation_dir)
         # Calculate compilation directory. There is not explicit error checking here because
         # there is on-demand, explicit error checking for each file within the modification loop.
         return unless compilation_dir.is_a?(String) && compilation_dir != ''
+
+        # Making sure that compilation_dir/environments/production exists. Otherwise, try to find
+        # compilation_dir/modules. If neither of those exist, this code can't run.
         env_dir = File.join(compilation_dir, 'environments', 'production')
+        unless File.directory?(File.join(env_dir, 'modules'))
+          return unless File.directory?(File.join(compilation_dir, 'modules'))
+          env_dir = compilation_dir
+        end
 
         # Modify the resources
         resources.map! do |resource|

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

@@ -23,6 +23,43 @@ def catalog_from_fixture(path)
       FileUtils.remove_entry_secure @tmpdir if File.directory?(@tmpdir)
     end
 
+    it 'should use compilation directory if environments/production is unavailable' do
+      FileUtils.rm_f File.join(@tmpdir, 'environments', 'production')
+
+      # Set up test
+      obj = catalog_from_fixture('catalogs/catalog-test-file-v4.json')
+      obj.compilation_dir = @tmpdir
+      resources_save = obj.resources.dup
+
+      # Perform test
+      OctocatalogDiff::CatalogUtil::FileResources.convert_file_resources(obj)
+      expect(obj.resources).to be_a_kind_of(Array), obj.resources.to_json
+      expect(obj.resources.size).to eq(3), obj.resources.to_json
+      expect(obj.resources[0]).to eq(resources_save[0]), obj.resources.to_json
+      expect(obj.resources[1]).to eq(resources_save[1]), obj.resources.to_json
+      expect(obj.resources[2]['parameters']['content']).to eq("foo\n"), obj.resources.to_json
+      expect(obj.resources[2]['parameters'].key?('source')).to eq(false), obj.resources.to_json
+
+      # Make sure the symlink isn't there, i.e. that we actually tested this
+      expect(File.exist?(File.join(@tmpdir, 'environments', 'production'))).to eq(false)
+    end
+
+    it 'should not run at all if modules directory cannot be found' do
+      module_dir = File.join(@tmpdir, 'modules')
+      FileUtils.remove_entry_secure module_dir if File.directory?(module_dir)
+
+      # Set up test
+      obj = catalog_from_fixture('catalogs/catalog-test-file-v4.json')
+      obj.compilation_dir = @tmpdir
+
+      # Perform test
+      OctocatalogDiff::CatalogUtil::FileResources.convert_file_resources(obj)
+      expect(obj.resources).to be_a_kind_of(Array), obj.resources.to_json
+      expect(obj.resources.size).to eq(3), obj.resources.to_json
+      expect(obj.resources[2]['parameters']['source']).to eq('puppet:///modules/test/tmp/foo')
+      expect(obj.resources[2]['parameters'].key?('content')).to eq(false), obj.resources.to_json
+    end
+
     it 'should modify array with convertible resources' do
       # Set up test
       obj = catalog_from_fixture('catalogs/catalog-test-file-v4.json')