Merge branch 'awslabs:develop' into docs/1064-jmespath-functions

Author: Michael Brewer

.github/dependabot.yml

@@ -17,6 +17,10 @@ updates:
     commit-message:
       prefix: chore
       include: scope
+    ignore:
+      # 2022-04-23: Ignoring boto3 changes until we need to care about them.
+      - dependency-name: "boto3"
+        
 
 #   - package-ecosystem: "pip"
 #     directory: "/"

.github/mergify.yml

@@ -1,29 +1,31 @@
-queue_rules:
-  - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
-      - check-success=Semantic Pull Request
-      - "#approved-reviews-by>=1"
-      - -title~=(WIP|wip)
-      - -label~="do-not-merge"
-      - "#changes-requested-reviews-by=0"
+## Temporarily disabled after Mergify breaking changes
+## might move to custom GitHub Actions altogether
+# queue_rules:
+#   - name: default
+#     conditions:
+#       # Conditions to get out of the queue (= merged)
+#       - check-success=Semantic Pull Request
+#       - "#approved-reviews-by>=1"
+#       - -title~=(WIP|wip)
+#       - -label~="do-not-merge"
+#       - "#changes-requested-reviews-by=0"
 
-pull_request_rules:
-  - name: automatic merge for Dependabot pull requests
-    conditions:
-      - author~=^dependabot(|-preview)\[bot\]$
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message: title+body
+# pull_request_rules:
+#   - name: automatic merge for Dependabot pull requests
+#     conditions:
+#       - author~=^dependabot(|-preview)\[bot\]$
+#     actions:
+#       queue:
+#         name: default
+#         method: squash
+#         commit_message: title+body
 
-  - name: Automatic merge ⬇️ on approval ✔
-    conditions:
-      - base!=master
-      - "#approved-reviews-by>=2"
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message: title+body
+#   - name: Automatic merge ⬇️ on approval ✔
+#     conditions:
+#       - base!=master
+#       - "#approved-reviews-by>=2"
+#     actions:
+#       queue:
+#         name: default
+#         method: squash
+#         commit_message: title+body

.github/workflows/codeql-analysis.yml

@@ -24,7 +24,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -33,4 +33,4 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/post_release.js

