@redpanda-data/docs-extensions-and-macros 5.47.1 → 5.47.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redpanda-data/docs-extensions-and-macros",
-  "version": "5.47.1",
+  "version": "5.47.3",
   "description": "Antora extensions and macros developed for Redpanda documentation.",
   "keywords": [
     "antora",

package/tools/property-extractor/README.adoc

@@ -1249,7 +1249,21 @@ DOCS=../docs   # path to your docs repo checkout
 git -C "$DOCS" show origin/main:docs-data/property-overrides.json \
   > __tests__/docs-data/property-overrides.json
 
-git -C "$DOCS" show origin/main:modules/reference/attachments/redpanda-properties-v26.2.2.json \
+# docs' own regen renames this file forward on every release (see
+# property-corpus-drift.sh's header), so there is no fixed filename to
+# git-show -- a tag pinned here today 404s the moment docs regenerates again.
+# Discover the tag docs main is actually on: the highest version among
+# whatever is currently in modules/reference/attachments/. An old RC/beta
+# cycle's last file, if one is still sitting there, sorts lower and is
+# skipped -- see the property-extractor helpers for why more than one file
+# can exist at once.
+TAG="$(git -C "$DOCS" ls-tree origin/main --name-only -- modules/reference/attachments/ \
+  | grep -oE 'redpanda-properties-(v[0-9]+\.[0-9]+\.[0-9]+[^.]*)\.json' \
+  | sed -E 's/redpanda-properties-(.*)\.json/\1/' \
+  | sort -V | tail -1)"
+echo "Refreshing against $TAG"
+
+git -C "$DOCS" show "origin/main:modules/reference/attachments/redpanda-properties-${TAG}.json" \
   | node -e '
     const fs = require("fs");
     const src = JSON.parse(fs.readFileSync(0, "utf8"));
@@ -1261,8 +1275,9 @@ git -C "$DOCS" show origin/main:modules/reference/attachments/redpanda-propertie
     }
     const out = JSON.parse(fs.readFileSync("__tests__/docs-data/property-snapshot.json", "utf8"));
     out.properties = properties;
-    fs.writeFileSync("__tests__/docs-data/property-snapshot.json", JSON.stringify(out, null, 1));
-  '
+    out.source_tag = process.argv[1];
+    fs.writeFileSync("__tests__/docs-data/property-snapshot.json", JSON.stringify(out, null, 1) + "\n");
+  ' "$TAG"
 ----
 
 The `docs` repo fails its own CI when the overrides mirror drifts, following the

package/tools/property-extractor/property_extractor.py

@@ -183,9 +183,16 @@ class ConstexprCache:
         for search_dir in search_dirs:
             if not os.path.exists(search_dir):
                 continue
-                
+
             for root, dirs, files in os.walk(search_dir):
-                for file in files:
+                # Deterministic traversal, same reasoning as get_file_pairs:
+                # constexpr_cache and function_cache below are plain dict
+                # assignment, last-write-wins, and an identifier redefined in
+                # more than one file would otherwise resolve to whichever
+                # file the filesystem's own directory order happened to
+                # visit last.
+                dirs.sort()
+                for file in sorted(files):
                     if file.endswith(('.h', '.cc', '.hpp', '.cpp')):
                         file_path = os.path.join(root, file)
                         try:
@@ -616,9 +623,13 @@ def resolve_constexpr_identifier(identifier):
         if not os.path.exists(search_dir):
             continue
             
-        # Walk through the directory recursively
+        # Walk through the directory recursively. Deterministic order, same
+        # reasoning as the ConstantResolver scan above: this feeds a
+        # last-write-wins dict, so an identifier defined in more than one
+        # file would otherwise resolve non-deterministically.
         for root, dirs, files in os.walk(search_dir):
-            for file in files:
+            dirs.sort()
+            for file in sorted(files):
                 # Check both .h and .cc files since definitions can be in either
                 if file.endswith(('.h', '.cc', '.hpp', '.cpp')):
                     file_path = os.path.join(root, file)
@@ -686,7 +697,17 @@ def get_file_pairs(options):
 
     file_pairs = []
 
-    for i in file_iter:
+    # Sorted, not raw rglob/glob order: iteration order reflects the
+    # filesystem's own directory-entry order, which is not guaranteed stable
+    # across clones or machines. A property name registered in more than one
+    # file (api_doc_dir, in both pandaproxy/rest/ and
+    # pandaproxy/schema_registry/) hits the "different defined_in" branch in
+    # transform_files_with_properties below, which keeps whichever file was
+    # processed last -- non-deterministically, without the sort, since that
+    # depends on this exact order. Confirmed live: two regenerations of the
+    # same overrides-unchanged tag six minutes apart produced different
+    # defined_in values for api_doc_dir.
+    for i in sorted(file_iter):
         if os.path.exists(i.with_suffix(".cc")):
             file_pairs.append(FilePair(i.resolve(), i.with_suffix(".cc").resolve()))