From fabf46782e089e4f0745530c44725408d85a31c5 Mon Sep 17 00:00:00 2001
From: Steve Linabery <slinaber@redhat.com>
Date: Thu, 13 Jul 2023 13:03:24 -0500
Subject: [PATCH] Fix unit test errors due to new version of pydantic

Pydantic updated to v2.x, so a bunch of pipeline unit tests started failing.
This patch follows the migration recommendations from pydantic to get the
tests passing again.
---
 src/bugjira/config.py     | 20 +++++++++-----------
 src/bugjira/issue.py      | 10 +++++-----
 tests/unit/test_config.py | 22 +++++++++++-----------
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/bugjira/config.py b/src/bugjira/config.py
index 897d9b1..f7b6a42 100644
--- a/src/bugjira/config.py
+++ b/src/bugjira/config.py
@@ -1,38 +1,36 @@
 import json
 
-from pydantic import BaseModel, validator, constr
+import pydantic
+from pydantic import BaseModel, field_validator, constr
 
 
 class BugzillaConfig(BaseModel):
+    model_config = pydantic.ConfigDict(extra='forbid')
+
     URL: constr(strip_whitespace=True, min_length=1)
     api_key: constr(strip_whitespace=True, min_length=1)
 
-    class Config:
-        extra = 'forbid'
-
 
 class JiraConfig(BaseModel):
+    model_config = pydantic.ConfigDict(extra='forbid')
+
     URL: constr(strip_whitespace=True, min_length=1)
     token_auth: constr(strip_whitespace=True, min_length=1)
 
-    class Config:
-        extra = 'forbid'
-
 
 class ConfigDict(BaseModel):
+    model_config = pydantic.ConfigDict(extra='forbid')
+
     bugzilla: BugzillaConfig
     jira: JiraConfig
 
-    class Config:
-        extra = 'forbid'
-
 
 class Config(BaseModel):
     """A BaseModel to validate config dicts"""
 
     config_dict: dict
 
-    @validator("config_dict")
+    @field_validator("config_dict")
     def validate_minimum_config(cls, v):
         ConfigDict(**v)
         return v
diff --git a/src/bugjira/issue.py b/src/bugjira/issue.py
index 457acc9..c4efc14 100644
--- a/src/bugjira/issue.py
+++ b/src/bugjira/issue.py
@@ -1,6 +1,6 @@
 from typing import Any
 
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 
 from bugjira.util import is_bugzilla_key, is_jira_key
 
@@ -12,12 +12,12 @@ class Issue(BaseModel):
     """
 
     key: str
-    bugzilla: Any
-    jira_issue: Any
+    bugzilla: Any = None
+    jira_issue: Any = None
 
 
 class BugzillaIssue(Issue):
-    @validator("key")
+    @field_validator("key")
     def validate_key(cls, key):
         if not is_bugzilla_key(key):
             raise ValueError(f"{key} is not a \
@@ -26,7 +26,7 @@ def validate_key(cls, key):
 
 
 class JiraIssue(Issue):
-    @validator("key")
+    @field_validator("key")
     def validate_key(cls, key):
         if not is_jira_key(key):
             raise ValueError(f"{key} is not a \
diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
index 28dfd8d..6d199e8 100644
--- a/tests/unit/test_config.py
+++ b/tests/unit/test_config.py
@@ -43,8 +43,8 @@ def test_config_extra_top_level_value(good_config_dict):
     assert len(excinfo.value.errors()) == 1
     error = excinfo.value.errors()[0]
     assert error.get("loc") == ("config_dict", "foo")
-    assert error.get("msg") == "extra fields not permitted"
-    assert error.get("type") == "value_error.extra"
+    assert error.get("msg") == "Extra inputs are not permitted"
+    assert error.get("type") == "extra_forbidden"
 
 
 def test_config_extra_bugzilla_value(good_config_dict):
@@ -62,8 +62,8 @@ def test_config_extra_bugzilla_value(good_config_dict):
     assert len(excinfo.value.errors()) == 1
     error = excinfo.value.errors()[0]
     assert error.get("loc") == ("config_dict", "bugzilla", "foo")
-    assert error.get("msg") == "extra fields not permitted"
-    assert error.get("type") == "value_error.extra"
+    assert error.get("msg") == "Extra inputs are not permitted"
+    assert error.get("type") == "extra_forbidden"
 
 
 def test_config_extra_jira_value(good_config_dict):
@@ -81,8 +81,8 @@ def test_config_extra_jira_value(good_config_dict):
     assert len(excinfo.value.errors()) == 1
     error = excinfo.value.errors()[0]
     assert error.get("loc") == ("config_dict", "jira", "foo")
-    assert error.get("msg") == "extra fields not permitted"
-    assert error.get("type") == "value_error.extra"
+    assert error.get("msg") == "Extra inputs are not permitted"
+    assert error.get("type") == "extra_forbidden"
 
 
 def test_config_missing_value(good_config_dict):
@@ -99,8 +99,8 @@ def test_config_missing_value(good_config_dict):
     assert len(excinfo.value.errors()) == 1
     error = excinfo.value.errors()[0]
     assert error.get("loc") == ("config_dict", "jira", "token_auth")
-    assert error.get("msg") == "field required"
-    assert error.get("type") == "value_error.missing"
+    assert error.get("msg") == "Field required"
+    assert error.get("type") == "missing"
 
 
 def test_config_empty_value(good_config_dict):
@@ -116,7 +116,7 @@ def test_config_empty_value(good_config_dict):
 
     assert len(excinfo.value.errors()) == 1
     error = excinfo.value.errors()[0]
-    assert error.get("ctx").get("limit_value") == 1
+    assert error.get("ctx").get("min_length") == 1
     assert error.get("loc") == ("config_dict", "jira", "token_auth")
 
 
@@ -132,8 +132,8 @@ def test_config_empty_values(config_defaults):
             config_path=(config_defaults + "/data/config/missing_config.json")
         )
     for error in excinfo.value.errors():
-        assert error.get("type") == "value_error.any_str.min_length"
-        assert error.get("ctx").get("limit_value") == 1
+        assert error.get("type") == "string_too_short"
+        assert error.get("ctx").get("min_length") == 1
 
 
 def test_config_no_file(config_defaults):