Skip to content

Commit 42e42d5

Browse files
heitorlessaheitorlessa
authored
Merge branch 'develop' into fix/logger-jmespath
2 parents d48729f + ea7508f commit 42e42d5

File tree

15 files changed

+69
-36
lines changed

15 files changed

+69
-36
lines changed

‎.github/workflows/label_pr_on_title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Checkout repository
5353
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5454
- name: "Label PR based on title"
55-
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
55+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5656
env:
5757
PR_NUMBER: ${{ needs.get_pr_details.outputs.prNumber }}
5858
PR_TITLE: ${{ needs.get_pr_details.outputs.prTitle }}

‎.github/workflows/on_label_added.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5151
# Maintenance: Persist state per PR as an artifact to avoid spam on label add
5252
- name: "Suggest split large Pull Request"
53-
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
53+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5454
env:
5555
PR_NUMBER: ${{ needs.get_pr_details.outputs.prNumber }}
5656
PR_ACTION: ${{ needs.get_pr_details.outputs.prAction }}

‎.github/workflows/on_merged_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
steps:
5252
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5353
- name: "Label PR related issue for release"
54-
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
54+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5555
env:
5656
PR_NUMBER: ${{ needs.get_pr_details.outputs.prNumber }}
5757
PR_BODY: ${{ needs.get_pr_details.outputs.prBody }}

‎.github/workflows/on_opened_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5151
- name: "Ensure related issue is present"
52-
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
52+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5353
env:
5454
PR_BODY: ${{ needs.get_pr_details.outputs.prBody }}
5555
PR_NUMBER: ${{ needs.get_pr_details.outputs.prNumber }}
@@ -68,7 +68,7 @@ jobs:
6868
steps:
6969
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
7070
- name: "Ensure acknowledgement section is present"
71-
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
71+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
7272
env:
7373
PR_BODY: ${{ needs.get_pr_details.outputs.prBody }}
7474
PR_NUMBER: ${{ needs.get_pr_details.outputs.prNumber }}

‎.github/workflows/record_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5050
- name: "Extract PR details"
51-
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
51+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5252
with:
5353
script: |
5454
const script = require('.github/scripts/save_pr_details.js')

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ jobs:
368368
artifact_name: ${{ needs.seal.outputs.artifact_name }}
369369

370370
- name: Close issues related to this release
371-
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
371+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
372372
with:
373373
github-token: ${{ secrets.GITHUB_TOKEN }}
374374
script: |

‎.github/workflows/reusable_export_pr_details.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- name: Checkout repository # in case caller workflow doesn't checkout thus failing with file not found
7979
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
8080
- name: "Download previously saved PR"
81-
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
81+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
8282
env:
8383
WORKFLOW_ID: ${{ inputs.record_pr_workflow_id }}
8484
# For security, we only download artifacts tied to the successful PR recording workflow

‎CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
## Maintenance
1313

1414
* **ci:** lint and type checking removal in Pydantic v2 quality check ([#3360](https://github.com/aws-powertools/powertools-lambda-python/issues/3360))
15-
* **deps:** bump the layer-balancer group in /layer/scripts/layer-balancer with 2 updates ([#3353](https://github.com/aws-powertools/powertools-lambda-python/issues/3353))
1615
* **deps:** bump squidfunk/mkdocs-material from `f486dc9` to `2c57e4d` in /docs ([#3366](https://github.com/aws-powertools/powertools-lambda-python/issues/3366))
17-
* **deps-dev:** bump ruff from 0.1.5 to 0.1.6 ([#3364](https://github.com/aws-powertools/powertools-lambda-python/issues/3364))
16+
* **deps:** bump the layer-balancer group in /layer/scripts/layer-balancer with 2 updates ([#3353](https://github.com/aws-powertools/powertools-lambda-python/issues/3353))
17+
* **deps-dev:** bump aws-cdk from 2.109.0 to 2.110.0 ([#3361](https://github.com/aws-powertools/powertools-lambda-python/issues/3361))
1818
* **deps-dev:** bump the boto-typing group with 11 updates ([#3362](https://github.com/aws-powertools/powertools-lambda-python/issues/3362))
1919
* **deps-dev:** bump aws-cdk-lib from 2.108.1 to 2.110.0 ([#3365](https://github.com/aws-powertools/powertools-lambda-python/issues/3365))
2020
* **deps-dev:** bump aws-cdk from 2.108.1 to 2.109.0 ([#3354](https://github.com/aws-powertools/powertools-lambda-python/issues/3354))
21-
* **deps-dev:** bump aws-cdk from 2.109.0 to 2.110.0 ([#3361](https://github.com/aws-powertools/powertools-lambda-python/issues/3361))
21+
* **deps-dev:** bump cfn-lint from 0.83.2 to 0.83.3 ([#3363](https://github.com/aws-powertools/powertools-lambda-python/issues/3363))
22+
* **deps-dev:** bump ruff from 0.1.5 to 0.1.6 ([#3364](https://github.com/aws-powertools/powertools-lambda-python/issues/3364))
2223

2324

2425
<a name="v2.27.0"></a>

‎aws_lambda_powertools/logging/logger.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ def exception(
508508
self,
509509
msg: object,
510510
*args,
511-
exc_info=True,
511+
exc_info: logging._ExcInfoType = True,
512512
stack_info: bool = False,
513513
stacklevel: int = 2,
514514
extra: Optional[Mapping[str, object]] = None,
@@ -684,6 +684,12 @@ def setLevel(self, level: Union[str, int, None]) -> None:
684684
def addHandler(self, handler: logging.Handler) -> None:
685685
return self._logger.addHandler(handler)
686686

687+
def addFilter(self, filter: logging._FilterType) -> None: # noqa: A002 # filter built-in usage
688+
return self._logger.addFilter(filter)
689+
690+
def removeFilter(self, filter: logging._FilterType) -> None: # noqa: A002 # filter built-in usage
691+
return self._logger.removeFilter(filter)
692+
687693
@property
688694
def registered_handler(self) -> logging.Handler:
689695
"""Convenience property to access the first logger handler"""

‎docs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# v9.1.18
2-
FROM squidfunk/mkdocs-material@sha256:2c57e4d0fe6ad69e38e1198a59871638256ab9fdeab74f0fe79b42d6b380a23f
2+
FROM squidfunk/mkdocs-material@sha256:fc42bac0005e79c2b2dd576e72103b06932c30c7b7b455a1f9cd3d39b187d49d
33
# pip-compile --generate-hashes --output-file=requirements.txt requirements.in
44
COPY requirements.txt /tmp/
55
RUN pip install --require-hashes -r /tmp/requirements.txt

‎layer/scripts/layer-balancer/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ go 1.18
44

55
require (
66
github.com/aws/aws-sdk-go-v2 v1.23.0
7-
github.com/aws/aws-sdk-go-v2/config v1.25.2
7+
github.com/aws/aws-sdk-go-v2/config v1.25.3
88
github.com/aws/aws-sdk-go-v2/service/lambda v1.48.0
99
golang.org/x/exp v0.0.0-20230321023759-10a507213a29
1010
golang.org/x/sync v0.5.0
1111
)
1212

1313
require (
1414
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.1 // indirect
15-
github.com/aws/aws-sdk-go-v2/credentials v1.16.1 // indirect
15+
github.com/aws/aws-sdk-go-v2/credentials v1.16.2 // indirect
1616
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.4 // indirect
1717
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.3 // indirect
1818
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.3 // indirect
1919
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.1 // indirect
2020
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.1 // indirect
2121
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.3 // indirect
2222
github.com/aws/aws-sdk-go-v2/service/sso v1.17.2 // indirect
23-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.19.2 // indirect
24-
github.com/aws/aws-sdk-go-v2/service/sts v1.25.2 // indirect
23+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.20.0 // indirect
24+
github.com/aws/aws-sdk-go-v2/service/sts v1.25.3 // indirect
2525
github.com/aws/smithy-go v1.17.0 // indirect
2626
github.com/jmespath/go-jmespath v0.4.0 // indirect
2727
)

‎layer/scripts/layer-balancer/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ github.com/aws/aws-sdk-go-v2 v1.23.0 h1:PiHAzmiQQr6JULBUdvR8fKlA+UPKLT/8KbiqpFBW
22
github.com/aws/aws-sdk-go-v2 v1.23.0/go.mod h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA=
33
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.1 h1:ZY3108YtBNq96jNZTICHxN1gSBSbnvIdYwwqnvCV4Mc=
44
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.1/go.mod h1:t8PYl/6LzdAqsU4/9tz28V/kU+asFePvpOMkdul0gEQ=
5-
github.com/aws/aws-sdk-go-v2/config v1.25.2 h1:+Gy7Xe372Tw/PiUw3We94Le9IwU1tmJqCD6cvI4oBJM=
6-
github.com/aws/aws-sdk-go-v2/config v1.25.2/go.mod h1:6hFlwWQiVOUG0Ej2ql0tG4zPlpDH++HD0WT1MA6l5Q4=
7-
github.com/aws/aws-sdk-go-v2/credentials v1.16.1 h1:WessyrdgyFN5TB+eLQdrFSlN/3oMnqukIFhDxK6z8h0=
8-
github.com/aws/aws-sdk-go-v2/credentials v1.16.1/go.mod h1:RQJyPxKcr+m4ArlIG1LUhMOrjposVfzbX6H8oR6oCgE=
5+
github.com/aws/aws-sdk-go-v2/config v1.25.3 h1:E4m9LbwJOoncDNt3e9MPLbz/saxWcGUlZVBydydD6+8=
6+
github.com/aws/aws-sdk-go-v2/config v1.25.3/go.mod h1:tAByZy03nH5jcq0vZmkcVoo6tRzRHEwSFx3QW4NmDw8=
7+
github.com/aws/aws-sdk-go-v2/credentials v1.16.2 h1:0sdZ5cwfOAipTzZ7eOL0gw4LAhk/RZnTa16cDqIt8tg=
8+
github.com/aws/aws-sdk-go-v2/credentials v1.16.2/go.mod h1:sDdvGhXrSVT5yzBDR7qXz+rhbpiMpUYfF3vJ01QSdrc=
99
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.4 h1:9wKDWEjwSnXZre0/O3+ZwbBl1SmlgWYBbrTV10X/H1s=
1010
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.4/go.mod h1:t4i+yGHMCcUNIX1x7YVYa6bH/Do7civ5I6cG/6PMfyA=
1111
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.3 h1:DUwbD79T8gyQ23qVXFUthjzVMTviSHi3y4z58KvghhM=
@@ -22,10 +22,10 @@ github.com/aws/aws-sdk-go-v2/service/lambda v1.48.0 h1:Q1ajPX+B64b/OyxuaSDBjqOMm
2222
github.com/aws/aws-sdk-go-v2/service/lambda v1.48.0/go.mod h1:80TuTBIg7+OWOOA85SdMfvV393HGXPwqoepFTQn6/qA=
2323
github.com/aws/aws-sdk-go-v2/service/sso v1.17.2 h1:V47N5eKgVZoRSvx2+RQ0EpAEit/pqOhqeSQFiS4OFEQ=
2424
github.com/aws/aws-sdk-go-v2/service/sso v1.17.2/go.mod h1:/pE21vno3q1h4bbhUOEi+6Zu/aT26UK2WKkDXd+TssQ=
25-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.19.2 h1:sMAcO7VHVw28HTAdZpTULDzFirHOsVm/x25CxhUH0jA=
26-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.19.2/go.mod h1:dWqm5G767qwKPuayKfzm4rjzFmVjiBFbOJrpSPnAMDs=
27-
github.com/aws/aws-sdk-go-v2/service/sts v1.25.2 h1:vwyiRTnXLqsak/6WAQ+uTRhVqKI6vxUQ0HJXjKij0zM=
28-
github.com/aws/aws-sdk-go-v2/service/sts v1.25.2/go.mod h1:4EqRHDCKP78hq3zOnmFXu5k0j4bXbRFfCh/zQ6KnEfQ=
25+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.20.0 h1:/XiEU7VIFcVWRDQLabyrSjBoKIm8UkYgsvWDuFW8Img=
26+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.20.0/go.mod h1:dWqm5G767qwKPuayKfzm4rjzFmVjiBFbOJrpSPnAMDs=
27+
github.com/aws/aws-sdk-go-v2/service/sts v1.25.3 h1:M2w4kiMGJCCM6Ljmmx/l6mmpfa3gPJVpBencfnsgvqs=
28+
github.com/aws/aws-sdk-go-v2/service/sts v1.25.3/go.mod h1:4EqRHDCKP78hq3zOnmFXu5k0j4bXbRFfCh/zQ6KnEfQ=
2929
github.com/aws/smithy-go v1.17.0 h1:wWJD7LX6PBV6etBUwO0zElG0nWN9rUhp0WdYeHSHAaI=
3030
github.com/aws/smithy-go v1.17.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
3131
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=

‎poetry.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ aws-cdk-lib = "^2.110.0"
6969
"aws-cdk.aws-apigatewayv2-authorizers-alpha" = "^2.38.1-alpha.0"
7070
pytest-benchmark = "^4.0.0"
7171
mypy-boto3-appconfig = "^1.29.0"
72-
mypy-boto3-cloudformation = "^1.29.0"
72+
mypy-boto3-cloudformation = "^1.29.3"
7373
mypy-boto3-cloudwatch = "^1.29.0"
7474
mypy-boto3-dynamodb = "^1.29.0"
7575
mypy-boto3-lambda = "^1.29.2"
7676
mypy-boto3-logs = "^1.29.0"
7777
mypy-boto3-secretsmanager = "^1.29.0"
7878
mypy-boto3-ssm = "^1.29.2"
79-
mypy-boto3-s3 = "^1.29.0"
79+
mypy-boto3-s3 = "^1.29.3"
8080
mypy-boto3-xray = "^1.29.0"
8181
types-requests = "^2.31.0"
8282
typing-extensions = "^4.6.2"

‎tests/functional/test_logger.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import logging
66
import random
77
import re
8+
import secrets
89
import string
910
import sys
1011
import warnings
@@ -1094,3 +1095,28 @@ def test_log_level_advanced_logging_controler_warning_different_log_levels_using
10941095

10951096
# THEN Logger must be INFO because it takes precedence over POWERTOOLS_LOG_LEVEL
10961097
assert logger.log_level == logging.INFO
1098+
1099+
1100+
def test_logger_add_remove_filter(stdout, service_name):
1101+
# GIVEN a Logger with a custom logging filter
1102+
class ApiKeyFilter(logging.Filter): # NOSONAR # need filter to test actual impl.
1103+
def filter(self, record):
1104+
if getattr(record, "api_key", None):
1105+
record.api_key = "REDACTED"
1106+
1107+
return True
1108+
1109+
redact_api_key_filter = ApiKeyFilter()
1110+
logger = Logger(service=service_name, stream=stdout)
1111+
logger.addFilter(redact_api_key_filter)
1112+
1113+
# WHEN a new log statement is issued
1114+
# AND another log statement is issued after filter is removed
1115+
logger.info("filtered", api_key=secrets.token_urlsafe())
1116+
logger.removeFilter(redact_api_key_filter)
1117+
logger.info("unfiltered", api_key=secrets.token_urlsafe())
1118+
1119+
# THEN logging filter should be called and mutate the log record accordingly
1120+
log = capture_multiple_logging_statements_output(stdout)
1121+
assert log[0]["api_key"] == "REDACTED"
1122+
assert log[1]["api_key"] != "REDACTED"

0 commit comments

Comments
 (0)