Fix/array of objects and cloud docs check

bin/doc-tools-mcp.js

@@ -15,6 +15,9 @@
  * - Telemetry: Usage tracking for adoption metrics
  */
 
+// Load environment variables from .env file if it exists
+require('dotenv').config();
+
 const fs = require('fs');
 const path = require('path');
 const { Server } = require('@modelcontextprotocol/sdk/server/index.js');

bin/doc-tools.js

@@ -2,6 +2,9 @@
 
 'use strict'
 
+// Load environment variables from .env file if it exists
+require('dotenv').config()
+
 const { spawnSync } = require('child_process')
 const os = require('os')
 const { Command, Option } = require('commander')

cli-utils/octokit-client.js

@@ -0,0 +1,36 @@
+'use strict'
+
+const { Octokit } = require('@octokit/rest')
+const { getGitHubToken } = require('./github-token')
+
+/**
+ * Shared Octokit client instance for GitHub API access
+ * Configured with optional authentication and retry logic
+ *
+ * This singleton instance is shared across all doc-tools modules to:
+ * - Avoid redundant initialization
+ * - Share rate limit tracking
+ * - Centralize GitHub API configuration
+ */
+
+// Get authentication token from environment
+const token = getGitHubToken()
+
+// Configure Octokit options
+const octokitOptions = {
+  userAgent: 'redpanda-docs-tools',
+  retry: {
+    enabled: true,
+    retries: 3
+  }
+}
+
+// Only add auth if token is available
+if (token) {
+  octokitOptions.auth = token
+}
+
+// Create singleton instance
+const octokit = new Octokit(octokitOptions)
+
+module.exports = octokit

extensions/generate-rp-connect-info.js

