Merge branch 'sshin/3211' into staging

Author: suejung-sentry

VERSION

@@ -1 +1 @@
-25.1.3
+25.1.10

codecov/settings_base.py

@@ -395,6 +395,7 @@
 )
 
 SHELTER_SHARED_SECRET = get_config("setup", "shelter_shared_secret", default=None)
+SHELTER_ENABLED = get_config("setup", "shelter_enabled", default=True)
 
 SENTRY_ENV = os.environ.get("CODECOV_ENV", False)
 SENTRY_DSN = os.environ.get("SERVICES__SENTRY__SERVER_DSN", None)

codecov/settings_enterprise.py

@@ -72,3 +72,5 @@
 ]
 
 GUEST_ACCESS = get_config("setup", "guest_access", default=True)
+
+SHELTER_ENABLED = get_config("setup", "shelter_enabled", default=False)

requirements.in

@@ -26,7 +26,7 @@ freezegun
 google-cloud-pubsub
 gunicorn>=22.0.0
 https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz#egg=codecovopentelem
-https://github.com/codecov/shared/archive/c1c9cb24639157fd903e40799c7d364481f42ef7.tar.gz#egg=shared
+https://github.com/codecov/shared/archive/a03c2f987b1f317f0372aa844cebd6b8d207a1f9.tar.gz#egg=shared
 https://github.com/photocrowd/django-cursor-pagination/archive/f560902696b0c8509e4d95c10ba0d62700181d84.tar.gz
 idna>=3.7
 minio

requirements.txt

@@ -202,8 +202,6 @@ googleapis-common-protos[grpc]==1.59.1
     #   grpcio-status
 graphql-core==3.2.3
     # via ariadne
-greenlet==3.1.1
-    # via sqlalchemy
 grpc-google-iam-v1==0.12.6
     # via google-cloud-pubsub
 grpcio==1.62.1
@@ -314,7 +312,7 @@ prometheus-client==0.17.1
     #   shared
 prompt-toolkit==3.0.28
     # via click-repl
-proto-plus==1.22.3
+proto-plus==1.25.0
     # via
     #   google-api-core
     #   google-cloud-pubsub
@@ -418,7 +416,7 @@ sentry-sdk[celery]==2.13.0
     #   shared
 setproctitle==1.1.10
     # via -r requirements.in
-shared @ https://github.com/codecov/shared/archive/c1c9cb24639157fd903e40799c7d364481f42ef7.tar.gz
+shared @ https://github.com/codecov/shared/archive/a03c2f987b1f317f0372aa844cebd6b8d207a1f9.tar.gz
     # via -r requirements.in
 simplejson==3.17.2
     # via -r requirements.in

utils/shelter.py

@@ -23,6 +23,9 @@ def get_instance(cls) -> "ShelterPubsub":
         return cls._instance
 
     def __init__(self) -> None:
+        if not settings.SHELTER_ENABLED:
+            return
+
         if not self.pubsub_publisher:
             self.pubsub_publisher = pubsub_v1.PublisherClient()
         pubsub_project_id: str = settings.SHELTER_PUBSUB_PROJECT_ID
@@ -32,6 +35,9 @@ def __init__(self) -> None:
         self.topic_path = self.pubsub_publisher.topic_path(pubsub_project_id, topic_id)
 
     def publish(self, data: Dict[str, Any]) -> None:
+        if not settings.SHELTER_ENABLED:
+            return
+
         try:
             self.pubsub_publisher.publish(
                 self.topic_path,