using resoruce id as the work metadata name

Signed-off-by: Wei Liu <liuweixa@redhat.com>

Author: skeeey

cmd/maestro/server/grpc_broker.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	ce "github.com/cloudevents/sdk-go/v2"
-	cetypes "github.com/cloudevents/sdk-go/v2/types"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/keepalive"
@@ -24,11 +23,14 @@ import (
 	servergrpc "open-cluster-management.io/sdk-go/pkg/cloudevents/server/grpc"
 
 	"github.com/openshift-online/maestro/pkg/api"
+	"github.com/openshift-online/maestro/pkg/client/cloudevents"
 	"github.com/openshift-online/maestro/pkg/dao"
 	"github.com/openshift-online/maestro/pkg/event"
 	"github.com/openshift-online/maestro/pkg/services"
 )
 
+const source = "maestro"
+
 var _ EventServer = &GRPCBroker{}
 
 type GRPCBrokerService struct {
@@ -290,63 +292,18 @@ func (s *GRPCBroker) PredicateEvent(ctx context.Context, eventID string) (bool,
 
 // decodeResourceStatus translates a CloudEvent into a resource containing the status JSON map.
 func decodeResourceStatus(evt *ce.Event) (*api.Resource, error) {
-	evtExtensions := evt.Context.GetExtensions()
-
-	clusterName, err := cetypes.ToString(evtExtensions[types.ExtensionClusterName])
-	if err != nil {
-		return nil, fmt.Errorf("failed to get clustername extension: %v", err)
-	}
-
-	resourceID, err := cetypes.ToString(evtExtensions[types.ExtensionResourceID])
-	if err != nil {
-		return nil, fmt.Errorf("failed to get resourceid extension: %v", err)
-	}
-
-	resourceVersion, err := cetypes.ToInteger(evtExtensions[types.ExtensionResourceVersion])
-	if err != nil {
-		return nil, fmt.Errorf("failed to get resourceversion extension: %v", err)
-	}
-
-	status, err := api.CloudEventToJSONMap(evt)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert cloudevent to resource status: %v", err)
-	}
-
-	resource := &api.Resource{
-		Source:       evt.Source(),
-		ConsumerName: clusterName,
-		Version:      resourceVersion,
-		Meta: api.Meta{
-			ID: resourceID,
-		},
-		Status: status,
-	}
-
-	return resource, nil
+	codec := cloudevents.NewCodec(source)
+	return codec.Decode(evt)
 }
 
 // encodeResourceSpec translates a resource spec JSON map into a CloudEvent.
 func encodeResourceSpec(resource *api.Resource) (*ce.Event, error) {
-	evt, err := api.JSONMAPToCloudEvent(resource.Payload)
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert resource payload to cloudevent: %v", err)
-	}
-
 	eventType := types.CloudEventsType{
 		CloudEventsDataType: workpayload.ManifestBundleEventDataType,
 		SubResource:         types.SubResourceSpec,
 		Action:              types.EventAction("create_request"),
 	}
-	evt.SetType(eventType.String())
-	evt.SetSource("maestro")
-	// TODO set resource.Source with a new extension attribute if the agent needs
-	evt.SetExtension(types.ExtensionResourceID, resource.ID)
-	evt.SetExtension(types.ExtensionResourceVersion, int64(resource.Version))
-	evt.SetExtension(types.ExtensionClusterName, resource.ConsumerName)
-
-	if !resource.GetDeletionTimestamp().IsZero() {
-		evt.SetExtension(types.ExtensionDeletionTimestamp, resource.GetDeletionTimestamp().Time)
-	}
 
-	return evt, nil
+	codec := cloudevents.NewCodec(source)
+	return codec.Encode(source, eventType, resource)
 }

docs/maestro.md

@@ -186,6 +186,8 @@ The `grpcClientTokenFile` stores the token for the corresponding service account
 
 4. After persisting the record, the Maestro server publishes a [CloudEvent](./resources/cloudevents.spec.maestro.json) representing the stored Resource to Maestro agent.
 
