Clean up #444
Merged
Clean up #444
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
…imaryHandler_Test as primaryHandler will no longer be used
Merged
denopink
reviewed
Jan 26, 2024
denopink
reviewed
Jan 26, 2024
listenerStub.go
Outdated
Comment on lines
1
to
56
| package main | ||
|
|
||
| import "time" | ||
|
|
||
| //This is a stub for the ancla listener. This will be removed once we can add ancla back into caduceus | ||
|
|
||
| type ListenerStub struct { | ||
| PartnerIds []string | ||
| Webhook Webhook | ||
| } | ||
|
|
||
| type Webhook struct { | ||
| // Address is the subscription request origin HTTP Address. | ||
| Address string `json:"registered_from_address"` | ||
|
|
||
| // Config contains data to inform how events are delivered. | ||
| Config DeliveryConfig `json:"config"` | ||
|
|
||
| // FailureURL is the URL used to notify subscribers when they've been cut off due to event overflow. | ||
| // Optional, set to "" to disable notifications. | ||
| FailureURL string `json:"failure_url"` | ||
|
|
||
| // Events is the list of regular expressions to match an event type against. | ||
| Events []string `json:"events"` | ||
|
|
||
| // Matcher type contains values to match against the metadata. | ||
| Matcher MetadataMatcherConfig `json:"matcher,omitempty"` | ||
|
|
||
| // Duration describes how long the subscription lasts once added. | ||
| Duration time.Duration `json:"duration"` | ||
|
|
||
| // Until describes the time this subscription expires. | ||
| Until time.Time `json:"until"` | ||
| } | ||
|
|
||
| // DeliveryConfig is a Webhook substructure with data related to event delivery. | ||
| type DeliveryConfig struct { | ||
| // URL is the HTTP URL to deliver messages to. | ||
| URL string `json:"url"` | ||
|
|
||
| // ContentType is content type value to set WRP messages to (unless already specified in the WRP). | ||
| ContentType string `json:"content_type"` | ||
|
|
||
| // Secret is the string value for the SHA1 HMAC. | ||
| // (Optional, set to "" to disable behavior). | ||
| Secret string `json:"secret,omitempty"` | ||
|
|
||
| // AlternativeURLs is a list of explicit URLs that should be round robin through on failure cases to the main URL. | ||
| AlternativeURLs []string `json:"alt_urls,omitempty"` | ||
| } | ||
|
|
||
| // MetadataMatcherConfig is Webhook substructure with config to match event metadata. | ||
| type MetadataMatcherConfig struct { | ||
| // DeviceID is the list of regular expressions to match device id type against. | ||
| DeviceID []string `json:"device_id"` | ||
| } |
There was a problem hiding this comment.
this is outdated, check https://github.com/xmidt-org/webhook-schema/pull/4/files#
denopink
reviewed
Jan 26, 2024
denopink
reviewed
Jan 26, 2024
denopink
approved these changes
Jan 26, 2024
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## denopink/feat/rewrite #444 +/- ##
========================================================
- Coverage 16.78% 7.99% -8.80%
========================================================
Files 12 12
Lines 1233 1214 -19
========================================================
- Hits 207 97 -110
- Misses 1014 1117 +103
+ Partials 12 0 -12
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
denopink
reviewed
Jan 29, 2024
Comment on lines
+581
to
+585
| /*TODO: need middleware for: | ||
| Counter: obs.deliveryRetryCounter.With("url", obs.id, "event", event) | ||
| Logger | ||
| Update Request | ||
| */ |
There was a problem hiding this comment.
yeah, this is important to us
denopink
approved these changes
Jan 29, 2024
yeah it's basically gone at this point - it just exists in primaryHandler.go which isn't being used right now - just keeping it so it's easier for me to reference what's needed for bascule once we have new bascule. |
|
going to change the listener stub and add the middleware in in the v2 work |
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.
What's Included:
should be reviewed/merged after merging #436