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

[1pt] PR: Updates for newer openjdk and black packages #1110

Merged
merged 4 commits into from
Apr 4, 2024

Conversation

RobHanna-NOAA
Copy link
Contributor

@RobHanna-NOAA RobHanna-NOAA commented Apr 2, 2024

This PR reflects upgrades for openJDK from 17.0.8 to something higher, minimum of 17.0.9. After some research, we can not upgrade all the way to the latest openJDK but can jump up to 19.0. This limitation is related to version of our base docker image. openJDK was identified as requiring an upgrade by a system wide security scan.

The "black" packages is also be upgraded from 23.7.0 to 24.3.

NOTE: the update of "black" has change the rules slightly for formatting. This is why you see a bunch of files being changed but only for the formatting changes.

Closes Issue 1105 and PR 1100

Files Change

  • Dockerfile, Pipfile, Pipefile.lock
  • pre-commit-config.yaml is also has Black upgraded for CI/CD tests for linting during GIT check ins.
  • many files:
    • 19 files have had minor formatting changes related to the upgrade in the "black" package.

Testing

  • A new temp docker image was created with both fixes, ran fim_pipeline against 12090301, then ran alpha testing against it. All was well.
  • Then had ITSG run a security test against the new docker image / container and it was fine.

Issuer Checklist (For developer use)

You may update this checklist before and/or after creating the PR. If you're unsure about any of them, please ask, we're here to help! These items are what we are going to look for before merging your code.

  • Informative and human-readable title, using the format: [_pt] PR: <description>
  • Links are provided if this PR resolves an issue, or depends on another other PR
  • If submitting a PR to the dev branch (the default branch), you have a descriptive Feature Branch name using the format: dev-<description-of-change> (e.g. dev-revise-levee-masking)
  • Changes are limited to a single goal (no scope creep)
  • The feature branch you're submitting as a PR is up to date (merged) with the latest dev branch
  • pre-commit hooks were run locally
  • Any change in functionality is tested
  • n/a Passes all unit tests locally (inside interactive Docker container, at /foss_fim/, run: pytest unit_tests/)
  • n/a New functions are documented (with a description, list of inputs, and expected output)
  • n/a Placeholder code is flagged / future todos are captured in comments
  • CHANGELOG updated with template version number, e.g. 4.x.x.x
  • Reviewers requested
  • Add yourself as an assignee in the PR as well as the FIM Technical Lead

Merge Checklist (For Technical Lead use only)

  • Update CHANGELOG with latest version number and merge date
  • Update the Citation.cff file to reflect the latest version number in the CHANGELOG
  • If applicable, update README with major alterations

@RobHanna-NOAA RobHanna-NOAA self-assigned this Apr 2, 2024
@RobHanna-NOAA RobHanna-NOAA added enhancement New feature or request FIM4 labels Apr 2, 2024
@RobHanna-NOAA RobHanna-NOAA marked this pull request as ready for review April 2, 2024 21:21
@RobHanna-NOAA
Copy link
Contributor Author

With black upgrading formatting on 9 files at last minute, fim will be retested.

@RobHanna-NOAA RobHanna-NOAA linked an issue Apr 2, 2024 that may be closed by this pull request
@CarsonPruitt-NOAA CarsonPruitt-NOAA merged commit 27f74d5 into dev Apr 4, 2024
1 check passed
@CarsonPruitt-NOAA CarsonPruitt-NOAA deleted the dev-fix-openjdk branch April 4, 2024 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request FIM4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[3pt] OpenJDK vulnerability
2 participants