chore: update sporadically failing tests, upgrade tigerbeetle (interl…

…edger#1541) * test(auth): update sporadically failing tests * test: update base jest config to use workerThreads * test: update tigerbeetle * chore: update tigerbeetle in docker compose & helm
Muasa-harman · Jul 13, 2023 · 4bdfcb8 · 4bdfcb8
1 parent d8120f0
commit 4bdfcb8
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 25 deletions.
diff --git a/infrastructure/helm/tigerbeetle/values.yaml b/infrastructure/helm/tigerbeetle/values.yaml
@@ -23,10 +23,10 @@ statefulset:
   clusterId: "0"
 
   image:
-    repository: ghcr.io/tigerbeetledb/tigerbeetle@sha256
+    repository: ghcr.io/tigerbeetledb/tigerbeetle
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "3e2954cba78e17db42013e56fd9850a6047f7caa6f30dd7c46ff932c809af10c"
+    tag: "0.13.38"
 
   proxyImage:
     repository: nginx

diff --git a/jest.config.base.js b/jest.config.base.js
@@ -6,5 +6,6 @@ module.exports = {
   },
   testEnvironment: 'node',
   moduleDirectories: ['node_modules', './'],
-  modulePaths: ['node_modules', './']
+  modulePaths: ['node_modules', './'],
+  workerThreads: true
 }
diff --git a/localenv/tigerbeetle/docker-compose.yml b/localenv/tigerbeetle/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   tigerbeetle:
     env_file:
       - ../tigerbeetle/.env.tigerbeetle
-    image: ghcr.io/tigerbeetledb/tigerbeetle@sha256:3e2954cba78e17db42013e56fd9850a6047f7caa6f30dd7c46ff932c809af10c
+    image: ghcr.io/tigerbeetle/tigerbeetle:0.13.38
     privileged: true
     volumes:
       - tigerbeetle-data:/var/lib/tigerbeetle

diff --git a/packages/auth/src/grant/service.test.ts b/packages/auth/src/grant/service.test.ts
@@ -288,15 +288,23 @@ describe('Grant Service', (): void => {
   })
 
   describe('getGrantsPage', (): void => {
-    let grants: Grant[] | undefined
+    let grants: Grant[] = []
     const paymentPointer = 'example.com/test'
+
     beforeEach(async () => {
-      grants = await Promise.all(
-        [paymentPointer, paymentPointer, 'example.com/test3'].map(
-          async (identifier) => createGrant(deps, identifier)
-        )
-      )
+      for (const identifier of [
+        paymentPointer,
+        paymentPointer,
+        'example.com/test3'
+      ]) {
+        grants.push(await createGrant(deps, { identifier }))
+      }
     })
+
+    afterEach(async () => {
+      grants = []
+    })
+
     test('No filter gets all', async (): Promise<void> => {
       const grants = await grantService.getPage()
       const allGrants = await Grant.query()

diff --git a/packages/auth/src/graphql/resolvers/grant.test.ts b/packages/auth/src/graphql/resolvers/grant.test.ts
@@ -89,7 +89,7 @@ describe('Grant Resolvers', (): void => {
       const grants: GrantModel[] = []
       const identifier = 'https://example.com/test'
       for (let i = 0; i < 2; i++) {
-        const grant = await createGrant(deps, identifier)
+        const grant = await createGrant(deps, { identifier })
         grants.push(grant)
       }
 

diff --git a/packages/auth/src/tests/grant.ts b/packages/auth/src/tests/grant.ts
@@ -1,5 +1,4 @@
 import { faker } from '@faker-js/faker'
-import { v4 as uuid } from 'uuid'
 import { FinishMethod, Grant, StartMethod } from '../grant/model'
 import { generateNonce } from '../shared/utils'
 import { AccessAction, AccessType } from '@interledger/open-payments'
@@ -8,13 +7,13 @@ import { AppServices } from '../app'
 
 export async function createGrant(
   deps: IocContract<AppServices>,
-  identifier?: string
+  options?: { identifier?: string }
 ): Promise<Grant> {
   const grantService = await deps.use('grantService')
   const CLIENT = faker.internet.url({ appendSlash: false })
   const BASE_GRANT_ACCESS = {
     actions: [AccessAction.Create, AccessAction.Read, AccessAction.List],
-    identifier: identifier ?? `https://example.com/${uuid()}`
+    identifier: options?.identifier
   }
 
   const BASE_GRANT_REQUEST = {

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -86,7 +86,7 @@
     "pino": "^8.14.1",
     "pino-pretty": "^10.0.0",
     "raw-body": "^2.5.2",
-    "tigerbeetle-node": "^0.12.76",
+    "tigerbeetle-node": "^0.13.38",
     "token-introspection": "workspace:../token-introspection",
     "uuid": "^9.0.0"
   }

diff --git a/packages/backend/src/tests/tigerbeetle.ts b/packages/backend/src/tests/tigerbeetle.ts
@@ -15,10 +15,9 @@ export async function startTigerbeetleContainer(clusterId?: number): Promise<{
   const tigerbeetleClusterId = clusterId || Config.tigerbeetleClusterId
   const { name: tigerbeetleDir } = tmp.dirSync({ unsafeCleanup: true })
   const tigerbeetleFile = `cluster_${tigerbeetleClusterId}_replica_0_test.tigerbeetle`
+  const tigerbeetleContainerVersion = 'ghcr.io/tigerbeetle/tigerbeetle:0.13.38'
 
-  const tbContFormat = await new GenericContainer(
-    'ghcr.io/tigerbeetledb/tigerbeetle@sha256:3e2954cba78e17db42013e56fd9850a6047f7caa6f30dd7c46ff932c809af10c'
-  )
+  const tbContFormat = await new GenericContainer(tigerbeetleContainerVersion)
     .withExposedPorts(TIGERBEETLE_PORT)
     .withBindMounts([
       {
@@ -49,9 +48,7 @@ export async function startTigerbeetleContainer(clusterId?: number): Promise<{
       .on('end', () => console.log('Stream closed for [tb-format]'))
   }
 
-  const tbContStart = await new GenericContainer(
-    'ghcr.io/tigerbeetledb/tigerbeetle@sha256:3e2954cba78e17db42013e56fd9850a6047f7caa6f30dd7c46ff932c809af10c'
-  )
+  const tbContStart = await new GenericContainer(tigerbeetleContainerVersion)
     .withExposedPorts(TIGERBEETLE_PORT)
     .withBindMounts([
       {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml