#19 code review changes

cmd/cache/main.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	cenats "github.com/cloudevents/sdk-go/protocol/nats/v2"
+	"github.com/cloudevents/sdk-go/protocol/nats/v2"
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 	"github.com/kelseyhightower/envconfig"
 	"go.uber.org/zap"
@@ -22,7 +22,7 @@ import (
 	goahealthsrv "code.vereign.com/gaiax/tsa/cache/gen/http/health/server"
 	goaopenapisrv "code.vereign.com/gaiax/tsa/cache/gen/http/openapi/server"
 	"code.vereign.com/gaiax/tsa/cache/gen/openapi"
-	"code.vereign.com/gaiax/tsa/cache/internal/clients/queue"
+	"code.vereign.com/gaiax/tsa/cache/internal/clients/event"
 	"code.vereign.com/gaiax/tsa/cache/internal/clients/redis"
 	"code.vereign.com/gaiax/tsa/cache/internal/config"
 	"code.vereign.com/gaiax/tsa/cache/internal/service"
@@ -52,7 +52,7 @@ func main() {
 
 	// create cloudevents nats sender
 	// other protocol implementations: https://github.com/cloudevents/sdk-go/tree/main/protocol
-	sender, err := cenats.NewSender(cfg.Nats.Addr, cfg.Nats.Subject, cenats.NatsOptions())
+	sender, err := nats.NewSender(cfg.Nats.Addr, cfg.Nats.Subject, nats.NatsOptions())
 	if err != nil {
 		log.Fatalf("failed to create nats sender, %v", err)
 	}
@@ -64,8 +64,8 @@ func main() {
 		log.Fatalf("failed to create cloudevents client, %v", err)
 	}
 
-	// create queue client
-	queue := queue.New(eventsClient)
+	// create event client
+	event := event.New(eventsClient)
 
 	// create services
 	var (
@@ -73,7 +73,7 @@ func main() {
 		healthSvc goahealth.Service
 	)
 	{
-		cacheSvc = cache.New(redis, queue, logger)
+		cacheSvc = cache.New(redis, event, logger)
 		healthSvc = health.New()
 	}
 

internal/clients/queue/client.go → internal/clients/event/client.go

-package queue
+package event
 
 import (
 	"context"
@@ -10,19 +10,18 @@ import (
 	"github.com/google/uuid"
 )
 
-const eventType = "External cache input"
+const eventType = "cache_set_event"
 
 type Client struct {
-	eventClient cloudevents.Client
+	events cloudevents.Client
 }
 
 type Data struct {
-	Key   string `json:"key"`
-	Value string `json:"value"`
+	Key string `json:"key"`
 }
 
 func New(eventClient cloudevents.Client) *Client {
-	return &Client{eventClient: eventClient}
+	return &Client{events: eventClient}
 }
 
 func (c *Client) Send(ctx context.Context, key string, data interface{}) error {
@@ -31,7 +30,7 @@ func (c *Client) Send(ctx context.Context, key string, data interface{}) error {
 		return err
 	}
 
-	res := c.eventClient.Send(ctx, *e)
+	res := c.events.Send(ctx, *e)
 	if cloudevents.IsUndelivered(res) {
 		return fmt.Errorf("failed to send event for key: %s, reason: %v", key, res)
 	}
@@ -42,13 +41,12 @@ func (c *Client) Send(ctx context.Context, key string, data interface{}) error {
 func newEvent(key string, data interface{}) (*event.Event, error) {
 	e := cloudevents.NewEvent()
 	e.SetID(uuid.NewString()) // required field
-	e.SetSource(eventType)    // required field
+	e.SetSource("cache")      // required field
 	e.SetType(eventType)      // required field
 	e.SetTime(time.Now())
 
 	err := e.SetData(event.ApplicationJSON, &Data{
-		Key:   key,
-		Value: fmt.Sprintf("%v", data),
+		Key: key,
 	})
 	if err != nil {
 		return nil, err

internal/service/cache/service.go

@@ -116,19 +116,11 @@ func (s *Service) SetExternal(ctx context.Context, req *cache.CacheSetRequest) e
 
 func makeCacheKey(key string, namespace, scope *string) string {
 	k := key
-	var n, s string
-	if namespace != nil {
-		n = *namespace
+	if namespace != nil && *namespace != "" {
+		k += "," + *namespace
 	}
-	if scope != nil {
-		s = *scope
-	}
-
-	if n != "" {
-		k += "," + n
-	}
-	if s != "" {
-		k += "," + s
+	if scope != nil && *scope != "" {
+		k += "," + *scope
 	}
 	return k
 }