Merge pull request #758 from opsmill/pog-combine-if-statements

Combine if statements

Author: ogenstad

infrahub_sdk/node/node.py

@@ -358,11 +358,12 @@ def _strip_unmodified(self, data: dict, variables: dict) -> tuple[dict, dict]:
             relationship_property = getattr(self, relationship)
             if not relationship_property or relationship not in data:
                 continue
-            if not relationship_property.initialized and (
-                not isinstance(relationship_property, RelatedNodeBase) or not relationship_property.schema.optional
-            ):
-                data.pop(relationship)
-            elif isinstance(relationship_property, RelationshipManagerBase) and not relationship_property.has_update:
+            if (
+                not relationship_property.initialized
+                and (
+                    not isinstance(relationship_property, RelatedNodeBase) or not relationship_property.schema.optional
+                )
+            ) or (isinstance(relationship_property, RelationshipManagerBase) and not relationship_property.has_update):
                 data.pop(relationship)
 
         for item in original_data:

infrahub_sdk/store.py

@@ -165,9 +165,7 @@ def _get_by_id(self, id: str, kind: str | None = None) -> InfrahubNode | Infrahu
     def _get_by_hfid(
         self, hfid: str | list[str], kind: str | None = None
     ) -> InfrahubNode | InfrahubNodeSync | CoreNode | CoreNodeSync:
-        if not kind:
-            node_kind, node_hfid = parse_human_friendly_id(hfid)
-        elif kind and isinstance(hfid, str) and hfid.startswith(kind):
+        if not kind or (kind and isinstance(hfid, str) and hfid.startswith(kind)):
             node_kind, node_hfid = parse_human_friendly_id(hfid)
         else:
             node_kind = kind

pyproject.toml

@@ -261,7 +261,6 @@ ignore = [
     "SIM105",  # Use `contextlib.suppress(KeyError)` instead of `try`-`except`-`pass`
     "SIM108",  # Use ternary operator `key_str = f"{value[ALIAS_KEY]}: {key}" if ALIAS_KEY in value and value[ALIAS_KEY] else key` instead of `if`-`else`-block
     "SIM110",  # Use `return any(getattr(item, resource_field) == resource_id for item in getattr(self, RESOURCE_MAP[resource_type]))` instead of `for` loop
-    "SIM114",  # Combine `if` branches using logical `or` operator
     "TC003",   # Move standard library import `collections.abc.Iterable` into a type-checking block
     "UP031",   # Use format specifiers instead of percent format
 ]