Merge branch 'main' into feature

* Add searchable deprecation comments on request_id and username fields in EventContext

* Add deprecation note in webhooks documentation

* Expand deprecation note/warning

* Add version number to deprecation warning

* Add deprecation warning to two other places

docs/integrations/webhooks.md

@@ -31,6 +31,11 @@ The following data is available as context for Jinja2 templates:
 * `data` - A detailed representation of the object in its current state. This is typically equivalent to the model's representation in NetBox's REST API.
 * `snapshots` - Minimal "snapshots" of the object state both before and after the change was made; provided as a dictionary with keys named `prechange` and `postchange`. These are not as extensive as the fully serialized representation, but contain enough information to convey what has changed.
 
+!!! warning "Deprecation of legacy fields"
+    The "request_id" and "username" fields in the webhook payload above are deprecated and should no longer be used. Support for them will be removed in NetBox v4.7.0.
+
+    Use `request.user.username` and `request.request_id` from the `request` object included in the callback context instead.
+
 ### Default Request Body
 
 If no body template is specified, the request body will be populated with a JSON object containing the context data. For example, a newly created site might appear as follows:

docs/models/extras/webhook.md

@@ -88,3 +88,8 @@ The following context variables are available in to the text and link templates.
 | `request_id` | The unique request ID                              |
 | `data`       | A complete serialized representation of the object |
 | `snapshots`  | Pre- and post-change snapshots of the object       |
+
+!!! warning "Deprecation of legacy fields"
+    The "request_id" and "username" fields in the webhook payload above are deprecated and should no longer be used. Support for them will be removed in NetBox v4.7.0.
+
+    Use `request.user.username` and `request.request_id` from the `request` object included in the callback context instead.

docs/plugins/development/webhooks.md

@@ -43,6 +43,11 @@ The resulting webhook payload will look like the following:
 }
 ```
 
+!!! warning "Deprecation of legacy fields"
+    The "request_id" and "username" fields in the webhook payload above are deprecated and should no longer be used. Support for them will be removed in NetBox v4.7.0.
+
+    Use `request.user.username` and `request.request_id` from the `request` object included in the callback context instead.
+
 !!! note "Consider namespacing webhook data"
     The data returned from all webhook callbacks will be compiled into a single `context` dictionary. Any existing keys within this dictionary will be overwritten by subsequent callbacks which include those keys. To avoid collisions with webhook data provided by other plugins, consider namespacing your plugin's data within a nested dictionary as such:
     

netbox/dcim/api/serializers_/cables.py

@@ -84,9 +84,6 @@ class CablePathSerializer(serializers.ModelSerializer):
     def get_path(self, obj):
         ret = []
         for nodes in obj.path_objects:
-            if not nodes:
-                # The path contains an invalid object
-                return []
             serializer = get_serializer_for_model(nodes[0])
             context = {'request': self.context['request']}
             ret.append(serializer(nodes, nested=True, many=True, context=context).data)

netbox/dcim/choices.py

@@ -921,7 +921,6 @@ class InterfaceTypeChoices(ChoiceSet):
     # 10 Gbps Ethernet
     TYPE_10GE_BR_D = '10gbase-br-d'
     TYPE_10GE_BR_U = '10gbase-br-u'
-    TYPE_10GE_CU = '10gbase-cu'
     TYPE_10GE_CX4 = '10gbase-cx4'
     TYPE_10GE_ER = '10gbase-er'
     TYPE_10GE_LR = '10gbase-lr'
@@ -944,7 +943,6 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_40GE_FR4 = '40gbase-fr4'
     TYPE_40GE_LR4 = '40gbase-lr4'
     TYPE_40GE_SR4 = '40gbase-sr4'
-    TYPE_40GE_SR4_BD = '40gbase-sr4-bd'
 
     # 50 Gbps Ethernet
     TYPE_50GE_CR = '50gbase-cr'
@@ -1194,7 +1192,6 @@ class InterfaceTypeChoices(ChoiceSet):
             (
                 (TYPE_10GE_BR_D, '10GBASE-BR-D (10GE BiDi Down)'),
                 (TYPE_10GE_BR_U, '10GBASE-BR-U (10GE BiDi Up)'),
-                (TYPE_10GE_CU, '10GBASE-CU (10GE DAC Passive Twinax)'),
                 (TYPE_10GE_CX4, '10GBASE-CX4 (10GE DAC)'),
                 (TYPE_10GE_ER, '10GBASE-ER (10GE)'),
                 (TYPE_10GE_LR, '10GBASE-LR (10GE)'),
@@ -1223,7 +1220,6 @@ class InterfaceTypeChoices(ChoiceSet):
                 (TYPE_40GE_FR4, '40GBASE-FR4 (40GE)'),
                 (TYPE_40GE_LR4, '40GBASE-LR4 (40GE)'),
                 (TYPE_40GE_SR4, '40GBASE-SR4 (40GE)'),
-                (TYPE_40GE_SR4_BD, '40GBASE-SR4 (40GE BiDi)'),
             )
         ),
         (

netbox/extras/graphql/mixins.py

@@ -22,19 +22,7 @@ if TYPE_CHECKING:
 @strawberry.type
 class ConfigContextMixin:
 
-    @classmethod
-    def get_queryset(cls, queryset, info: Info, **kwargs):
-        queryset = super().get_queryset(queryset, info, **kwargs)
-
-        # If `config_context` is requested, call annotate_config_context_data() on the queryset
-        selected = {f.name for f in info.selected_fields[0].selections}
-        if 'config_context' in selected and hasattr(queryset, 'annotate_config_context_data'):
-            return queryset.annotate_config_context_data()
-
-        return queryset
-
-    # Ensure `local_context_data` is fetched when `config_context` is requested
-    @strawberry_django.field(only=['local_context_data'])
+    @strawberry_django.field
     def config_context(self) -> strawberry.scalars.JSON:
         return self.get_config_context()