Merge branch 'production' into ranbel/unified-access-apps

merge in latest prod changes

Author: ranbel

.github/CODEOWNERS

@@ -4,15 +4,15 @@
 
 # More dev-specific files
 
-/.github/ @pedrosousa @haleycode @kristianfreeman @GregBrimble @KianNH @maxvp @marciocloudflare @WalshyDev
+/.github/ @kodster28 @pedrosousa @haleycode @kristianfreeman @GregBrimble @KianNH @maxvp @marciocloudflare @WalshyDev
 /.github/CODEOWNERS @cloudflare/pcx-technical-writing
 /.github/actions/assign-issue/index.js @cloudflare/pcx-technical-writing
 /.github/actions/assign-pr/index.js @cloudflare/pcx-technical-writing
 /.github/styles/cloudflare/spelling-exceptions.txt @cloudflare/pcx-technical-writing
-/src/components/ @cloudflare/developer-advocacy @kristianfreeman @pedrosousa @marciocloudflare @haleycode @maxvp @GregBrimble @KianNH @WalshyDev
-/functions/ @cloudflare/developer-advocacy @kristianfreeman @pedrosousa @haleycode @marciocloudflare @maxvp @GregBrimble @KianNH @WalshyDev
-*.js @cloudflare/developer-advocacy @kristianfreeman @pedrosousa @haleycode @maxvp @marciocloudflare @GregBrimble @KianNH @WalshyDev
-*.ts @cloudflare/developer-advocacy @kristianfreeman @pedrosousa @haleycode @maxvp @marciocloudflare @GregBrimble @KianNH @WalshyDev
+/src/components/ @cloudflare/developer-advocacy @kristianfreeman @kodster28 @pedrosousa @marciocloudflare @haleycode @maxvp @GregBrimble @KianNH @WalshyDev
+/functions/ @cloudflare/developer-advocacy @kristianfreeman @kodster28 @pedrosousa @haleycode @marciocloudflare @maxvp @GregBrimble @KianNH @WalshyDev
+*.js @cloudflare/developer-advocacy @kristianfreeman @kodster28 @pedrosousa @haleycode @maxvp @marciocloudflare @GregBrimble @KianNH @WalshyDev
+*.ts @cloudflare/developer-advocacy @kristianfreeman @kodster28 @pedrosousa @haleycode @maxvp @marciocloudflare @GregBrimble @KianNH @WalshyDev
 /src/content/workers-ai-models/ @craigsdennis @pedrosousa @cloudflare/pcx-technical-writing
 /public/_redirects @GregBrimble @KianNH @pedrosousa @WalshyDev @cloudflare/pcx-technical-writing
 
@@ -77,7 +77,7 @@
 /src/content/docs/china-network/ @pedrosousa @cloudflare/pcx-technical-writing
 /src/content/docs/cloudflare-for-platforms/cloudflare-for-saas/ @RebeccaTamachiro @cloudflare/pcx-technical-writing
 /src/content/docs/dns/ @RebeccaTamachiro @cloudflare/pcx-technical-writing
-/src/content/docs/fundamentals/ @cloudflare/pcx-technical-writing
+/src/content/docs/fundamentals/ @dcpena @cloudflare/pcx-technical-writing
 /src/content/docs/fundamentals/account-and-billing/ @dcpena @cloudflare/pcx-technical-writing
 /src/content/docs/learning-paths/ @cloudflare/pcx-technical-writing
 /src/content/docs/network-error-logging/ @dcpena @cloudflare/pcx-technical-writing
@@ -150,8 +150,8 @@
 
 # Docs team areas
 
-/src/content/docs/docs-guide/ @crwaters16 @cloudflare/pcx-technical-writing
-/src/content/docs/style-guide/ @crwaters16 @cloudflare/pcx-technical-writing
+/src/content/docs/docs-guide/ @dcpena @cloudflare/pcx-technical-writing
+/src/content/docs/style-guide/ @dcpena @cloudflare/pcx-technical-writing
 
 # Magic products
 
@@ -163,8 +163,8 @@
 
 # Migration guides
 
-/src/content/docs/migration-guides/ @kimj15 @crwaters16 @cloudflare/pcx-technical-writing
-/src/assets/images/migration-guides/ @kimj15 @crwaters16 @cloudflare/pcx-technical-writing
+/src/content/docs/migration-guides/ @kimj15 @cloudflare/pcx-technical-writing
+/src/assets/images/migration-guides/ @kimj15 @cloudflare/pcx-technical-writing
 
 # Performance products
 
