fix(propertyFiles): change wording of error message to indicate that …

…there might be a syntax error in the file (#1715)
spinnaker · Oct 18, 2017 · 03c5dba · 03c5dba
1 parent d0c89df
commit 03c5dba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy b/...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy
@@ -83,7 +83,7 @@ public class WaitOnJobCompletion extends AbstractCloudProviderAwareTask implemen
             Map<String, Object> properties = [:]
             properties = katoRestService.getFileContents(appName, account, location, name, stage.context.propertyFile)
             if (properties.size() == 0) {
-              throw new IllegalStateException("expected properties file ${stage.context.propertyFile} but one was not found or was empty")
+              throw new IllegalStateException("Expected properties file ${stage.context.propertyFile} but it was either missing, empty or contained invalid syntax")
             }
             outputs << properties
             outputs.propertyFileContents = properties

diff --git a/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/tasks/MonitorJenkinsJobTask.groovy b/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/tasks/MonitorJenkinsJobTask.groovy
@@ -79,7 +79,7 @@ class MonitorJenkinsJobTask implements OverridableTimeoutRetryableTask {
         if (stage.context.propertyFile) {
           properties = buildService.getPropertyFile(buildNumber, stage.context.propertyFile, master, job)
           if (properties.size() == 0 && result == 'SUCCESS') {
-            throw new IllegalStateException("expected properties file ${stage.context.propertyFile} but one was not found or was empty")
+            throw new IllegalStateException("Expected properties file ${stage.context.propertyFile} but it was either missing, empty or contained invalid syntax")
           }
           outputs << properties
           outputs.propertyFileContents = properties

diff --git a/...or/src/test/groovy/com/netflix/spinnaker/orca/igor/tasks/MonitorJenkinsJobTaskSpec.groovy b/...or/src/test/groovy/com/netflix/spinnaker/orca/igor/tasks/MonitorJenkinsJobTaskSpec.groovy
@@ -175,7 +175,7 @@ class MonitorJenkinsJobTaskSpec extends Specification {
 
     then:
     IllegalStateException e = thrown IllegalStateException
-    e.message == 'expected properties file noexist.properties but one was not found or was empty'
+    e.message == 'Expected properties file noexist.properties but it was either missing, empty or contained invalid syntax'
   }
 
   def "marks 'unstable' results as successful if explicitly configured to do so"() {