refactor resolve usage for comment processing, update tests for cov…

test/ci_provider/merge_request_hook_test.py

@@ -20,6 +20,20 @@ def test_add_comment_calls_impl(self):
         self.assertEqual(hook.id, 1)
         self.assertIsNotNone(hook._add_comment_impl)
 
+    @patch('valhalla.ci_provider.merge_request_hook.resolve')
+    def test_add_comment_calls_resolve(self, mock_resolve):
+        # given:
+        mock_impl = MagicMock()
+        hook = MergeRequestHook(mr_id=1, add_comment_impl=mock_impl)
+        comment = "Comment with {VAR}"
+        mock_resolve.return_value = "Comment with VALUE"
+
+        # when:
+        hook.add_comment(comment)
+
+        # then:
+        mock_resolve.assert_called_once_with(comment)
+        mock_impl.assert_called_once_with("Comment with VALUE")
 
     def test_skip_add_comment(self):
         # given:

test/common/logger_test.py

@@ -158,7 +158,7 @@ def test_resolve_author_in_log(self, mock_print):
         # given:
         from valhalla.common import resolver
         resolver.init_str_resolver("token123", "John Doe")
-        msg = "Author is {AUTHOR}"
+        msg = f"Author is {{AUTHOR}}"
 
         # when:
         info(msg)

valhalla/ci_provider/merge_request_hook.py

@@ -2,6 +2,8 @@
 
 from typing import Callable, Optional
 
+from valhalla.common.resolver import resolve
+
 
 class MergeRequestHook:
     """
@@ -20,7 +22,7 @@ def __init__(self, mr_id: Optional[int], add_comment_impl: Optional[Callable[[st
     def add_comment(self, comment: str):
         if self._add_comment_impl is None:
             return
-        self._add_comment_impl(comment)
+        self._add_comment_impl(resolve(comment))
 
     @classmethod
     def Skip(cls) -> "MergeRequestHook":