@redpanda-data/docs-extensions-and-macros 5.47.0 → 5.47.2

package/package.json

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

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()))
 

package/tools/redpanda-connect/helpers/renderConnectDescription.js

@@ -93,10 +93,16 @@ function ensureHeadingSeparation (body) {
  * Single-backtick spans still apply attribute substitution, so spans are
  * escaped too; `----` listing blocks and ```/~~~ fences are verbatim and stay
  * untouched (a `\{` inside a fence would render as a literal backslash).
+ *
+ * The name may start uppercase or with an underscore, because environment
+ * variable placeholders are the common case in prose: Asciidoctor downcases
+ * a reference before looking it up, so ${SALESFORCE_CLIENT_SECRET} outside a
+ * fence is consumed exactly like a lowercase one and logs the missing
+ * attribute as salesforce_client_secret.
  */
 function escapePlaceholderBraces (body) {
   return annotateVerbatimLines(body).map(({ line, verbatim }) => (
-    verbatim ? line : line.replace(/(?<![\\{])\{([a-z][\w.-]{1,30})\}/g, '\\{$1}')
+    verbatim ? line : line.replace(/(?<![\\{])\{([A-Za-z_][\w.-]{1,30})\}/g, '\\{$1}')
   )).join('\n');
 }
 

package/tools/redpanda-connect/helpers/renderConnectFields.js

@@ -2,6 +2,7 @@ const yaml = require('yaml');
 const renderYamlList = require('./renderYamlList');
 const handlebars = require('handlebars');
 const { connectFieldName } = require('./flattenConnectFields');
+const { escapePlaceholderBraces } = require('./renderConnectDescription');
 
 /**
  * Renders the children of a configuration object into AsciiDoc.
@@ -68,7 +69,9 @@ module.exports = function renderConnectFields(children, prefix = '') {
     block += `=== \`${currentPath}\`\n\n`;
 
     // --- Beta badge logic (now uses is_beta) ---
-    let desc = child.description || '';
+    // Escaped before the badge is prepended, not after: the badge's own
+    // tooltip={page-beta-text} is a real attribute reference and must survive.
+    let desc = escapePlaceholderBraces(child.description || '');
     if (child.is_beta) {
       // Remove any leading "BETA:" label (case-insensitive, trims leading whitespace)
       desc = 'badge::[label=Beta, size=large, tooltip={page-beta-text}]\n\n' + desc.replace(/^\s*BETA:\s*/i, '');