@@ -15,7 +15,7 @@ const fetchIssues = async ({
 	gh_client,
 	org,
 	repository,
-	state = "open",
+	state = "all",
 	label = STAGED_LABEL,
 }) => {
 

aws_lambda_powertools/event_handler/api_gateway.py

@@ -491,6 +491,11 @@ def resolve(self, event, context) -> Dict[str, Any]:
         dict
             Returns the dict response
         """
+        if isinstance(event, BaseProxyEvent):
+            warnings.warn(
+                "You don't need to serialize event to Event Source Data Class when using Event Handler; see issue #1152"
+            )
+            event = event.raw_event
         if self._debug:
             print(self._json_dump(event), end="")
         BaseRouter.current_event = self._to_proxy_event(event)
@@ -651,7 +656,10 @@ def _lookup_exception_handler(self, exp_type: Type) -> Optional[Callable]:
     def _call_exception_handler(self, exp: Exception, route: Route) -> Optional[ResponseBuilder]:
         handler = self._lookup_exception_handler(type(exp))
         if handler:
-            return ResponseBuilder(handler(exp), route)
+            try:
+                return ResponseBuilder(handler(exp), route)
+            except ServiceError as service_error:
+                exp = service_error
 
         if isinstance(exp, ServiceError):
             return ResponseBuilder(

aws_lambda_powertools/utilities/batch/sqs.py

@@ -135,6 +135,10 @@ def _clean(self) -> Optional[List]:
             return None
 
         queue_url = self._get_queue_url()
+        if queue_url is None:
+            logger.debug("No queue url found")
+            return None
+
         entries_to_remove = self._get_entries_to_clean()
         # Batch delete up to 10 messages at a time (SQS limit)
         max_workers = math.ceil(len(entries_to_remove) / self.max_message_batch)

aws_lambda_powertools/utilities/data_classes/ses_event.py

@@ -1,4 +1,4 @@
-from typing import Iterator, List
+from typing import Iterator, List, Optional
 
 from aws_lambda_powertools.utilities.data_classes.common import DictWrapper
 
@@ -26,7 +26,7 @@ def get_from(self) -> List[str]:
         return self["from"]
 
     @property
-    def date(self) -> List[str]:
+    def date(self) -> str:
         """The date and time when Amazon SES received the message."""
         return self["date"]
 
@@ -45,6 +45,26 @@ def subject(self) -> str:
         """The value of the Subject header for the email."""
         return str(self["subject"])
 
+    @property
+    def cc(self) -> Optional[List[str]]:
+        """The values in the CC header of the email."""
+        return self.get("cc")
+
+    @property
+    def bcc(self) -> Optional[List[str]]:
+        """The values in the BCC header of the email."""
+        return self.get("bcc")
+
+    @property
+    def sender(self) -> Optional[List[str]]:
+        """The values in the Sender header of the email."""
+        return self.get("sender")
+
+    @property
+    def reply_to(self) -> Optional[List[str]]:
+        """The values in the replyTo header of the email."""
+        return self.get("replyTo")
+
 
 class SESMail(DictWrapper):
     @property
@@ -94,6 +114,9 @@ def common_headers(self) -> SESMailCommonHeaders:
 class SESReceiptStatus(DictWrapper):
     @property
     def status(self) -> str:
+        """Receipt status
+        Possible values: 'PASS', 'FAIL', 'GRAY', 'PROCESSING_FAILED', 'DISABLED'
+        """
         return str(self["status"])
 
 
@@ -107,6 +130,12 @@ def get_type(self) -> str:
         # Note: this name conflicts with existing python builtins
         return self["type"]
 
+    @property
+    def topic_arn(self) -> Optional[str]:
+        """String that contains the Amazon Resource Name (ARN) of the Amazon SNS topic to which the
+        notification was published."""
+        return self.get("topicArn")
+
     @property
     def function_arn(self) -> str:
         """String that contains the ARN of the Lambda function that was triggered.
@@ -154,12 +183,24 @@ def spf_verdict(self) -> SESReceiptStatus:
         """Object that indicates whether the Sender Policy Framework (SPF) check passed."""
         return SESReceiptStatus(self["spfVerdict"])
 
+    @property
+    def dkim_verdict(self) -> SESReceiptStatus:
+        """Object that indicates whether the DomainKeys Identified Mail (DKIM) check passed"""
+        return SESReceiptStatus(self["dkimVerdict"])
+
     @property
     def dmarc_verdict(self) -> SESReceiptStatus:
         """Object that indicates whether the Domain-based Message Authentication,
         Reporting & Conformance (DMARC) check passed."""
         return SESReceiptStatus(self["dmarcVerdict"])
 
+    @property
+    def dmarc_policy(self) -> Optional[str]:
+        """Indicates the Domain-based Message Authentication, Reporting & Conformance (DMARC) settings for
+        the sending domain. This field only appears if the message fails DMARC authentication.
+        Possible values for this field are: none, quarantine, reject"""
+        return self.get("dmarcPolicy")
+
     @property
     def action(self) -> SESReceiptAction:
         """Object that encapsulates information about the action that was executed."""

aws_lambda_powertools/utilities/idempotency/persistence/dynamodb.py

@@ -22,7 +22,7 @@ def __init__(
         self,
         table_name: str,
         key_attr: str = "id",
-        static_pk_value: str = f"idempotency#{os.getenv(constants.LAMBDA_FUNCTION_NAME_ENV, '')}",
+        static_pk_value: Optional[str] = None,
         sort_key_attr: Optional[str] = None,
         expiry_attr: str = "expiration",
         status_attr: str = "status",
@@ -76,6 +76,9 @@ def __init__(
         if sort_key_attr == key_attr:
             raise ValueError(f"key_attr [{key_attr}] and sort_key_attr [{sort_key_attr}] cannot be the same!")
 
+        if static_pk_value is None:
+            static_pk_value = f"idempotency#{os.getenv(constants.LAMBDA_FUNCTION_NAME_ENV, '')}"
+
         self._table = None
         self.table_name = table_name
         self.key_attr = key_attr

poetry.lock

@@ -49,11 +49,11 @@ pytest-asyncio = "^0.16.0"
 bandit = "^1.7.1"
 radon = "^5.1.0"
 xenon = "^0.9.0"
-flake8-eradicate = "^1.2.0"
-flake8-bugbear = "^22.1.11"
+flake8-eradicate = "^1.2.1"
+flake8-bugbear = "^22.4.25"
 mkdocs-git-revision-date-plugin = "^0.3.2"
 mike = "^0.6.0"
-mypy = "^0.942"
+mypy = "^0.950"
 mkdocs-material = "^8.2.7"
 
 

pyproject.toml

@@ -77,6 +77,7 @@
           "dkimVerdict": {
             "status": "PASS"
           },
+          "dmarcPolicy": "reject",
           "processingTimeMillis": 574,
           "action": {
             "type": "Lambda",