locust-cloud 1.20.5__py3-none-any.whl → 1.20.6__py3-none-any.whl

locust_cloud/apisession.py

@@ -8,6 +8,8 @@ from locust_cloud.common import VALID_REGIONS, __version__, get_api_url, read_cl
 
 logger = logging.getLogger(__name__)
 
+unauthorized_message = "You need to log in again. Please run:\n    locust --cloud --login"
+
 
 class ApiSession(requests.Session):
     def __init__(self, non_interactive: bool) -> None:
@@ -39,28 +41,28 @@ class ApiSession(requests.Session):
                 print(f"Authentication failed: {response.text}")
                 sys.exit(1)
 
-            self.__refresh_token = response.json()["refresh_token"]
             id_token = response.json()["cognito_client_id_token"]
             user_sub_id = response.json()["user_sub_id"]
+            refresh_token = response.json()["refresh_token"]
             id_token_expires = response.json()["id_token_expires"]
         else:
             config = read_cloud_config()
 
             if config.refresh_token_expires < time.time() + 24 * 60 * 60:
-                message = "You need to authenticate before proceeding. Please run:\n    locust-cloud --login"
-                print(message)
+                print(unauthorized_message)
                 sys.exit(1)
 
             assert config.region
             self.__configure_for_region(config.region)
-            self.__refresh_token = config.refresh_token
             id_token = config.id_token
             user_sub_id = config.user_sub_id
+            refresh_token = config.refresh_token
             id_token_expires = config.id_token_expires
 
         assert id_token
 
         self.__user_sub_id = user_sub_id
+        self.__refresh_token = refresh_token
         self.__id_token_expires = id_token_expires - 60  # Refresh 1 minute before expiry
         self.headers["Authorization"] = f"Bearer {id_token}"
         self.headers["X-Client-Version"] = __version__
@@ -75,6 +77,9 @@ class ApiSession(requests.Session):
     def __ensure_valid_authorization_header(self) -> None:
         if self.__id_token_expires > time.time():
             return
+        if not self.__user_sub_id and self.__refresh_token:
+            print(unauthorized_message)
+            sys.exit(1)
 
         response = requests.post(
             self.__login_url,
@@ -89,7 +94,7 @@ class ApiSession(requests.Session):
         # TODO: Technically the /login endpoint can return a challenge for you
         #       to change your password.
         #       Now that we have a web based login flow we should force them to
-        #       do a locust-cloud --login if we get that.
+        #       do a locust --cloud --login if we get that.
 
         id_token = response.json()["cognito_client_id_token"]
         id_token_expires = response.json()["id_token_expires"]

locust_cloud/args.py

@@ -186,7 +186,7 @@ combined_cloud_parser = configargparse.ArgumentParser(
     ),
     description="""Launches a distributed Locust runs on locust.cloud infrastructure.
 
-Example: locust-cloud -f my_locustfile.py --users 1000 ...""",
+Example: locust --cloud -f my_locustfile.py --users 1000 ...""",
     epilog="""Any parameters not listed here are forwarded to locust master unmodified, so go ahead and use things like --users, --host, --run-time, ...
 Locust config can also be set using config file (~/.locust.conf, locust.conf, pyproject.toml, ~/.cloud.conf or cloud.conf).
 Parameters specified on command line override env vars, which in turn override config files.""",

locust_cloud/docs/locust-cloud.rst

@@ -1,6 +1,6 @@
-============
-Locust Cloud
-============
+=========================
+Running with Locust Cloud
+=========================
 
 .. include:: 1-first-run.rst
 .. include:: 2-examples.rst

locust_cloud/web_login.py

@@ -62,7 +62,7 @@ If the browser does not open or you wish to use a different device to authorize
             print(f"\nFailed to authorize CLI: {data['reason']}")
             sys.exit(1)
         elif data["state"] == "authorized":
-            print("\nAuthorization succeded. Now you can re-run locust-cloud without the --login flag.")
+            print("\nAuthorization succeded. Now you can re-run locust --cloud without the --login flag.")
             break
         else:
             print("\nGot unexpected response when authorizing CLI")

{locust_cloud-1.20.5.dist-info → locust_cloud-1.20.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust-cloud
-Version: 1.20.5
+Version: 1.20.6
 Summary: Locust Cloud
 Project-URL: homepage, https://locust.cloud
 Project-URL: repository, https://github.com/locustcloud/locust-cloud

{locust_cloud-1.20.5.dist-info → locust_cloud-1.20.6.dist-info}/RECORD

@@ -1,18 +1,18 @@
 locust_cloud/__init__.py,sha256=6z2hE5rUP9WJyYgr-7XC2GhIV-05m8XxjOsnb8ae1WY,56
-locust_cloud/apisession.py,sha256=gWqNADGL3H745fefm_tE1O1516OBfOhqZRlc-BgIudM,4224
-locust_cloud/args.py,sha256=warMJQvUg_liowJWHS0XF400rQQ0PUigPSutfwG9BLY,7661
+locust_cloud/apisession.py,sha256=fz3mJsHbS-LdlVcuaJurf4_nq_Oa_XdBTZ7sVpux_mA,4376
+locust_cloud/args.py,sha256=KD2svA77-Dz98J7p-WiSr9wIiA7GJ2wCglIcFOccncs,7663
 locust_cloud/cloud.py,sha256=LFO_Ykst0bOBYPqfxS6ll7abAvCCqyUpD3ql4nem9ys,6264
 locust_cloud/common.py,sha256=GVKkWcbbqd9n8oU-fHZRVZw3jGtuIVGSCLD2ZizeEo0,1160
 locust_cloud/input_events.py,sha256=MyxccgboHByICuK6VpQCCJhZQqTZAacNmkSpw-gxBEw,3420
-locust_cloud/web_login.py,sha256=Byu62DKyf8NSbPdP9I2Q3lJh_lZgxjn0OZcRgnMIlXg,2555
+locust_cloud/web_login.py,sha256=UTwuRJBCkdsGkzHmzwW_s03GKABR22gScq-nBMmqcag,2557
 locust_cloud/websocket.py,sha256=9Q7nTFuAwVhgW74DlJNcHTZXOQ1drsXi8hX9ciZhWlQ,8998
 locust_cloud/docs/.gitignore,sha256=ghNPcjYkjQXNS_eVmu2hQFhq6FIUliAD1O2CJhulS2o,10
 locust_cloud/docs/1-first-run.rst,sha256=Z34qKIxIniwCELeUmEQbNLsN7HWM5fq-a3Wc4fuapG0,1091
 locust_cloud/docs/2-examples.rst,sha256=bYElk5GbDWo8ZtBwbdK1lfnySF7EZ3ycST1BYEyFid4,9537
-locust_cloud/docs/locust-cloud.rst,sha256=NMfWGZdT0YPa0gPPuOcKplzBcqiEK7buPzXHOlzY5T0,98
+locust_cloud/docs/locust-cloud.rst,sha256=q0WSBOJI0LR3zxuaE9Lor0_bzv4AOKr3aCz9VC6sIzs,137
 locust_cloud/docs/images/locust-cloud-screenshot.png,sha256=ag0IxBi-40VexC84MApol1GCgRCL2h-l8NQDTMaeTyE,477350
-locust_cloud-1.20.5.dist-info/METADATA,sha256=YzP49vyactP3LQMLmSY8SiH9AbX_KKTa-ZsKhQ7PpkA,644
-locust_cloud-1.20.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-locust_cloud-1.20.5.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
-locust_cloud-1.20.5.dist-info/licenses/LICENSE,sha256=Ow6fY6ta4KIjdlWalmxGvRP8yLmetvkbkl-SdHMjPIs,1093
-locust_cloud-1.20.5.dist-info/RECORD,,
+locust_cloud-1.20.6.dist-info/METADATA,sha256=5rHgcrYsaLPBPOcEwrZku_Jbqs_7qy-iJBndvjmQM-I,644
+locust_cloud-1.20.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+locust_cloud-1.20.6.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
+locust_cloud-1.20.6.dist-info/licenses/LICENSE,sha256=Ow6fY6ta4KIjdlWalmxGvRP8yLmetvkbkl-SdHMjPIs,1093
+locust_cloud-1.20.6.dist-info/RECORD,,