github-org-manager 0.5.5__tar.gz → 0.5.7__tar.gz

{github_org_manager-0.5.5 → github_org_manager-0.5.7}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: github-org-manager
-Version: 0.5.5
+Version: 0.5.7
 Summary: Manage a GitHub Organization, its teams, repository permissions, and more
-Home-page: https://github.com/OpenRailAssociation/github-org-manager
 License: Apache-2.0
 Keywords: github,github-management,permissions,access-control
 Author: Max Mehl

{github_org_manager-0.5.5 → github_org_manager-0.5.7}/gh_org_mgr/_gh_org.py

@@ -15,10 +15,12 @@ from github import (
     GithubIntegration,
     UnknownObjectException,
 )
+from github.GithubException import BadCredentialsException
 from github.NamedUser import NamedUser
 from github.Organization import Organization
 from github.Repository import Repository
 from github.Team import Team
+from jwt.exceptions import InvalidKeyError
 
 from ._gh_api import get_github_secrets_from_env, run_graphql_query
 
@@ -65,6 +67,7 @@ class GHorg:  # pylint: disable=too-many-instance-attributes, too-many-lines
         # supported, or multiple spaces etc.
         return team.replace(" ", "-")
 
+    # amazonq-ignore-next-line
     def login(
         self, orgname: str, token: str = "", app_id: str | int = "", app_private_key: str = ""
     ) -> None:
@@ -81,7 +84,11 @@ class GHorg:  # pylint: disable=too-many-instance-attributes, too-many-lines
             logging.debug("Logging in via app %s", self.gh_app_id)
             auth = Auth.AppAuth(app_id=self.gh_app_id, private_key=self.gh_app_private_key)
             app = GithubIntegration(auth=auth)
-            installation = app.get_org_installation(org=orgname)
+            try:
+                installation = app.get_org_installation(org=orgname)
+            except InvalidKeyError:
+                logging.critical("Invalid private key provided for GitHub App")
+                sys.exit(1)
             self.gh = installation.get_github_for_installation()
             logging.debug("Logged in via app installation %s", installation.id)
 
@@ -90,7 +97,11 @@ class GHorg:  # pylint: disable=too-many-instance-attributes, too-many-lines
         elif self.gh_token:
             logging.debug("Logging in as user with PAT")
             self.gh = Github(auth=Auth.Token(self.gh_token))
-            logging.debug("Logged in as %s", self.gh.get_user().login)
+            try:
+                logging.debug("Logged in as %s", self.gh.get_user().login)
+            except BadCredentialsException:
+                logging.critical("Invalid GitHub token provided")
+                sys.exit(1)
         else:
             logging.error("No GitHub token or App ID+private key provided")
             sys.exit(1)
@@ -708,7 +719,25 @@ class GHorg:  # pylint: disable=too-many-instance-attributes, too-many-lines
                 continue
 
             # Convert team name to Team object
-            team = self.org.get_team_by_slug(self._sluggify_teamname(team_name))
+            try:
+                team = self.org.get_team_by_slug(self._sluggify_teamname(team_name))
+            # Team not found, probably because a new team should be created, but it's a dry-run
+            except UnknownObjectException:
+                logging.debug(
+                    "Team %s not found, probably because it should be created but it's a dry-run",
+                    team_name,
+                )
+                # Initialise a new Team() object with the name, manually
+                team = Team(
+                    requester=None,  # type: ignore
+                    headers={},  # No headers required
+                    attributes={
+                        "id": 0,
+                        "name": team_name,
+                        "slug": self._sluggify_teamname(team_name),
+                    },
+                    completed=True,  # Mark as fully initialized
+                )
 
             # Get configured repo permissions
             for repo, perm in team_attrs.get("repos", {}).items():

{github_org_manager-0.5.5 → github_org_manager-0.5.7}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [tool.poetry]
 name = "github-org-manager"
-version = "0.5.5"
+version = "0.5.7"
 description = "Manage a GitHub Organization, its teams, repository permissions, and more"
 authors = ["Max Mehl <max.mehl@deutschebahn.com>"]
 readme = "README.md"
@@ -33,13 +33,13 @@ requests = "^2.32.3"
 python-slugify = "^8.0.4"
 
 [tool.poetry.group.dev.dependencies]
-black = "^24.3.0"
-isort = "^5.13.2"
+black = "^25.1.0"
+isort = ">=5.13.2,<7.0.0"
 mypy = "^1.9.0"
 pylint = "^3.1.0"
 types-pyyaml = "^6.0.12.20240311"
 types-requests = "^2.32.0.20240712"
-bump-my-version = "^0.26.0"
+bump-my-version = "^0.30.0"
 
 [build-system]
 requires = ["poetry-core"]