From 66b6b02c9b9e3c9660c921eca3e3b047938fc9a1 Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Thu, 11 Jun 2020 09:46:22 +0200 Subject: [PATCH 1/4] Ported the last images to sdk-go v2 Signed-off-by: Francesco Guardiani --- test/test_images/filterevents/main.go | 22 ++++++++-------------- test/test_images/heartbeats/main.go | 20 +++++++++++--------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/test/test_images/filterevents/main.go b/test/test_images/filterevents/main.go index 0a6df568576..b08f8b7f9e3 100644 --- a/test/test_images/filterevents/main.go +++ b/test/test_images/filterevents/main.go @@ -21,7 +21,8 @@ import ( "flag" "log" - cloudevents "github.com/cloudevents/sdk-go" + cloudevents "github.com/cloudevents/sdk-go/v2" + cehttp "github.com/cloudevents/sdk-go/v2/protocol/http" ) var ( @@ -32,26 +33,19 @@ func init() { flag.BoolVar(&filter, "filter", false, "Whether to filter the event") } -func gotEvent(event cloudevents.Event, resp *cloudevents.EventResponse) error { +func gotEvent(event cloudevents.Event) (*cloudevents.Event, cloudevents.Result) { ctx := event.Context.AsV1() - dataBytes, err := event.DataBytes() - if err != nil { - log.Printf("Got Data Error: %s\n", err.Error()) - return err - } log.Println("Received a new event: ") - log.Printf("[%s] %s %s: %s", ctx.Time.String(), ctx.GetSource(), ctx.GetType(), dataBytes) + log.Printf("[%s] %s %s: %s", ctx.Time.String(), ctx.GetSource(), ctx.GetType(), string(event.Data())) if filter { log.Println("Filter event") - resp.Status = 200 - } else { - event.SetDataContentType(cloudevents.ApplicationJSON) - log.Println("Reply with event") - resp.RespondWith(200, &event) + return nil, cehttp.NewResult(200, "OK") } - return nil + event.SetDataContentType(cloudevents.ApplicationJSON) + log.Println("Reply with event") + return &event, cehttp.NewResult(200, "OK") } func main() { diff --git a/test/test_images/heartbeats/main.go b/test/test_images/heartbeats/main.go index 9e9f4de94a6..6c9c2a73c38 100644 --- a/test/test_images/heartbeats/main.go +++ b/test/test_images/heartbeats/main.go @@ -28,9 +28,7 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" - "knative.dev/eventing/pkg/kncloudevents" - - cloudevents "github.com/cloudevents/sdk-go" + cloudevents "github.com/cloudevents/sdk-go/v2" "github.com/kelseyhightower/envconfig" ) @@ -91,7 +89,12 @@ func main() { ceOverrides = &overrides } - c, err := kncloudevents.NewDefaultClient(sink) + p, err := cloudevents.NewHTTP(cloudevents.WithTarget(sink)) + if err != nil { + log.Fatalf("failed to create protocol: %s", err.Error()) + } + + c, err := cloudevents.NewClient(p) if err != nil { log.Fatalf("failed to create client: %s", err.Error()) } @@ -117,7 +120,6 @@ func main() { event := cloudevents.NewEvent("1.0") event.SetType("dev.knative.eventing.samples.heartbeat") event.SetSource(source) - event.SetDataContentType(cloudevents.ApplicationJSON) event.SetExtension("the", 42) event.SetExtension("heart", "yes") event.SetExtension("beats", true) @@ -128,13 +130,13 @@ func main() { } } - if err := event.SetData(hb); err != nil { - log.Printf("failed to set cloudevents data: %s", err.Error()) + if err := event.SetData(cloudevents.ApplicationJSON, hb); err != nil { + log.Fatalf("failed to set cloudevents data: %s", err.Error()) } log.Printf("sending cloudevent to %s", sink) - if _, _, err := c.Send(context.Background(), event); err != nil { - log.Printf("failed to send cloudevent: %s", err.Error()) + if result := c.Send(context.Background(), event); !cloudevents.IsACK(result) { + log.Printf("failed to send cloudevent: %s", result.Error()) } if env.OneShot { From 344090cb9eae91943c11765463a2476c103e80fe Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Thu, 11 Jun 2020 10:08:31 +0200 Subject: [PATCH 2/4] Removed kncloudevents usage in performance image Signed-off-by: Francesco Guardiani --- test/performance/infra/receiver/receiver.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/performance/infra/receiver/receiver.go b/test/performance/infra/receiver/receiver.go index 39b3038c060..a8c4ed20398 100644 --- a/test/performance/infra/receiver/receiver.go +++ b/test/performance/infra/receiver/receiver.go @@ -28,7 +28,6 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/timestamp" - "knative.dev/eventing/pkg/kncloudevents" "knative.dev/eventing/test/performance/infra/common" pb "knative.dev/eventing/test/performance/infra/event_state" ) @@ -148,7 +147,7 @@ func (r *Receiver) processEvents() { } func (r *Receiver) startCloudEventsReceiver(ctx context.Context) error { - cli, err := kncloudevents.NewDefaultClient() + cli, err := cloudevents.NewDefaultClient() if err != nil { return fmt.Errorf("failed to create CloudEvents client: %v", err) } From a0bbf08759659a00512b7ceaa232498bf86df51b Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Thu, 11 Jun 2020 11:19:41 +0200 Subject: [PATCH 3/4] Id defaulter Signed-off-by: Francesco Guardiani --- test/test_images/heartbeats/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_images/heartbeats/main.go b/test/test_images/heartbeats/main.go index 6c9c2a73c38..be1d05629ff 100644 --- a/test/test_images/heartbeats/main.go +++ b/test/test_images/heartbeats/main.go @@ -94,7 +94,7 @@ func main() { log.Fatalf("failed to create protocol: %s", err.Error()) } - c, err := cloudevents.NewClient(p) + c, err := cloudevents.NewClient(p, cloudevents.WithUUIDs(), cloudevents.WithTimeNow()) if err != nil { log.Fatalf("failed to create client: %s", err.Error()) } From 0c4d8a21fdf4cc6cf5057dcb16aa1093edb6d2cf Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Thu, 11 Jun 2020 12:10:41 +0200 Subject: [PATCH 4/4] Useless version identifier Signed-off-by: Francesco Guardiani --- test/test_images/heartbeats/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_images/heartbeats/main.go b/test/test_images/heartbeats/main.go index be1d05629ff..5986c6f8e1f 100644 --- a/test/test_images/heartbeats/main.go +++ b/test/test_images/heartbeats/main.go @@ -117,7 +117,7 @@ func main() { for { hb.Sequence++ - event := cloudevents.NewEvent("1.0") + event := cloudevents.NewEvent() event.SetType("dev.knative.eventing.samples.heartbeat") event.SetSource(source) event.SetExtension("the", 42)