Fix source codec

Signed-off-by: Jian Qiu <[email protected]>

Author: qiujian16

pkg/cloudevents/clients/work/source/codec/manifestbundle.go

@@ -3,8 +3,6 @@ package codec
 import (
 	"encoding/json"
 	"fmt"
-	"strconv"
-
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 	cloudeventstypes "github.com/cloudevents/sdk-go/v2/types"
 
@@ -36,15 +34,10 @@ func (c *ManifestBundleCodec) Encode(source string, eventType types.CloudEventsT
 		return nil, fmt.Errorf("unsupported cloudevents data type %s", eventType.CloudEventsDataType)
 	}
 
-	resourceVersion, err := strconv.Atoi(work.ResourceVersion)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert resource version %s to int: %v", work.ResourceVersion, err)
-	}
-
 	evt := types.NewEventBuilder(source, eventType).
 		WithClusterName(work.Namespace).
 		WithResourceID(string(work.UID)).
-		WithResourceVersion(int64(resourceVersion)).
+		WithResourceVersion(work.Generation).
 		NewEvent()
 
 	// set the work's meta data to its cloud event
@@ -120,7 +113,7 @@ func (c *ManifestBundleCodec) Decode(evt *cloudevents.Event) (*workv1.ManifestWo
 	if len(metaObj.Name) == 0 {
 		metaObj.Name = resourceID
 	}
-	metaObj.ResourceVersion = fmt.Sprintf("%d", resourceVersion)
+	metaObj.Generation = int64(resourceVersion)
 	if metaObj.Annotations == nil {
 		metaObj.Annotations = map[string]string{}
 	}

pkg/cloudevents/clients/work/store/informer.go

@@ -12,8 +12,6 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog/v2"
-
 	workv1 "open-cluster-management.io/api/work/v1"
 
 	"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
@@ -167,7 +165,6 @@ func (s *AgentInformerWatcherStore) Delete(resource runtime.Object) error {
 }
 
 func (s *AgentInformerWatcherStore) HandleReceivedResource(ctx context.Context, action types.ResourceAction, work *workv1.ManifestWork) error {
-	logger := klog.FromContext(ctx)
 	switch action {
 	case types.Added:
 		return s.Add(work.DeepCopy())
@@ -179,15 +176,14 @@ func (s *AgentInformerWatcherStore) HandleReceivedResource(ctx context.Context,
 		if !exists {
 			return fmt.Errorf("the work %s/%s does not exist", work.Namespace, work.Name)
 		}
+
+		updatedWork := work.DeepCopy()
+
 		// prevent the work from being updated if it is deleting
 		if !lastWork.GetDeletionTimestamp().IsZero() {
-			logger.Info("the work is deleting, ignore the update",
-				"manifestWorkNamespace", work.Namespace, "manifestWorkName", work.Name)
-			return nil
+			updatedWork.SetDeletionTimestamp(lastWork.DeletionTimestamp)
 		}
 
-		updatedWork := work.DeepCopy()
-
 		// restore the fields that are maintained by local agent.
 		updatedWork.Finalizers = lastWork.Finalizers
 		updatedWork.Status = lastWork.Status

pkg/cloudevents/generic/clients/baseclient.go

@@ -174,7 +174,7 @@ func (c *baseClient) subscribe(ctx context.Context, receive receiveFn) {
 				go func() {
 					if err := c.transport.Receive(receiverCtx, func(evt cloudevents.Event) {
 						logger.V(2).Info("Received event", "event", evt.Context)
-						logger.V(5).Info("Received event", "event", func() any { return evt.String() })
+						logger.V(5).Info("Received event", "event", evt.String())
 
 						receive(receiverCtx, evt)
 					}); err != nil {