chore: merge main to release

Author: jennifer-richards

.github/workflows/build.yml

@@ -418,17 +418,14 @@ jobs:
           echo "DEPLOY_NAMESPACE=$(node cli.js --branch ${{ github.ref_name }})" >> "$GITHUB_ENV"
 
       - name: Deploy to dev
-        uses: the-actions-org/workflow-dispatch@v4
+        uses: ietf-tools/workflow-dispatch-action@v1
         with:
           workflow: deploy-dev.yml
           repo: ietf-tools/infra-k8s
           ref: main
           token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
           inputs: '{ "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}", "namespace":"${{ env.DEPLOY_NAMESPACE }}", "disableDailyDbRefresh":${{ inputs.devNoDbRefresh }} }'
-          wait-for-completion: true
-          wait-for-completion-timeout: 60m
-          wait-for-completion-interval: 30s
-          display-workflow-run-url: false
+          waitForCompletionTimeout: 60m
 
   # -----------------------------------------------------------------
   # STAGING
@@ -445,30 +442,24 @@ jobs:
 
     steps:
       - name: Refresh Staging DB
-        uses: the-actions-org/workflow-dispatch@v4
+        uses: ietf-tools/workflow-dispatch-action@v1
         with:
           workflow: deploy-db.yml
           repo: ietf-tools/infra-k8s
           ref: main
           token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
           inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "manifest":"postgres", "forceRecreate":true, "restoreToLastFullSnapshot":true, "waitClusterReady":true }'
-          wait-for-completion: true
-          wait-for-completion-timeout: 120m
-          wait-for-completion-interval: 20s
-          display-workflow-run-url: false
+          waitForCompletionTimeout: 120m
 
       - name: Deploy to staging
-        uses: the-actions-org/workflow-dispatch@v4
+        uses: ietf-tools/workflow-dispatch-action@v1
         with:
           workflow: deploy.yml
           repo: ietf-tools/infra-k8s
           ref: main
           token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
           inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}" }'
-          wait-for-completion: true
-          wait-for-completion-timeout: 30m
-          wait-for-completion-interval: 30s
-          display-workflow-run-url: false
+          waitForCompletionTimeout: 30m
 
   # -----------------------------------------------------------------
   # PROD
@@ -485,14 +476,11 @@ jobs:
 
     steps:
       - name: Deploy to production
-        uses: the-actions-org/workflow-dispatch@v4
+        uses: ietf-tools/workflow-dispatch-action@v1
         with:
           workflow: deploy.yml
           repo: ietf-tools/infra-k8s
           ref: main
           token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
           inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}" }'
-          wait-for-completion: true
-          wait-for-completion-timeout: 30m
-          wait-for-completion-interval: 30s
-          display-workflow-run-url: false
+          waitForCompletionTimeout: 30m

.vscode/settings.json

@@ -57,5 +57,8 @@
     "python.testing.pytestEnabled": false,
     "python.testing.unittestEnabled": false,
     "python.linting.enabled": true,
-    "python.terminal.shellIntegration.enabled": false
+    "python.terminal.shellIntegration.enabled": false,
+    "vs-kubernetes": {
+        "disable-linters": ["resource-limits"]
+    }
 }

dev/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/ietf-tools/datatracker-app-base:20260410T1557
+FROM ghcr.io/ietf-tools/datatracker-app-base:20260512T1629
 LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
 
 ENV DEBIAN_FRONTEND=noninteractive

dev/build/TARGET_BASE

@@ -1 +1 @@
-20260410T1557
+20260512T1629

ietf/api/serializers_rpc.py

@@ -8,7 +8,7 @@
 from django.utils import timezone
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
-from rest_framework import serializers
+from rest_framework import fields, serializers
 
 from ietf.doc.expire import move_draft_files_to_archive
 from ietf.doc.models import (
@@ -265,6 +265,23 @@ def __init__(self, **kwargs):
         super().__init__(regex, **kwargs)
 
 
+class RfcGroupRelatedField(serializers.SlugRelatedField):
+    """SlugRelatedField that translates None / "" to the acronym "none" """
+
+    def __init__(self, **kwargs):
+        super().__init__(
+            slug_field="acronym",
+            queryset=Group.objects.all(),
+            allow_null=True,
+            required=False,
+        )
+
+    def run_validation(self, data=fields.empty):
+        # Use the Group with acronym "none" when group is not specified 
+        if data is fields.empty or data is None or data == "":
+            data = "none"
+        return super().run_validation(data)
+
 
 class RfcPubSerializer(serializers.ModelSerializer):
     """Write-only serializer for RFC publication"""
@@ -279,9 +296,7 @@ class RfcPubSerializer(serializers.ModelSerializer):
 
     # fields on the RFC Document that need tweaking from ModelSerializer defaults
     rfc_number = serializers.IntegerField(min_value=1, required=True)
-    group = serializers.SlugRelatedField(
-        slug_field="acronym", queryset=Group.objects.all(), required=False
-    )
+    group = RfcGroupRelatedField()
     stream = serializers.PrimaryKeyRelatedField(
         queryset=StreamName.objects.filter(used=True)
     )
@@ -556,6 +571,18 @@ class EditableRfcSerializer(serializers.ModelSerializer):
         child=SubseriesNameField(required=False),
         write_only=True,
     )
+    updates = serializers.ListField(
+        child=serializers.IntegerField(),
+        required=False,
+        write_only=True,
+        help_text="List of RFC numbers this document updates."
+    )
+    obsoletes = serializers.ListField(
+        child=serializers.IntegerField(),
+        required=False,
+        write_only=True,
+        help_text="List of RFC numbers this document obsoletes."
+    )
 
     class Meta:
         model = Document
@@ -569,7 +596,27 @@ class Meta:
             "std_level",
             "subseries",
             "keywords",
+            "updates",
+            "obsoletes",
+        ]
+
+    def _validate_rfc_number_list(self, field_name, rfc_numbers):
+        """Raise ValidationError if any RFC numbers in the list don't exist."""
+        unknown = [
+            n for n in rfc_numbers
+            if not Document.objects.filter(rfc_number=n, type_id="rfc").exists()
         ]
+        if unknown:
+            raise serializers.ValidationError(
+                {field_name: [f"Unknown RFC number: {n}" for n in unknown]}
+            )
+        return rfc_numbers
+
+    def validate_updates(self, value):
+        return self._validate_rfc_number_list("updates", value)
+
+    def validate_obsoletes(self, value):
+        return self._validate_rfc_number_list("obsoletes", value)
 
     def create(self, validated_data):
         raise RuntimeError("Cannot create with this serializer")
@@ -587,6 +634,8 @@ def update(self, instance, validated_data):
         published = validated_data.pop("published", omitted)
         subseries = validated_data.pop("subseries", omitted)
         authors_data = validated_data.pop("rfcauthor_set", omitted)
+        updates = validated_data.pop("updates", omitted)
+        obsoletes = validated_data.pop("obsoletes", omitted)
 
         # Transaction to clean up if something fails
         with transaction.atomic():
@@ -658,6 +707,24 @@ def update(self, instance, validated_data):
                                 )
                             )
                         )
+            if updates is not omitted:
+                RelatedDocument.objects.filter(
+                    source=rfc, relationship_id="updates"
+                ).exclude(target__rfc_number__in=updates).delete()
+                for rfc_num in updates:
+                    target = Document.objects.get(rfc_number=rfc_num, type_id="rfc")
+                    RelatedDocument.objects.get_or_create(
+                        source=rfc, relationship_id="updates", target=target
+                    )
+            if obsoletes is not omitted:
+                RelatedDocument.objects.filter(
+                    source=rfc, relationship_id="obs"
+                ).exclude(target__rfc_number__in=obsoletes).delete()
+                for rfc_num in obsoletes:
+                    target = Document.objects.get(rfc_number=rfc_num, type_id="rfc")
+                    RelatedDocument.objects.get_or_create(
+                        source=rfc, relationship_id="obs", target=target
+                    )
 
             # update subseries relations
             if subseries is not omitted:

ietf/api/tests_serializers_rpc.py

@@ -215,3 +215,27 @@ def test_partial_update(self, mock_trigger_red_task, mock_update_searchindex_tas
             mock_update_searchindex_task.delay.call_args,
             mock.call(rfc.rfc_number),
         )
+
+    def test_unknown_rfc_number_rejected(self):
+        """Unknown RFC numbers in updates/obsoletes should cause validation failure."""
+        from django.db.models import Max
+
+        rfc = WgRfcFactory()
+        unknown_rfc_number = (
+            Document.objects.filter(rfc_number__isnull=False).aggregate(
+                m=Max("rfc_number") + 1
+            )["m"]
+            or 10000
+        )
+
+        for field in ("updates", "obsoletes"):
+            serializer = EditableRfcSerializer(
+                partial=True,
+                instance=rfc,
+                data={field: [unknown_rfc_number]},
+            )
+            self.assertFalse(
+                serializer.is_valid(),
+                msg=f"{field} with unknown RFC number should be invalid",
+            )
+            self.assertIn(field, serializer.errors)

