Merge pull request #2202 from zendesk/grosser/verify

do not blow up with strange error when file is missing in repo or inv…

plugins/kubernetes/app/models/kubernetes/deploy_executor.rb

@@ -447,7 +447,12 @@ def verify_kubernetes_templates!
         end
 
         # make sure each set of templates is valid
-        configs = roles.map { |r| r.fetch(:role).role_config_file(@job.commit).primary }.compact
+        configs = roles.map do |r|
+          role = r.fetch(:role)
+          config = role.role_config_file(@job.commit)
+          raise Samson::Hooks::UserError, "Error parsing #{role.config_file}" unless config
+          config.primary
+        end.compact
         Kubernetes::RoleVerifier.verify_group(configs)
       end
     end

plugins/kubernetes/app/models/kubernetes/role.rb

@@ -126,7 +126,7 @@ def role_config_file(reference)
       begin
         RoleConfigFile.new(raw_template, config_file)
       rescue Samson::Hooks::UserError
-        return
+        nil
       end
     end
 

plugins/kubernetes/test/models/kubernetes/deploy_executor_test.rb

@@ -217,6 +217,16 @@ def worker_is_unstable
         end
         e.message.must_include "Missing env variables FOO, BAR"
       end
+
+      it "fails before building when role config is missing" do
+        GitRepository.any_instance.stubs(:file_content).with('kubernetes/resque_worker.yml', commit, anything).
+          returns(nil)
+
+        e = assert_raises Samson::Hooks::UserError do
+          refute execute
+        end
+        e.message.must_include "Error parsing kubernetes/resque_worker.yml"
+      end
     end
 
     describe "role settings" do