fix(tests): make some tests more robust

- Do not hard-code exact versions, match them with regex
- Do not hard-code values for quota (except limit for now)

Author: agateau-gg

tests/cassettes/quota.yaml

@@ -9,33 +9,50 @@ interactions:
         Connection:
           - keep-alive
         User-Agent:
-          - pygitguardian/1.1.3 (Linux;py3.9.5)
+          - pygitguardian/1.3.4 (Linux;py3.8.10)
       method: GET
       uri: https://api.gitguardian.com/v1/quotas
     response:
       body:
-        string: '{"content": {"count": 2,"limit": 5000,"remaining": 4998,"since": "2021-04-18"}}'
+        string: '{"content":{"count":1092,"limit":10000,"remaining":8908,"since":"2022-05-31"}}'
       headers:
         Access-Control-Expose-Headers:
           - X-App-Version
+        Allow:
+          - GET, HEAD, OPTIONS
         Connection:
           - keep-alive
         Content-Length:
-          - '79'
+          - '78'
         Content-Type:
           - application/json
         Date:
-          - Wed, 19 May 2021 15:57:19 GMT
+          - Thu, 30 Jun 2022 10:29:43 GMT
         Referrer-Policy:
-          - same-origin
+          - strict-origin-when-cross-origin
         Server:
           - nginx
+        Set-Cookie:
+          - AWSALB=VrB3AmmOenUGpcQmmBHpD0IPTpDMLjk+9jYaMY0CHng7krkcm7W6MOcLTgFUARmhhvAFbzeiLnNXuClqxjvf42e/qfYZkv5fRm35bkE69HfBN8CGjcv+8uCCW40a;
+            Expires=Thu, 07 Jul 2022 10:29:43 GMT; Path=/
+          - AWSALBCORS=VrB3AmmOenUGpcQmmBHpD0IPTpDMLjk+9jYaMY0CHng7krkcm7W6MOcLTgFUARmhhvAFbzeiLnNXuClqxjvf42e/qfYZkv5fRm35bkE69HfBN8CGjcv+8uCCW40a;
+            Expires=Thu, 07 Jul 2022 10:29:43 GMT; Path=/; SameSite=None; Secure
         Strict-Transport-Security:
           - max-age=31536000; includeSubDomains
+        Vary:
+          - Cookie
         X-App-Version:
-          - 1.26.0-rc.4
+          - v2.8.1
+        X-Content-Type-Options:
+          - nosniff
+          - nosniff
+        X-Frame-Options:
+          - DENY
+          - SAMEORIGIN
         X-Secrets-Engine-Version:
-          - 2.43.0
+          - 2.70.0
+        X-XSS-Protection:
+          - 1; mode=block
       status:
         code: 200
         message: OK

tests/cassettes/test_health_check.yaml

@@ -9,77 +9,50 @@ interactions:
         Connection:
           - keep-alive
         User-Agent:
-          - pygitguardian/1.1.0 (Linux;py3.8.3)
+          - pygitguardian/1.3.4 (Linux;py3.8.10)
       method: GET
       uri: https://api.gitguardian.com/v1/health
     response:
       body:
         string: '{"detail":"Valid API key."}'
       headers:
+        Access-Control-Expose-Headers:
+          - X-App-Version
         Allow:
-          - OPTIONS, GET
+          - GET, HEAD, OPTIONS
         Connection:
           - keep-alive
         Content-Length:
           - '27'
         Content-Type:
           - application/json
         Date:
-          - Fri, 19 Jun 2020 13:32:39 GMT
+          - Thu, 30 Jun 2022 10:29:31 GMT
+        Referrer-Policy:
+          - strict-origin-when-cross-origin
         Server:
           - nginx
+        Set-Cookie:
+          - AWSALB=ZAU9JIicUlzJUNwRc9mylRpa+xGHlXk7K6hR4AXPyVGxpv6RzWENXH+X6DekAaXLAqGr8GCssUXwqYsvRjfFPtGZd53wkfYQJmrmBAMw1ZNexucrzoXCmEycJsHU;
+            Expires=Thu, 07 Jul 2022 10:29:31 GMT; Path=/
+          - AWSALBCORS=ZAU9JIicUlzJUNwRc9mylRpa+xGHlXk7K6hR4AXPyVGxpv6RzWENXH+X6DekAaXLAqGr8GCssUXwqYsvRjfFPtGZd53wkfYQJmrmBAMw1ZNexucrzoXCmEycJsHU;
+            Expires=Thu, 07 Jul 2022 10:29:31 GMT; Path=/; SameSite=None; Secure
+        Strict-Transport-Security:
+          - max-age=31536000; includeSubDomains
         Vary:
           - Cookie
-        X-Content-Type-Options:
-          - nosniff
-        X-Frame-Options:
-          - DENY
         X-App-Version:
-          - 1.26.0-rc.4
-        X-Secrets-Engine-Version:
-          - 2.43.0
-      status:
-        code: 200
-        message: OK
-  - request:
-      body: null
-      headers:
-        Accept:
-          - '*/*'
-        Accept-Encoding:
-          - gzip, deflate
-        Connection:
-          - keep-alive
-        User-Agent:
-          - pygitguardian/1.1.0 (Linux;py3.8.3)
-      method: GET
-      uri: https://api.gitguardian.com/v1/health
-    response:
-      body:
-        string: '{"detail":"Valid API key."}'
-      headers:
-        Allow:
-          - OPTIONS, GET
-        Connection:
-          - keep-alive
-        Content-Length:
-          - '27'
-        Content-Type:
-          - application/json
-        Date:
-          - Fri, 19 Jun 2020 14:58:35 GMT
-        Server:
-          - nginx
-        Vary:
-          - Cookie
+          - v2.8.1
         X-Content-Type-Options:
           - nosniff
+          - nosniff
         X-Frame-Options:
           - DENY
-        X-App-Version:
-          - 1.26.0-rc.4
+          - SAMEORIGIN
         X-Secrets-Engine-Version:
-          - 2.43.0
+          - 2.70.0
+        X-XSS-Protection:
+          - 1; mode=block
       status:
         code: 200
         message: OK

tests/test_client.py

@@ -1,4 +1,5 @@
 import json
+import re
 from collections import OrderedDict
 from datetime import date
 from typing import Any, Dict, List, Optional, Type
@@ -264,10 +265,8 @@ def test_health_check(client: GGClient):
     health = client.health_check()
     assert health.status_code == 200
     assert health.detail == "Valid API key."
-    assert str(health) == (
-        "detail:Valid API key., status_code:200, "
-        "app version:1.26.0-rc.4, secrets engine version:2.43.0"
-    )
+    assert re.match(r"^v\d+\.\d+\.\d+([-0-9.rc])?$", health.app_version)
+    assert re.match(r"^\d+\.\d+\.\d+$", health.secrets_engine_version)
     assert bool(health)
     assert health.success
 
@@ -556,10 +555,10 @@ def test_quota_overview(client: GGClient):
         assert type(str(quota_response)) == str
         assert quota_response.status_code == 200
         if isinstance(quota_response, QuotaResponse):
-            assert quota_response.content.limit == 5000
-            assert quota_response.content.count == 2
-            assert quota_response.content.remaining == 4998
-            assert quota_response.content.since == date(2021, 4, 18)
+            content = quota_response.content
+            assert content.count + content.remaining == content.limit
+            assert content.limit == 10000
+            assert 2021 <= content.since.year <= date.today().year
         else:
             pytest.fail("returned should be a QuotaResponse")