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

ci: Unblock trivy dependency updates #750

Merged
merged 4 commits into from
Aug 22, 2024

Conversation

jpayne3506
Copy link
Contributor

@jpayne3506 jpayne3506 commented Aug 22, 2024

Updates go.opentelemetry.io/otel/sdk/metric from v1.21.0 to v1.27.0 to unblock Trivy updates. This has been blocking all Trivy updates after v0.51.4 as you could not build the patch package. Links below to relevant < workflow | PR >

RCA of the issue is Trivy using go.opentelemetry.io/otel/metric but not go.opentelemetry.io/otel/sdk/metric. Causing a version mismatch with breaking results within the repo.

Link for release notes:

Notes:

  • The only use within copacetic of go.opentelemetry.io/otel/sdk/metric is from
    solveOpt.SourcePolicy, err = build.ReadSourcePolicy()

Closes #729

Signed-off-by: jpayne3506 <payne.3506@gmail.com>
Signed-off-by: jpayne3506 <payne.3506@gmail.com>
Signed-off-by: jpayne3506 <payne.3506@gmail.com>
Signed-off-by: jpayne3506 <payne.3506@gmail.com>
@jpayne3506
Copy link
Contributor Author

Also, I leveraged git rebase -i HEAD~4 --signoff to get a signoff on all of my commits as I did not know about the DCO. Perhaps this would be a good addition for https://github.com/project-copacetic/copacetic/blob/main/CONTRIBUTING.md#i-didnt-sign-my-commit-now-what?

Copy link

codecov bot commented Aug 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.46%. Comparing base (10fd0c7) to head (612e5b8).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #750   +/-   ##
=======================================
  Coverage   47.46%   47.46%           
=======================================
  Files          18       18           
  Lines        1677     1677           
=======================================
  Hits          796      796           
  Misses        826      826           
  Partials       55       55           

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

Copy link
Contributor

@ashnamehrotra ashnamehrotra left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@ashnamehrotra
Copy link
Contributor

Also, I leveraged git rebase -i HEAD~4 --signoff to get a signoff on all of my commits as I did not know about the DCO. Perhaps this would be a good addition for https://github.com/project-copacetic/copacetic/blob/main/CONTRIBUTING.md#i-didnt-sign-my-commit-now-what?

yes! I think it would be good to document this

@ashnamehrotra ashnamehrotra merged commit a284d8b into project-copacetic:main Aug 22, 2024
21 of 23 checks passed
jpayne3506 added a commit to jpayne3506/copacetic that referenced this pull request Aug 22, 2024
Signed-off-by: jpayne3506 <payne.3506@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants