Align on RECCE_API_TOKEN

Signed-off-by: even-wei <evenwei@infuseai.io>

Author: even-wei

recce/cli.py

@@ -226,7 +226,7 @@ def _add_options(func):
         "--api-token",
         help="The personal token generated by Recce Cloud.",
         type=click.STRING,
-        envvar="RECCE_CLOUD_API_TOKEN",
+        envvar="RECCE_API_TOKEN",
     )
 ]
 
@@ -1311,7 +1311,7 @@ def delete_artifacts(**kwargs):
 
 
 @cloud.command(cls=TrackCommand, name="list-organizations")
-@click.option("--api-token", help="The Recce Cloud API token.", type=click.STRING, envvar="RECCE_CLOUD_API_TOKEN")
+@click.option("--api-token", help="The Recce Cloud API token.", type=click.STRING, envvar="RECCE_API_TOKEN")
 @add_options(recce_options)
 def list_organizations(**kwargs):
     """
@@ -1367,7 +1367,7 @@ def list_organizations(**kwargs):
     type=click.STRING,
     envvar="RECCE_ORGANIZATION_ID",
 )
-@click.option("--api-token", help="The Recce Cloud API token.", type=click.STRING, envvar="RECCE_CLOUD_API_TOKEN")
+@click.option("--api-token", help="The Recce Cloud API token.", type=click.STRING, envvar="RECCE_API_TOKEN")
 @add_options(recce_options)
 def list_projects(**kwargs):
     """
@@ -1449,7 +1449,7 @@ def list_projects(**kwargs):
     type=click.STRING,
     envvar="RECCE_PROJECT_ID",
 )
-@click.option("--api-token", help="The Recce Cloud API token.", type=click.STRING, envvar="RECCE_CLOUD_API_TOKEN")
+@click.option("--api-token", help="The Recce Cloud API token.", type=click.STRING, envvar="RECCE_API_TOKEN")
 @add_options(recce_options)
 def list_sessions(**kwargs):
     """
@@ -1563,7 +1563,7 @@ def artifact(**kwargs):
     "--api-token",
     help="The personal token generated by Recce Cloud.",
     type=click.STRING,
-    envvar="RECCE_CLOUD_API_TOKEN",
+    envvar="RECCE_API_TOKEN",
 )
 def share(state_file, **kwargs):
     """

recce/state/cloud.py

@@ -13,7 +13,7 @@
 from ..event import get_recce_api_token
 from ..models import CheckDAO
 from .const import (
-    RECCE_CLOUD_API_TOKEN_MISSING,
+    RECCE_API_TOKEN_MISSING,
     RECCE_CLOUD_PASSWORD_MISSING,
     RECCE_CLOUD_TOKEN_MISSING,
     RECCE_STATE_COMPRESSED_FILE,
@@ -66,8 +66,8 @@ def verify(self) -> bool:
                     return False
         elif self.catalog == "preview":
             if self.cloud_options.get("api_token") is None:
-                self.error_message = RECCE_CLOUD_API_TOKEN_MISSING.error_message
-                self.hint_message = RECCE_CLOUD_API_TOKEN_MISSING.hint_message
+                self.error_message = RECCE_API_TOKEN_MISSING.error_message
+                self.hint_message = RECCE_API_TOKEN_MISSING.hint_message
                 return False
             if self.cloud_options.get("share_id") is None:
                 self.error_message = "No share ID is provided for the preview catalog."
@@ -77,8 +77,8 @@ def verify(self) -> bool:
                 return False
         elif self.catalog == "session":
             if self.cloud_options.get("api_token") is None:
-                self.error_message = RECCE_CLOUD_API_TOKEN_MISSING.error_message
-                self.hint_message = RECCE_CLOUD_API_TOKEN_MISSING.hint_message
+                self.error_message = RECCE_API_TOKEN_MISSING.error_message
+                self.hint_message = RECCE_API_TOKEN_MISSING.hint_message
                 return False
             if self.cloud_options.get("session_id") is None:
                 self.error_message = "No session ID is provided for the session catalog."
@@ -614,8 +614,8 @@ def __init__(self, auth_options: Optional[Dict[str, str]] = None):
 
     def verify(self) -> bool:
         if get_recce_api_token() is None:
-            self.error_message = RECCE_CLOUD_API_TOKEN_MISSING.error_message
-            self.hint_message = RECCE_CLOUD_API_TOKEN_MISSING.hint_message
+            self.error_message = RECCE_API_TOKEN_MISSING.error_message
+            self.hint_message = RECCE_API_TOKEN_MISSING.hint_message
             return False
         return True
 

recce/state/const.py

@@ -20,7 +20,7 @@ class ErrorMessage:
     hint_message='Please provide a password with the option "--password <compress-password>"',
 )
 
-RECCE_CLOUD_API_TOKEN_MISSING = ErrorMessage(
+RECCE_API_TOKEN_MISSING = ErrorMessage(
     error_message="No Recce API token is provided",
     hint_message="Please login to Recce Cloud and copy the API token from the settings page",
 )

recce/state/state_loader.py

@@ -8,7 +8,7 @@
 from recce.pull_request import fetch_pr_metadata
 
 from ..util.io import SupportedFileTypes, file_io_factory
-from .const import RECCE_CLOUD_API_TOKEN_MISSING
+from .const import RECCE_API_TOKEN_MISSING
 from .state import RecceState
 
 logger = logging.getLogger("uvicorn")
@@ -53,7 +53,7 @@ def __init__(
                     self.catalog = "preview"
                     self.share_id = self.cloud_options.get("share_id")
             else:
-                raise RecceException(RECCE_CLOUD_API_TOKEN_MISSING.error_message)
+                raise RecceException(RECCE_API_TOKEN_MISSING.error_message)
 
     @property
     def token(self):