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

[IA-4681] Update terra-common-lib #4732

Merged
merged 43 commits into from
Aug 27, 2024
Merged

[IA-4681] Update terra-common-lib #4732

merged 43 commits into from
Aug 27, 2024

Conversation

lucymcnatt
Copy link
Collaborator

@lucymcnatt lucymcnatt commented Aug 1, 2024

Jira ticket: https://broadworkbench.atlassian.net/browse/IA-4681

Summary of changes

What

  • Updating terra-common-lib and fixing affected functions
  • Also upgraded wblibs to pull in most recent version of openTelemetry to fix dep conflicts

Why

  • In order to pull in a non-vulnerable version of Okio (3.4.0)

Testing these changes

What to test

Who tested and where

  • This change is covered by automated tests
    • NB: Rerun automation tests on this PR by commenting jenkins retest or jenkins multi-test.
  • I validated this change
  • Primary reviewer validated this change
  • I validated this change in the dev environment

@@ -365,19 +365,7 @@ class LeoMetricsMonitor[F[_]](config: LeoMetricsMonitorConfig,
val labelSelector = s"leoAppName=${app.appName.value}"
for {
pods <- F.blocking(
client.listNamespacedPod(namespace.value,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

this method was changed so that the arguments are now setter functions

@lucymcnatt lucymcnatt marked this pull request as ready for review August 15, 2024 15:40
@lucymcnatt
Copy link
Collaborator Author

@LizBaldo I changed how the mocking is done in that one spec, so 🤞 it should be passing now

@LizBaldo
Copy link
Collaborator

Thanks a bunch! I'll monitor the rest of the tests and will merge early next week

Copy link

codecov bot commented Aug 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.14%. Comparing base (2178c7d) to head (f2a5358).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #4732   +/-   ##
========================================
  Coverage    74.14%   74.14%           
========================================
  Files          161      161           
  Lines        15051    15051           
  Branches      1208     1208           
========================================
  Hits         11159    11159           
  Misses        3892     3892           
Files Coverage Δ
...itute/dsde/workbench/leonardo/db/DbReference.scala 84.09% <ø> (ø)
...workbench/leonardo/monitor/LeoMetricsMonitor.scala 54.38% <ø> (ø)
...orkbench/leonardo/util/KubernetesInterpreter.scala 0.00% <ø> (ø)

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2178c7d...f2a5358. Read the comment docs.

@LizBaldo
Copy link
Collaborator

Note that updating to the new kubernetes java client was causing issues with GKE app creation and so given that the scope of this PR is to upgrade to a safe version of okio ( >= 3.4.0), pinning TCL to 1.1.4 lets us do that (okio is 3.6.0 now), while still using the legacy kubernetes java API.

We should upgrade to the latest kubernetes API eventually but this is outside of the scope of this PR

@LizBaldo LizBaldo merged commit 4f47442 into develop Aug 27, 2024
23 of 24 checks passed
@LizBaldo LizBaldo deleted the IA-4681-update-tcl branch August 27, 2024 15:43
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