fix: Set last_update_date to the time reported by the REST endpoint
#2672
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michaelkedar
requested review from
oliverchang,
andrewpollock and
another-rex
andrewpollock
requested changes
Sep 27, 2024
docker/importer/importer_test.py
Outdated
| imp = importer.Importer('fake_public_key', 'fake_private_key', self.tmp_dir, | ||
| importer.DEFAULT_PUBLIC_LOGGING_BUCKET, 'bucket', | ||
| False, False) | ||
| imp.run() | ||
| self.assertEqual(mock_publish.call_count, data_handler.cve_count) | ||
| self.assertEqual(repo.get().last_update_date, datetime.datetime(2024, 1, 1)) |
There was a problem hiding this comment.
Could you add a msg attribute to this with a human-friendly string explaining the nature of the assertion failure to help with debugging test failures?
| logging.info('No changes since last update.') | ||
| return | ||
| request_last_modified = None | ||
| if last_modified := request.headers.get('Last-Modified'): |
There was a problem hiding this comment.
oliverchang
approved these changes
Sep 30, 2024
docker/importer/importer.py
Outdated
| adapter = HTTPAdapter( | ||
| max_retries=Retry( | ||
| total=3, status_forcelist=[502, 503, 504], backoff_factor=1)) | ||
| s.mount(source_repo.rest_api_url, adapter) |
There was a problem hiding this comment.
Rather than mounting these explicitly, would it make sense (and is it possible to) just do a catchall here to apply this to all URLs?
There was a problem hiding this comment.
Worked out how to catchall by mounting on http:// and https://
another-rex
reviewed
Sep 30, 2024
andrewpollock
approved these changes
Sep 30, 2024
| @@ -821,7 +825,7 @@ def setUp(self): | |||
| self.tmp_dir = tempfile.mkdtemp() | |||
|
|
|||
| tests.mock_datetime(self) | |||
| warnings.filterwarnings("ignore", "unclosed", ResourceWarning) | |||
| warnings.filterwarnings('ignore', category=SystemTimeWarning) | |||
There was a problem hiding this comment.
I didn't realize there was a way to squelch these, this is awesome! Thank you!!!
another-rex
approved these changes
Sep 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use the
Last-Modifiedheader (or the latestmodifiedvuln date if the header is missing) to set the REST SourceRepository'slast_update_date, instead of using the time when the importer ran.Should alleviate #2670 for well-behaved REST sources, though it still doesn't handle cases where the source itself adds a record with date before the previous updated date.
While I was here, I also tidied up the
ignore_last_import_timelogic a bit (because the long line splitting was annoying).