@@ -25,11 +25,9 @@ module.exports.register = function ({ config }) {
   // Use csvpath (legacy) or csvPath
   const localCsvPath = csvpath || null
 
-  async function loadOctokit () {
-    const { Octokit } = await import('@octokit/rest')
-    const { getGitHubToken } = require('../cli-utils/github-token')
-    const token = getGitHubToken()
-    return token ? new Octokit({ auth: token }) : new Octokit()
+  function loadOctokit () {
+    // Use shared Octokit client
+    return require('../cli-utils/octokit-client')
   }
 
   // Use 'on' and return the promise so Antora waits for async completion

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redpanda-data/docs-extensions-and-macros",
-  "version": "4.13.4",
+  "version": "4.13.5",
   "description": "Antora extensions and macros developed for Redpanda documentation.",
   "keywords": [
     "antora",
@@ -103,6 +103,7 @@
     "chalk": "4.1.2",
     "cheerio": "^1.1.2",
     "commander": "^14.0.0",
+    "dotenv": "^16.6.1",
     "glob": "^11.0.0",
     "gulp": "^4.0.2",
     "gulp-connect": "^5.7.0",

tools/cloud-regions/generate-cloud-regions.js

@@ -70,8 +70,8 @@ function displayClusterType(ct) {
  */
 async function fetchYaml({ owner, repo, path, ref = 'main', token }) {
   try {
-    const { Octokit } = await import('@octokit/rest');
-    const octokit = new Octokit(token ? { auth: token } : {});
+    // Use shared Octokit client
+    const octokit = require('../../cli-utils/octokit-client');
 
     console.log(`[cloud-regions] INFO: Fetching ${owner}/${repo}/${path}@${ref} via GitHub API`);
 

tools/fetch-from-github.js

@@ -1,23 +1,10 @@
 const fs = require('fs');
 const path = require('path');
 
-let octokitInstance = null;
-async function loadOctokit() {
-  if (!octokitInstance) {
-    const { Octokit } = await import('@octokit/rest');
-    octokitInstance = process.env.VBOT_GITHUB_API_TOKEN
-      ? new Octokit({
-          auth: process.env.VBOT_GITHUB_API_TOKEN,
-        })
-      : new Octokit();
-
-    if (!process.env.VBOT_GITHUB_API_TOKEN) {
-      console.info(
-        'No GitHub token found (VBOT_GITHUB_API_TOKEN).'
-      );
-    }
-  }
-  return octokitInstance;
+// Use shared Octokit client
+function loadOctokit() {
+  const octokit = require('../cli-utils/octokit-client');
+  return octokit;
 }
 
 async function saveFile(content, saveDir, filename) {

tools/get-console-version.js

@@ -23,13 +23,8 @@ module.exports = async function getConsoleVersion({ beta = false, fromAntora = f
     useBeta = getPrereleaseFromAntora();
   }
 
-  // Initialize GitHub client
-  const { getGitHubToken } = require('../cli-utils/github-token');
-  const { Octokit } = await import('@octokit/rest');
-  const token = getGitHubToken();
-  const octokit = token
-    ? new Octokit({ auth: token })
-    : new Octokit();
+  // Use shared Octokit client
+  const octokit = require('../cli-utils/octokit-client');
 
   // Fetch latest release info
   let data;

tools/get-redpanda-version.js

@@ -19,13 +19,8 @@ module.exports = async function getRedpandaVersion({ beta = false, fromAntora =
     useBeta = getPrereleaseFromAntora();
   }
 
-  // Load Octokit
-  const { getGitHubToken } = require('../cli-utils/github-token');
-  const { Octokit } = await import('@octokit/rest');
-  const token = getGitHubToken();
-  const octokit = token
-    ? new Octokit({ auth: token })
-    : new Octokit();
+  // Use shared Octokit client
+  const octokit = require('../cli-utils/octokit-client');
 
   // Fetch version data
   let data;

tools/redpanda-connect/connector-binary-analyzer.js

@@ -1,4 +1,4 @@
-const { Octokit } = require('@octokit/rest');
+const octokit = require('../../cli-utils/octokit-client');
 const { execSync, spawnSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
@@ -13,16 +13,6 @@ const https = require('https');
  * - Which connectors are self-hosted only
  */
 
-// Initialize Octokit with optional authentication
-const octokit = new Octokit({
-  auth: process.env.GITHUB_TOKEN,
-  userAgent: 'redpanda-docs-tools',
-  retry: {
-    enabled: true,
-    retries: 3
-  }
-});
-
 const REPO_OWNER = 'redpanda-data';
 const REPO_NAME = 'connect';
 

tools/redpanda-connect/helpers/buildConfigYaml.js

@@ -36,11 +36,16 @@ module.exports = function buildConfigYaml(type, connectorName, children, include
       return; // skip deprecated fields
     }
     if (!includeAdvanced && field.is_advanced) {
-      return; // skip advanced fields in “common” mode
+      return; // skip advanced fields in "common" mode
     }
 
-    if (field.type === 'object' && Array.isArray(field.children)) {
-      // Render nested object
+    // Check if this is an array-of-objects (e.g., client_certs[])
+    // These should render as empty arrays, not expanded object structures
+    if (field.kind === 'array' && field.type === 'object' && Array.isArray(field.children)) {
+      // Render as array leaf (e.g., "client_certs: []")
+      lines.push(renderLeafField(field, baseIndent));
+    } else if (field.type === 'object' && Array.isArray(field.children)) {
+      // Render nested object (plain object, not array)
       const nestedLines = renderObjectField(field, baseIndent);
       lines.push(...nestedLines);
     } else {

tools/redpanda-connect/helpers/renderObjectField.js

@@ -28,7 +28,12 @@ module.exports = function renderObjectField(field, indentLevel) {
     if (child.is_deprecated) {
       return; // skip entirely
     }
-    if (Array.isArray(child.children) && child.children.length > 0) {
+    // Check if this is an array-of-objects (e.g., client_certs[])
+    // These should render as empty arrays, not expanded object structures
+    if (child.kind === 'array' && child.type === 'object' && Array.isArray(child.children)) {
+      // Render as array leaf (e.g., "client_certs: []")
+      lines.push(renderLeafField(child, childIndent));
+    } else if (Array.isArray(child.children) && child.children.length > 0) {
       // Nested object → recurse
       lines.push(...renderObjectField(child, childIndent));
     } else {