Display appropriate message when an activation ID is not returned from a trigger fire

Author: dubee

commands/trigger.go

@@ -82,7 +82,7 @@ var triggerFireCmd = &cobra.Command{
 			}
 		}
 
-		trigResp, _, err := Client.Triggers.Fire(qualifiedName.GetEntityName(), parameters)
+		trigResp, resp, err := Client.Triggers.Fire(qualifiedName.GetEntityName(), parameters)
 		if err != nil {
 			whisk.Debug(whisk.DbgError, "Client.Triggers.Fire(%s, %#v) failed: %s\n", qualifiedName.GetEntityName(), parameters, err)
 			errStr := wski18n.T("Unable to fire trigger '{{.name}}': {{.err}}",
@@ -92,13 +92,24 @@ var triggerFireCmd = &cobra.Command{
 			return werr
 		}
 
+		if resp.StatusCode == 204 {
+			fmt.Fprintf(color.Output,
+				wski18n.T("trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule(s)\n",
+					map[string]interface{}{
+						"namespace": boldString(qualifiedName.GetNamespace()),
+						"name":      boldString(qualifiedName.GetEntityName())}))
+
+			return nil
+		}
+
 		fmt.Fprintf(color.Output,
 			wski18n.T("{{.ok}} triggered /{{.namespace}}/{{.name}} with id {{.id}}\n",
 				map[string]interface{}{
 					"ok":        color.GreenString("ok:"),
 					"namespace": boldString(qualifiedName.GetNamespace()),
 					"name":      boldString(qualifiedName.GetEntityName()),
 					"id":        boldString(trigResp.ActivationId)}))
+
 		return nil
 	},
 }

tests/src/test/scala/system/basic/WskCliBasicTests.scala

@@ -195,12 +195,12 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
     }
 
     val stdout = wsk.action.get(name).stdout
-    stdout should not include regex(""""key": "a"""")
-    stdout should not include regex(""""value": "A"""")
-    stdout should include regex (""""key": "b""")
-    stdout should include regex (""""value": "B"""")
-    stdout should include regex (""""publish": false""")
-    stdout should include regex (""""version": "0.0.2"""")
+    stdout should not include (""""key": "a"""")
+    stdout should not include (""""value": "A"""")
+    stdout should include (""""key": "b""")
+    stdout should include (""""value": "B"""")
+    stdout should include (""""publish": false""")
+    stdout should include (""""version": "0.0.2"""")
     wsk.action.list().stdout should include(name)
   }
 
@@ -744,6 +744,20 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
       }
   }
 
+  it should "display proper error when trigger is not associated with active rule" in withAssetCleaner(wskprops) {
+    val triggerName = withTimestamp("noRuleTrigger")
+
+    (wp, assetHelper) =>
+      assetHelper.withCleaner(wsk.trigger, triggerName) { (trigger, _) =>
+        trigger.create(triggerName)
+      }
+
+      val rr = wsk.trigger.fire(triggerName)
+      val ns = wsk.namespace.whois()
+
+      rr.stdout should include regex(s"trigger /.*/$triggerName did not fire as it is not associated with an active rule\\(s\\)")
+  }
+
   behavior of "Wsk Rule CLI"
 
   it should "create rule, get rule, update rule and list rule" in withAssetCleaner(wskprops) { (wp, assetHelper) =>

wski18n/resources/en_US.all.json

@@ -625,6 +625,10 @@
     "id": "{{.ok}} triggered /{{.namespace}}/{{.name}} with id {{.id}}\n",
     "translation": "{{.ok}} triggered /{{.namespace}}/{{.name}} with id {{.id}}\n"
   },
+  {
+    "id": "trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule(s)\n",
+    "translation": "trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule(s)\n"
+  },
   {
     "id": "create new trigger",
     "translation": "create new trigger"