From f5bd3acc70b2bda73c896c7e914e91be25601603 Mon Sep 17 00:00:00 2001
From: Alexandra Kirk <alexandra@developmentseed.org>
Date: Mon, 3 Jun 2024 13:52:11 -0600
Subject: [PATCH 1/2] remove debug log from ingest api

---
 ingest_api/runtime/src/auth.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ingest_api/runtime/src/auth.py b/ingest_api/runtime/src/auth.py
index fa3a0ddf..294bec64 100644
--- a/ingest_api/runtime/src/auth.py
+++ b/ingest_api/runtime/src/auth.py
@@ -26,7 +26,6 @@ def validated_token(
     required_scopes: security.SecurityScopes,
 ) -> Dict:
     # Parse & validate token
-    logger.info(f"\nToken String {token_str}")
     try:
         token = jwt.decode(
             token_str,

From e538be45127c27f3d50ba94bcb25246eee037f54 Mon Sep 17 00:00:00 2001
From: Alexandra Kirk <alexandra@developmentseed.org>
Date: Mon, 3 Jun 2024 15:24:37 -0600
Subject: [PATCH 2/2] fix: requester pays get head object if configured

---
 ingest_api/infrastructure/config.py    | 5 +++++
 ingest_api/infrastructure/construct.py | 4 ++++
 ingest_api/runtime/src/config.py       | 5 +++++
 ingest_api/runtime/src/validators.py   | 9 ++++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ingest_api/infrastructure/config.py b/ingest_api/infrastructure/config.py
index 3a2a587a..7645df07 100644
--- a/ingest_api/infrastructure/config.py
+++ b/ingest_api/infrastructure/config.py
@@ -45,6 +45,11 @@ class IngestorConfig(BaseSettings):
         None, description="ARN of AWS Role used to validate access to S3 data"
     )
 
+    raster_aws_request_payer: Optional[str] = Field(
+        None,
+        description="Set optional global parameter to 'requester' if the requester agrees to pay S3 transfer costs",
+    )
+
     stac_api_url: str = Field(description="URL of STAC API used to serve STAC Items")
 
     raster_api_url: str = Field(
diff --git a/ingest_api/infrastructure/construct.py b/ingest_api/infrastructure/construct.py
index 662e90ac..05e82291 100644
--- a/ingest_api/infrastructure/construct.py
+++ b/ingest_api/infrastructure/construct.py
@@ -73,6 +73,10 @@ def __init__(
             build_api_lambda_params["data_access_role"] = iam.Role.from_role_arn(
                 self, "data-access-role", config.raster_data_access_role_arn
             )
+
+        if config.raster_aws_request_payer:
+            lambda_env["AWS_REQUEST_PAYER"] = config.raster_aws_request_payer
+
         build_api_lambda_params["env"] = lambda_env
 
         # create lambda
diff --git a/ingest_api/runtime/src/config.py b/ingest_api/runtime/src/config.py
index 2183bbda..ff51f680 100644
--- a/ingest_api/runtime/src/config.py
+++ b/ingest_api/runtime/src/config.py
@@ -19,6 +19,11 @@ class Settings(BaseSettings):
         description="ARN of AWS Role used to validate access to S3 data"
     )
 
+    aws_request_payer: Optional[str] = Field(
+        None,
+        description="Set optional global parameter to 'requester' if the requester agrees to pay S3 transfer costs",
+    )
+
     stac_url: AnyHttpUrl = Field(description="URL of STAC API")
 
     userpool_id: str = Field(description="The Cognito Userpool used for authentication")
diff --git a/ingest_api/runtime/src/validators.py b/ingest_api/runtime/src/validators.py
index ff057d5c..706f6f55 100644
--- a/ingest_api/runtime/src/validators.py
+++ b/ingest_api/runtime/src/validators.py
@@ -28,9 +28,16 @@ def s3_object_is_accessible(bucket: str, key: str):
     """
     Ensure we can send HEAD requests to S3 objects.
     """
+    from src.main import settings
+
     client = boto3.client("s3", **get_s3_credentials())
     try:
-        client.head_object(Bucket=bucket, Key=key)
+        if settings.aws_request_payer:
+            client.head_object(
+                Bucket=bucket, Key=key, RequestPayer=settings.aws_request_payer
+            )
+        else:
+            client.head_object(Bucket=bucket, Key=key)
     except client.exceptions.ClientError as e:
         raise ValueError(
             f"Asset not accessible: {e.__dict__['response']['Error']['Message']}"