canonicalwebteam.store-api 7.3.2__py3-none-any.whl → 7.3.4__py3-none-any.whl

canonicalwebteam/store_api/base.py

@@ -1,3 +1,5 @@
+import logging
+
 from canonicalwebteam.exceptions import (
     PublisherAgreementNotSigned,
     PublisherMacaroonRefreshRequired,
@@ -15,13 +17,55 @@ from canonicalwebteam.exceptions import (
 )
 
 
+logger = logging.getLogger(__name__)
+
+
+def _sanitize_dict(dictionary):
+    result = {}
+    for k, v in dictionary.items():
+        if isinstance(v, str):
+            result[k] = f"<len {len(v)}>"
+        else:
+            result[k] = None
+    return result
+
+
+def _loggable_request(request):
+    return {
+        "url": request.url,
+        "headers": _sanitize_dict(request.headers),
+        "cookies": _sanitize_dict(request._cookies),
+        "body": request.body,
+    }
+
+
+def _loggable_response(response):
+    return {
+        "status": response.status_code,
+        "url": response.url,
+        "headers": _sanitize_dict(response.headers),
+        "cookies": _sanitize_dict(response.cookies),
+        "text": response.text,
+    }
+
+
 class Base:
     def __init__(self, session):
         self.session = session
 
+    def log_detailed_error(self, response):
+        logger.error(
+            "Request failed",
+            extra={
+                "request": _loggable_request(response.request),
+                "response": _loggable_response(response),
+            },
+        )
+
     def process_response(self, response):
         # 5xx responses are not in JSON format
         if response.status_code >= 500:
+            self.log_detailed_error(response)
             if response.status_code == 500:
                 raise StoreApiInternalError("Internal error upstream")
             elif response.status_code == 501:
@@ -42,15 +86,20 @@ class Base:
         try:
             body = response.json()
         except ValueError as decode_error:
+            logger.error(
+                "JSON decoding failed. Response text: %s", response.text
+            )
             api_error_exception = StoreApiResponseDecodeError(
                 "JSON decoding failed: {}".format(decode_error)
             )
             raise api_error_exception
 
         if self._is_macaroon_expired(response.headers):
+            logger.error("Publisher macaroon refresh required")
             raise PublisherMacaroonRefreshRequired
 
         if not response.ok:
+            self.log_detailed_error(response)
             error_list = (
                 body["error_list"]
                 if "error_list" in body

canonicalwebteam/store_api/dashboard.py

@@ -10,7 +10,7 @@ from canonicalwebteam.exceptions import (
 
 
 DASHBOARD_API_URL = getenv(
-    "DASHBOARD_API_URL", "https://dashboard.snapcraft.io/"
+    "SNAPSTORE_DASHBOARD_API_URL", "https://dashboard.snapcraft.io/"
 )
 
 

{canonicalwebteam_store_api-7.3.2.dist-info → canonicalwebteam_store_api-7.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: canonicalwebteam.store-api
-Version: 7.3.2
+Version: 7.3.4
 Summary: 
 License: LGPL-3.0
 License-File: LICENSE

{canonicalwebteam_store_api-7.3.2.dist-info → canonicalwebteam_store_api-7.3.4.dist-info}/RECORD

@@ -2,13 +2,13 @@ canonicalwebteam/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,
 canonicalwebteam/exceptions.py,sha256=Uf9HxtLH5fAXPdDm6H14tA8jUxKQAWUmWIovzHLtdRw,2134
 canonicalwebteam/retry_utils.py,sha256=zGGabWzHyoXPNdwXBS_gbz3W0Qpdg3wN1G6aNy_xef8,8517
 canonicalwebteam/store_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-canonicalwebteam/store_api/base.py,sha256=_kx3_hPQHJPUtdf3z4NXmcwHlswV1g1mw483fZXD5LM,3331
-canonicalwebteam/store_api/dashboard.py,sha256=M5JLjTTahN-bfiVz9SuP6ahLjqEvOalwmNim6X5Ky6o,22796
+canonicalwebteam/store_api/base.py,sha256=4KGdGdr0phY4ouH5hCU9TXUlnePWKrPwnRHYj_hJc3w,4616
+canonicalwebteam/store_api/dashboard.py,sha256=Dajmi-MqLLOm9ykTCJELom6peMhAYyc3mmUAUrJBC1A,22806
 canonicalwebteam/store_api/devicegw.py,sha256=NxO0kGtKjSixmwmyp-dXz53ohtlSDw-hJ55ugsUKj5I,10723
 canonicalwebteam/store_api/publishergw.py,sha256=u2D2Y76xC8ms16XTZcUe_KmRdcyzqOV2g0aN9HYZBrQ,29702
 canonicalwebteam/stores_web_redis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 canonicalwebteam/stores_web_redis/utility.py,sha256=iT5Wb6tk53ywtDVWMcfzAT_Sljmvo0bdhaUg6uepT2o,4290
-canonicalwebteam_store_api-7.3.2.dist-info/METADATA,sha256=I7Po50dEoiflvNsbb675IAY2owGLspq8QjVg_uA4mMo,2357
-canonicalwebteam_store_api-7.3.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-canonicalwebteam_store_api-7.3.2.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-canonicalwebteam_store_api-7.3.2.dist-info/RECORD,,
+canonicalwebteam_store_api-7.3.4.dist-info/METADATA,sha256=MEaDSbIAhWwDcRQqD1cw9sTQNP5HmEgeM22oGUHZh08,2357
+canonicalwebteam_store_api-7.3.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+canonicalwebteam_store_api-7.3.4.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+canonicalwebteam_store_api-7.3.4.dist-info/RECORD,,