test(global): added test-utils

.github/actions/init-pnpm/action.yaml

@@ -0,0 +1,30 @@
+name: init-pnpm
+description: 'Initialize the repo with pnpm and install all the dependencies'
+inputs:
+  node-version:
+    description: 'Node.js version'
+    required: true
+    default: 24.x
+runs:
+  using: composite
+  steps:
+    - name: Cache turbo build
+      uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
+      with:
+        path: .turbo
+        key: ${{ runner.os }}-turbo-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-turbo-
+    - name: Set up pnpm
+      uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+    - name: Set up Node.js
+      uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
+      with:
+        node-version: ${{ inputs.node-version }}
+        cache: 'pnpm'
+    - name: Install TS Project dependencies
+      shell: bash
+      run: pnpm install
+    - name: build
+      shell: bash
+      run: pnpm run build

apps/auth-cron/package.json

@@ -33,33 +33,34 @@
     "url": "https://github.com/MapColonies/opa-la/issues"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.317.0",
+    "@aws-sdk/client-s3": "catalog:",
     "@godaddy/terminus": "^4.12.0",
     "@map-colonies/auth-bundler": "workspace:^",
     "@map-colonies/auth-core": "workspace:^",
-    "@map-colonies/config": "^4.0.1",
+    "@map-colonies/config": "catalog:",
     "@map-colonies/js-logger": "catalog:",
-    "@map-colonies/schemas": "^1.9.0",
+    "@map-colonies/schemas": "catalog:",
     "@map-colonies/telemetry": "^10.0.1",
     "@opentelemetry/api": "^1.9.0",
     "croner": "6.0.3",
     "express": "^5.1.0",
     "http-status-codes": "^2.2.0",
     "pg": "^8.10.0",
     "prom-client": "^15.1.3",
-    "typeorm": "^0.3.12"
+    "typeorm": "catalog:"
   },
   "devDependencies": {
     "@types/node": "catalog:",
     "@types/express": "^4.17.17",
-    "copyfiles": "^2.4.1",
     "jest-extended": "catalog:",
+    "test-utils": "workspace:^",
     "ts-node": "^10.9.1",
     "typescript": "catalog:",
     "@types/lodash": "^4.17.24",
     "vitest": "catalog:",
     "@vitest/coverage-v8": "catalog:",
     "@vitest/ui": "catalog:",
-    "@map-colonies/vitest-utils": "catalog:"
+    "@map-colonies/vitest-utils": "catalog:",
+    "@map-colonies/eslint-config": "catalog:"
   }
 }

apps/auth-cron/tests/configurations/vitest.globalSetup.mts

@@ -0,0 +1,32 @@
+import path from 'node:path';
+import type { TestProject } from 'vitest/node';
+import { createMinioContainer, createS3Client, createAndProvideTempDir, removeTempDir, mergeTestConfig, ensureBucketExists } from 'test-utils';
+import { getConfig, initConfig } from '@src/config.js';
+
+export async function setup(project: TestProject): Promise<void> {
+  await createAndProvideTempDir('authcrontests', project);
+  await initConfig(true);
+  const configInstance = getConfig();
+  const cronOptions = configInstance.get('cron.np');
+
+  const container = await createMinioContainer({
+    username: cronOptions?.s3.accessKeyId as string,
+    password: cronOptions?.s3.secretAccessKey as string,
+  });
+
+  const endpoint = `http://${container.getHost()}:${container.getPort()}`;
+
+  await mergeTestConfig(path.join(__dirname, '../../config'), { 'cron.np.s3.endpoint': endpoint, 'cron.prod.s3.endpoint': endpoint });
+
+  const client = createS3Client({
+    endpoint,
+    accessKeyId: cronOptions?.s3.accessKeyId as string,
+    secretAccessKey: cronOptions?.s3.secretAccessKey as string,
+  });
+
+  await ensureBucketExists(client, cronOptions?.s3.bucket as string);
+}
+
+export async function teardown(): Promise<void> {
+  await removeTempDir('authcrontests');
+}

apps/auth-cron/tests/s3.spec.ts → apps/auth-cron/tests/s3.spec.mts

@@ -10,9 +10,9 @@ import type { Environments } from '@map-colonies/auth-core';
 import { Environment } from '@map-colonies/auth-core';
 import type { infraOpalaCronV1Type } from '@map-colonies/schemas';
 import { jsLogger } from '@map-colonies/js-logger';
