@redpanda-data/docs-extensions-and-macros 3.5.8 → 3.5.10

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

@@ -1,22 +1,5 @@
-// Fetch the latest release version from GitHub
-const { Octokit } = require("@octokit/rest");
-const { retry } = require("@octokit/plugin-retry");
-const OctokitWithRetries = Octokit.plugin(retry);
-const owner = 'redpanda-data';
-const repo = 'connect';
+module.exports = async (github, owner, repo) => {
 
-let githubOptions = {
-  userAgent: 'Redpanda Docs',
-  baseUrl: 'https://api.github.com',
-};
-
-if (process.env.REDPANDA_GITHUB_TOKEN) {
-  githubOptions.auth = process.env.REDPANDA_GITHUB_TOKEN;
-}
-
-const github = new OctokitWithRetries(githubOptions);
-
-module.exports = async () => {
   try {
     const release = await github.rest.repos.getLatestRelease({ owner, repo });
     tag = release.data.tag_name.replace(/^v/, '');

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

@@ -1,22 +1,5 @@
-const { Octokit } = require("@octokit/rest");
-const { retry } = require("@octokit/plugin-retry");
-const semver = require("semver");
-const OctokitWithRetries = Octokit.plugin(retry);
-const owner = 'redpanda-data';
-const repo = 'console';
-
-let githubOptions = {
-  userAgent: 'Redpanda Docs',
-  baseUrl: 'https://api.github.com',
-};
-
-if (process.env.REDPANDA_GITHUB_TOKEN) {
-  githubOptions.auth = process.env.REDPANDA_GITHUB_TOKEN;
-}
-
-const github = new OctokitWithRetries(githubOptions);
-
-module.exports = async () => {
+module.exports = async (github, owner, repo) => {
+  const semver = require('semver')
   try {
     const releases = await github.rest.repos.listReleases({
       owner,

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

@@ -1,22 +1,4 @@
-// Fetch the latest release version from GitHub
-const { Octokit } = require("@octokit/rest");
-const { retry } = require("@octokit/plugin-retry");
-const OctokitWithRetries = Octokit.plugin(retry);
-const owner = 'redpanda-data';
-const repo = 'redpanda-operator';
-
-let githubOptions = {
-  userAgent: 'Redpanda Docs',
-  baseUrl: 'https://api.github.com',
-};
-
-if (process.env.REDPANDA_GITHUB_TOKEN) {
-  githubOptions.auth = process.env.REDPANDA_GITHUB_TOKEN;
-}
-
-const github = new OctokitWithRetries(githubOptions);
-
-module.exports = async () => {
+module.exports = async (github, owner, repo) => {
   try {
     const release = await github.rest.repos.getLatestRelease({ owner, repo });
     latestOperatorReleaseVersion = release.data.tag_name;

package/extensions/version-fetcher/get-latest-redpanda-helm-version.js

@@ -1,20 +1,5 @@
-const { Octokit } = require("@octokit/rest");
-const { retry } = require("@octokit/plugin-retry");
-const yaml = require('js-yaml');
-const OctokitWithRetries = Octokit.plugin(retry);
-
-const githubOptions = {
-  userAgent: 'Redpanda Docs',
-  baseUrl: 'https://api.github.com',
-  auth: process.env.REDPANDA_GITHUB_TOKEN
-};
-
-const github = new OctokitWithRetries(githubOptions);
-const owner = 'redpanda-data';
-const repo = 'helm-charts';
-const path = 'charts/redpanda/Chart.yaml';
-
-module.exports = async () => {
+module.exports = async (github, owner, repo, path) => {
+  const yaml = require('js-yaml');
   try {
     const response = await github.repos.getContent({
       owner: owner,

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

@@ -1,23 +1,5 @@
-const { Octokit } = require("@octokit/rest");
-const { retry } = require("@octokit/plugin-retry");
-const semver = require("semver");
-const OctokitWithRetries = Octokit.plugin(retry);
-
-const owner = 'redpanda-data';
-const repo = 'redpanda';
-
-let githubOptions = {
-  userAgent: 'Redpanda Docs',
-  baseUrl: 'https://api.github.com',
-};
-
-if (process.env.REDPANDA_GITHUB_TOKEN) {
-  githubOptions.auth = process.env.REDPANDA_GITHUB_TOKEN;
-}
-
-const github = new OctokitWithRetries(githubOptions);
-
-module.exports = async () => {
+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({

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

@@ -1,25 +1,40 @@
-const GetLatestRedpandaVersion = require('./get-latest-redpanda-version')
-const GetLatestConsoleVersion = require('./get-latest-console-version')
-const GetLatestOperatorVersion = require('./get-latest-operator-version')
-const GetLatestHelmChartVersion = require('./get-latest-redpanda-helm-version')
-const GetLatestConnectVersion = require('./get-latest-connect')
-const chalk = require('chalk')
-const semver = require('semver')
-
 module.exports.register = function ({ config }) {
+  const GetLatestRedpandaVersion = require('./get-latest-redpanda-version')
+  const GetLatestConsoleVersion = require('./get-latest-console-version')
+  const GetLatestOperatorVersion = require('./get-latest-operator-version')
+  const GetLatestHelmChartVersion = require('./get-latest-redpanda-helm-version')
+  const GetLatestConnectVersion = require('./get-latest-connect')
+  const chalk = require('chalk')
   const logger = this.getLogger('set-latest-version-extension')
   if (!process.env.REDPANDA_GITHUB_TOKEN) {
     logger.warn('REDPANDA_GITHUB_TOKEN environment variable not set. Attempting unauthenticated request.')
   }
 
   this.on('contentClassified', async ({ contentCatalog }) => {
+    const { Octokit } = await import("@octokit/rest");
+    const { retry } = await import("@octokit/plugin-retry");
+    const semver = await import("semver");
+    const OctokitWithRetries = Octokit.plugin(retry);
+
+    const owner = 'redpanda-data';
+
+    let githubOptions = {
+      userAgent: 'Redpanda Docs',
+      baseUrl: 'https://api.github.com',
+    };
+
+    if (process.env.REDPANDA_GITHUB_TOKEN) {
+      githubOptions.auth = process.env.REDPANDA_GITHUB_TOKEN;
+    }
+
+    const github = new OctokitWithRetries(githubOptions);
     try {
       const results = await Promise.allSettled([
-        GetLatestRedpandaVersion(),
-        GetLatestConsoleVersion(),
-        GetLatestOperatorVersion(),
-        GetLatestHelmChartVersion(),
-        GetLatestConnectVersion()
+        GetLatestRedpandaVersion(github, owner, 'redpanda'),
+        GetLatestConsoleVersion(github, owner, 'console'),
+        GetLatestOperatorVersion(github, owner, 'redpanda-operator'),
+        GetLatestHelmChartVersion(github, owner, 'helm-charts', 'charts/redpanda/Chart.yaml'),
+        GetLatestConnectVersion(github, owner, 'connect')
       ])
 
       const LatestRedpandaVersion = results[0].status === 'fulfilled' ? results[0].value : null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redpanda-data/docs-extensions-and-macros",
-  "version": "3.5.8",
+  "version": "3.5.10",
   "description": "Antora extensions and macros developed for Redpanda documentation.",
   "keywords": [
     "antora",
@@ -57,8 +57,6 @@
     "url": "git+https://github.com/redpanda-data/docs-extensions-and-macros"
   },
   "dependencies": {
-    "@octokit/plugin-retry": "~4.1.3",
-    "@octokit/rest": "~19.0.7",
     "algoliasearch": "^4.17.0",
     "chalk": "4.1.2",
     "gulp": "^4.0.2",
@@ -72,6 +70,9 @@
   "devDependencies": {
     "@antora/cli": "3.1.4",
     "@antora/site-generator": "3.1.4",
+    "@octokit/core": "^6.1.2",
+    "@octokit/plugin-retry": "^7.1.1",
+    "@octokit/rest": "^21.0.1",
     "@web/dev-server": "^0.2.5"
   }
 }