Access token

Author: choldgraf

.github/workflows/tests.yaml

@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-24.04
     env:
       # This is a private access token for @choldgraf that has public read-only access.
-      GITHUB_ACCESS_TOKEN: ${{ secrets.TOKEN_READONLY }}
+      GHA_ACCESS_TOKEN: ${{ secrets.TOKEN_READONLY }}
     strategy:
       matrix:
         include:

github_activity/github_activity.py

@@ -169,46 +169,47 @@ def get_activity(
         # We have just org
         search_query = f"user:{org}"
 
-    if not auth:
-        if "GITHUB_ACCESS_TOKEN" in os.environ:
-            # Access token is stored in a local environment variable so just use this
-            print(
-                "Using GH access token stored in `GITHUB_ACCESS_TOKEN`.",
-                file=sys.stderr,
-            )
-            auth = os.environ.get("GITHUB_ACCESS_TOKEN")
-            if auth == "":
-                raise ValueError("GITHUB_ACCESS_TOKEN exists, but it is empty...")
-
-        else:
-            # Attempt to use the gh cli if installed
-            try:
-                p = run(["gh", "auth", "token"], text=True, capture_output=True)
-                auth = p.stdout.strip()
-            except CalledProcessError:
-                print(
-                    ("gh cli has no token. Login with `gh auth login`"),
-                    file=sys.stderr,
-                )
-            except FileNotFoundError:
+    if auth is None:
+        for kind in ["GITHUB_ACCESS_TOKEN", "GHA_ACCESS_TOKEN"]:
+            if kind in os.environ:
+                # Access token is stored in a local environment variable so just use this
                 print(
-                    (
-                        "gh cli not found, so will not use it for auth. To download, "
-                        "see https://cli.github.com/"
-                    ),
+                    "Using GH access token stored in `GITHUB_ACCESS_TOKEN`.",
                     file=sys.stderr,
                 )
-        # We can't use this without auth because we hit rate limits immediately
-        if auth is None:
-            raise ValueError(
-                "Either the environment variable GITHUB_ACCESS_TOKEN or the "
-                "--auth flag or must be used to pass a Personal Access Token "
-                "needed by the GitHub API. You can generate a token at "
-                "https://github.com/settings/tokens/new. Note that while "
-                "working with a public repository, you don’t need to set any "
-                "scopes on the token you create. Alternatively, you may log-in "
-                "via the GitHub CLI (`gh auth login`)."
+                auth = os.environ.get(kind)
+                if auth == "":
+                    raise ValueError(f"Found {kind}, but it is empty...")
+
+    if auth is None:
+        # Attempt to use the gh cli if installed
+        try:
+            p = run(["gh", "auth", "token"], text=True, capture_output=True)
+            auth = p.stdout.strip()
+        except CalledProcessError:
+            print(
+                ("gh cli has no token. Login with `gh auth login`"),
+                file=sys.stderr,
+            )
+        except FileNotFoundError:
+            print(
+                (
+                    "gh cli not found, so will not use it for auth. To download, "
+                    "see https://cli.github.com/"
+                ),
+                file=sys.stderr,
             )
+    # We can't use this without auth because we hit rate limits immediately
+    if auth is None:
+        raise ValueError(
+            "Either the environment variable GITHUB_ACCESS_TOKEN or the "
+            "--auth flag or must be used to pass a Personal Access Token "
+            "needed by the GitHub API. You can generate a token at "
+            "https://github.com/settings/tokens/new. Note that while "
+            "working with a public repository, you don’t need to set any "
+            "scopes on the token you create. Alternatively, you may log-in "
+            "via the GitHub CLI (`gh auth login`)."
+        )
 
     # Figure out dates for our query
     since_dt, since_is_git_ref = _get_datetime_and_type(org, repo, since, auth)