fix feed delete when feed action does not exist

Author: mdeuser

commands/trigger.go

@@ -290,18 +290,22 @@ var triggerDeleteCmd = &cobra.Command{
 
 					// If the trigger feed does not exist, it's deleted! This error message will look like
 					//      "could not find trigger /NAMESPACE_ID/TRIGGER_NAME in the database"
-					if !strings.Contains(err.Error(), "could not find trigger") {
-						errStr := wski18n.T("Unable to delete trigger '{{.name}}': {{.err}}",
-							map[string]interface{}{"name": qualifiedName.GetEntityName(), "err": err})
-
-						if !Flags.common.force {
-							werr := whisk.MakeWskErrorFromWskError(errors.New(errStr), err, whisk.EXIT_CODE_ERR_GENERAL, whisk.DISPLAY_MSG, whisk.NO_DISPLAY_USAGE)
-							return werr
-						} else {
-							whisk.Debug(whisk.DbgInfo, "trigger delete is forced despite feed deletion failure\n")
-						}
+					// OR if the feed action is not present, there's no way to clean up the feed
+					//     "The requested resource does not exist"
+					if strings.Contains(err.Error(), "could not find trigger") {
+					    whisk.Debug(whisk.DbgWarn, "trigger feed is already deleted for trigger %s\n", qualifiedName.GetEntityName())
+					} else if strings.Contains(err.Error(), "The requested resource does not exist") {
+                        whisk.Debug(whisk.DbgWarn, "trigger feed action '%s' does not exist\n", fullFeedName)
 					} else {
-						whisk.Debug(whisk.DbgWarn, "trigger feed is already deleted for trigger %s\n", qualifiedName.GetEntityName())
+    					errStr := wski18n.T("Unable to delete trigger '{{.name}}': {{.err}}",
+	    					map[string]interface{}{"name": qualifiedName.GetEntityName(), "err": err})
+
+		    			if !Flags.common.force {
+			    			werr := whisk.MakeWskErrorFromWskError(errors.New(errStr), err, whisk.EXIT_CODE_ERR_GENERAL, whisk.DISPLAY_MSG, whisk.NO_DISPLAY_USAGE)
+				    		return werr
+					   	} else {
+					    	whisk.Debug(whisk.DbgInfo, "trigger delete is forced despite feed deletion failure\n")
+					    }
 					}
 				}
 

tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala

@@ -1565,11 +1565,11 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
     val triggerName = withTimestamp("feedDeleteTest")
     val feedActionCreateParams = Map("statusCode" -> JsNumber(200))
 
-    val pwd = new File(".").getAbsolutePath()
-    println(s"PWD: '${pwd}'")
+    val feedActionPath = new File(".").getAbsolutePath() + "/src/dat/feed-action-fails-delete.js"
+    println(s"feedActionPath: '${feedActionPath}'")
 
     assetHelper.withCleaner(wsk.action, actionName) { (action, _) =>
-      action.create(actionName, Some(TestUtils.getTestActionFilename("feed-action-fails-delete.js")))
+      action.create(actionName, Some(feedActionPath))
     }
 
     try {