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

* Only do logging when it's internal

* Black reformatting

* Fix typo

Author: qingchm

integration/combination/test_api_with_authorizers.py

@@ -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:

integration/helpers/base_test.py

@@ -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]
@@ -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):
@@ -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