Fallback to CRD event annotations if reconciler's method is failing (#272)

Author: tzununbekov

pkg/triggermesh/components/source/source.go

@@ -233,27 +233,26 @@ func (s *Source) GetEventTypes() ([]string, error) {
 	// try GetEventTypes method first
 	o, err := s.asUnstructured()
 	if err != nil {
-		return []string{}, fmt.Errorf("unstructured object: %w", err)
+		return s.tryCRDEventTypes()
 	}
 	eventAttributes, err := adapter.EventAttributes(o)
 	if err != nil {
-		return []string{}, fmt.Errorf("source event attributes: %w", err)
+		return s.tryCRDEventTypes()
 	}
 	if len(eventAttributes.ProducedEventTypes) != 0 {
 		return eventAttributes.ProducedEventTypes, nil
 	}
-	// then read CRD annotations
-	// sourceCRD, err := crd.GetResourceCRD(s.Kind, s.CRD)
-	// if err != nil {
-	// 	return []string{}, fmt.Errorf("source CRD: %w", err)
-	// }
+	return s.tryCRDEventTypes()
+}
+
+func (s *Source) tryCRDEventTypes() ([]string, error) {
 	var et crd.EventTypes
-	if err := json.Unmarshal([]byte(s.CRD.Metadata.Annotations.EventTypes), &et); err != nil {
-		return []string{}, fmt.Errorf("event types CRD: %w", err)
+	if err := json.Unmarshal([]byte(s.CRD.Metadata.Annotations.ProducedEventTypes), &et); err != nil {
+		return []string{}, fmt.Errorf("unable to parse event annotations: %w", err)
 	}
 	var result []string
-	for _, v := range et {
-		result = append(result, v.Type)
+	for _, e := range et {
+		result = append(result, e.Type)
 	}
 	return result, nil
 }

pkg/triggermesh/components/target/target.go

@@ -18,6 +18,7 @@ package target
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"strconv"
@@ -224,15 +225,27 @@ func (t *Target) GetChildren() ([]triggermesh.Component, error) {
 func (t *Target) ConsumedEventTypes() ([]string, error) {
 	o, err := t.asUnstructured()
 	if err != nil {
-		return nil, err
+		return t.tryCRDEventTypes()
 	}
 	eventAttributes, err := adapter.EventAttributes(o)
 	if err != nil {
-		return []string{}, err
+		return t.tryCRDEventTypes()
 	}
 	return eventAttributes.AcceptedEventTypes, nil
 }
 
+func (t *Target) tryCRDEventTypes() ([]string, error) {
+	var et crd.EventTypes
+	if err := json.Unmarshal([]byte(t.CRD.Metadata.Annotations.ConsumedEventTypes), &et); err != nil {
+		return []string{}, fmt.Errorf("unable to parse event annotations: %w", err)
+	}
+	var result []string
+	for _, e := range et {
+		result = append(result, e.Type)
+	}
+	return result, nil
+}
+
 func (t *Target) Start(ctx context.Context, additionalEnvs map[string]string, restart bool) (*docker.Container, error) {
 	client, err := docker.NewClient()
 	if err != nil {

pkg/triggermesh/crd/crd.go

@@ -63,7 +63,8 @@ type CRD struct {
 	Metadata   struct {
 		Name        string `yaml:"name"`
 		Annotations struct {
-			EventTypes string `yaml:"registry.knative.dev/eventTypes"`
+			ProducedEventTypes string `yaml:"registry.knative.dev/eventTypes"`
+			ConsumedEventTypes string `yaml:"registry.triggermesh.io/acceptedEventTypes"`
 		} `yaml:"annotations"`
 	} `yaml:"metadata"`
 	Spec struct {
@@ -94,7 +95,8 @@ type CRD struct {
 }
 
 type EventTypes []struct {
-	Type string `json:"type"`
+	Type   string `json:"type"`
+	Schema string `json:"schema"`
 }
 
 // Fetch downloads the release version of TriggerMesh CRDs for specified version.