@redpanda-data/docs-extensions-and-macros 3.7.4 → 3.9.0

package/extensions/find-related-docs.js

@@ -54,7 +54,7 @@ module.exports.register = function ({ config }) {
       }
 
       if (uniqueRelatedDocs.length > 0 || uniqueRelatedLabs.length > 0) {
-        logger.info(`Set related docs and labs attributes for ${labPage.asciidoc.doctitle}`);
+        logger.debug(`Set related docs and labs attributes for ${labPage.asciidoc.doctitle}`);
       }
     });
   });

package/extensions/find-related-labs.js

@@ -19,7 +19,7 @@ module.exports.register = function ({ config }) {
       })
       if (!relatedLabs.length) return
       docPage.asciidoc.attributes['page-related-labs'] = JSON.stringify(relatedLabs)
-      logger.info(`Set page-related-labs attribute for ${docPage.asciidoc.doctitle} to ${docPage.asciidoc.attributes['page-related-labs']}`)
+      logger.debug(`Set page-related-labs attribute for ${docPage.asciidoc.doctitle} to ${docPage.asciidoc.attributes['page-related-labs']}`)
     })
   })
 }

package/extensions/replace-attributes-in-attachments.js

@@ -37,9 +37,12 @@ module.exports.register = function () {
       ? sanitizeAttributeValue(attributes['latest-redpanda-tag'] || '')
       : sanitizeAttributeValue(attributes['full-version'] || ''));
 
-      const consoleVersion = useTagAttributes
-        ? sanitizeAttributeValue(attributes['latest-console-tag'] || '')
-        : sanitizeAttributeValue(attributes['latest-console-version'] || '');
+      const consoleVersion = isPrerelease
+      ? sanitizeAttributeValue(attributes['console-beta-tag'] || '')
+      : (useTagAttributes
+      ? sanitizeAttributeValue(attributes['latest-console-tag'] || '')
+      : sanitizeAttributeValue(attributes['latest-console-version'] || ''));
+
       const redpandaRepo = isPrerelease ? 'redpanda-unstable' : 'redpanda';
       const consoleRepo = 'console';
 

package/extensions/version-fetcher/get-latest-console-version.js

@@ -1,6 +1,7 @@
 module.exports = async (github, owner, repo) => {
   const semver = require('semver');
   try {
+    // Fetch all the releases from the repository
     const releases = await github.rest.repos.listReleases({
       owner,
       repo,
@@ -8,21 +9,27 @@ module.exports = async (github, owner, repo) => {
       per_page: 50
     });
 
-    // Filter tags with valid semver format
+    // Filter valid semver tags and sort them to find the highest version
     const sortedReleases = releases.data
       .map(release => release.tag_name)
       .filter(tag => semver.valid(tag.replace(/^v/, '')))
       .sort((a, b) => semver.rcompare(a.replace(/^v/, ''), b.replace(/^v/, '')));
 
     if (sortedReleases.length > 0) {
-      // Return the highest version with "v" prefix
-      return sortedReleases[0];
+      // Find the highest versions for stable and beta releases
+      const latestStableReleaseVersion = sortedReleases.find(tag => !tag.includes('-beta'));
+      const latestBetaReleaseVersion = sortedReleases.find(tag => tag.includes('-beta'));
+
+      return {
+        latestStableRelease: latestStableReleaseVersion || null,
+        latestBetaRelease: latestBetaReleaseVersion || null
+      };
     } else {
       console.log("No valid semver releases found.");
-      return null;
+      return { latestStableRelease: null, latestBetaRelease: null };
     }
   } catch (error) {
-    console.error(error);
-    return null;
+    console.error('Failed to fetch release information:', error);
+    return { latestStableRelease: null, latestBetaRelease: null };
   }
 };

package/extensions/version-fetcher/set-latest-version.js

@@ -69,7 +69,7 @@ module.exports.register = function ({ config }) {
 
           // Set attributes for console and connect versions
           if (latestVersions.console) {
-            setVersionAndTagAttributes(asciidoc, 'latest-console', latestVersions.console, name, version);
+            setVersionAndTagAttributes(asciidoc, 'latest-console', latestVersions.console.latestStableRelease, name, version);
           }
           if (latestVersions.connect) {
             setVersionAndTagAttributes(asciidoc, 'latest-connect', latestVersions.connect, name, version);
@@ -77,6 +77,7 @@ module.exports.register = function ({ config }) {
           // Special handling for Redpanda RC versions if in beta
           if (latestVersions.redpanda?.latestRcRelease?.version) {
             setVersionAndTagAttributes(asciidoc, 'redpanda-beta', latestVersions.redpanda.latestRcRelease.version, name, version)
+            setVersionAndTagAttributes(asciidoc, 'console-beta', latestVersions.console.latestBetaRelease, name, version);
             asciidoc.attributes['redpanda-beta-commit'] = latestVersions.redpanda.latestRcRelease.commitHash;
           }
         });
@@ -91,12 +92,18 @@ module.exports.register = function ({ config }) {
             component.latest.asciidoc.attributes['full-version'] = sanitizeVersion(latestVersions.redpanda.latestRedpandaRelease.version);
             setVersionAndTagAttributes(component.latest.asciidoc, 'latest-redpanda', latestVersions.redpanda.latestRedpandaRelease.version, component.latest.name, component.latest.version);
             component.latest.asciidoc.attributes['latest-release-commit'] = latestVersions.redpanda.latestRedpandaRelease.commitHash;
-            logger.info(`Updated Redpanda release version to ${latestVersions.redpanda.latestRedpandaRelease.version}`);
           }
         }
       });
 
       console.log(chalk.green('Updated Redpanda documentation versions successfully.'));
