Merge pull request #102 from networktocode/dga-fix-101

Convert DiffSyncActions enum into simple string

Author: dgarros

diffsync/diff.py

@@ -106,9 +106,9 @@ def order_children_default(cls, children: Mapping) -> Iterator["DiffElement"]:
     def summary(self) -> Mapping[Text, int]:
         """Build a dict summary of this Diff and its child DiffElements."""
         summary = {
-            DiffSyncActions.CREATE.value: 0,
-            DiffSyncActions.UPDATE.value: 0,
-            DiffSyncActions.DELETE.value: 0,
+            DiffSyncActions.CREATE: 0,
+            DiffSyncActions.UPDATE: 0,
+            DiffSyncActions.DELETE: 0,
             "no-change": 0,
         }
         for child in self.get_children():
@@ -221,11 +221,11 @@ def __len__(self):
         return total
 
     @property
-    def action(self) -> Optional[DiffSyncActions]:
+    def action(self) -> Optional[Text]:
         """Action, if any, that should be taken to remediate the diffs described by this element.
 
         Returns:
-            DiffSyncActions ("create", "update", "delete", or None)
+            str: DiffSyncActions ("create", "update", "delete", or None)
         """
         if self.source_attrs is not None and self.dest_attrs is None:
             return DiffSyncActions.CREATE
@@ -329,13 +329,13 @@ def has_diffs(self, include_children: bool = True) -> bool:
     def summary(self) -> Mapping[Text, int]:
         """Build a summary of this DiffElement and its children."""
         summary = {
-            DiffSyncActions.CREATE.value: 0,
-            DiffSyncActions.UPDATE.value: 0,
-            DiffSyncActions.DELETE.value: 0,
+            DiffSyncActions.CREATE: 0,
+            DiffSyncActions.UPDATE: 0,
+            DiffSyncActions.DELETE: 0,
             "no-change": 0,
         }
         if self.action:
-            summary[self.action.value] += 1
+            summary[self.action] += 1
         else:
             summary["no-change"] += 1
         child_summary = self.child_diff.summary()

diffsync/enum.py

@@ -89,7 +89,7 @@ class DiffSyncStatus(enum.Enum):
     ERROR = "error"
 
 
-class DiffSyncActions(enum.Enum):
+class DiffSyncActions:  # pylint: disable=too-few-public-methods
     """List of valid Action for DiffSyncModel."""
 
     CREATE = "create"

diffsync/helpers.py

@@ -305,7 +305,7 @@ def __init__(  # pylint: disable=too-many-arguments
         # Local state maintained during synchronization
         self.logger: structlog.BoundLogger = self.base_logger
         self.model_class: Type["DiffSyncModel"]
-        self.action: Optional[DiffSyncActions] = None
+        self.action: Optional[str] = None
 
     def incr_elements_processed(self, delta: int = 1):
         """Increment self.elements_processed, then call self.callback if present."""
@@ -408,7 +408,7 @@ def sync_model(  # pylint: disable=too-many-branches, unused-argument
             return (False, dst_model)
 
         try:
-            self.logger.debug(f"Attempting model {self.action.value}")
+            self.logger.debug(f"Attempting model {self.action}")
             if self.action == DiffSyncActions.CREATE:
                 if dst_model is not None:
                     raise ObjectNotCreated(f"Failed to create {self.model_class.get_type()} {ids} - it already exists!")
@@ -428,7 +428,7 @@ def sync_model(  # pylint: disable=too-many-branches, unused-argument
                 status, message = dst_model.get_status()
             else:
                 status = DiffSyncStatus.FAILURE
-                message = f"{self.model_class.get_type()} {self.action.value} did not return the model object."
+                message = f"{self.model_class.get_type()} {self.action} did not return the model object."
 
         except ObjectCrudException as exception:
             status = DiffSyncStatus.ERROR
@@ -442,7 +442,7 @@ def sync_model(  # pylint: disable=too-many-branches, unused-argument
 
         return (True, dst_model)
 
-    def log_sync_status(self, action: Optional[DiffSyncActions], status: DiffSyncStatus, message: str):
+    def log_sync_status(self, action: Optional[str], status: DiffSyncStatus, message: str):
         """Log the current sync status at the appropriate verbosity with appropriate context.
 
         Helper method to `sync_diff_element`/`sync_model`.

tests/unit/test_diffsync.py

@@ -620,7 +620,7 @@ def check_sync_logs_against_diff(diffsync, diff, log, errors_permitted=False):
 
             assert {
                 ("action", element.action),
-                ("event", f"Attempting model {element.action.value}"),
+                ("event", f"Attempting model {element.action}"),
                 ("level", "debug"),
             } <= begin_event.items()
             # attrs_diffs dict is unhashable so we can't include it in the above set comparison
@@ -633,7 +633,7 @@ def check_sync_logs_against_diff(diffsync, diff, log, errors_permitted=False):
             if complete_event["status"] == "success":
                 assert {
                     ("action", element.action),
-                    ("event", f"{element.action.value.title()}d successfully"),
+                    ("event", f"{element.action.title()}d successfully"),
                     ("level", "info"),
                     ("status", "success"),
                 } <= complete_event.items()