locust-cloud 1.10.0__py3-none-any.whl → 1.11.0__py3-none-any.whl

locust_cloud/auth.py

@@ -87,7 +87,7 @@ def register_auth(environment: locust.env.Environment):
 
             credentials = auth_response.json()
 
-            if os.getenv("CUSTOMER_ID", "") and credentials["user_sub_id"] != os.getenv("CUSTOMER_ID", ""):
+            if os.getenv("CUSTOMER_ID", "") and credentials["customer_id"] != os.getenv("CUSTOMER_ID", ""):
                 session["auth_error"] = "Invalid login for this deployment"
                 return redirect(url_for("locust.login"))
 
@@ -133,10 +133,11 @@ def register_auth(environment: locust.env.Environment):
                             "label": "Username",
                             "name": "username",
                             "is_required": True,
+                            "type": "email",
                         },
                         {
                             "label": "Full Name",
-                            "name": "full_name",
+                            "name": "customer_name",
                             "is_required": True,
                         },
                         {
@@ -181,7 +182,7 @@ def register_auth(environment: locust.env.Environment):
         session["auth_info"] = ""
 
         username = request.form.get("username", "")
-        full_name = request.form.get("full_name", "")
+        customer_name = request.form.get("customer_name", "")
         password = request.form.get("password")
         access_code = request.form.get("access_code")
 
@@ -193,9 +194,9 @@ def register_auth(environment: locust.env.Environment):
 
             auth_response.raise_for_status()
 
-            session["user_sub"] = auth_response.json().get("user_sub")
+            session["user_sub_id"] = auth_response.json().get("user_sub_id")
             session["username"] = username
-            session["full_name"] = full_name
+            session["customer_name"] = customer_name
             session["auth_info"] = (
                 "Please check your email and enter the confirmation code. If you didn't get a code after one minute, you can [request a new one](/resend-code)"
             )
@@ -212,7 +213,7 @@ def register_auth(environment: locust.env.Environment):
     def resend_code():
         try:
             auth_response = requests.post(
-                f"{environment.parsed_options.deployer_url}/1/auth/resend-confirmation",
+                f"{environment.parsed_options.deployer_url}/auth/resend-confirmation",
                 json={"username": session["username"]},
             )
 
@@ -242,8 +243,8 @@ def register_auth(environment: locust.env.Environment):
                 f"{environment.parsed_options.deployer_url}/auth/confirm-signup",
                 json={
                     "username": session.get("username"),
-                    "full_name": session.get("full_name"),
-                    "user_sub": session["user_sub"],
+                    "customer_name": session.get("customer_name"),
+                    "user_sub_id": session["user_sub_id"],
                     "confirmation_code": confirmation_code,
                 },
             )

locust_cloud/cloud.py

