From 60b852ca323df16f3d23044a0d3411727c56a17b Mon Sep 17 00:00:00 2001 From: Frederico Sabino <3332770+fmrsabino@users.noreply.github.com> Date: Thu, 7 Sep 2023 15:41:51 +0100 Subject: [PATCH] Revert "Support a second Client Gateway URL (#900)" (#942) This reverts commit 77d0ec228ede16e3c20f6f95d3fa1ab3a26bf421. --- .dev.env | 2 - src/chains/signals.py | 2 - src/chains/tests/test_signals.py | 96 +--------- src/clients/safe_client_gateway.py | 27 +-- src/config/settings.py | 2 - src/safe_apps/signals.py | 2 - src/safe_apps/tests/test_signals.py | 282 ++-------------------------- 7 files changed, 27 insertions(+), 386 deletions(-) diff --git a/.dev.env b/.dev.env index 8dad41a7..b3912fb5 100644 --- a/.dev.env +++ b/.dev.env @@ -69,11 +69,9 @@ GUNICORN_WEB_RELOAD=false # The Client Gateway URL. This is for triggering webhooks to invalidate its cache for example #CGW_URL=http://127.0.0.1 -#ALTERNATIVE_CGW_URL= # The Client Gateway /flush token. #CGW_FLUSH_TOKEN=example-flush-token -#ALTERNATIVE_CGW_FLUSH_TOKEN=example-flush-token # What CPU and memory constraints will be added to your services? When left at # 0, they will happily use as much as needed. diff --git a/src/chains/signals.py b/src/chains/signals.py index 9a6dd19e..40eb6582 100644 --- a/src/chains/signals.py +++ b/src/chains/signals.py @@ -16,8 +16,6 @@ def _flush_cgw_chains() -> None: clients.safe_client_gateway.flush( cgw_url=settings.CGW_URL, cgw_flush_token=settings.CGW_FLUSH_TOKEN, - alternative_cgw_url=settings.ALTERNATIVE_CGW_URL, - alternative_cgw_flush_token=settings.ALTERNATIVE_CGW_FLUSH_TOKEN, json={"invalidate": "Chains"}, ) diff --git a/src/chains/tests/test_signals.py b/src/chains/tests/test_signals.py index 9e332e8b..22dfafb6 100644 --- a/src/chains/tests/test_signals.py +++ b/src/chains/tests/test_signals.py @@ -7,9 +7,7 @@ @override_settings( CGW_URL="http://127.0.0.1", - ALTERNATIVE_CGW_URL="http://alternative.cgw.url", CGW_FLUSH_TOKEN="example-token", - ALTERNATIVE_CGW_FLUSH_TOKEN="alternative-token", ) class ChainNetworkHookTestCase(TestCase): @responses.activate @@ -25,21 +23,10 @@ def test_on_chain_update_hook_200(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) ChainFactory.create() - assert len(responses.calls) == 2 + assert len(responses.calls) == 1 assert isinstance(responses.calls[0], responses.Call) assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" @@ -47,13 +34,6 @@ def test_on_chain_update_hook_200(self) -> None: responses.calls[0].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[1], responses.Call) - assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_chain_update_hook_400(self) -> None: @@ -68,21 +48,10 @@ def test_on_chain_update_hook_400(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=400, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) ChainFactory.create() - assert len(responses.calls) == 2 + assert len(responses.calls) == 1 @responses.activate def test_on_chain_update_hook_500(self) -> None: @@ -97,21 +66,10 @@ def test_on_chain_update_hook_500(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=500, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) ChainFactory.create() - assert len(responses.calls) == 2 + assert len(responses.calls) == 1 @responses.activate def test_on_chain_delete_hook_call(self) -> None: @@ -135,9 +93,7 @@ def test_on_chain_update_hook_call(self) -> None: @override_settings( CGW_URL=None, - ALTERNATIVE_CGW_URL="http://alternative.cgw.url", CGW_FLUSH_TOKEN=None, - ALTERNATIVE_CGW_FLUSH_TOKEN="alternative-token", ) @responses.activate def test_on_chain_update_with_no_cgw_set(self) -> None: @@ -147,9 +103,7 @@ def test_on_chain_update_with_no_cgw_set(self) -> None: @override_settings( CGW_URL="http://127.0.0.1", - ALTERNATIVE_CGW_URL="http://alternative.cgw.url", CGW_FLUSH_TOKEN=None, - ALTERNATIVE_CGW_FLUSH_TOKEN="alternative-token", ) @responses.activate def test_on_chain_update_with_no_flush_token_set(self) -> None: @@ -160,9 +114,7 @@ def test_on_chain_update_with_no_flush_token_set(self) -> None: @override_settings( CGW_URL="http://127.0.0.1", - ALTERNATIVE_CGW_URL="http://alternative.cgw.url", CGW_FLUSH_TOKEN="example-token", - ALTERNATIVE_CGW_FLUSH_TOKEN="alternative-token", ) class FeatureHookTestCase(TestCase): @responses.activate @@ -178,21 +130,10 @@ def test_on_feature_create_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) Feature(key="Test Feature").save() - assert len(responses.calls) == 2 + assert len(responses.calls) == 1 assert isinstance(responses.calls[0], responses.Call) assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" @@ -200,13 +141,6 @@ def test_on_feature_create_hook_call(self) -> None: responses.calls[0].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[1], responses.Call) - assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_feature_delete_hook_call(self) -> None: @@ -232,9 +166,7 @@ def test_on_feature_update_hook_call(self) -> None: @override_settings( CGW_URL="http://127.0.0.1", - ALTERNATIVE_CGW_URL="http://alternative.cgw.url", CGW_FLUSH_TOKEN="example-token", - ALTERNATIVE_CGW_FLUSH_TOKEN="alternative-token", ) class WalletHookTestCase(TestCase): @responses.activate @@ -250,21 +182,10 @@ def test_on_wallet_create_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) Wallet(key="Test Wallet").save() - assert len(responses.calls) == 2 + assert len(responses.calls) == 1 assert isinstance(responses.calls[0], responses.Call) assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" @@ -272,13 +193,6 @@ def test_on_wallet_create_hook_call(self) -> None: responses.calls[0].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[1], responses.Call) - assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_wallet_delete_hook_call(self) -> None: diff --git a/src/clients/safe_client_gateway.py b/src/clients/safe_client_gateway.py index aba0b8e2..0cfce38d 100644 --- a/src/clients/safe_client_gateway.py +++ b/src/clients/safe_client_gateway.py @@ -18,11 +18,7 @@ def setup_session() -> requests.Session: def flush( - cgw_url: Optional[str], - cgw_flush_token: Optional[str], - alternative_cgw_url: Optional[str], - alternative_cgw_flush_token: Optional[str], - json: Dict[str, Any], + cgw_url: Optional[str], cgw_flush_token: Optional[str], json: Dict[str, Any] ) -> None: if cgw_url is None: logger.error("CGW_URL is not set. Skipping hook call") @@ -31,22 +27,13 @@ def flush( logger.error("CGW_FLUSH_TOKEN is not set. Skipping hook call") return - targets = [cgw_url] - tokens = [cgw_flush_token] - - if alternative_cgw_url is not None and alternative_cgw_flush_token is not None: - targets.append(alternative_cgw_url) - tokens.append(alternative_cgw_flush_token) - - urls = list(map(lambda url: urljoin(url, "/v2/flush"), targets)) - + url = urljoin(cgw_url, "/v2/flush") try: - for url, token in zip(urls, tokens): - post = setup_session().post( - url, - json=json, - headers={"Authorization": f"Basic {token}"}, - ) + post = setup_session().post( + url, + json=json, + headers={"Authorization": f"Basic {cgw_flush_token}"}, + ) post.raise_for_status() except Exception as error: logger.error(error) diff --git a/src/config/settings.py b/src/config/settings.py index 1680a832..e1b6e044 100644 --- a/src/config/settings.py +++ b/src/config/settings.py @@ -200,9 +200,7 @@ CORS_URLS_REGEX = r"^/api/.*$" CGW_URL = os.environ.get("CGW_URL") -ALTERNATIVE_CGW_URL = os.environ.get("ALTERNATIVE_CGW_URL") CGW_FLUSH_TOKEN = os.environ.get("CGW_FLUSH_TOKEN") -ALTERNATIVE_CGW_FLUSH_TOKEN = os.environ.get("ALTERNATIVE_CGW_FLUSH_TOKEN") # By default, Django stores files locally, using the MEDIA_ROOT and MEDIA_URL settings. # (using the default the default FileSystemStorage) diff --git a/src/safe_apps/signals.py b/src/safe_apps/signals.py index a35c183c..6138a762 100644 --- a/src/safe_apps/signals.py +++ b/src/safe_apps/signals.py @@ -17,8 +17,6 @@ def _flush_cgw_safe_apps() -> None: clients.safe_client_gateway.flush( cgw_url=settings.CGW_URL, cgw_flush_token=settings.CGW_FLUSH_TOKEN, - alternative_cgw_url=settings.ALTERNATIVE_CGW_URL, - alternative_cgw_flush_token=settings.ALTERNATIVE_CGW_FLUSH_TOKEN, # Even though the payload is Chains, it actually invalidates all the safe-config related cache json={"invalidate": "Chains"}, ) diff --git a/src/safe_apps/tests/test_signals.py b/src/safe_apps/tests/test_signals.py index 517b50b3..39cc0339 100644 --- a/src/safe_apps/tests/test_signals.py +++ b/src/safe_apps/tests/test_signals.py @@ -7,9 +7,7 @@ @override_settings( CGW_URL="http://127.0.0.1", - ALTERNATIVE_CGW_URL="http://alternative.cgw.url", CGW_FLUSH_TOKEN="example-token", - ALTERNATIVE_CGW_FLUSH_TOKEN="alternative-token", ) class SafeAppHookTestCase(TestCase): @responses.activate @@ -25,21 +23,10 @@ def test_on_safe_app_create_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) SafeApp(app_id=1, chain_ids=[1]).save() - assert len(responses.calls) == 2 + assert len(responses.calls) == 1 assert isinstance(responses.calls[0], responses.Call) assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" @@ -47,13 +34,6 @@ def test_on_safe_app_create_hook_call(self) -> None: responses.calls[0].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[1], responses.Call) - assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_safe_app_update_hook_call(self) -> None: @@ -68,52 +48,20 @@ def test_on_safe_app_update_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) safe_app = SafeApp(app_id=1, chain_ids=[1]) safe_app.save() # create safe_app.name = "Test app" safe_app.save() # update - assert len(responses.calls) == 4 - assert isinstance(responses.calls[0], responses.Call) - assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[0].request.headers.get("Authorization") - == "Basic example-token" - ) + assert len(responses.calls) == 2 assert isinstance(responses.calls[1], responses.Call) assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" + assert responses.calls[1].request.url == "http://127.0.0.1/v2/flush" assert ( responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) - assert isinstance(responses.calls[2], responses.Call) - assert responses.calls[2].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[2].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[2].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[3], responses.Call) - assert responses.calls[3].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[3].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[3].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_safe_app_delete_hook_call(self) -> None: @@ -128,58 +76,24 @@ def test_on_safe_app_delete_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) safe_app = SafeApp(app_id=1, chain_ids=[1]) safe_app.save() # create safe_app.delete() # delete - assert len(responses.calls) == 4 - assert isinstance(responses.calls[0], responses.Call) - assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[0].request.headers.get("Authorization") - == "Basic example-token" - ) + assert len(responses.calls) == 2 assert isinstance(responses.calls[1], responses.Call) assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" + assert responses.calls[1].request.url == "http://127.0.0.1/v2/flush" assert ( responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) - assert isinstance(responses.calls[2], responses.Call) - assert responses.calls[2].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[2].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[2].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[3], responses.Call) - assert responses.calls[3].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[3].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[3].request.headers.get("Authorization") - == "Basic alternative-token" - ) @override_settings( CGW_URL="http://127.0.0.1", - ALTERNATIVE_CGW_URL="http://alternative.cgw.url", CGW_FLUSH_TOKEN="example-token", - ALTERNATIVE_CGW_FLUSH_TOKEN="alternative-token", ) class ProviderHookTestCase(TestCase): @responses.activate @@ -195,21 +109,10 @@ def test_on_provider_create_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) ProviderFactory.create() - assert len(responses.calls) == 2 + assert len(responses.calls) == 1 assert isinstance(responses.calls[0], responses.Call) assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" @@ -217,13 +120,6 @@ def test_on_provider_create_hook_call(self) -> None: responses.calls[0].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[1], responses.Call) - assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_provider_update_hook_call(self) -> None: @@ -238,51 +134,19 @@ def test_on_provider_update_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) provider = ProviderFactory.create() # create provider.name = "Test Provider" provider.save() # update - assert len(responses.calls) == 4 - assert isinstance(responses.calls[0], responses.Call) - assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[0].request.headers.get("Authorization") - == "Basic example-token" - ) + assert len(responses.calls) == 2 assert isinstance(responses.calls[1], responses.Call) assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" + assert responses.calls[1].request.url == "http://127.0.0.1/v2/flush" assert ( responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) - assert isinstance(responses.calls[2], responses.Call) - assert responses.calls[2].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[2].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[2].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[3], responses.Call) - assert responses.calls[3].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[3].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[3].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_provider_delete_hook_call(self) -> None: @@ -297,57 +161,23 @@ def test_on_provider_delete_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) provider = ProviderFactory.create() # create provider.delete() # delete - assert len(responses.calls) == 4 - assert isinstance(responses.calls[0], responses.Call) - assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[0].request.headers.get("Authorization") - == "Basic example-token" - ) + assert len(responses.calls) == 2 assert isinstance(responses.calls[1], responses.Call) assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" + assert responses.calls[1].request.url == "http://127.0.0.1/v2/flush" assert ( responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) - assert isinstance(responses.calls[2], responses.Call) - assert responses.calls[2].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[2].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[2].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[3], responses.Call) - assert responses.calls[3].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[3].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[3].request.headers.get("Authorization") - == "Basic alternative-token" - ) @override_settings( CGW_URL="http://127.0.0.1", - ALTERNATIVE_CGW_URL="http://alternative.cgw.url", CGW_FLUSH_TOKEN="example-token", - ALTERNATIVE_CGW_FLUSH_TOKEN="alternative-token", ) class TagHookTestCase(TestCase): @responses.activate @@ -363,21 +193,10 @@ def test_on_tag_create_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) Tag().save() # create - assert len(responses.calls) == 2 + assert len(responses.calls) == 1 assert isinstance(responses.calls[0], responses.Call) assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" @@ -385,13 +204,6 @@ def test_on_tag_create_hook_call(self) -> None: responses.calls[0].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[1], responses.Call) - assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_tag_update_hook_call(self) -> None: @@ -406,52 +218,20 @@ def test_on_tag_update_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) tag = Tag() tag.save() # create tag.name = "Test Tag" tag.save() # update - assert len(responses.calls) == 4 - assert isinstance(responses.calls[0], responses.Call) - assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[0].request.headers.get("Authorization") - == "Basic example-token" - ) + assert len(responses.calls) == 2 assert isinstance(responses.calls[1], responses.Call) assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" + assert responses.calls[1].request.url == "http://127.0.0.1/v2/flush" assert ( responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) - assert isinstance(responses.calls[2], responses.Call) - assert responses.calls[2].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[2].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[2].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[3], responses.Call) - assert responses.calls[3].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[3].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[3].request.headers.get("Authorization") - == "Basic alternative-token" - ) @responses.activate def test_on_tag_delete_hook_call(self) -> None: @@ -466,48 +246,16 @@ def test_on_tag_delete_hook_call(self) -> None: responses.matchers.json_params_matcher({"invalidate": "Chains"}), ], ) - responses.add( - responses.POST, - "http://alternative.cgw.url/v2/flush", - status=200, - match=[ - responses.matchers.header_matcher( - {"Authorization": "Basic alternative-token"} - ), - responses.matchers.json_params_matcher({"invalidate": "Chains"}), - ], - ) tag = Tag() tag.save() # create tag.delete() # delete - assert len(responses.calls) == 4 - assert isinstance(responses.calls[0], responses.Call) - assert responses.calls[0].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[0].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[0].request.headers.get("Authorization") - == "Basic example-token" - ) + assert len(responses.calls) == 2 assert isinstance(responses.calls[1], responses.Call) assert responses.calls[1].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[1].request.url == "http://alternative.cgw.url/v2/flush" + assert responses.calls[1].request.url == "http://127.0.0.1/v2/flush" assert ( responses.calls[1].request.headers.get("Authorization") - == "Basic alternative-token" - ) - assert isinstance(responses.calls[2], responses.Call) - assert responses.calls[2].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[2].request.url == "http://127.0.0.1/v2/flush" - assert ( - responses.calls[2].request.headers.get("Authorization") == "Basic example-token" ) - assert isinstance(responses.calls[3], responses.Call) - assert responses.calls[3].request.body == b'{"invalidate": "Chains"}' - assert responses.calls[3].request.url == "http://alternative.cgw.url/v2/flush" - assert ( - responses.calls[3].request.headers.get("Authorization") - == "Basic alternative-token" - )