Merge pull request #14767 from milzi234/master

Publish Docs to Netlify and AWS

.github/actions/spell-check/expect.txt

@@ -263,7 +263,9 @@ Darron
 dataformat
 datatracker
 Daugaard
+davidmillerskt
 Davids
+davidtmiller
 Dayneko
 dbfile
 dblacka
@@ -481,6 +483,7 @@ geobackend
 geoipbackend
 geolocated
 Georgeto
+getbootstrap
 Gergely
 Gerritsen
 Gervai
@@ -608,6 +611,7 @@ ipencrypt
 ipfilter
 IPSECKEY
 iputils
+ironsummitmedia
 isane
 ismaster
 isoc
@@ -777,6 +781,7 @@ mbed
 mbedtls
 MBOXFW
 mbytes
+mdo
 Meerwald
 Mekking
 melpa
@@ -1309,6 +1314,7 @@ sshfp
 ssi
 SSQ
 stacksize
+startbootstrap
 starttransaction
 Stasic
 statbag
@@ -1388,6 +1394,7 @@ Thessalonikefs
 Thiago
 thinko
 Thomassen
+Thorton
 threadmessage
 throttlemap
 thrysoee

.github/actions/spell-check/patterns.txt

@@ -183,3 +183,6 @@ DoH
 
 # scrypt / argon
 \$(?:scrypt|argon\d+[di]*)\$\S+
+
+# Twitter status
+\btwitter\.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)

.github/scripts/publish.js

@@ -0,0 +1,96 @@
+const { S3Client, PutObjectCommand } = require("@aws-sdk/client-s3");
+const { CloudFrontClient, CreateInvalidationCommand } = require("@aws-sdk/client-cloudfront");
+const fs = require('fs');
+const path = require('path');
+
+// Configure AWS SDK
+const s3Client = new S3Client({ region: process.env.AWS_REGION });
+const cloudFrontClient = new CloudFrontClient({ region: process.env.AWS_REGION });
+
+async function uploadToS3(bucketName, sourceDir, destDir = '') {
+  const files = fs.readdirSync(sourceDir);
+
+  for (const file of files) {
+    const filePath = path.join(sourceDir, file);
+    const key = path.join(destDir, file);
+
+    if (fs.statSync(filePath).isDirectory()) {
+      await uploadToS3(bucketName, filePath, key);
+    } else {
+      const fileContent = fs.readFileSync(filePath);
+      const command = new PutObjectCommand({
+        Bucket: bucketName,
+        Key: key,
+        Body: fileContent,
+        ContentType: getContentType(file),
+      });
+      await s3Client.send(command);
+    }
+  }
+}
+
+function getContentType(filename) {
+  const ext = path.extname(filename).toLowerCase();
+  switch (ext) {
+    case '.html': return 'text/html';
+    case '.css': return 'text/css';
+    case '.js': return 'application/javascript';
+    case '.json': return 'application/json';
+    case '.png': return 'image/png';
+    case '.jpg': case '.jpeg': return 'image/jpeg';
+    default: return 'application/octet-stream';
+  }
+}
+
+async function invalidateCloudFront(distributionId, paths) {
+  const command = new CreateInvalidationCommand({
+    DistributionId: distributionId,
+    InvalidationBatch: {
+      CallerReference: Date.now().toString(),
+      Paths: {
+        Quantity: paths.length,
+        Items: paths,
+      },
+    },
+  });
+  await cloudFrontClient.send(command);
+}
+
+async function publishToSite(site, sourceDir, targetDir = '') {
+  const bucketName = process.env.AWS_S3_BUCKET_DOCS;
+  let distributionId, siteDir;
+
+  if (site === 'dnsdist.org') {
+    distributionId = process.env.AWS_CLOUDFRONT_DISTRIBUTION_ID_DNSDIST;
+    siteDir = 'dnsdist.org';
+  } else if (site === 'docs.powerdns.com') {
+    distributionId = process.env.AWS_CLOUDFRONT_DISTRIBUTION_ID_DOCS;
+    siteDir = 'docs.powerdns.com';
+  } else {
+    throw new Error('Invalid site specified');
+  }
+
+  const fullTargetDir = path.join(siteDir, targetDir);
+  await uploadToS3(bucketName, sourceDir, fullTargetDir);
+
+  // Invalidate CloudFront cache
+  await invalidateCloudFront(distributionId, ['/*']);
+
+  console.log(`Published from ${sourceDir} to ${site}${targetDir ? '/' + targetDir : ''}`);
+}
+
+async function main() {
+  const args = process.argv.slice(2);
+  if (args[0] === 'publish') {
+    if (args.length < 3 || args.length > 4) {
+      console.log('Usage: node publish.js publish <SITE> <SOURCE_DIR> [TARGET_DIR]');
+      return;
+    }
+    const [, site, sourceDir, targetDir] = args;
+    await publishToSite(site, sourceDir, targetDir);
+  } else {
+    console.log('Usage: node publish.js publish <SITE> <SOURCE_DIR> [TARGET_DIR]');
+  }
+}
+
+main().catch(console.error);

.github/workflows/codeql-analysis.yml

@@ -279,4 +279,4 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 2
-    - run: if [[ "$(file -i --dereference $(git diff --name-only HEAD^..HEAD -- . :^fuzzing/corpus) | grep binary | grep -v 'image/' | grep -v 'inode/x-empty' | grep -v 'inode/directory' | grep -v '^modules/tinydnsbackend/data.cdb' | tee /dev/stderr)" != "" ]]; then exit 1; fi
+    - run: if [[ "$(file -i --dereference $(git diff --name-only HEAD^..HEAD -- . :^fuzzing/corpus) | grep binary | grep -v 'image/' | grep -v 'inode/x-empty' | grep -v 'inode/directory' | grep -v '^website/docs.powerdns.com/website/fonts/' | grep -v '^website/docs.powerdns.com/website/img/' | grep -v '^modules/tinydnsbackend/data.cdb' | tee /dev/stderr)" != "" ]]; then exit 1; fi