From 7ce2ba07d6674e86431123056f6cc78a9f115b9b Mon Sep 17 00:00:00 2001 From: Matthieu Date: Wed, 4 Sep 2024 10:20:07 +0200 Subject: [PATCH] (PC-31643)[API] chore: change recommendation endpoints urls --- api/.env.integration | 1 - api/.env.ops | 1 - api/.env.staging | 1 - api/.env.testing | 1 - api/src/pcapi/connectors/recommendation.py | 10 ++++++++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/api/.env.integration b/api/.env.integration index a72427947ac..cd7a96dd7cd 100644 --- a/api/.env.integration +++ b/api/.env.integration @@ -66,7 +66,6 @@ PRO_URL=https://integration.passculture.pro PUSH_NOTIFICATION_BACKEND=pcapi.notifications.push.backends.batch.BatchBackend RECAPTCHA_MINIMAL_SCORE=0.5 RECOMMENDATION_API_AUTHENTICATION_TOKEN=7t2eBnco2G6hsdVMXz4MGGPY4s -RECOMMENDATION_API_URL=https://apireco.staging.passculture.team # sic RECOMMENDATION_BACKEND=pcapi.connectors.recommendation.HttpBackend REDIS_OFFER_IDS_CHUNK_SIZE=10000 SEARCH_BACKEND=pcapi.core.search.backends.algolia.AlgoliaBackend diff --git a/api/.env.ops b/api/.env.ops index f94b3db7e69..f04c4ee063c 100644 --- a/api/.env.ops +++ b/api/.env.ops @@ -90,7 +90,6 @@ PRO_URL=https://pro.testing.passculture.team PUSH_NOTIFICATION_BACKEND=pcapi.notifications.push.backends.batch.BatchBackend RECAPTCHA_MINIMAL_SCORE=0.5 RECOMMENDATION_API_AUTHENTICATION_TOKEN=N7qFKDgVcooTwHUk3osKcLq6co -RECOMMENDATION_API_URL=https://apireco.testing.passculture.team RECOMMENDATION_BACKEND=pcapi.connectors.recommendation.HttpBackend REDIS_OFFER_IDS_CHUNK_SIZE=10000 SEARCH_BACKEND=pcapi.core.search.backends.algolia.AlgoliaBackend diff --git a/api/.env.staging b/api/.env.staging index 013fa27681c..94d20467a37 100644 --- a/api/.env.staging +++ b/api/.env.staging @@ -87,7 +87,6 @@ PRO_URL=https://pro.staging.passculture.team PUSH_NOTIFICATION_BACKEND=pcapi.notifications.push.backends.batch.BatchBackend RECAPTCHA_MINIMAL_SCORE=0.5 RECOMMENDATION_API_AUTHENTICATION_TOKEN=7t2eBnco2G6hsdVMXz4MGGPY4s -RECOMMENDATION_API_URL=https://apireco.staging.passculture.team RECOMMENDATION_BACKEND=pcapi.connectors.recommendation.HttpBackend REDIS_OFFER_IDS_CHUNK_SIZE=10000 REDIS_VENUE_IDS_CHUNK_SIZE=10000 diff --git a/api/.env.testing b/api/.env.testing index 0dae727f7c4..a4ed78c2887 100644 --- a/api/.env.testing +++ b/api/.env.testing @@ -94,7 +94,6 @@ PRO_URL=https://pro.testing.passculture.team PUSH_NOTIFICATION_BACKEND=pcapi.notifications.push.backends.batch.BatchBackend RECAPTCHA_MINIMAL_SCORE=0.5 RECOMMENDATION_API_AUTHENTICATION_TOKEN=N7qFKDgVcooTwHUk3osKcLq6co -RECOMMENDATION_API_URL=https://apireco.testing.passculture.team RECOMMENDATION_BACKEND=pcapi.connectors.recommendation.HttpBackend REDIS_OFFER_IDS_CHUNK_SIZE=10000 SEARCH_BACKEND=pcapi.core.search.backends.algolia.AlgoliaBackend diff --git a/api/src/pcapi/connectors/recommendation.py b/api/src/pcapi/connectors/recommendation.py index b3bc73ee0b0..e68c065dc9d 100644 --- a/api/src/pcapi/connectors/recommendation.py +++ b/api/src/pcapi/connectors/recommendation.py @@ -69,11 +69,17 @@ class HttpBackend: def _request(self, method: str, path: str, params: dict, body: dict | None = None) -> bytes: params["token"] = settings.RECOMMENDATION_API_AUTHENTICATION_TOKEN url = "/".join((settings.RECOMMENDATION_API_URL.rstrip("/"), path.lstrip("/"))) + # FIXME : once all env has been migrated to a private vpc (in a week or two), + # all calls to recommendation api will not be verified. + # The certificates are google-managed and seen as self-signed. + verify = False + if settings.IS_PROD: + verify = True try: if method == "get": - response = requests.get(url, params=params, disable_synchronous_retry=True) + response = requests.get(url, params=params, disable_synchronous_retry=True, verify=verify) elif method == "post": - response = requests.post(url, params=params, json=body, disable_synchronous_retry=True) + response = requests.post(url, params=params, json=body, disable_synchronous_retry=True, verify=verify) else: raise ValueError(f"Unexpected method: {method}") response.raise_for_status()