-import { initConfig, getConfig } from '@src/config';
-import { getS3Client } from '@src/s3';
-import type * as appConfig from '@src/config';
+import { initConfig, getConfig } from '@src/config.js';
+import { getS3Client } from '@src/s3.js';
+import type * as appConfig from '@src/config.js';
 
 vi.mock('../src/telemetry/logger', () => {
   return {

apps/auth-cron/tests/util.spec.ts → apps/auth-cron/tests/util.spec.mts

@@ -1,12 +1,11 @@
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
 import path from 'node:path';
 import type { BundleContentVersions } from '@map-colonies/auth-bundler';
 import { describe, expect, it, vi } from 'vitest';
 import type { Bundle } from '@map-colonies/auth-core';
+import { getFakeBundle, getTempDir } from 'test-utils';
 import { jsLogger } from '@map-colonies/js-logger';
-import { compareVersionsToBundle, emptyDir } from '@src/util';
-import { getFakeBundle } from './utils/bundle';
+import { compareVersionsToBundle, emptyDir } from '@src/util.js';
 
 vi.mock('../src/telemetry/logger', () => {
   return {
@@ -19,7 +18,7 @@ vi.mock('../src/telemetry/logger', () => {
 describe('util.ts', function () {
   describe('#emptyDir', function () {
     it('should empty the dir', async function () {
-      const folderPath = path.join(tmpdir(), 'authcrontests', 'empty');
+      const folderPath = path.join(getTempDir(), 'empty');
       mkdirSync(folderPath);
       writeFileSync(path.join(folderPath, 'file.txt'), 'data');
 

apps/auth-cron/vitest.config.mts

@@ -7,9 +7,9 @@ export default defineConfig({
     alias: getPathAlias(tsconfig, __dirname),
   },
   test: {
-    globalSetup: './tests/configurations/vitest.globalSetup.ts',
+    globalSetup: './tests/configurations/vitest.globalSetup.mts',
     setupFiles: ['@map-colonies/vitest-utils/extended'],
-    include: ['tests/**/*.spec.ts'],
+    include: ['tests/**/*.spec.{ts,mts}'],
     environment: 'node',
     reporters,
     coverage: {

apps/auth-manager/package.json

@@ -42,13 +42,13 @@
   "dependencies": {
     "@godaddy/terminus": "^4.11.2",
     "@map-colonies/auth-core": "workspace:^",
-    "@map-colonies/config": "^3.0.1",
+    "@map-colonies/config": "catalog:",
     "@map-colonies/error-express-handler": "^2.1.0",
     "@map-colonies/express-access-log-middleware": "^4.1.0",
     "@map-colonies/js-logger": "catalog:",
     "@map-colonies/openapi-express-viewer": "^3.0.0",
     "@map-colonies/read-pkg": "0.0.1",
-    "@map-colonies/schemas": "^1.9.0",
+    "@map-colonies/schemas": "catalog:",
     "@map-colonies/telemetry": "^10.0.1",
     "@opentelemetry/api": "^1.9.0",
     "body-parser": "^2.2.2",
@@ -63,11 +63,12 @@
     "prom-client": "^15.1.3",
     "reflect-metadata": "^0.2.2",
     "tsyringe": "^4.9.1",
-    "typeorm": "^0.3.12"
+    "typeorm": "catalog:"
   },
   "devDependencies": {
     "@map-colonies/openapi-helpers": "^2.0.0",
     "@map-colonies/tsconfig": "catalog:",
+    "test-utils": "workspace:^",
     "@types/body-parser": "1.19.6",
     "@types/compression": "^1.7.2",
     "@types/cors": "^2.8.17",
@@ -78,14 +79,15 @@
     "@types/supertest": "^6.0.3",
     "@vitest/coverage-v8": "catalog:",
     "@vitest/ui": "catalog:",
-    "copyfiles": "^2.4.1",
     "jest-extended": "catalog:",
     "jest-openapi": "^0.14.2",
     "supertest": "^7.1.0",
     "ts-node": "^10.9.1",
     "type-fest": "^4.40.0",
     "typescript": "catalog:",
     "vitest": "catalog:",
-    "@map-colonies/vitest-utils": "catalog:"
+    "@map-colonies/vitest-utils": "catalog:",
+    "@map-colonies/eslint-config": "catalog:",
+    "@faker-js/faker": "catalog:"
   }
 }

apps/auth-manager/tests/configurations/vitest.globalSetup.mts

@@ -0,0 +1,22 @@
+import 'reflect-metadata';
+import path from 'node:path';
+import { initConnection } from '@map-colonies/auth-core';
+import { createPostgresContainer, resetAndMigrate, mergeTestConfig } from 'test-utils';
+
+import { getConfig, initConfig } from '@src/common/config.js';
+
+export async function setup(): Promise<void> {
+  await initConfig(true);
+  const dataSourceOptions = getConfig().get('db');
+
+  const container = await createPostgresContainer({
+    username: dataSourceOptions.username,
+    database: dataSourceOptions.database,
+    password: dataSourceOptions.password,
+  });
+
+  const connection = await initConnection({ ...dataSourceOptions });
+  await mergeTestConfig(path.join(__dirname, '../../config'), { port: container.getPort() });
+
+  await resetAndMigrate(connection, dataSourceOptions.schema);
+}

apps/auth-manager/tests/integration/asset/asset.spec.ts → apps/auth-manager/tests/integration/asset/asset.spec.mts

@@ -11,12 +11,12 @@ import { Asset, AssetType, Environment } from '@map-colonies/auth-core';
 import { faker } from '@faker-js/faker';
 import type { RequestSender } from '@map-colonies/openapi-helpers/requestSender';
 import { createRequestSender } from '@map-colonies/openapi-helpers/requestSender';
+import { getFakeAsset } from 'test-utils';
 import type { paths, operations } from '@openapi';
-import { getApp } from '@src/app';
-import { SERVICES } from '@common/constants';
-import type { AssetRepository } from '@src/asset/DAL/assetRepository';
-import { getFakeAsset } from '@tests/utils/asset';
-import { initConfig } from '@common/config';
+import type { AssetRepository } from '@src/asset/DAL/assetRepository.js';
+import { getApp } from '@src/app.js';
+import { SERVICES } from '@common/constants.js';
+import { initConfig } from '@common/config.js';
 
 describe('client', function () {
   let requestSender: RequestSender<paths, operations>;

apps/auth-manager/tests/integration/bundle/bundle.spec.ts → apps/auth-manager/tests/integration/bundle/bundle.spec.mts

@@ -12,11 +12,11 @@ import { Bundle, Environment } from '@map-colonies/auth-core';
 import 'jest-openapi';
 import type { RequestSender } from '@map-colonies/openapi-helpers/requestSender';
 import { createRequestSender } from '@map-colonies/openapi-helpers/requestSender';
+import { getFakeBundle } from 'test-utils';
 import type { paths, operations } from '@openapi';
-import { getApp } from '@src/app';
-import { SERVICES } from '@common/constants';
-import { getFakeBundle } from '@tests/utils/bundle';
-import { initConfig } from '@common/config';
+import { getApp } from '@src/app.js';
+import { SERVICES } from '@common/constants.js';
+import { initConfig } from '@common/config.js';
 
 describe('bundle', function () {
   let requestSender: RequestSender<paths, operations>;

apps/auth-manager/tests/integration/client/client.spec.ts → apps/auth-manager/tests/integration/client/client.spec.mts

@@ -11,12 +11,12 @@ import type { IClient } from '@map-colonies/auth-core';
 import { Client } from '@map-colonies/auth-core';
 import type { RequestSender } from '@map-colonies/openapi-helpers/requestSender';
 import { createRequestSender } from '@map-colonies/openapi-helpers/requestSender';
+import { getFakeClient } from 'test-utils';
 import type { paths, operations } from '@openapi';
-import { getApp } from '@src/app';
-import { SERVICES } from '@common/constants';
-import { getFakeClient } from '@tests/utils/client';
-import { initConfig } from '@common/config';
-import type { ClientRepository } from '@src/client/DAL/clientRepository';
+import { getApp } from '@src/app.js';
+import { SERVICES } from '@common/constants.js';
+import { initConfig } from '@common/config.js';
+import type { ClientRepository } from '@src/client/DAL/clientRepository.js';
 
 describe('client', function () {
   let requestSender: RequestSender<paths, operations>;

apps/auth-manager/tests/integration/connection/connection.spec.ts → apps/auth-manager/tests/integration/connection/connection.spec.mts

@@ -11,16 +11,14 @@ import { Client, Connection, Domain, Environment, Key } from '@map-colonies/auth
 import { faker } from '@faker-js/faker';
 import type { RequestSender } from '@map-colonies/openapi-helpers/requestSender';
 import { createRequestSender } from '@map-colonies/openapi-helpers/requestSender';
+import { getRealKeys, getFakeClient, getFakeConnection, getFakeIConnection } from 'test-utils';
 import type { paths, operations } from '@openapi';
-import { getApp } from '@src/app';
-import { SERVICES } from '@common/constants';
-import type { ConnectionRepository } from '@src/connection/DAL/connectionRepository';
-import { getFakeConnection, getFakeIConnection } from '@tests/utils/connection';
-import type { KeyRepository } from '@src/key/DAL/keyRepository';
-import type { DomainRepository } from '@src/domain/DAL/domainRepository';
-import { getFakeClient } from '@tests/utils/client';
-import { getRealKeys } from '@tests/utils/key';
-import { initConfig } from '@common/config';
+import { getApp } from '@src/app.js';
+import { SERVICES } from '@common/constants.js';
+import type { ConnectionRepository } from '@src/connection/DAL/connectionRepository.js';
+import type { KeyRepository } from '@src/key/DAL/keyRepository.js';
+import type { DomainRepository } from '@src/domain/DAL/domainRepository.js';
+import { initConfig } from '@common/config.js';
 
 describe('connection', function () {
   const OPENAPI_SPEC_PATH = 'openapi3.yaml'; // Path to the OpenAPI spec file