Merge pull request #6529 from opsmill/stable-to-develop

Stable to develop

Author: ajtmccarty

.vale/styles/spelling-exceptions.txt

@@ -1,5 +1,6 @@
 agent
 Alibaba
+allocation_weight
 Ansible
 anonymized
 append_git_suffix
@@ -68,6 +69,7 @@ Infrahub's
 infrahubctl
 IP
 IPAddress
+IPHost
 IPAM
 is_empty
 is_ip_within

CHANGELOG.md

@@ -11,6 +11,21 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [Infrahub - v1.2.11](https://github.com/opsmill/infrahub/tree/infrahub-v1.2.11) - 2025-05-23
+
+### Added
+
+- Add the `CoreWeightedPoolResource` generic to better control which resource should be used when allocating from a pool. The higher the weight of the resource, the more likely it is to be selected for allocation.
+
+### Changed
+
+- The scrollbar in the infinite scroll tables, is now only visible when your mouse hovers the table.
+
+### Fixed
+
+- Fix a problem in the logic to calculate a diff that could cause it to quit too early under certain unlikely circumstances
+- Fixes an issue where the next page of data was loaded even when the infinite scroll table wasn't scrolled.
+
 ## [Infrahub - v1.2.10](https://github.com/opsmill/infrahub/tree/infrahub-v1.2.10) - 2025-05-13
 
 ### Added

backend/infrahub/core/constants/infrahubkind.py

@@ -78,3 +78,4 @@
 USERVALIDATOR = "CoreUserValidator"
 VALIDATOR = "CoreValidator"
 WEBHOOK = "CoreWebhook"
+WEIGHTED_POOL_RESOURCE = "CoreWeightedPoolResource"

backend/infrahub/core/node/resource_manager/ip_address_pool.py

@@ -81,11 +81,15 @@ async def get_resource(
         return node
 
     async def get_next(self, db: InfrahubDatabase, prefixlen: int | None = None) -> IPAddressType:
-        # Measure utilization of all prefixes identified as resources
         resources = await self.resources.get_peers(db=db)  # type: ignore[attr-defined]
         ip_namespace = await self.ip_namespace.get_peer(db=db)  # type: ignore[attr-defined]
 
-        for resource in resources.values():
+        try:
+            weighted_resources = sorted(resources.values(), key=lambda r: r.allocation_weight.value or 0, reverse=True)
+        except AttributeError:
+            weighted_resources = list(resources.values())
+
+        for resource in weighted_resources:
             ip_prefix = ipaddress.ip_network(resource.prefix.value)  # type: ignore[attr-defined]
             prefix_length = prefixlen or ip_prefix.prefixlen
 

backend/infrahub/core/node/resource_manager/ip_prefix_pool.py

@@ -88,11 +88,15 @@ async def get_resource(
         return node
 
     async def get_next(self, db: InfrahubDatabase, prefixlen: int) -> IPNetworkType:
-        # Measure utilization of all prefixes identified as resources
         resources = await self.resources.get_peers(db=db)  # type: ignore[attr-defined]
         ip_namespace = await self.ip_namespace.get_peer(db=db)  # type: ignore[attr-defined]
 
-        for resource in resources.values():
+        try:
+            weighted_resources = sorted(resources.values(), key=lambda r: r.allocation_weight.value or 0, reverse=True)
+        except AttributeError:
+            weighted_resources = list(resources.values())
+
+        for resource in weighted_resources:
             subnets = await get_subnets(
                 db=db,
                 ip_prefix=ipaddress.ip_network(resource.prefix.value),  # type: ignore[attr-defined]

backend/infrahub/core/protocols.py

@@ -227,6 +227,10 @@ class CoreWebhook(CoreNode):
     validate_certificates: BooleanOptional
 
 
+class CoreWeightedPoolResource(CoreNode):
+    allocation_weight: IntegerOptional
+
+
 class LineageOwner(CoreNode):
     pass
 

backend/infrahub/core/schema/definitions/core/__init__.py

@@ -68,7 +68,13 @@
     core_user_validator,
 )
 from .repository import core_generic_repository, core_read_only_repository, core_repository
-from .resource_pool import core_ip_address_pool, core_ip_prefix_pool, core_number_pool, core_resource_pool
+from .resource_pool import (
+    core_ip_address_pool,
+    core_ip_prefix_pool,
+    core_number_pool,
+    core_resource_pool,
+    core_weighted_pool_resource,
+)
 from .template import core_object_component_template, core_object_template
 from .transform import core_transform, core_transform_jinja2, core_transform_python
 from .webhook import core_custom_webhook, core_standard_webhook, core_webhook
@@ -96,6 +102,7 @@
         builtin_ip_prefix,
         builtin_ip_address,
         core_resource_pool,
+        core_weighted_pool_resource,
         core_generic_account,
         core_base_permission,
         core_credential,

backend/infrahub/core/schema/definitions/core/resource_pool.py

@@ -32,6 +32,26 @@
     ],
 )
 
+core_weighted_pool_resource = GenericSchema(
+    name="WeightedPoolResource",
+    namespace="Core",
+    label="Weighted Pool Resource",
+    description="Resource to be used in a pool, its weight is used to determine its priority on allocation.",
+    include_in_menu=False,
+    branch=BranchSupportType.AWARE,
+    generate_profile=False,
+    attributes=[
+        Attr(
+            name="allocation_weight",
+            label="Weight",
+            description="Weight determines allocation priority, resources with higher values are selected first.",
+            kind="Number",
+            optional=True,
+            order_weight=10000,
+        )
+    ],
+)
+
 core_ip_prefix_pool = NodeSchema(
     name="IPPrefixPool",
     namespace="Core",

backend/infrahub/database/__init__.py

@@ -496,7 +496,10 @@ async def get_db(retry: int = 0) -> AsyncDriver:
         auth=(config.SETTINGS.database.username, config.SETTINGS.database.password),
         encrypted=config.SETTINGS.database.tls_enabled,
         trusted_certificates=trusted_certificates,
-        notifications_disabled_categories=[NotificationDisabledCategory.UNRECOGNIZED],
+        notifications_disabled_categories=[
+            NotificationDisabledCategory.UNRECOGNIZED,
+            NotificationDisabledCategory.DEPRECATION,  # TODO: Remove me with 1.3
+        ],
         notifications_min_severity=NotificationMinimumSeverity.WARNING,
     )
 

backend/infrahub/graphql/mutations/resource_manager.py

@@ -272,9 +272,8 @@ async def mutate_delete(
 
         if violating_branches:
             raise ValidationError(
-                input_value=f"Unable to delete number pool {number_pool.node.value}.{
-                    number_pool.node_attribute.value
-                } is in use (branches: {','.join(violating_branches)})"
+                input_value=f"Unable to delete number pool {number_pool.node.value}.{number_pool.node_attribute.value}"
+                f" is in use (branches: {','.join(violating_branches)})"
             )
 
         return await super().mutate_delete(info=info, data=data, branch=branch)