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

[chore] update to mapstructure 2.0.0 #10610

Merged
merged 4 commits into from
Jul 19, 2024

Conversation

atoulme
Copy link
Contributor

@atoulme atoulme commented Jul 14, 2024

Description

Reprises #10300

Testing

Fixed a few tests that no longer make sense. One test will conflict if #10609 is merged first.

@atoulme atoulme force-pushed the mapstructure-2.0.0 branch from 0c2e3da to 301dfba Compare July 14, 2024 03:00
dmitryax pushed a commit to open-telemetry/opentelemetry-collector-contrib that referenced this pull request Jul 15, 2024
**Description:** <Describe what has changed.>
Relax checks on confmap validation messages to avoid running into
conflicts with mapstructure upgrades

See open-telemetry/opentelemetry-collector#10610
- tests don't pass with this upgrade of the mapstructure lib.
@atoulme atoulme force-pushed the mapstructure-2.0.0 branch from f74fd35 to 30d81d3 Compare July 15, 2024 21:06
Copy link

codecov bot commented Jul 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.30%. Comparing base (5753a58) to head (41248d3).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #10610   +/-   ##
=======================================
  Coverage   92.30%   92.30%           
=======================================
  Files         397      397           
  Lines       18705    18705           
=======================================
  Hits        17265    17265           
  Misses       1080     1080           
  Partials      360      360           

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

Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

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

Do we need to change

if strings.HasPrefix(err.Error(), "error decoding ''") {
in any way?

@atoulme
Copy link
Contributor Author

atoulme commented Jul 19, 2024

Do we need to change

if strings.HasPrefix(err.Error(), "error decoding ''") {

in any way?

TestEmbeddedUnmarshalerError tests this and passes. We don't need to update this code.

@mx-psi mx-psi merged commit 2449345 into open-telemetry:main Jul 19, 2024
50 checks passed
@github-actions github-actions bot added this to the next release milestone Jul 19, 2024
@atoulme atoulme deleted the mapstructure-2.0.0 branch July 19, 2024 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants