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

Update image configuration and fix CSV processing #94

Merged
merged 5 commits into from
Apr 12, 2024

Conversation

mcdonnnj
Copy link
Member

@mcdonnnj mcdonnnj commented Apr 2, 2024

🗣 Description

This pull request does the following:

  • Update Alpine Linux package dependencies in the Dockerfile.
  • Update Python dependencies declared in the Dockerfile.
  • Update the Pipfile to reflect changes in Python version.
  • Re-lock the Pipfile to update any dependencies in Pipfile.lock.
  • Update the vdp_scanner.py script to account for CSV header format changes.

💭 Motivation and context

The Alpine Linux package changes are required for the image to build successfully and since I would need to re-lock the Pipfile after updating it to match Python versions used in the Dockerfile it made since to update all of the dependencies. There were some capitalization changes in current-federal.csv that break vdp_scanner.py so that needed to be fixed.

🧪 Testing

Automated tests pass. The image builds successfully. I used this branch's image in production to process this week's domain scan reports.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All new and existing tests pass.

✅ Post-merge checklist

  • Create a release.

These represent the current versions available for Alpine Linux 3.18.
The tag for the `python` Docker image was also updated to reflect the
change in system Python version being installed.
The Pipfile should have the same Python version as that specified in
the Dockerfile. Dependencies were updated with `pipenv lock` as well.
Bump pip from 23.1.2 to 24.0
Bump pipenv from 2023.10.20 to 2023.12.1
Bump setuptools from 67.7.2 to 69.2.0
Bump wheel from 0.40.0 to 0.43.0
In cisagov/dotgov-data#114 the headers for the `current-federal.csv`
file were changed. This updates the script used in this Docker
configuration to use the updated header field values.
@mcdonnnj mcdonnnj added bug This issue or pull request addresses broken functionality version bump This issue or pull request increments the version number dependencies Pull requests that update a dependency file docker Pull requests that update Docker code labels Apr 2, 2024
@mcdonnnj mcdonnnj self-assigned this Apr 2, 2024
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

👍 👍

Copy link
Member

@jsf9k jsf9k left a comment

Choose a reason for hiding this comment

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

Why not upgrade to Alpine 3.19 while we're here?

@mcdonnnj
Copy link
Member Author

mcdonnnj commented Apr 9, 2024

Why not upgrade to Alpine 3.19 while we're here?

I'd rather keep this as "necessary changes for the PR's purpose" as possible in line with our bullet regarding scope creep.

@mcdonnnj mcdonnnj merged commit 4396c7a into develop Apr 12, 2024
18 checks passed
@mcdonnnj mcdonnnj deleted the bugfix/fix_for_domain_csv_changes branch April 12, 2024 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue or pull request addresses broken functionality dependencies Pull requests that update a dependency file docker Pull requests that update Docker code version bump This issue or pull request increments the version number
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants