Skip to content

chore: Only do request logging when internal flag is provided #2514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2022
Merged

chore: Only do request logging when internal flag is provided #2514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
249e8f3
Only do logging when it's internal
qingchm Sep 23, 2022
54f3d5e
Black reformatting
qingchm Sep 23, 2022
ccb099c
Fix typo
qingchm Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integration/combination/test_api_with_authorizers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,10 @@ def verify_authorized_request(
header_value=None,
):
if not header_key or not header_value:
response = BaseTest.do_get_request_with_logging(url)
response = self.do_get_request_with_logging(url)
else:
headers = {header_key: header_value}
response = BaseTest.do_get_request_with_logging(url, headers)
response = self.do_get_request_with_logging(url, headers)
status = response.status_code

if status != expected_status_code:
Expand Down
26 changes: 17 additions & 9 deletions integration/helpers/base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,14 @@ def s3_bucket(self, get_s3):
def case_name(self, request):
self.testcase = request.node.name

@pytest.fixture(autouse=True)
def internal_check(self, check_internal):
self.internal = check_internal

@classmethod
@pytest.mark.usefixtures("get_prefix", "get_stage", "check_internal", "parameter_values", "get_s3")
@pytest.mark.usefixtures(
"get_prefix", "get_stage", "check_internal", "parameter_values", "get_s3", "check_internal"
)
def setUpClass(cls):
cls.FUNCTION_OUTPUT = "hello"
cls.tests_integ_dir = Path(__file__).resolve().parents[1]
Expand Down Expand Up @@ -560,10 +566,11 @@ def do_get_request_with_logging(self, url, headers=None):
"""
response = requests.get(url, headers=headers) if headers else requests.get(url)
amazon_headers = RequestUtils(response).get_amazon_headers()
REQUEST_LOGGER.info(
"Request made to " + url,
extra={"test": self.testcase, "status": response.status_code, "headers": amazon_headers},
)
if self.internal:
REQUEST_LOGGER.info(
"Request made to " + url,
extra={"test": self.testcase, "status": response.status_code, "headers": amazon_headers},
)
return response

def do_options_request_with_logging(self, url, headers=None):
Expand All @@ -578,8 +585,9 @@ def do_options_request_with_logging(self, url, headers=None):
"""
response = requests.options(url, headers=headers) if headers else requests.options(url)
amazon_headers = RequestUtils(response).get_amazon_headers()
REQUEST_LOGGER.info(
"Request made to " + url,
extra={"test": self.testcase, "status": response.status_code, "headers": amazon_headers},
)
if self.internal:
REQUEST_LOGGER.info(
"Request made to " + url,
extra={"test": self.testcase, "status": response.status_code, "headers": amazon_headers},
)
return response