diff --git a/go.mod b/go.mod index 4db048b..ea58dff 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,14 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.0 github.com/prometheus/client_golang v1.14.0 - github.com/redhat-cne/sdk-go v1.0.1-0.20240702163442-605f629084b9 + github.com/redhat-cne/sdk-go v1.0.1-unpublished github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.8.0 golang.org/x/net v0.7.0 ) +replace github.com/redhat-cne/sdk-go v1.0.1-unpublished => ../sdk-go + require ( github.com/BurntSushi/toml v0.3.1 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/go.sum b/go.sum index 7ff684e..210e666 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,6 @@ github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/redhat-cne/sdk-go v1.0.1-0.20240702163442-605f629084b9 h1:qDOGSHOtHRszd8FnM0GZVUvbIvHhZrw5GeccXYPwT04= -github.com/redhat-cne/sdk-go v1.0.1-0.20240702163442-605f629084b9/go.mod h1:q9LxxPbK1tGpDbQm/KIPujqdP0bK1hhuHrIXV3vuUrM= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= diff --git a/v2/routes.go b/v2/routes.go index 668dba5..9c52024 100644 --- a/v2/routes.go +++ b/v2/routes.go @@ -78,15 +78,7 @@ func (s *Server) createSubscription(w http.ResponseWriter, r *http.Request) { sub.SetID(id) sub.SetVersion(API_VERSION) sub.SetURILocation(fmt.Sprintf("http://localhost:%d%s%s/%s", s.port, s.apiPath, "subscriptions", sub.ID)) //nolint:errcheck - - // TODO: cleanup: local pubsub is no longer needed since we are using configMap - newSub, err := s.pubSubAPI.CreateSubscription(sub) - if err != nil { - respondWithStatusCode(w, http.StatusNotFound, fmt.Sprintf("error creating subscription %v", err)) - localmetrics.UpdateSubscriptionCount(localmetrics.FAILCREATE, 1) - return - } - addr := newSub.GetResource() + addr := sub.GetResource() // this is placeholder not sending back to report out := channel.DataChan{ @@ -119,7 +111,8 @@ func (s *Server) createSubscription(w http.ResponseWriter, r *http.Request) { } restClient := restclient.New() - out.Data.SetID(newSub.ID) // set ID to the subscriptionID + // make sure event ID is unique + out.Data.SetID(uuid.New().String()) status, err := restClient.PostCloudEvent(sub.EndPointURI, *out.Data) if err != nil { respondWithStatusCode(w, http.StatusBadRequest, @@ -139,7 +132,7 @@ func (s *Server) createSubscription(w http.ResponseWriter, r *http.Request) { subs := subscriber.New(s.getClientIDFromURI(endPointURI)) _ = subs.SetEndPointURI(endPointURI) - subs.AddSubscription(newSub) + subs.AddSubscription(sub) subs.Action = channel.NEW cevent, _ := subs.CreateCloudEvents() cevent.SetSource(addr) @@ -165,7 +158,7 @@ func (s *Server) createSubscription(w http.ResponseWriter, r *http.Request) { _ = out.Data.SetData(cloudevents.ApplicationJSON, updatedObj) log.Infof("subscription created successfully.") localmetrics.UpdateSubscriptionCount(localmetrics.ACTIVE, 1) - respondWithJSON(w, http.StatusCreated, newSub) + respondWithJSON(w, http.StatusCreated, sub) } s.dataOut <- &out diff --git a/vendor/github.com/redhat-cne/sdk-go/pkg/channel/data.go b/vendor/github.com/redhat-cne/sdk-go/pkg/channel/data.go index 7c20be5..aba9886 100644 --- a/vendor/github.com/redhat-cne/sdk-go/pkg/channel/data.go +++ b/vendor/github.com/redhat-cne/sdk-go/pkg/channel/data.go @@ -52,7 +52,6 @@ type StatusChan struct { // CreateCloudEvents ... func (d *DataChan) CreateCloudEvents(dataType string) (*cloudevents.Event, error) { ce := cloudevents.NewEvent(cloudevents.VersionV03) - ce.SetDataContentType(cloudevents.ApplicationJSON) ce.SetSpecVersion(cloudevents.VersionV03) ce.SetType(dataType) ce.SetSource(d.Address) diff --git a/vendor/github.com/redhat-cne/sdk-go/pkg/event/event_ce.go b/vendor/github.com/redhat-cne/sdk-go/pkg/event/event_ce.go index 5fe66d4..9f36e5b 100644 --- a/vendor/github.com/redhat-cne/sdk-go/pkg/event/event_ce.go +++ b/vendor/github.com/redhat-cne/sdk-go/pkg/event/event_ce.go @@ -28,8 +28,6 @@ func (e *Event) NewCloudEvent(ps *pubsub.PubSub) (*cloudevent.Event, error) { ce := cloudevent.NewEvent(cloudevent.VersionV03) ce.SetTime(e.GetTime()) ce.SetType(e.Type) - ce.SetDataContentType(cloudevent.ApplicationJSON) - ce.SetSubject(e.Source) // subject is set to source of the event object ce.SetSource(ps.Resource) // bus address ce.SetSpecVersion(cloudevent.VersionV03) ce.SetID(uuid.New().String()) diff --git a/vendor/github.com/redhat-cne/sdk-go/pkg/subscriber/subscriber_reader.go b/vendor/github.com/redhat-cne/sdk-go/pkg/subscriber/subscriber_reader.go index 98bcf43..81c9c57 100644 --- a/vendor/github.com/redhat-cne/sdk-go/pkg/subscriber/subscriber_reader.go +++ b/vendor/github.com/redhat-cne/sdk-go/pkg/subscriber/subscriber_reader.go @@ -32,7 +32,6 @@ func (s *Subscriber) GetSubStore() *store.PubSubStore { // CreateCloudEvents ... func (s *Subscriber) CreateCloudEvents() (*cloudevents.Event, error) { ce := cloudevents.NewEvent(cloudevents.VersionV03) - ce.SetDataContentType(cloudevents.ApplicationJSON) ce.SetSpecVersion(cloudevents.VersionV03) ce.SetType(channel.SUBSCRIBER.String()) ce.SetSource("subscription-request") diff --git a/vendor/github.com/redhat-cne/sdk-go/v1/event/event.go b/vendor/github.com/redhat-cne/sdk-go/v1/event/event.go index 93786f4..418274b 100644 --- a/vendor/github.com/redhat-cne/sdk-go/v1/event/event.go +++ b/vendor/github.com/redhat-cne/sdk-go/v1/event/event.go @@ -88,8 +88,6 @@ func CreateCloudEvents(e event.Event, ps pubsub.PubSub) (*cloudevents.Event, err ce := cloudevents.NewEvent(cloudevents.VersionV03) ce.SetTime(e.GetTime()) ce.SetType(e.Type) - ce.SetDataContentType(cloudevents.ApplicationJSON) - ce.SetSubject(e.Source) // subject is set to source of the event object ce.SetSource(ps.Resource) // bus address ce.SetSpecVersion(cloudevents.VersionV03) ce.SetID(uuid.New().String()) diff --git a/vendor/modules.txt b/vendor/modules.txt index ac0647f..6090f78 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -71,7 +71,7 @@ github.com/prometheus/common/model github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util -# github.com/redhat-cne/sdk-go v1.0.1-0.20240702163442-605f629084b9 +# github.com/redhat-cne/sdk-go v1.0.1-unpublished => ../sdk-go ## explicit; go 1.22 github.com/redhat-cne/sdk-go/pkg/channel github.com/redhat-cne/sdk-go/pkg/common