fix: satisfy serverless lint and Terraform formatting gates

Author: CoreyLeath-code

.github/workflows/aws-snowflake-validation.yml

@@ -54,7 +54,7 @@ jobs:
           terraform_version: '1.9.8'
 
       - name: Check Terraform formatting
-        run: terraform fmt -check -recursive infra/aws
+        run: terraform fmt -check -diff -recursive infra/aws
 
       - name: Initialize providers without backend
         run: terraform -chdir=infra/aws init -backend=false

app/api/routes.py

@@ -7,7 +7,7 @@
 import time
 import uuid
 from dataclasses import dataclass
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Literal
 
 from fastapi import APIRouter, Header, HTTPException
@@ -211,7 +211,7 @@ def feedback(req: FeedbackRequest, x_api_key: str | None = Header(default=None))
         "schema_version": 1,
         "event_id": str(uuid.uuid4()),
         "anonymous_user_id": anonymized_user,
-        "occurred_at": datetime.now(timezone.utc).isoformat(),
+        "occurred_at": datetime.now(UTC).isoformat(),
     }
     try:
         _feedback_sink.publish(event)

app/core/feedback_sink.py

@@ -4,7 +4,8 @@
 
 import json
 import logging
-from typing import Any, Mapping, Protocol
+from collections.abc import Mapping
+from typing import Any, Protocol
 
 logger = logging.getLogger(__name__)
 

infra/aws/main.tf

@@ -115,8 +115,8 @@ resource "aws_iam_role_policy" "feedback_lambda" {
         Resource = aws_sqs_queue.feedback.arn
       },
       {
-        Effect = "Allow"
-        Action = ["s3:PutObject"]
+        Effect   = "Allow"
+        Action   = ["s3:PutObject"]
         Resource = "${aws_s3_bucket.feedback.arn}/feedback/*"
       }
     ]

serverless/feedback_ingestion/handler.py

@@ -6,9 +6,11 @@
 import logging
 import os
 import re
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Any
 
+from botocore.exceptions import BotoCoreError, ClientError
+
 logger = logging.getLogger(__name__)
 
 ALLOWED_EVENT_TYPES = {"impression", "click", "skip", "cart", "purchase", "dislike"}
@@ -63,16 +65,14 @@ def parse_feedback_message(body: str) -> dict[str, Any]:
     if not isinstance(payload["event_id"], str) or not payload["event_id"]:
         raise TypeError("event_id must be a non-empty string")
 
-    occurred_at = str(payload["occurred_at"])
-    parsed = datetime.fromisoformat(occurred_at.replace("Z", "+00:00"))
+    parsed = datetime.fromisoformat(str(payload["occurred_at"]))
     if parsed.tzinfo is None:
         raise ValueError("occurred_at must include a timezone")
     return payload
 
 
 def _storage_key(payload: dict[str, Any], message_id: str) -> str:
-    occurred = datetime.fromisoformat(str(payload["occurred_at"]).replace("Z", "+00:00"))
-    occurred = occurred.astimezone(timezone.utc)
+    occurred = datetime.fromisoformat(str(payload["occurred_at"])).astimezone(UTC)
     safe_message_id = re.sub(r"[^A-Za-z0-9_.-]", "_", message_id)
     return (
         f"feedback/event_date={occurred:%Y-%m-%d}/hour={occurred:%H}/"
@@ -125,7 +125,7 @@ def lambda_handler(event: dict[str, Any], context: Any) -> dict[str, list[dict[s
                 raise TypeError("SQS record must be an object")
             key = _process_record(record, bucket=bucket, s3_client=s3_client)
             logger.info("feedback_landed message_id=%s key=%s", message_id, key)
-        except Exception as exc:  # Lambda must isolate malformed records in a batch.
+        except (TypeError, ValueError, BotoCoreError, ClientError) as exc:
             logger.warning(
                 "feedback_ingestion_failed message_id=%s error_type=%s",
                 message_id,