@@ -102,7 +102,7 @@ advanced.add_argument(
 advanced.add_argument(
     "--region",
     type=str,
-    default="eu-north-1",  # temp setup for pycon # os.environ.get("AWS_DEFAULT_REGION")
+    default=os.environ.get("AWS_DEFAULT_REGION"),
     help="Sets the AWS region to use for the deployed cluster, e.g. us-east-1. It defaults to use AWS_DEFAULT_REGION env var, like AWS tools.",
 )
 parser.add_argument(
@@ -172,7 +172,7 @@ logging.getLogger("requests").setLevel(logging.INFO)
 logging.getLogger("urllib3").setLevel(logging.INFO)
 
 
-api_url = f"https://api.{options.region}.locust.cloud/1"
+api_url = os.environ.get("LOCUSTCLOUD_DEPLOYER_URL", f"https://api.{options.region}.locust.cloud/1")
 
 
 def main() -> None:
@@ -181,6 +181,8 @@ def main() -> None:
             "Setting a region is required to use Locust Cloud. Please ensure the AWS_DEFAULT_REGION env variable or the --region flag is set."
         )
         sys.exit(1)
+    if options.region:
+        os.environ["AWS_DEFAULT_REGION"] = options.region
 
     s3_bucket = "dmdb-default" if options.region == "us-east-1" else "locust-default"
     deployments: list[Any] = []

locust_cloud/timescale/queries.py

@@ -274,7 +274,7 @@ SELECT
   max_users as "maxUsers",
   users_per_worker as "usersPerWorker"
 FROM customers
-WHERE customer = current_user
+WHERE id = current_user
 """
 
 queries: dict["str", LiteralString] = {

{locust_cloud-1.10.0.dist-info → locust_cloud-1.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: locust-cloud
-Version: 1.10.0
+Version: 1.11.0
 Summary: Locust Cloud
 Project-URL: Homepage, https://locust.cloud
 Requires-Python: >=3.11

{locust_cloud-1.10.0.dist-info → locust_cloud-1.11.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 locust_cloud/__init__.py,sha256=q95z_3-z0f10hRLpYmgXS9T5brvDBJWboWATwkaHebM,3101
-locust_cloud/auth.py,sha256=zQ4cdKPFSx_typ1LpBvTIHBwz88gJRfKQwWDlj6t5fo,10257
-locust_cloud/cloud.py,sha256=5u_D7-f7vl6fWJ1IH_FGWmAWqRB3RVAh2W08Hg4RK94,16034
+locust_cloud/auth.py,sha256=OPJoUvTWRfqQcaNv9UHWICuSCyW3pNoa6LsRo1Y0zR4,10340
+locust_cloud/cloud.py,sha256=mgumiDCZGa-rLDZSd8ZV3DwBK2fPa272kenltfIdB-s,16120
 locust_cloud/credential_manager.py,sha256=MiESqS8IOxncBON04irK1-seF-VNAHHTcELcyxp1ZR8,5571
 locust_cloud/idle_exit.py,sha256=bYD6LeUa0d8Ev2b1f-tiRXVnfyolCoACcDWC8zizNPE,1189
 locust_cloud/timescale/exporter.py,sha256=10JOYo3X6ZlUxvKFVzNnCLYjpjuytM4apuJD6PNXvDE,12966
-locust_cloud/timescale/queries.py,sha256=nOkm_UTnik_YhDH_j_hOvvEkm2RoV4SK7rhRJURoGQE,6560
+locust_cloud/timescale/queries.py,sha256=d8ERzYpd_uDIoGumi4h8dCKAUF_80JIvxZ8W5_QhJ1w,6554
 locust_cloud/timescale/query.py,sha256=gAi4wjlLZhgGo2ByQhlZxrtBhJDYKzHBvU8q9avU1wU,3065
 locust_cloud/webui/.eslintrc,sha256=kIMPN7JEUqHPpFmFOR2iym-TitbXUds45y27dbR9UIQ,1152
 locust_cloud/webui/.gitignore,sha256=i8EHIqDlVm1-Dkvf_GTZmP_Wu99GE7ABfbYzHXOU734,54
@@ -17,7 +17,7 @@ locust_cloud/webui/vite.config.ts,sha256=cqxPMkbwEA3H9mGGbuPulQUhIHCosUqm_1usxzs
 locust_cloud/webui/yarn.lock,sha256=52aat3Nl-O3OVBRrKO4RMpNJFCIpodvop0rxp0iWo-E,220316
 locust_cloud/webui/dist/index.html,sha256=6b_uDESY4tIoZr_a4zeIsbkUai5jX9oJaNKhWznWksw,664
 locust_cloud/webui/dist/assets/index-DkFumpSS.js,sha256=aTeMYWJ0rkOJ7_jI5ofSd42qNJNatTjsZA4Qkntptaw,2864270
-locust_cloud-1.10.0.dist-info/METADATA,sha256=A-CwLL5JzQxvytl4xfxEjA-GTPvpq8_5oRrRD6hrrIA,452
-locust_cloud-1.10.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-locust_cloud-1.10.0.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
-locust_cloud-1.10.0.dist-info/RECORD,,
+locust_cloud-1.11.0.dist-info/METADATA,sha256=tVaPg9LFaS2BziLCmWfAdX3pkZGiC7Co4BPFJyIHEAM,452
+locust_cloud-1.11.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+locust_cloud-1.11.0.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
+locust_cloud-1.11.0.dist-info/RECORD,,