Pipelines webhook data dir (#34775)

src/rest/scripts/utils/decorator.js

@@ -6,11 +6,10 @@ import { slug } from 'github-slugger'
 import { allVersions } from '../../../../lib/all-versions.js'
 import { categoriesWithoutSubcategories } from '../../lib/index.js'
 import getOperations, { getWebhooks } from './get-operations.js'
-
+import { WEBHOOK_DATA_DIR, WEBHOOK_SCHEMA_FILENAME } from '../../../webhooks/lib/index.js'
 const ENABLED_APPS = 'src/github-apps/data/enabled-for-apps.json'
 const STATIC_REDIRECTS = 'lib/redirects/static/client-side-rest-api-redirects.json'
 const REST_DECORATED_DIR = 'src/rest/data'
-const WEBHOOK_DECORATED_DIR = 'src/webhooks/data'
 const REST_DEREFERENCED_DIR = 'src/rest/data/dereferenced'
 
 export async function decorate(schemas) {
@@ -216,11 +215,11 @@ async function createStaticWebhookFiles(webhookSchemas) {
       }
     })
     const webhooksFilename = path
-      .join(WEBHOOK_DECORATED_DIR, `${schemaName}.json`)
+      .join(WEBHOOK_DATA_DIR, schemaName, WEBHOOK_SCHEMA_FILENAME)
       .replace('.deref', '')
     if (Object.keys(categorizedWebhooks).length > 0) {
-      if (!existsSync(WEBHOOK_DECORATED_DIR)) {
+      if (!existsSync(`${WEBHOOK_DATA_DIR}/${schemaName}`)) {
-        mkdirSync(WEBHOOK_DECORATED_DIR)
+        mkdirSync(`${WEBHOOK_DATA_DIR}/${schemaName}`)
       }
       await writeFile(webhooksFilename, JSON.stringify(categorizedWebhooks, null, 2))
       console.log('Wrote', path.relative(process.cwd(), webhooksFilename))

src/webhooks/lib/index.js

@@ -3,7 +3,8 @@ import path from 'path'
 import { allVersions } from '../../../lib/all-versions.js'
 import { readCompressedJsonFileFallback } from '../../../lib/read-json-file.js'
 
-const schemasPath = 'src/webhooks/data'
+export const WEBHOOK_DATA_DIR = 'src/webhooks/data'
+export const WEBHOOK_SCHEMA_FILENAME = 'schema.json'
 
 // cache for webhook data per version
 const webhooksCache = new Map()
@@ -62,13 +63,13 @@ export async function getWebhook(version, webhookCategory) {
 export async function getWebhooks(version) {
   const openApiVersion = getOpenApiVersion(version)
   if (!webhooksCache.has(openApiVersion)) {
-    const filename = `${openApiVersion}.json`
-
     // The `readCompressedJsonFileFallback()` function
     // will check for both a .br and .json extension.
     webhooksCache.set(
       openApiVersion,
-      readCompressedJsonFileFallback(path.join(schemasPath, filename))
+      readCompressedJsonFileFallback(
+        path.join(WEBHOOK_DATA_DIR, openApiVersion, WEBHOOK_SCHEMA_FILENAME)
+      )
     )
   }