+      logger.info(`Latest Redpanda version: ${latestVersions.redpanda.latestRedpandaRelease.version}`);
+      if (latestVersions.redpanda.latestRCRelease) logger.info(`Latest Redpanda beta version: ${latestVersions.redpanda.latestRCRelease.version}`);
+      logger.info(`Latest Connect version: ${latestVersions.connect}`);
+      logger.info(`Latest Console version: ${latestVersions.console.latestStableRelease}`);
+      if (latestVersions.console.latestBetaRelease) logger.info(`Latest Console beta version: ${latestVersions.console.latestBetaRelease}`);
+      logger.info(`Latest Redpanda Helm chart version: ${latestVersions.helmChart}`);
+      logger.info(`Latest Operator version: ${latestVersions.operator}`);
     } catch (error) {
       logger.error(`Error updating versions: ${error}`);
     }
@@ -110,9 +117,9 @@ module.exports.register = function ({ config }) {
       asciidoc.attributes[`${baseName}-tag`] = `${versionData}`;
 
       if (name && version) {
-        logger.info(`Set ${baseName}-version to ${versionWithoutPrefix} and ${baseName}-tag to ${versionData} in ${name} ${version}`);
+        logger.debug(`Set ${baseName}-version to ${versionWithoutPrefix} and ${baseName}-tag to ${versionData} in ${name} ${version}`);
       } else {
-        logger.info(`Updated ${baseName}-version to ${versionWithoutPrefix} and ${baseName}-tag to ${versionData}`);
+        logger.debug(`Updated ${baseName}-version to ${versionWithoutPrefix} and ${baseName}-tag to ${versionData}`);
       }
     }
   }

package/macros/rp-connect-components.js

@@ -389,13 +389,15 @@ module.exports.register = function (registry, context) {
             supportLevelStr += `<p>${certifiedDrivers}${certifiedDrivers && communityDrivers ? '</br> ' : ''}${communityDrivers}</p>`;
           }
         }
-        // Build the cloud support column
+        // Build the cloud support column and include the connector URL where a connector page is available. Otherwise, just mark as available.
         const firstCloudSupportedType = Array.from(types.entries())
           .map(([_, commercialNames]) => Object.values(commercialNames).find(({ isCloudSupported }) => isCloudSupported))
-          .find(entry => entry && entry.urls.redpandaCloudUrl);
+          .find(entry => entry);
         const cloudLinkDisplay = firstCloudSupportedType
-          ? `<a href="${firstCloudSupportedType.urls.redpandaCloudUrl}">Yes</a>`
-          : 'No';
+          ? firstCloudSupportedType.urls.redpandaCloudUrl
+            ? `<a href="${firstCloudSupportedType.urls.redpandaCloudUrl}">Yes</a>`
+          : `Yes`
+        : 'No';
 
         const firstUrl = getFirstUrlFromTypesArray(Array.from(types.entries()), isCloud);
 

package/package.json

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