+    - Maestro server uses the `Resource` record ID as the `ManifestWork` name.
+
 5. The Maestro agent receives this CloudEvent, converts it back into a `ManifestWork`, and applies it to the target Kubernetes cluster. After applied, there is a corresponding [appliedmanifestwork](./resources/appliedmanifestwork.json) created on the agent side.
 
 ### Maestro Subscribe Resource Status with MQTT

docs/resources/appliedmanifestwork.json

@@ -11,14 +11,14 @@
             "cloudevents.open-cluster-management.io/originalsource": "maestro",
             "maestro.resource.type": "2d18a7dc-c731-5753-8aa9-6b2f22e3b12b"
         },
-        "name": "f1d8a1049b93dffc1929d57a719c3a09a4dcbfe0cd6e42840325be3b2dde73c8-e44ec579-9646-549a-b679-db8d19d6da37",
+        "name": "f1d8a1049b93dffc1929d57a719c3a09a4dcbfe0cd6e42840325be3b2dde73c8-55c61e54-a3f6-563d-9fec-b1fe297bdfdb",
         "resourceVersion": "1552",
         "uid": "432b3ff3-702e-4363-89e6-ad399c75608c"
     },
     "spec": {
         "agentID": "f1d8a1049b93dffc1929d57a719c3a09a4dcbfe0cd6e42840325be3b2dde73c8",
         "hubHash": "f1d8a1049b93dffc1929d57a719c3a09a4dcbfe0cd6e42840325be3b2dde73c8",
-        "manifestWorkName": "e44ec579-9646-549a-b679-db8d19d6da37"
+        "manifestWorkName": "55c61e54-a3f6-563d-9fec-b1fe297bdfdb"
     },
     "status": {
         "appliedResources": [

docs/resources/cloudevents.spec.maestro.json

@@ -74,7 +74,7 @@
     },
     "clustername": "7ff1a8f4-8811-49b4-8c19-9271bc51975e",
     "logtracing": "{}",
-    "metadata": "{\"creationTimestamp\":\"2025-12-16T06:00:17Z\",\"labels\":{\"maestro.resource.type\":\"2d18a7dc-c731-5753-8aa9-6b2f22e3b12b\"},\"name\":\"e44ec579-9646-549a-b679-db8d19d6da37\",\"namespace\":\"7ff1a8f4-8811-49b4-8c19-9271bc51975e\",\"resourceVersion\":\"0\",\"uid\":\"55c61e54-a3f6-563d-9fec-b1fe297bdfdb\"}",
+    "metadata": "{\"creationTimestamp\":\"2025-12-16T06:00:17Z\",\"labels\":{\"maestro.resource.type\":\"2d18a7dc-c731-5753-8aa9-6b2f22e3b12b\"},\"name\":\"55c61e54-a3f6-563d-9fec-b1fe297bdfdb\",\"namespace\":\"7ff1a8f4-8811-49b4-8c19-9271bc51975e\",\"resourceVersion\":\"0\",\"uid\":\"55c61e54-a3f6-563d-9fec-b1fe297bdfdb\"}",
     "originalsource": "",
     "resourceid": "55c61e54-a3f6-563d-9fec-b1fe297bdfdb",
     "resourceversion": 1

docs/resources/cloudevents.status.maestro.json

@@ -141,7 +141,7 @@
     },
     "clustername": "7ff1a8f4-8811-49b4-8c19-9271bc51975e",
     "logtracing": "{}",
