Merge pull request #172 from anotherchrisberry/cron-messages

include description on successful cron validation
spinnaker · Jan 7, 2016 · 6364f1d · 6364f1d
2 parents ca157da + a07e1d1
commit 6364f1d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/CronService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/CronService.groovy
@@ -36,8 +36,8 @@ class CronService {
     }
 
     try {
-      echoService.validateCronExpression(cronExpression)
-      return [ valid: true ]
+      Map validationResult = echoService.validateCronExpression(cronExpression)
+      return [ valid: true, description: validationResult.description ]
     } catch (RetrofitError e) {
       if (e.response?.status == 400) {
         Map responseBody = e.getBodyAs(Map) as Map

diff --git a/gate-web/src/test/groovy/com/netflix/spinnaker/gate/services/CronServiceSpec.groovy b/gate-web/src/test/groovy/com/netflix/spinnaker/gate/services/CronServiceSpec.groovy
@@ -79,6 +79,20 @@ class CronServiceSpec extends Specification {
     )
 
     expect:
-    service.validateCronExpression("totally invalid cron expression") == [ valid: true ]
+    service.validateCronExpression("totally invalid cron expression") == [ valid: true, description: null ]
+  }
+
+  void "should include description if present when validation is successful"() {
+    def response = [
+        description: "LGTM"
+    ]
+    def service = new CronService(
+        echoService: Mock(EchoService) {
+          1 * validateCronExpression("1 1 1 1 1 1") >> response
+        }
+    )
+
+    expect:
+    service.validateCronExpression("1 1 1 1 1 1") == [ valid: true, description: 'LGTM' ]
   }
 }