locust-cloud 1.0.19__py3-none-any.whl → 1.0.21__py3-none-any.whl

locust_cloud/auth.py

@@ -4,8 +4,9 @@ from datetime import UTC, datetime, timedelta
 import requests
 from flask import redirect, request, url_for
 from flask_login import UserMixin, current_user, login_user
+from locust_cloud.constants import DEFAULT_LAMBDA_URL
 
-LAMBDA = "https://deployer.locust.cloud/1"
+LAMBDA = DEFAULT_LAMBDA_URL
 
 
 class AuthUser(UserMixin):
@@ -17,6 +18,9 @@ class AuthUser(UserMixin):
 
 
 def set_credentials(credentials, response):
+    if not credentials.get("cognito_client_id_token"):
+        return response
+
     id_token = credentials["cognito_client_id_token"]
     user_sub_id = credentials["user_sub_id"]
     refresh_token = credentials["refresh_token"]

locust_cloud/cloud.py

@@ -190,8 +190,8 @@ def main() -> None:
             )
             sys.exit(1)
 
-        logger.info(f"Logging you into Locust Cloud ({options.lambda_url}, {options.aws_region_name}, v{__version__})")
-
+        logger.info(f"Logging you into Locust Cloud ({options.aws_region_name}, v{__version__})")
+        logger.debug(f"Lambda url: {options.lambda_url}")
         credential_manager = CredentialManager(
             lambda_url=options.lambda_url,
             access_key=options.aws_access_key_id,
@@ -255,6 +255,7 @@ def main() -> None:
                 {"name": "LOCUST_REQUIREMENTS_URL", "value": requirements_url},
                 {"name": "LOCUST_FLAGS", "value": " ".join(locust_options)},
                 {"name": "LOCUST_WEB_HOST_DISPLAY_NAME", "value": "_____"},
+                {"name": "LOCUST_API_BASE_URL", "value": DEFAULT_LAMBDA_URL},
                 *locust_env_variables,
             ],
             "worker_count": worker_count,