Merge da71c5e into f1f3276

exodus_gw/routers/publish.py

@@ -339,10 +339,23 @@ def update_publish_items(
         if item.object_key == "absent":
             # deleted items don't get indexed
             continue
+
         basename = os.path.basename(item.web_uri)
         for entrypoint_basename in settings.entry_point_files:
             if basename == entrypoint_basename:
-                entrypoint_paths.add(item.web_uri)
+                if any(
+                    [
+                        exclude in item.web_uri
+                        for exclude in settings.autoindex_partial_excludes
+                    ]
+                ):
+                    # Not eligible for partial autoindex, e.g. /kickstart/ repos
+                    # because the kickstart and yum repodata might arrive separately.
+                    LOG.info(
+                        "%s: excluded from partial autoindex", item.web_uri
+                    )
+                else:
+                    entrypoint_paths.add(item.web_uri)
 
     if entrypoint_paths:
         msg = worker.autoindex_partial.send(

exodus_gw/settings.py

@@ -170,6 +170,11 @@ class Settings(BaseSettings):
     Can be set to an empty string to disable generation of indexes.
     """
 
+    autoindex_partial_excludes: List[str] = ["/kickstart/"]
+    """Background processing of autoindexes will be disabled for paths matching
+    any of these values.
+    """
+
     config_cache_ttl: int = 2
     """Time (in minutes) config is expected to live in components that consume it.
 

tests/routers/test_publish.py

@@ -1,4 +1,5 @@
 import json
+import logging
 from datetime import datetime, timedelta
 
 import mock
@@ -290,6 +291,54 @@ def test_update_publish_items_autoindex(db, auth_header):
     ]
 
 
+def test_update_publish_items_autoindex_excluded(
+    db, auth_header, caplog: pytest.LogCaptureFixture
+):
+    """PUTting items including entry points under an excluded path will NOT trigger
+    partial autoindex.
+    """
+
+    publish_id = "11224567-e89b-12d3-a456-426614174000"
+
+    publish = Publish(id=publish_id, env="test", state="PENDING")
+
+    with TestClient(app) as client:
+        # Ensure a publish object exists
+        db.add(publish)
+        db.commit()
+
+        # Try to add some items to it
+        r = client.put(
+            "/test/publish/%s" % publish_id,
+            json=[
+                {
+                    "web_uri": "/some/kickstart/repo1/repodata/repomd.xml",
+                    "object_key": "1" * 64,
+                },
+                {
+                    "web_uri": "/some/kickstart/repo1/other",
+                    "object_key": "2" * 64,
+                },
+            ],
+            headers=auth_header(roles=["test-publisher"]),
+        )
+
+    # It should have succeeded
+    assert r.status_code == 200
+
+    # Check the enqueued messages...
+    messages: list[DramatiqMessage] = db.query(DramatiqMessage).all()
+
+    # It should have enqueued no messages
+    assert len(messages) == 0
+
+    # And it should have logged about the exclusion
+    assert (
+        "/some/kickstart/repo1/repodata/repomd.xml: excluded from partial autoindex"
+        in caplog.text
+    )
+
+
 def test_update_publish_items_path_normalization(db, auth_header):
     """URI and link target paths are normalized in PUT items."""