fix: pydantic 2 fixes (#237)

* fix: pydantic 2 fixes

* fix: poetry lock and model_validate

* fix: rename github to gh

* fix: cat out action.yml

* fix: fix ci

* fix: action integration test on PR and push to main

Author: andrewthetechie

.github/workflows/action-integration.yml

@@ -2,7 +2,9 @@
 name: Action Integration Test
 on:
   push:
-  pull_request_target:
+    branches:
+      - main
+  pull_request:
 jobs:
   action-integration-testing:
     name: Action Integration Testing
@@ -17,6 +19,8 @@ jobs:
         with:
           infile: action.yml
           varlist: "runs.image=Dockerfile"
+      - name: cat action.yml
+        run: cat action.yml
       - name: Test action
         id: test-action
         # test with the local checkout of the action

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.4.3
+    rev: v0.4.4
     hooks:
       # Run the linter.
       - id: ruff
@@ -21,7 +21,7 @@ repos:
     hooks:
       - id: prettier
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.6.27
+    rev: v1.7.0
     hooks:
       - id: actionlint-docker
         name: Actionlint

poetry.lock

@@ -0,0 +1,14 @@
+from functools import lru_cache
+
+from github import Github
+from github.GithubException import GithubException
+from github.GithubException import UnknownObjectException
+
+
+@lru_cache
+def get_github_client(token: str, api_url: str) -> Github:
+    """ """
+    return Github(token, base_url=api_url)
+
+
+__all__ = ["get_github_client", "GithubException", "UnknownObjectException"]

repo_manager/gh/__init__.py

@@ -1,4 +1,4 @@
-from github import Github
+from gh import Github
 from github.Repository import Repository
 
 

repo_manager/github/branch_protections.py repo_manager/gh/branch_protections.py

@@ -2,30 +2,43 @@
 import sys
 
 from actions_toolkit import core as actions_toolkit
-from github.GithubException import GithubException
-from github.GithubException import UnknownObjectException
 
-from repo_manager.github.branch_protections import check_repo_branch_protections
-from repo_manager.github.branch_protections import update_branch_protection
-from repo_manager.github.files import copy_file
-from repo_manager.github.files import delete_file
-from repo_manager.github.files import move_file
-from repo_manager.github.files import RemoteSrcNotFoundError
-from repo_manager.github.labels import check_repo_labels
-from repo_manager.github.labels import update_label
-from repo_manager.github.secrets import check_repo_secrets
-from repo_manager.github.secrets import create_secret
-from repo_manager.github.secrets import delete_secret
-from repo_manager.github.settings import check_repo_settings
-from repo_manager.github.settings import update_settings
+from repo_manager.gh.branch_protections import check_repo_branch_protections
+from repo_manager.gh.branch_protections import update_branch_protection
+from repo_manager.gh.files import copy_file
+from repo_manager.gh.files import delete_file
+from repo_manager.gh.files import move_file
+from repo_manager.gh.files import RemoteSrcNotFoundError
+from repo_manager.gh.labels import check_repo_labels
+from repo_manager.gh.labels import update_label
+from repo_manager.gh.secrets import check_repo_secrets
+from repo_manager.gh.secrets import create_secret
+from repo_manager.gh.secrets import delete_secret
+from repo_manager.gh.settings import check_repo_settings
+from repo_manager.gh.settings import update_settings
 from repo_manager.schemas import load_config
 from repo_manager.utils import get_inputs
+from yaml import YAMLError
+from pydantic import ValidationError
+from repo_manager.gh import GithubException, UnknownObjectException
 
 
 def main():  # noqa: C901
-    inputs = get_inputs()
+    try:
+        inputs = get_inputs()
+    # actions toolkit has very broad exceptions :(
+    except Exception as exc:
+        actions_toolkit.set_failed(f"Unable to collect inputs {exc}")
     actions_toolkit.debug(f"Loading config from {inputs['settings_file']}")
-    config = load_config(inputs["settings_file"])
+    try:
+        config = load_config(inputs["settings_file"])
+    except FileNotFoundError:
+        actions_toolkit.set_failed(f"{inputs['settings_file']} does not exist or is not readable")
+    except YAMLError as exc:
+        actions_toolkit.set_failed(f"Unable to read {inputs['settings_file']} - {exc}")
+    except ValidationError as exc:
+        actions_toolkit.set_failed(f"{inputs['settings_file']} is invalid - {exc}")
+
     actions_toolkit.debug(f"Inputs: {inputs}")
     if inputs["action"] == "validate":
         actions_toolkit.set_output("result", f"Validated {inputs['settings_file']}")

repo_manager/github/files.py repo_manager/gh/files.py

@@ -6,14 +6,21 @@
 from .label import Label
 from .secret import Secret
 from .settings import Settings
+from pydantic import Field
+from copy import copy
+
+
+def empty_list():
+    this_list = list()
+    return copy(this_list)
 
 
 class RepoManagerConfig(BaseModel):
     settings: Settings | None
-    branch_protections: list[BranchProtection] | None
-    secrets: list[Secret] | None
-    labels: list[Label] | None
-    files: list[FileConfig] | None
+    branch_protections: list[BranchProtection] = Field(default_factory=empty_list)
+    secrets: list[Secret] = Field(default_factory=empty_list)
+    labels: list[Label] = Field(default_factory=empty_list)
+    files: list[FileConfig] = Field(default_factory=empty_list)
 
     @property
     def secrets_dict(self):
@@ -37,4 +44,4 @@ def load_config(filename: str) -> RepoManagerConfig:
     with open(filename) as fh:
         this_dict = yaml.safe_load(fh)
 
-    return RepoManagerConfig(**this_dict)
+    return RepoManagerConfig.model_validate(this_dict)

repo_manager/github/labels.py repo_manager/gh/labels.py

@@ -6,7 +6,7 @@
 # Needed to handle extracting certain attributes/fields from nested objects and lists
 from itertools import repeat
 
-from repo_manager.github import get_github_client
+from repo_manager.gh import get_github_client
 
 from ._inputs import INPUTS
 

repo_manager/github/repos.py repo_manager/gh/repos.py

@@ -1,9 +1,9 @@
 import pytest
 from github.GithubException import UnknownObjectException
 
-from repo_manager.github import files
-from repo_manager.github.files import copy_file
-from repo_manager.github.files import RemoteSrcNotFoundError
+from repo_manager.gh import files
+from repo_manager.gh.files import copy_file
+from repo_manager.gh.files import RemoteSrcNotFoundError
 from repo_manager.schemas import FileConfig
 
 VALID_CONFIG = {