ietf/api/tests_views_rpc.py

@@ -477,3 +477,91 @@ def test_destination_helper_mixin_blob_destination(self):
             DestinationHelperMixin().blob_destination(filename),
             f"notprepped/{filename}",
         )
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views_rpc": ["valid-token"]})
+    @mock.patch("ietf.api.views_rpc.process_rpc_queue_task.delay")
+    def test_process_rpc_queue(self, mock_task_delay):
+        url = urlreverse("ietf.api.purple_api.process_rpc_queue")
+        queue_entries = [
+            {
+                "id": 9850,
+                "name": "draft-ietf-netmod-system-config",
+                "title": "System-defined Configuration",
+                "draft_url": "http://localhost:8000/doc/draft-ietf-netmod-system-config-20",
+                "disposition": "in_progress",
+                "external_deadline": None,
+                "labels": [],
+                "cluster": None,
+                "assignment_set": [
+                    {
+                        "id": 434,
+                        "rfc_to_be": 9850,
+                        "role": "first_editor",
+                        "state": "in_progress",
+                    }
+                ],
+                "actionholder_set": [],
+                "pending_activities": [],
+                "rfc_number": None,
+                "pages": 33,
+                "enqueued_at": "2026-01-26T12:00:00Z",
+                "final_approval": [],
+                "iana_status": {
+                    "slug": "completed",
+                    "name": "completed",
+                    "desc": "IANA has completed actions in draft",
+                },
+                "blocking_reasons": [],
+                "authors": [{"titlepage_name": "Q. Ma", "is_editor": True}],
+                "approval_log_message": [],
+                "stream": "ietf",
+                "group": "netmod",
+                "group_name": "Network Modeling",
+                "std_level": "ps",
+                "references": [],
+                "rev": "20",
+            }
+        ]
+        queue_data = {"data": queue_entries}
+
+        # no credentials
+        response = self.client.post(
+            url, data=queue_data, content_type="application/json"
+        )
+        self.assertEqual(response.status_code, 403)
+        mock_task_delay.assert_not_called()
+
+        # invalid token
+        response = self.client.post(
+            url,
+            data=queue_data,
+            content_type="application/json",
+            headers={"X-Api-Key": "invalid-token"},
+        )
+        self.assertEqual(response.status_code, 403)
+        mock_task_delay.assert_not_called()
+
+        # valid token, wrong method
+        response = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(response.status_code, 405)
+        mock_task_delay.assert_not_called()
+
+        # valid token, missing "data" field
+        response = self.client.post(
+            url,
+            data={},
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(response.status_code, 400)
+        mock_task_delay.assert_not_called()
+
+        # valid token, POST with data
+        response = self.client.post(
+            url,
+            data=queue_data,
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(response.status_code, 202)
+        mock_task_delay.assert_called_once_with(queue_entries)

ietf/api/urls_rpc.py

@@ -36,6 +36,11 @@
         name="ietf.api.purple_api.refresh_rfc_index",
     ),
     path(r"subject/<str:subject_id>/person/", views_rpc.SubjectPersonView.as_view()),
+    path(
+        r"queue/process/",
+        views_rpc.ProcessRpcQueueView.as_view(),
+        name="ietf.api.purple_api.process_rpc_queue",
+    ),
 ]
 
 # add routers at the end so individual routes can steal parts of their address

ietf/api/views_rpc.py

@@ -48,6 +48,7 @@
 )
 from ietf.person.models import Email, Person
 from ietf.sync.rfcindex import mark_rfcindex_as_dirty
+from ietf.sync.tasks import process_rpc_queue_task
 
 
 class Conflict(APIException):
@@ -576,3 +577,24 @@ class RfcIndexView(APIView):
     def post(self, request):
         mark_rfcindex_as_dirty()
         return Response(status=202)
+
+
+class RpcQueueDataSerializer(serializers.Serializer):
+    data = serializers.JSONField()
+
+
+class ProcessRpcQueueView(APIView):
+    api_key_endpoint = "ietf.api.views_rpc"
+
+    @extend_schema(
+        operation_id="process_rpc_queue",
+        summary="Process the provided RPC queue",
+        description="Schedules parsing the provided queue to update documents with change dqueue data",
+        responses={202: None},
+        request=RpcQueueDataSerializer,
+    )
+    def post(self, request):
+        serializer = RpcQueueDataSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        process_rpc_queue_task.delay(serializer.validated_data["data"])
+        return Response(status=202)