Merge pull request #4530 from vincentgoat/configmap_optional

fix comfigmap/secret optional error

2 files changed, 10 insertions, 9 deletions

diff --git a/cloud/pkg/cloudhub/dispatcher/message_dispatcher.go b/cloud/pkg/cloudhub/dispatcher/message_dispatcher.go
index 364fc3c83..622f5f80a 100644
--- a/cloud/pkg/cloudhub/dispatcher/message_dispatcher.go
+++ b/cloud/pkg/cloudhub/dispatcher/message_dispatcher.go
@@ -375,6 +375,11 @@ func noAckRequired(msg *beehivemodel.Message) bool {
 		if ok && content == commonconst.MessageSuccessfulContent {
 			return true
 		}
+		// `error message` is not required to ack
+		_, ok = msg.Content.(error)
+		if ok {
+			return true
+		}
 		fallthrough
 	default:
 		if msg.GetSource() == modules.EdgeControllerModuleName {
diff --git a/cloud/pkg/cloudhub/dispatcher/message_dispatcher_test.go b/cloud/pkg/cloudhub/dispatcher/message_dispatcher_test.go
index 0dfa14524..ab26f8a9f 100644
--- a/cloud/pkg/cloudhub/dispatcher/message_dispatcher_test.go
+++ b/cloud/pkg/cloudhub/dispatcher/message_dispatcher_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package dispatcher
 
 import (
+	"fmt"
 	"reflect"
 	"testing"
 
@@ -72,11 +73,6 @@ func TestNoAckRequired(t *testing.T) {
 			want:    true,
 		},
 		{
-			name:    "applicationResponse message",
-			message: beehivemodel.NewMessage("").SetResourceOperation("/node/edge-test/ignore/Application/ignore", "applicationResponse"),
-			want:    true,
-		},
-		{
 			name:    "user data message",
 			message: beehivemodel.NewMessage("router").SetRoute("", "user"),
 			want:    true,
@@ -87,13 +83,13 @@ func TestNoAckRequired(t *testing.T) {
 			want:    true,
 		},
 		{
-			name:    "response ok message",
-			message: beehivemodel.NewMessage("").SetResourceOperation("node/edge-node/default/node/edge-node", "response").FillBody("OK"),
+			name:    "node message",
+			message: beehivemodel.NewMessage("").SetResourceOperation("node/edge-node/default/node/edge-node", "response").SetRoute("edgecontroller", "resource"),
 			want:    true,
 		},
 		{
-			name:    "node message",
-			message: beehivemodel.NewMessage("").SetResourceOperation("node/edge-node/default/node/edge-node", "response").SetRoute("edgecontroller", "resource"),
+			name:    "response error message",
+			message: beehivemodel.NewMessage("").SetResourceOperation("node/edge-node/default/node/edge-node", "response").FillBody(fmt.Errorf("error")),
 			want:    true,
 		},
 		{