fix: add constraint to the age of import log range (GoogleCloudPlatform#10633)

ensure that import range does not include dates older than 29 days from now. Fixes GoogleCloudPlatform#10632 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Author: minherz

logging/import-logs/main.py

@@ -79,6 +79,21 @@ def _day(blob_name: str) -> int:
  return int(blob_name[offset : offset + 2])
 
 
+def _is_valid_import_range() -> bool:
+ """Check the import range dates to ensure that
+ - start date is earlier than end date
+ - no dates in the range is older than 29 days
+ (for reason see https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#FIELDS.timestamp)
+ """
+ if START_DATE > END_DATE:
+ eprint("Start date of the import time range should be earlier than end date")
+ return False
+ if (date.today() - START_DATE).days > 29:
+ eprint("Import range includes dates older than 29 days from today.")
+ return False
+ return True
+
+
 def calc_import_range() -> Tuple[date, date]:
  """Calculate import range for the task based on full import range and number of tasks"""
  if TASK_COUNT == 1:
@@ -201,12 +216,10 @@ def import_logs(
 
 def main() -> None:
  """Imports logs from Cloud Storage to Cloud Logging"""
-
  if not START_DATE or not END_DATE or not LOG_ID or not BUCKET_NAME:
  eprint("Missing some of required parameters")
  sys.exit(1)
- if START_DATE > END_DATE:
- eprint("Start date of the import time range should be earlier than end date")
+ if not _is_valid_import_range():
  sys.exit(1)
 
  start_date, end_date = calc_import_range()

logging/import-logs/main_test.py

@@ -17,7 +17,7 @@
 # pylint: disable=too-many-arguments
 # pylint: disable=too-many-return-statements
 
-from datetime import date
+from datetime import date, timedelta
 import json
 import os
 import sys
@@ -53,6 +53,34 @@ def _setup_environment(
  main._LOGS_MAX_SIZE_BYTES = max_size # pylint: disable=protected-access
 
 
+@pytest.mark.parametrize(
+ "start_date, end_date, expected_validity",
+ [
+ (date.today() - timedelta(days=29), date.today() - timedelta(days=10), True),
+ (date.today() - timedelta(days=10), date.today() - timedelta(days=29), False),
+ (date.today() - timedelta(days=30), date.today(), False),
+ ("07/01/2023", "06/01/2023", False),
+ ],
+ ids=[
+ "valid range",
+ "invalid range: start later than end",
+ "invalid range: start older than 29 days",
+ "invalid range: end older than 29 days",
+ ],
+)
+def test_import_range_validation(
+ start_date: str, end_date: str, expected_validity: bool
+) -> None:
+ _setup_environment(
+ start_date=start_date,
+ end_date=end_date,
+ )
+ isvalid = main._is_valid_import_range() # pylint: disable=protected-access
+ assert (
+ isvalid == expected_validity
+ ), f"import range ({start_date} -> {end_date}) validation failed: expected {expected_validity} and got {isvalid}"
+
+
 @pytest.mark.parametrize(
  "start_date, end_date, task_index, task_count, expected_first_day, expected_last_day",
  [