Fix bug 1004910: provide warning when processed_templates declares a …

…non-existent file

node/lib/openshift-origin-node/model/v2_cart_model.rb

@@ -274,7 +274,7 @@ def configure(cartridge_name, template_git_url = nil, manifest = nil)
               expected_entries = Dir.glob(PathUtils.join(@container.container_dir, '*'))
 
               output << cartridge_action(cartridge, 'setup', software_version, true)
-              process_erb_templates(c)
+              output << process_erb_templates(c)
               output << cartridge_action(cartridge, 'install', software_version)
 
               actual_entries  = Dir.glob(PathUtils.join(@container.container_dir, '*'))
@@ -605,12 +605,26 @@ def populate_gear_repo(cartridge_name, template_url = nil)
       #
       # Search cartridge for any remaining <code>erb</code> files render them
       def process_erb_templates(cartridge)
+        buffer = ''
+
         directory = PathUtils.join(@container.container_dir, cartridge.name)
         logger.info "Processing ERB templates for #{cartridge.name}"
 
         env  = ::OpenShift::Runtime::Utils::Environ.for_gear(@container.container_dir, directory)
         erbs = @container.processed_templates(cartridge).map { |x| PathUtils.join(@container.container_dir, x) }
+        erbs.delete_if do |erb_file|
+          reject = !File.exists?(erb_file)
+
+          if reject
+            buffer << "CLIENT_ERROR: File declared in processed_templates does not exist and will not be rendered: #{erb_file}"
+          end
+
+          reject
+        end
+
         render_erbs(env, erbs)
+
+        buffer
       end
 
       #  cartridge_action(cartridge, action, software_version, render_erbs) -> buffer

node/test/unit/v2_cart_model_test.rb

@@ -149,6 +149,46 @@ def test_get_cartridge_error_loading
       end
     end
 
+    def test_process_erb_templates_success
+      cartridge = mock()
+      cartridge.stubs(:name).returns('cartridge')
+
+      @container.stubs(:container_dir).returns("/foo")
+      env = mock()
+
+      Runtime::Utils::Environ.expects(:for_gear).with(@container.container_dir, '/foo/cartridge').returns(env)
+      @container.expects(:processed_templates).with(cartridge).returns(%w(a b c))
+      File.expects(:exists?).with('/foo/a').returns(true)
+      File.expects(:exists?).with('/foo/b').returns(true)
+      File.expects(:exists?).with('/foo/c').returns(true)
+
+      @model.expects(:render_erbs).with(env, %w(/foo/a /foo/b /foo/c))
+
+      result = @model.process_erb_templates(cartridge)
+
+      assert_equal '', result
+    end
+
+    def test_process_erb_templates_file_dne
+      cartridge = mock()
+      cartridge.stubs(:name).returns('cartridge')
+
+      @container.stubs(:container_dir).returns("/foo")
+      env = mock()
+
+      Runtime::Utils::Environ.expects(:for_gear).with(@container.container_dir, '/foo/cartridge').returns(env)
+      @container.expects(:processed_templates).with(cartridge).returns(%w(a b c))
+      File.expects(:exists?).with('/foo/a').returns(true)
+      File.expects(:exists?).with('/foo/b').returns(true)
+      File.expects(:exists?).with('/foo/c').returns(false)
+
+      @model.expects(:render_erbs).with(env, %w(/foo/a /foo/b))
+
+      result = @model.process_erb_templates(cartridge)
+
+      assert_match /CLIENT_ERROR/, result
+    end
+
     def test_private_endpoint_create
       ip1 = "127.0.250.1"
       ip2 = "127.0.250.2"