Add pubsub source and schema validation #1679
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Shubham Nazare <[email protected]>
YourTechBud
requested changes
May 14, 2023
sc-poc/modules/pubsub/operations.go
Outdated
Comment on lines
38
to
40
| "doc": { | ||
| Type: "string", | ||
| }, |
There was a problem hiding this comment.
What is this schema for? Why not keep the entire schema as type = object & AdditionalProperties true
sc-poc/modules/pubsub/operations.go
Outdated
| asyncapiProvisionChannel := Channel{ | ||
| Name: "asyncapi-provision", | ||
| Payload: ChannelPayload{ | ||
| Schema: map[string]*v1alpha1.ChannelSchema{ |
sc-poc/modules/pubsub/operations.go
Outdated
| // Channels return channels with their schema | ||
| func (a *App) Channels() ChannelsWithSchema { | ||
| channels := ChannelsWithSchema{ | ||
| Channels: make(map[string]Channel), | ||
| Components: &Components{ | ||
| Schemas: map[string]interface{}{ | ||
| "APIManMsg": map[string]interface{}{ |
There was a problem hiding this comment.
Remove this if its no longer needed
sc-poc/modules/pubsub/types.go
Outdated
| Schema map[string]interface{} `json:"schema,omitempty"` | ||
| Example interface{} `json:"example,omitempty"` | ||
| Examples []interface{} `json:"examples,omitempty"` | ||
| Schema map[string]*v1alpha1.ChannelSchema `json:"schema,omitempty"` |
There was a problem hiding this comment.
Suggested change
| Schema map[string]*v1alpha1.ChannelSchema `json:"schema,omitempty"` | |
| Schema *v1alpha1.ChannelSchema `json:"schema,omitempty"` |
sc-poc/modules/pubsub/websocket.go
Outdated
Comment on lines
105
to
106
| err = a.Publish(channel.Name, pubMsg, PublishOptions{}) | ||
| if err != nil { |
There was a problem hiding this comment.
Suggested change
| err = a.Publish(channel.Name, pubMsg, PublishOptions{}) | |
| if err != nil { | |
| if err := a.Publish(channel.Name, pubMsg, PublishOptions{}); err != nil { |
| // Channel describes the name of the pubsub channel | ||
| Channel string `json:"channel"` | ||
| // Payload describes the payload schema of the channel | ||
| Payload map[string]*ChannelSchema `json:"payload,omitempty"` |
There was a problem hiding this comment.
Suggested change
| Payload map[string]*ChannelSchema `json:"payload,omitempty"` | |
| Payload *ChannelSchema `json:"payload,omitempty"` |
sc-poc/modules/pubsub/app.go
Outdated
| sourceMan := sourceManT.(*source.App) | ||
| sources := sourceMan.GetSources("pubsub") | ||
| for _, src := range sources { | ||
| channelSrc := src.(*pubsub_channel.PubsubChannelSource) |
There was a problem hiding this comment.
Make an interface in this package itself
… validation and pubsub channel source type Signed-off-by: Shubham Nazare <[email protected]>
YourTechBud
requested changes
May 14, 2023
sc-poc/modules/pubsub/app.go
Outdated
| Schema: channelSrc.Spec.Payload, | ||
| }, | ||
| } | ||
| channelSrc := src.(Source) |
There was a problem hiding this comment.
Check if its okay. Continue if it isnt
sc-poc/modules/pubsub/asyncapi.go
Outdated
| }, | ||
| }, | ||
| { | ||
| Name: "Error", |
There was a problem hiding this comment.
Suggested change
| Name: "Error", | |
| Name: "PublishError", |
sc-poc/modules/pubsub/asyncapi.go
Outdated
| Payload: map[string]interface{}{ | ||
| "type": "object", | ||
| "properties": map[string]interface{}{ | ||
| "message": map[string]interface{}{ |
There was a problem hiding this comment.
Accept a message id as well. We need to tell the publisher which message didn't publish. Also you can make json schema directly from a struct without having to make such maps. Look at this library: https://github.com/invopop/jsonschema
There was a problem hiding this comment.
Can we do this in a separate PR? I will make an issue for it.
Signed-off-by: Shubham Nazare <[email protected]>
Signed-off-by: Shubham Nazare <[email protected]>
YourTechBud
requested changes
May 27, 2023
sc-poc/modules/pubsub/asyncapi.go
Outdated
| }, | ||
| }, | ||
| { | ||
| Name: "PublishError", |
There was a problem hiding this comment.
Can we merge publish error with the Acknowledge message?
Signed-off-by: Shubham Nazare <[email protected]>
YourTechBud
requested changes
May 30, 2023
sc-poc/modules/pubsub/asyncapi.go
Outdated
| }, | ||
| "ack": map[string]interface{}{ | ||
| "type": "boolean", | ||
| OneOf: []MessageEntity{ |
There was a problem hiding this comment.
No need of a oneOf if you are returning just a single object
Signed-off-by: Shubham Nazare <[email protected]>
YourTechBud
approved these changes
Jun 17, 2023
shubham4443
added a commit
to shubham4443/space-cloud
that referenced
this pull request
Jun 22, 2023
Signed-off-by: Shubham Nazare <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1672