From 846ac0cba3123e3d308be3c6aa2d491c00e9d1da Mon Sep 17 00:00:00 2001 From: anabellabuckvar <41971124+anabellabuckvar@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:23:05 -0800 Subject: [PATCH 1/6] DOP-5395 hardcode parser user to docsworker-xlarge for persistence module --- modules/persistence/src/services/pages/index.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/persistence/src/services/pages/index.ts b/modules/persistence/src/services/pages/index.ts index 81dd98d5d..7ca095401 100644 --- a/modules/persistence/src/services/pages/index.ts +++ b/modules/persistence/src/services/pages/index.ts @@ -269,7 +269,12 @@ const updatePages = async (pages: Page[], collection: string, githubUser: string try { // Find all pages that share the same project name + branch. Expects page IDs // to include these two properties after parse - const pageIdPrefix = pages[0].page_id.split('/').slice(0, 3).join('/'); + const pageIdArr = pages[0].page_id.split('/').slice(0, 3); + if (pageIdArr[1] === 'buildbot') { + pageIdArr[1] = 'docsworker-xlarge'; + } + const pageIdPrefix = pageIdArr.join('/'); + const previousPagesCursor = await findPrevPageDocs(pageIdPrefix, collection, githubUser); const { mapping: prevPageDocsMapping, pageIds: prevPageIds } = await createPageAstMapping(previousPagesCursor); From 0065d39a87412ba2dbc4222a09b2694456813cb8 Mon Sep 17 00:00:00 2001 From: anabellabuckvar <41971124+anabellabuckvar@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:28:57 -0800 Subject: [PATCH 2/6] DOP-5395 add comments --- modules/persistence/src/services/pages/index.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/persistence/src/services/pages/index.ts b/modules/persistence/src/services/pages/index.ts index 7ca095401..366c826a0 100644 --- a/modules/persistence/src/services/pages/index.ts +++ b/modules/persistence/src/services/pages/index.ts @@ -267,14 +267,16 @@ const updatePages = async (pages: Page[], collection: string, githubUser: string console.time(timerLabel); try { - // Find all pages that share the same project name + branch. Expects page IDs - // to include these two properties after parse + // TEMPORARY FIX FOR NETLIFY BUILDS + // TODO: DOP-5405 remove parser user from page id const pageIdArr = pages[0].page_id.split('/').slice(0, 3); if (pageIdArr[1] === 'buildbot') { pageIdArr[1] = 'docsworker-xlarge'; } const pageIdPrefix = pageIdArr.join('/'); + // Find all pages that share the same project name + branch. Expects page IDs + // to include these two properties after parse const previousPagesCursor = await findPrevPageDocs(pageIdPrefix, collection, githubUser); const { mapping: prevPageDocsMapping, pageIds: prevPageIds } = await createPageAstMapping(previousPagesCursor); From 021068ae84d637c229e9423354aa3791f4839a5c Mon Sep 17 00:00:00 2001 From: anabellabuckvar <41971124+anabellabuckvar@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:50:19 -0800 Subject: [PATCH 3/6] DOP-5395 use replace --- modules/persistence/src/services/pages/index.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/persistence/src/services/pages/index.ts b/modules/persistence/src/services/pages/index.ts index 366c826a0..0b81529ec 100644 --- a/modules/persistence/src/services/pages/index.ts +++ b/modules/persistence/src/services/pages/index.ts @@ -269,11 +269,7 @@ const updatePages = async (pages: Page[], collection: string, githubUser: string try { // TEMPORARY FIX FOR NETLIFY BUILDS // TODO: DOP-5405 remove parser user from page id - const pageIdArr = pages[0].page_id.split('/').slice(0, 3); - if (pageIdArr[1] === 'buildbot') { - pageIdArr[1] = 'docsworker-xlarge'; - } - const pageIdPrefix = pageIdArr.join('/'); + const pageIdPrefix = pages[0].page_id.split('/').slice(0, 3).join('/').replace('buildbot', 'docsworker-xlarge'); // Find all pages that share the same project name + branch. Expects page IDs // to include these two properties after parse From 6a48bd4dfc03349da72f42a174fa80d594be0c88 Mon Sep 17 00:00:00 2001 From: anabellabuckvar <41971124+anabellabuckvar@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:28:49 -0800 Subject: [PATCH 4/6] DOP-5395 replace parser user for every page id in persistence module --- modules/persistence/src/services/pages/index.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/persistence/src/services/pages/index.ts b/modules/persistence/src/services/pages/index.ts index 0b81529ec..eada4771c 100644 --- a/modules/persistence/src/services/pages/index.ts +++ b/modules/persistence/src/services/pages/index.ts @@ -267,9 +267,7 @@ const updatePages = async (pages: Page[], collection: string, githubUser: string console.time(timerLabel); try { - // TEMPORARY FIX FOR NETLIFY BUILDS - // TODO: DOP-5405 remove parser user from page id - const pageIdPrefix = pages[0].page_id.split('/').slice(0, 3).join('/').replace('buildbot', 'docsworker-xlarge'); + const pageIdPrefix = pages[0].page_id.split('/').slice(0, 3).join('/'); // Find all pages that share the same project name + branch. Expects page IDs // to include these two properties after parse @@ -303,6 +301,13 @@ const updatePages = async (pages: Page[], collection: string, githubUser: string export const insertAndUpdatePages = async (buildId: ObjectId, zip: AdmZip, githubUser: string) => { try { const pages = pagesFromZip(zip, githubUser); + + // TEMPORARY FIX FOR NETLIFY BUILDS + // TODO: DOP-5405 remove parser user from page id altogether + for (const page of pages) { + page.page_id = page.page_id.replace('buildbot', 'docsworker-xlarge'); + } + const ops: PromiseLike[] = [insert(pages, COLLECTION_NAME, buildId, true)]; const featureEnabled = process.env.FEATURE_FLAG_UPDATE_PAGES; From 483c2d9db683bb7f90523db8e824e5fcd10e5840 Mon Sep 17 00:00:00 2001 From: anabellabuckvar <41971124+anabellabuckvar@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:30:39 -0800 Subject: [PATCH 5/6] DOP-5395 lint --- modules/persistence/src/services/pages/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/persistence/src/services/pages/index.ts b/modules/persistence/src/services/pages/index.ts index eada4771c..8ffcf9fd7 100644 --- a/modules/persistence/src/services/pages/index.ts +++ b/modules/persistence/src/services/pages/index.ts @@ -267,10 +267,9 @@ const updatePages = async (pages: Page[], collection: string, githubUser: string console.time(timerLabel); try { - const pageIdPrefix = pages[0].page_id.split('/').slice(0, 3).join('/'); - // Find all pages that share the same project name + branch. Expects page IDs // to include these two properties after parse + const pageIdPrefix = pages[0].page_id.split('/').slice(0, 3).join('/'); const previousPagesCursor = await findPrevPageDocs(pageIdPrefix, collection, githubUser); const { mapping: prevPageDocsMapping, pageIds: prevPageIds } = await createPageAstMapping(previousPagesCursor); From 04c16b3377fb1eb398dfc39f8f2cadf101c022f1 Mon Sep 17 00:00:00 2001 From: anabellabuckvar <41971124+anabellabuckvar@users.noreply.github.com> Date: Fri, 14 Feb 2025 07:38:15 -0800 Subject: [PATCH 6/6] DOP-5395 remove unecessary replace for page id prefix --- modules/persistence/src/services/pages/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/persistence/src/services/pages/index.ts b/modules/persistence/src/services/pages/index.ts index ef5f47753..8ffcf9fd7 100644 --- a/modules/persistence/src/services/pages/index.ts +++ b/modules/persistence/src/services/pages/index.ts @@ -267,12 +267,9 @@ const updatePages = async (pages: Page[], collection: string, githubUser: string console.time(timerLabel); try { - // TEMPORARY FIX FOR NETLIFY BUILDS - // TODO: DOP-5405 remove parser user from page id - const pageIdPrefix = pages[0].page_id.split('/').slice(0, 3).join('/').replace('buildbot', 'docsworker-xlarge'); - // Find all pages that share the same project name + branch. Expects page IDs // to include these two properties after parse + const pageIdPrefix = pages[0].page_id.split('/').slice(0, 3).join('/'); const previousPagesCursor = await findPrevPageDocs(pageIdPrefix, collection, githubUser); const { mapping: prevPageDocsMapping, pageIds: prevPageIds } = await createPageAstMapping(previousPagesCursor);