#10 Clean up

siisurit · Oct 23, 2024 · 3565527 · 3565527
1 parent 220dcb2
commit 3565527
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.12"]
     env:
       MAIN_PYTHON_VERSION: "3.12" # same as Ubuntu 24 LTS
 
@@ -38,8 +38,8 @@ jobs:
           poetry build
       - name: Run the test suite
         env:
-          GITHUB_PRIVATE_KEY: ${{ secrets.GITHUB_APP_ID }}
-          GITHUB_APP_ID: ${{ secrets.GITHUB_APP_PRIVATE_KEY }}
+          CHECK_DONE_GITHUB_PRIVATE_KEY: ${{ secrets.CHECK_DONE_GITHUB_APP_ID }}
+          CHECK_DONE_GITHUB_APP_ID: ${{ secrets.CHECK_DONE_GITHUB_APP_PRIVATE_KEY }}
         run: |
           poetry run pytest --cov=check-done --cov-branch
 

diff --git a/check_done/authentication.py b/check_done/authentication.py
@@ -3,7 +3,12 @@
 import jwt
 import requests
 
-from check_done.common import GITHUB_APP_ID, GITHUB_APP_PRIVATE_KEY, AuthenticationError, HttpBearerAuth
+from check_done.common import (
+    CHECK_DONE_GITHUB_APP_ID,
+    CHECK_DONE_GITHUB_APP_PRIVATE_KEY,
+    AuthenticationError,
+    HttpBearerAuth,
+)
 
 _GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code"
 _SECONDS_PER_MINUTE = 60
@@ -45,9 +50,9 @@ def _generated_jwt_token() -> str:
             payload = {
                 "exp": _EXPIRES_AT,
                 "iat": _ISSUED_AT,
-                "iss": GITHUB_APP_ID,
+                "iss": CHECK_DONE_GITHUB_APP_ID,
             }
-            return jwt.encode(payload, GITHUB_APP_PRIVATE_KEY, algorithm="RS256")
+            return jwt.encode(payload, CHECK_DONE_GITHUB_APP_PRIVATE_KEY, algorithm="RS256")
         except Exception as error:
             raise AuthenticationError(f"Cannot generate JWT token: {error}") from error
 

diff --git a/check_done/common.py b/check_done/common.py
@@ -10,10 +10,10 @@
 from requests.auth import AuthBase
 
 load_dotenv()
-_ENVVAR_GITHUB_APP_ID = "GITHUB_APP_ID"
-_ENVVAR_GITHUB_APP_PRIVATE_KEY = "GITHUB_APP_PRIVATE_KEY"
-GITHUB_APP_ID = os.environ.get(_ENVVAR_GITHUB_APP_ID)
-GITHUB_APP_PRIVATE_KEY = os.environ.get(_ENVVAR_GITHUB_APP_PRIVATE_KEY)
+_ENVVAR_CHECK_DONE_GITHUB_APP_ID = "CHECK_DONE_GITHUB_APP_ID"
+_ENVVAR_CHECK_DONE_GITHUB_APP_PRIVATE_KEY = "CHECK_DONE_GITHUB_APP_PRIVATE_KEY"
+CHECK_DONE_GITHUB_APP_ID = os.environ.get(_ENVVAR_CHECK_DONE_GITHUB_APP_ID)
+CHECK_DONE_GITHUB_APP_PRIVATE_KEY = os.environ.get(_ENVVAR_CHECK_DONE_GITHUB_APP_PRIVATE_KEY)
 
 _GITHUB_ORGANIZATION_NAME_AND_PROJECT_NUMBER_URL_REGEX = re.compile(
     r"https://github\.com/orgs/(?P<organization_name>[a-zA-Z0-9\-]+)/projects/(?P<project_number>[0-9]+).*"