@@ -189,8 +189,8 @@
 
 # Reference architecture
 
-/src/content/docs/reference-architecture/ @securitypedant @crwaters16 @cloudflare/pcx-technical-writing
-/src/assets/images/reference-architecture/ @securitypedant @crwaters16 @cloudflare/pcx-technical-writing
+/src/content/docs/reference-architecture/ @securitypedant @haleycode @cloudflare/pcx-technical-writing
+/src/assets/images/reference-architecture/ @securitypedant @haleycode @cloudflare/pcx-technical-writing
 
 # Security products
 

.github/workflows/api-links-crawl.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   compile:
     name: Compiles
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:

.hyperlint/config.yaml

@@ -1,6 +1,5 @@
 content_dir: /src/content
 authorized_users:
-  - crwaters16
   - dcpena
   - kodster28
   - KianNH

astro.config.ts

@@ -193,6 +193,7 @@ export default defineConfig({
 									"/products/",
 									"/rules/snippets/examples/?operation=*",
 									"/rules/transform/examples/?operation=*",
+									"/ruleset-engine/rules-language/fields/reference/**",
 									"/workers/examples/?languages=*",
 									"/workers/examples/?tags=*",
 									"/workers-ai/models/**",

bin/crawl-api-links.js

@@ -28,7 +28,7 @@ async function checkLinks() {
 		else request.continue();
 	});
 
-	const sitemapUrl = "https://developers.cloudflare.com/sitemap.xml";
+	const sitemapUrl = "https://developers.cloudflare.com/sitemap-0.xml";
 	await page.goto(sitemapUrl, { timeout: navigationTimeout });
 
 	const sitemapLinks = await page.$$eval("url loc", (elements) =>
@@ -43,10 +43,17 @@ async function checkLinks() {
 			continue; // Skip if the link is empty
 		}
 
-		await page.goto(link, {
-			waitUntil: "networkidle0",
-			timeout: navigationTimeout,
-		});
+		try {
+			await page.goto(link, {
+				waitUntil: "networkidle0",
+				timeout: navigationTimeout,
+			});
+		} catch (e) {
+			console.log(
+				`  WARNING: Error loading Dev Docs page: ${e.message}... Skipping.`,
+			);
+			continue;
+		}
 
 		const pageLinks = await page.$$eval("a", (elements) =>
 			elements.map((el) => el.href),
@@ -62,18 +69,28 @@ async function checkLinks() {
 				pageLink.startsWith("/api/resources/")
 			) {
 				console.log(`Evaluating link: ${pageLink}`);
-				const response = await page.goto(pageLink, {
-					waitUntil: "networkidle0",
-					timeout: navigationTimeout,
-				});
-				visitedLinks.push(pageLink);
+
+				let response = null;
+
+				try {
+					response = await page.goto(pageLink, {
+						waitUntil: "networkidle0",
+						timeout: navigationTimeout,
+					});
+					visitedLinks.push(pageLink);
+				} catch (e) {
+					console.log(
+						`  WARNING: Error loading API page: ${e.message}... Skipping.`,
+					);
+					continue;
+				}
 
 				if (response) {
 					if (response.status() === 404) {
 						brokenLinks.push(pageLink);
 					}
 				} else {
-					console.log("WARNING: Didn't receive a response... skipping.");
+					console.log("  WARNING: Didn't receive a response... skipping.");
 				}
 			}
 		}

bin/fetch-warp-releases.js

@@ -0,0 +1,62 @@
+import fs from "fs";
+import YAML from "yaml";
+import { marked } from "marked";
+
+const tracks = ["windows/ga", "windows/beta", "macos/ga", "macos/beta"];
+
+const linesToRemove = [
+	"For related Cloudflare for Teams documentation please see: https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp",
+	"For Zero Trust documentation please see: https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp",
+	"For related Consumer documentation please see: https://developers.cloudflare.com/warp-client/",
+	"For Consumer documentation please see: https://developers.cloudflare.com/warp-client/",
+];
+
+for (const track of tracks) {
+	fetch(`https://downloads.cloudflareclient.com/v1/update/json/${track}`)
+		.then((res) => res.json())
+		.then((data) => {
+			data.items.forEach((item) => {
+				const path = `./src/content/warp-releases/${track}/${item.version}.yaml`;
+
+				if (fs.existsSync(path)) {
+					console.log(`${track} ${item.version} already exists.`);
+					return;
+				}
+
+				console.log(`Saving ${track} ${item.version}.`);
+
+				let markdown = item.releaseNotes;
+
+				markdown.replace(/\r\n/g, "\n");
+
+				for (const line of linesToRemove) {
+					markdown = markdown.replace(line, "");
+				}
+
+				markdown = markdown.trim();
+
+				const tokens = marked.lexer(markdown);
+
+				marked.walkTokens(tokens, (token) => {
+					if (token.type === "heading") {
+						token.type = "strong";
+						token.raw = `**${token.text}**\n`;
+
+						delete token.depth;
+					}
+				});
+
+				const releaseNotes = tokens.reduce((s, t) => s + t.raw, "");
+
+				fs.writeFileSync(
+					`./src/content/warp-releases/${track}/${item.version}.yaml`,
+					YAML.stringify({
+						...item,
+						releaseNotes,
+						platformName: data.platformName,
+					}),
+					"utf-8",
+				);
+			});
+		});
+}

package-lock.json

@@ -73,10 +73,12 @@
 		"playwright": "^1.49.1",
 		"prettier": "^3.4.2",
 		"prettier-plugin-astro": "^0.14.1",
+		"pretty-bytes": "6.1.1",
 		"prettier-plugin-tailwindcss": "^0.6.9",
 		"puppeteer": "^24.0.0",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
+		"react-markdown": "^9.0.3",
 		"react-textarea-autosize": "^8.5.7",
 		"redirects-in-workers": "^0.0.5",
 		"rehype-autolink-headings": "^7.1.0",

package.json

@@ -750,7 +750,6 @@
 /logs/reference/logpush-api-configuration/examples/example-logpush-curl/ /logs/tutorials/examples/example-logpush-curl/ 301
 
 # magic-firewall
-/magic-firewall/reference/magic-firewall-fields/ /ruleset-engine/rules-language/fields/magic-firewall/ 301
 /magic-firewall/reference/examples/ /magic-firewall/how-to/add-rules/ 301
 /magic-firewall/how-to/pcaps-bucket-setup/ /magic-firewall/packet-captures/pcaps-bucket-setup/ 301
 /magic-firewall/how-to/collect-pcaps/ /magic-firewall/packet-captures/collect-pcaps/ 301
@@ -934,7 +933,6 @@
 /reference-architecture/load-balancing-reference-architecture/ /reference-architecture/architectures/load-balancing/ 301
 /reference-architecture/magic-transit-reference-architecture/ /reference-architecture/architectures/magic-transit/ 301
 /reference-architecture/multi-vendor-architecture/ /reference-architecture/architectures/multi-vendor/ 301
-
 /reference-architecture/secure-application-delivery-design-guide/ /reference-architecture/design-guides/secure-application-delivery/ 301
 
 # radar
@@ -973,6 +971,15 @@
 /rules/url-forwarding/single-redirects/examples/ /rules/url-forwarding/examples/ 301
 /rules/url-forwarding/dynamic-redirects/parameters/ /rules/url-forwarding/single-redirects/settings/ 301
 
+# ruleset engine
+/ruleset-engine/rules-language/fields/standard-fields/ /ruleset-engine/rules-language/fields/reference/ 301
+/ruleset-engine/rules-language/fields/dynamic-fields/ /ruleset-engine/rules-language/fields/reference/ 301
+/ruleset-engine/rules-language/fields/uri/ /ruleset-engine/rules-language/fields/reference/ 301
+/ruleset-engine/rules-language/fields/http-request-header/ /ruleset-engine/rules-language/fields/reference/ 301
+/ruleset-engine/rules-language/fields/http-request-body/ /ruleset-engine/rules-language/fields/reference/ 301
+/ruleset-engine/rules-language/fields/http-request-response/ /ruleset-engine/rules-language/fields/reference/ 301
+/ruleset-engine/rules-language/fields/magic-firewall/ /magic-firewall/reference/magic-firewall-fields/ 301
+
 # security center
 /security-center/indicator-feeds/getting-started/ /security-center/indicator-feeds/ 301
 /security-center/indicator-feeds/get-started/ /security-center/indicator-feeds/ 301