Requester Pay (#90)

* /deploy sit

* /deploy sit

* /deploy sit

* /deploy sit

* /deploy sit

* update changelog

Author: sliu008

.github/workflows/build.yml

@@ -75,7 +75,8 @@ jobs:
 
           # Version calculation based on branch
           if [[ "${{ github.ref }}" =~ ^refs/heads/(issue|feature|dependabot)/ ]]; then
-            new_version="${base_version%%-*}+$(git rev-parse --short HEAD)"
+            TIMESTAMP=$(date -u +"%Y%m%d%H%M")
+            new_version="${base_version}a${TIMESTAMP}"
             echo "TARGET_ENV_UPPERCASE=SIT" >> $GITHUB_ENV
           elif [[ "${{ github.ref }}" == "refs/heads/develop" ]]; then
             echo "TARGET_ENV_UPPERCASE=SIT" >> $GITHUB_ENV

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
+- Added in requester pay flag into s3 calls
 ### Changed
 ### Deprecated
 ### Removed

docker/lambdaDockerfileArm

@@ -6,7 +6,8 @@ FROM public.ecr.aws/lambda/python:3.10-arm64
 ARG SOURCE
 ARG DIST_PATH
 
-RUN yum -q -y install gcc
+# Install compilers needed for matplotlib (C + C++)
+RUN yum -q -y install gcc gcc-c++ make
 
 # Create function directory
 # RUN mkdir -p ${FUNCTION_DIR}

podaac/lambda_handler/lambda_handler.py

@@ -101,6 +101,13 @@ def clean_all(self):
         rmtree(self.path)
         clean_tmp()
 
+    def _get_s3_extra(self, upload=False):
+        """Helper to build the extra dict for S3 operations."""
+        extra = {"ACL": "bucket-owner-full-control"} if upload else {}
+        if self.config.get("requester_pay", False):
+            extra["RequestPayer"] = "requester"
+        return extra
+
     def download_file_from_s3(self, s3file, working_dir):
         """ Download s3 file to local
 
@@ -117,7 +124,8 @@ def download_file_from_s3(self, s3file, working_dir):
             full path of the downloaded file
         """
         try:
-            return s3.download(s3file, working_dir)
+            extra = self._get_s3_extra()
+            return s3.download(s3file, working_dir, extra=extra)
         except botocore.exceptions.ClientError as ex:
             self.logger.error("Error downloading file %s: %s" % (s3file, working_dir), exc_info=True)
             raise ex
@@ -133,7 +141,8 @@ def upload_file_to_s3(self, filename, uri):
             s3 string of file location
         """
         try:
-            return s3.upload(filename, uri, extra={"ACL": "bucket-owner-full-control"})
+            extra = self._get_s3_extra(upload=True)
+            return s3.upload(filename, uri, extra=extra)
         except botocore.exceptions.ClientError as ex:
             self.logger.error("Error uploading file %s: %s" % (os.path.basename(os.path.basename(filename)), str(ex)), exc_info=True)
             raise ex
@@ -370,7 +379,8 @@ def _download_file(self, file_):
         """Download the input file from S3."""
         input_file = f's3://{file_["bucket"]}/{file_["key"]}'
         try:
-            return s3.download(input_file, path=self.path)
+            extra = self._get_s3_extra()
+            return s3.download(input_file, path=self.path, extra=extra)
         except botocore.exceptions.ClientError as ex:
             self.logger.error("Error downloading file from S3: {}".format(ex), exc_info=True)
             raise