[MISC] update wrapper methods context

* Update the wrapper methods context to the wrapped method. * Increase libpatch Signed-off-by: Guillaume Boutry <[email protected]>
canonical · Sep 10, 2024 · 1accd1d · 1accd1d
1 parent f43364e
commit 1accd1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/charms/data_platform_libs/v0/data_interfaces.py b/lib/charms/data_platform_libs/v0/data_interfaces.py
@@ -292,6 +292,7 @@ def _on_topic_requested(self, event: TopicRequestedEvent):
 """
 
 import copy
+import functools
 import json
 import logging
 from abc import ABC, abstractmethod
@@ -331,7 +332,7 @@ def _on_topic_requested(self, event: TopicRequestedEvent):
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 39
+LIBPATCH = 40
 
 PYDEPS = ["ops>=2.0.0"]
 
@@ -492,12 +493,13 @@ def wrapper(self, *args, **kwargs):
         return f(self, *args, **kwargs)
 
     wrapper.leader_only = True
-    return wrapper
+    return functools.wraps(f)(wrapper)
 
 
 def juju_secrets_only(f):
     """Decorator to ensure that certain operations would be only executed on Juju3."""
 
+    @functools.wraps(f)
     def wrapper(self, *args, **kwargs):
         if not self.secrets_enabled:
             raise SecretsUnavailableError("Secrets unavailable on current Juju version")
@@ -509,6 +511,7 @@ def wrapper(self, *args, **kwargs):
 def dynamic_secrets_only(f):
     """Decorator to ensure that certain operations would be only executed when NO static secrets are defined."""
 
+    @functools.wraps(f)
     def wrapper(self, *args, **kwargs):
         if self.static_secret_fields:
             raise IllegalOperationError(
@@ -522,6 +525,7 @@ def wrapper(self, *args, **kwargs):
 def either_static_or_dynamic_secrets(f):
     """Decorator to ensure that static and dynamic secrets won't be used in parallel."""
 
+    @functools.wraps(f)
     def wrapper(self, *args, **kwargs):
         if self.static_secret_fields and set(self.current_secret_fields) - set(
             self.static_secret_fields

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -189,7 +189,7 @@ def fetch_old_versions():
     for commit in last_commits:
         check_call(f"git checkout {commit}", shell=True)
         version = check_output(
-            "grep LIBPATCH lib/charms/data_platform_libs/v0/data_interfaces.py | cut -d ' ' -f 3",
+            "grep ^LIBPATCH lib/charms/data_platform_libs/v0/data_interfaces.py | cut -d ' ' -f 3",
             shell=True,
             universal_newlines=True,
         )