-    "metadata": "{\"creationTimestamp\":\"2025-12-16T06:00:17Z\",\"labels\":{\"maestro.resource.type\":\"2d18a7dc-c731-5753-8aa9-6b2f22e3b12b\"},\"name\":\"e44ec579-9646-549a-b679-db8d19d6da37\",\"namespace\":\"7ff1a8f4-8811-49b4-8c19-9271bc51975e\",\"resourceVersion\":\"0\",\"uid\":\"55c61e54-a3f6-563d-9fec-b1fe297bdfdb\"}",
+    "metadata": "{\"creationTimestamp\":\"2025-12-16T06:00:17Z\",\"labels\":{\"maestro.resource.type\":\"2d18a7dc-c731-5753-8aa9-6b2f22e3b12b\"},\"name\":\"55c61e54-a3f6-563d-9fec-b1fe297bdfdb\",\"namespace\":\"7ff1a8f4-8811-49b4-8c19-9271bc51975e\",\"resourceVersion\":\"0\",\"uid\":\"55c61e54-a3f6-563d-9fec-b1fe297bdfdb\"}",
     "originalsource": "maestro",
     "resourceid": "55c61e54-a3f6-563d-9fec-b1fe297bdfdb",
     "resourceversion": 1,

go.sum

@@ -833,8 +833,6 @@ open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c h1:LWZ+5dwVS
 open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c/go.mod h1:Hk/3c114t6Ba5qhpqw+RoA93yEbE2CosG+JzzBZ6aCo=
 open-cluster-management.io/ocm v1.1.1-0.20251211014758-deb61b0a60d5 h1:02XVQtUt8v/fw6n3Rbf7Tu4FHJVVW2MiQLSpThWLwro=
 open-cluster-management.io/ocm v1.1.1-0.20251211014758-deb61b0a60d5/go.mod h1:kaFjiXsxtUUwWChYIy/ojANeMMrDW1KUrliuKA55z/Q=
-open-cluster-management.io/sdk-go v1.1.1-0.20251209031938-62521c9935ac h1:Wt7rzenZqrtyYI58+lpe9tmf9e5Ft8Wwd0MyDwuJ4ck=
-open-cluster-management.io/sdk-go v1.1.1-0.20251209031938-62521c9935ac/go.mod h1:0EZ9M7AtD0b+x9lUo5pYlyFF2aKOk1y88looeOVybwU=
 open-cluster-management.io/sdk-go v1.1.1-0.20251218031856-08bb1caedf74 h1:Sf+w+8ZzJgUQez/ADk2FLhoVDl1hD4rJqLQfvCFuM1o=
 open-cluster-management.io/sdk-go v1.1.1-0.20251218031856-08bb1caedf74/go.mod h1:3xQf3gISaZ3377vFnwjH3QH8EF2UNaf8D9igLPUBChk=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=

pkg/client/cloudevents/codec.go

@@ -7,6 +7,7 @@ import (
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 	cloudeventstypes "github.com/cloudevents/sdk-go/v2/types"
 	"github.com/google/uuid"
+
 	workpayload "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/work/payload"
 	cegeneric "open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
 	cetypes "open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types"
@@ -31,6 +32,14 @@ func (codec *Codec) EventDataType() cetypes.CloudEventsDataType {
 }
 
 func (codec *Codec) Encode(source string, eventType cetypes.CloudEventsType, res *api.Resource) (*cloudevents.Event, error) {
+	// use resource id as the resource payload metadata name to ensure the payload metadata name is
+	// unique on the agent side
+	if err := resetPayloadMetadataNameWithResID(res); err != nil {
+		return nil, err
+	}
+
+	// converts a resource payload to a CloudEvent
+	// If the resource payload has metadata the event will have the metadata extension
 	evt, err := api.JSONMAPToCloudEvent(res.Payload)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert resource payload to cloudevent: %v", err)
@@ -107,3 +116,20 @@ func (codec *Codec) Decode(evt *cloudevents.Event) (*api.Resource, error) {
 
 	return resource, nil
 }
+
+func resetPayloadMetadataNameWithResID(res *api.Resource) error {
+	metadata, ok := res.Payload[cetypes.ExtensionWorkMeta]
+	if !ok {
+		// the resource payload does not have metadata, do nothing
+		// the agent will using resource id as the payload metadata name
+		return nil
+	}
+
+	metaObj, ok := metadata.(map[string]interface{})
+	if !ok {
+		return fmt.Errorf("unsupported object type %T", metadata)
+	}
+	metaObj["name"] = res.ID
+	res.Payload[cetypes.ExtensionWorkMeta] = metaObj
+	return nil
+}