From 10f30df63cc3d3137e1a115f11e7d2de9ca66e91 Mon Sep 17 00:00:00 2001 From: Cassidy Schaufele Date: Wed, 13 Dec 2023 15:34:35 -0700 Subject: [PATCH 1/4] Update Dockerfiles --- Dockerfile | 4 ++-- Dockerfile.enhanced | 4 ++-- Dockerfile.local | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9a05f4441..487b99286 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,8 @@ RUN cd ./modules/oas-page-builder \ # where repo work will happen FROM ubuntu:20.04 ARG WORK_DIRECTORY=/home/docsworker-xlarge -ARG SNOOTY_PARSER_VERSION=0.15.0 -ARG SNOOTY_FRONTEND_VERSION=0.15.1.1c +ARG SNOOTY_PARSER_VERSION=0.15.1 +ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 ARG REDOC_CLI_VERSION=1.2.2 ARG NPM_BASE_64_AUTH diff --git a/Dockerfile.enhanced b/Dockerfile.enhanced index 6d8c6895a..3c22e71cc 100644 --- a/Dockerfile.enhanced +++ b/Dockerfile.enhanced @@ -22,8 +22,8 @@ RUN cd ./modules/oas-page-builder \ # where repo work will happen FROM ubuntu:20.04 ARG WORK_DIRECTORY=/home/docsworker-xlarge -ARG SNOOTY_PARSER_VERSION=0.15.0 -ARG SNOOTY_FRONTEND_VERSION=0.15.1.1c +ARG SNOOTY_PARSER_VERSION=0.15.1 +ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 ARG REDOC_CLI_VERSION=1.2.2 ARG NPM_BASE_64_AUTH diff --git a/Dockerfile.local b/Dockerfile.local index f1eaa1faf..d5cd2779b 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,8 +1,8 @@ FROM arm64v8/ubuntu:20.04 ARG NPM_BASE_64_AUTH ARG NPM_EMAIL -ARG SNOOTY_PARSER_VERSION=0.15.0 -ARG SNOOTY_FRONTEND_VERSION=0.15.1.1c +ARG SNOOTY_PARSER_VERSION=0.15.1 +ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 ARG REDOC_CLI_VERSION=1.2.2 ARG NPM_BASE_64_AUTH From 1db8b734c6b4c3d831f205e27d42abfd2a5bd294 Mon Sep 17 00:00:00 2001 From: Cassidy Schaufele Date: Thu, 14 Dec 2023 08:52:11 -0700 Subject: [PATCH 2/4] DOP-4201: Increase redundancy limit on metadata (#952) * DOP-4201: Increase retention limit to 50 metadata entries * DOP-4201: Update deletion test * fixup --- modules/persistence/src/services/metadata/index.ts | 2 +- modules/persistence/tests/metadata/metadata.test.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/persistence/src/services/metadata/index.ts b/modules/persistence/src/services/metadata/index.ts index 74fdac5eb..ef35a9b81 100644 --- a/modules/persistence/src/services/metadata/index.ts +++ b/modules/persistence/src/services/metadata/index.ts @@ -82,7 +82,7 @@ export const insertMergedMetadataEntries = async (buildId: ObjectId, metadata: M export const deleteStaleMetadata = async (metadata: Metadata) => { try { const { project, branch } = metadata; - const LIMIT = 4; + const LIMIT = 49; // get most recent metadata for this project-branch const snooty = await db(); const entries = await snooty diff --git a/modules/persistence/tests/metadata/metadata.test.ts b/modules/persistence/tests/metadata/metadata.test.ts index 8f8fb555b..ec064d752 100644 --- a/modules/persistence/tests/metadata/metadata.test.ts +++ b/modules/persistence/tests/metadata/metadata.test.ts @@ -71,7 +71,7 @@ describe('metadata module', () => { describe('deleteStaleMetadata', () => { // upserting data const testData: Document[] = []; - for (let idx = 0; idx < 10; idx++) { + for (let idx = 0; idx < 100; idx++) { const buildId = new ObjectId(); const testDoc = { ...meta, @@ -95,9 +95,9 @@ describe('metadata module', () => { _id: -1, }) .toArray(); - expect(res.length).toEqual(4); + expect(res.length).toEqual(49); for (let idx = 0; idx < res.length; idx++) { - expect(res[idx].idx).toEqual(9 - idx); + expect(res[idx].idx).toEqual(99 - idx); } }); }); From 09a28aa11e94e00381913ec0c0a4124c047e393f Mon Sep 17 00:00:00 2001 From: rayangler <27821750+rayangler@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:56:06 -0500 Subject: [PATCH 3/4] Update REDOC_CLI_VERSION --- Dockerfile | 2 +- Dockerfile.enhanced | 2 +- Dockerfile.local | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 487b99286..b24b8d1a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ ARG WORK_DIRECTORY=/home/docsworker-xlarge ARG SNOOTY_PARSER_VERSION=0.15.1 ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 -ARG REDOC_CLI_VERSION=1.2.2 +ARG REDOC_CLI_VERSION=1.2.3 ARG NPM_BASE_64_AUTH ARG NPM_EMAIL ENV DEBIAN_FRONTEND=noninteractive diff --git a/Dockerfile.enhanced b/Dockerfile.enhanced index 3c22e71cc..5beed4aa4 100644 --- a/Dockerfile.enhanced +++ b/Dockerfile.enhanced @@ -25,7 +25,7 @@ ARG WORK_DIRECTORY=/home/docsworker-xlarge ARG SNOOTY_PARSER_VERSION=0.15.1 ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 -ARG REDOC_CLI_VERSION=1.2.2 +ARG REDOC_CLI_VERSION=1.2.3 ARG NPM_BASE_64_AUTH ARG NPM_EMAIL ENV DEBIAN_FRONTEND=noninteractive diff --git a/Dockerfile.local b/Dockerfile.local index d5cd2779b..ad5e1e284 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -4,7 +4,7 @@ ARG NPM_EMAIL ARG SNOOTY_PARSER_VERSION=0.15.1 ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 -ARG REDOC_CLI_VERSION=1.2.2 +ARG REDOC_CLI_VERSION=1.2.3 ARG NPM_BASE_64_AUTH ARG NPM_EMAIL ENV DEBIAN_FRONTEND=noninteractive From c15b72c82c6b7ddab666fbb351132f0011c70dd4 Mon Sep 17 00:00:00 2001 From: Cassidy Schaufele Date: Thu, 14 Dec 2023 15:34:42 -0700 Subject: [PATCH 4/4] Rollback Parser Version to 0.15.0 --- Dockerfile | 2 +- Dockerfile.enhanced | 2 +- Dockerfile.local | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b24b8d1a8..b69db3e88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN cd ./modules/oas-page-builder \ # where repo work will happen FROM ubuntu:20.04 ARG WORK_DIRECTORY=/home/docsworker-xlarge -ARG SNOOTY_PARSER_VERSION=0.15.1 +ARG SNOOTY_PARSER_VERSION=0.15.0 ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 ARG REDOC_CLI_VERSION=1.2.3 diff --git a/Dockerfile.enhanced b/Dockerfile.enhanced index 5beed4aa4..7f3f0c0cf 100644 --- a/Dockerfile.enhanced +++ b/Dockerfile.enhanced @@ -22,7 +22,7 @@ RUN cd ./modules/oas-page-builder \ # where repo work will happen FROM ubuntu:20.04 ARG WORK_DIRECTORY=/home/docsworker-xlarge -ARG SNOOTY_PARSER_VERSION=0.15.1 +ARG SNOOTY_PARSER_VERSION=0.15.0 ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 ARG REDOC_CLI_VERSION=1.2.3 diff --git a/Dockerfile.local b/Dockerfile.local index ad5e1e284..7fe85a591 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,7 +1,7 @@ FROM arm64v8/ubuntu:20.04 ARG NPM_BASE_64_AUTH ARG NPM_EMAIL -ARG SNOOTY_PARSER_VERSION=0.15.1 +ARG SNOOTY_PARSER_VERSION=0.15.0 ARG SNOOTY_FRONTEND_VERSION=0.15.2 ARG MUT_VERSION=0.10.7 ARG REDOC_CLI_VERSION=1.2.3