refactor: simplify ancla setup and startup #599
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
- simplify ancla setup and startup with `anclafx.Provide()`
denopink
commented
Dec 9, 2024
Comment on lines
-133
to
-182
| webhookConfig := in.WebhookConfig | ||
| webhookConfig.Logger = in.Logger | ||
| listenerMeasures := ancla.ListenerConfig{ | ||
| Measures: *in.Measures, | ||
| } | ||
| webhookConfig.BasicClientConfig.HTTPClient = newHTTPClient(in.ArgusClientTimeout, in.Tracing) | ||
|
|
||
| svc, err := ancla.NewService(webhookConfig, sallust.Get) | ||
| if err != nil { | ||
| return out, fmt.Errorf("failed to initialize webhook service: %s", err) | ||
| } | ||
| out.GetAllWebhooksHandler = ancla.NewGetAllWebhooksHandler(in.AnclaSvc, ancla.HandlerConfig{}) | ||
|
|
||
| stopWatches, err := svc.StartListener(listenerMeasures, sallust.With) | ||
| if err != nil { | ||
| return out, fmt.Errorf("webhook service start listener error: %s", err) | ||
| } | ||
| in.Logger.Info("Webhook service enabled") | ||
|
|
||
| in.Lifecycle.Append(fx.Hook{ | ||
| OnStop: func(_ context.Context) error { | ||
| stopWatches() | ||
| return nil | ||
| }, | ||
| }) | ||
|
|
||
| out.GetAllWebhooksHandler = ancla.NewGetAllWebhooksHandler(svc, ancla.HandlerConfig{ | ||
| GetLogger: sallust.Get, | ||
| }) | ||
|
|
||
| checker, err := webhookConfig.Validation.BuildURLChecker() | ||
| checker, err := ancla.BuildURLChecker(in.WebhookConfig.Validation) | ||
| if err != nil { | ||
| return out, fmt.Errorf("failed to set up url checker for validation: %s", err) | ||
| } | ||
| validationOpts := webhookConfig.Validation.BuildOptions(checker) | ||
|
|
||
| out.AddWebhookHandler = ancla.NewAddWebhookHandler(svc, ancla.HandlerConfig{ | ||
| V: validationOpts, | ||
| DisablePartnerIDs: webhookConfig.DisablePartnerIDs, | ||
| GetLogger: sallust.Get, | ||
| out.AddWebhookHandler = ancla.NewAddWebhookHandler(in.AnclaSvc, ancla.HandlerConfig{ | ||
| V: in.WebhookConfig.Validation.BuildOptions(checker), | ||
| DisablePartnerIDs: in.WebhookConfig.DisablePartnerIDs, | ||
| }) | ||
|
|
||
| v2Validators, err := v2WebhookValidators(webhookConfig) | ||
| v2Validators, err := v2WebhookValidators(in.WebhookConfig) | ||
| if err != nil { | ||
| return out, fmt.Errorf("failed to setup v2 webhook validators: %s", err) | ||
| } | ||
|
|
||
| out.V2AddWebhookHandler = ancla.NewAddWebhookHandler(svc, ancla.HandlerConfig{ | ||
| out.V2AddWebhookHandler = ancla.NewAddWebhookHandler(in.AnclaSvc, ancla.HandlerConfig{ | ||
| V: v2Validators, | ||
| DisablePartnerIDs: webhookConfig.DisablePartnerIDs, | ||
| GetLogger: sallust.Get, |
There was a problem hiding this comment.
This will be taken care of by anclafx.Provide()
|
pending potential changes from xmidt-org/ancla#269 |
denopink
force-pushed
the
denopink/refactor/ancla-setup-and-startup
branch
from
cfd4dc9 to
0a89a21
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feat/caduceus-updates #599 +/- ##
========================================================
Coverage ? 43.36%
========================================================
Files ? 16
Lines ? 1229
Branches ? 0
========================================================
Hits ? 533
Misses ? 684
Partials ? 12
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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.
anclafx.Provide()