Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix in ECS forward #1290

Merged
merged 9 commits into from
Dec 3, 2023
Merged

Bugfix in ECS forward #1290

merged 9 commits into from
Dec 3, 2023

Conversation

kwitsch
Copy link
Collaborator

@kwitsch kwitsch commented Dec 3, 2023

Changes:

  • ecs resolver: bugfix for incorrect overrides of ecs option if forward is enabled and mask is set
  • ecs resolver test: use ginkgo context instead of context.Background()
  • devcontainer: set prettier as default formatter for yaml files
  • example config: added ecs section

Closes #1288

@kwitsch kwitsch added the 🐞 bug Something isn't working label Dec 3, 2023
@kwitsch kwitsch added this to the v0.23 milestone Dec 3, 2023
@kwitsch kwitsch enabled auto-merge (squash) December 3, 2023 16:55
Copy link

codecov bot commented Dec 3, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (ac54110) 93.74% compared to head (5f1a484) 93.61%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1290      +/-   ##
==========================================
- Coverage   93.74%   93.61%   -0.13%     
==========================================
  Files          77       77              
  Lines        6087     6097      +10     
==========================================
+ Hits         5706     5708       +2     
- Misses        293      300       +7     
- Partials       88       89       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@ThinkChaos ThinkChaos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was fast since the report!

Just a couple minor things for clarity, mostly relating to the debug logs.

resolver/ecs_resolver.go Outdated Show resolved Hide resolved
resolver/ecs_resolver.go Outdated Show resolved Hide resolved
resolver/ecs_resolver.go Outdated Show resolved Hide resolved
resolver/ecs_resolver.go Outdated Show resolved Hide resolved
resolver/ecs_resolver.go Outdated Show resolved Hide resolved
kwitsch and others added 6 commits December 3, 2023 20:12
Co-authored-by: ThinkChaos <ThinkChaos@users.noreply.github.com>
Co-authored-by: ThinkChaos <ThinkChaos@users.noreply.github.com>
Co-authored-by: ThinkChaos <ThinkChaos@users.noreply.github.com>
Co-authored-by: ThinkChaos <ThinkChaos@users.noreply.github.com>
@kwitsch kwitsch merged commit 1154335 into 0xERR0R:main Dec 3, 2023
11 checks passed
@kwitsch kwitsch deleted the issues/1288 branch December 3, 2023 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ECS forward is overwritten if mask is set
2 participants