chore(test-utils): update tescontainers lib and fix

tresdoce · Aug 14, 2023 · eed3427 · eed3427
1 parent ad72205
commit eed3427
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     ]
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.378.0",
+    "@aws-sdk/client-dynamodb": "^3.391.0",
     "@nestjs/axios": "^3.0.0",
     "@nestjs/class-validator": "^0.13.3",
     "@nestjs/common": "^10.1.2",
@@ -85,7 +85,7 @@
     "redis": "^4.6.7",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.5.5",
-    "testcontainers": "^9.12.0",
+    "testcontainers": "^10.2.1",
     "typeorm": "^0.3.17",
     "uuid": "^9.0.0"
   },
@@ -127,19 +127,19 @@
     "@types/pug": "^2.0.6",
     "@types/supertest": "^2.0.11",
     "@types/uuid": "^9.0.2",
-    "@typescript-eslint/eslint-plugin": "^6.3.0",
-    "@typescript-eslint/parser": "^6.3.0",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "@typescript-eslint/parser": "^6.4.0",
     "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
     "husky": "^8.0.3",
     "jest": "^29.6.2",
     "jest-extended": "^4.0.1",
     "jest-junit": "^16.0.0",
     "jest-mock-extended": "^3.0.1",
     "jest-sonar-reporter": "^2.0.0",
     "lerna": "^4.0.0",
-    "lint-staged": "^13.2.1",
+    "lint-staged": "^14.0.0",
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",
     "mochawesome-merge": "^4.3.0",
@@ -149,7 +149,7 @@
     "prettier": "^3.0.0",
     "rimraf": "^5.0.1",
     "supertest": "^6.2.2",
-    "testcontainers": "^9.12.0",
+    "testcontainers": "^10.2.1",
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.4",
     "ts-node": "^10.9.1",

diff --git a/packages/dynamoose/package.json b/packages/dynamoose/package.json
@@ -37,7 +37,7 @@
     "directory": "../../dist/dynamoose"
   },
   "peerDependencies": {
-    "@aws-sdk/client-dynamodb": "^3.378.0",
+    "@aws-sdk/client-dynamodb": "^3.391.0",
     "@nestjs/common": "^10.1.2",
     "@nestjs/core": "^10.1.2",
     "@nestjs/platform-express": "^10.1.2",
@@ -47,7 +47,7 @@
     "rxjs": "^7.5.5"
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.378.0",
+    "@aws-sdk/client-dynamodb": "^3.391.0",
     "dynamoose": "^3.2.0",
     "dynamoose-logger": "^3.2.0"
   },

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -41,10 +41,10 @@
     "@nestjs/platform-express": "^10.1.2",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.5.5",
-    "testcontainers": "^9.12.0"
+    "testcontainers": "^10.2.1"
   },
   "dependencies": {
-    "testcontainers": "^9.12.0"
+    "testcontainers": "^10.2.1"
   },
   "devDependencies": {
     "@tresdoce-nestjs-toolkit/config": "^0.3.1",

diff --git a/packages/test-utils/src/__test__/testcontainer.spec.ts b/packages/test-utils/src/__test__/testcontainer.spec.ts
@@ -1,6 +1,5 @@
 import { testContainers } from '../testcontainers';
-import { StartedGenericContainer } from 'testcontainers/dist/src/generic-container/started-generic-container';
-
+import { StartedGenericContainer } from 'testcontainers/build/generic-container/started-generic-container';
 import {
   TCRedisOptions,
   TCDynamoDBOptions,

diff --git a/packages/test-utils/src/testcontainers/globalTestContainersTD.ts b/packages/test-utils/src/testcontainers/globalTestContainersTD.ts
@@ -1,6 +1,5 @@
-import { DockerComposeEnvironment } from 'testcontainers';
-import { DockerComposeDownOptions } from 'testcontainers/dist/src/docker-compose/docker-compose-options';
-import { StartedDockerComposeEnvironment } from 'testcontainers/dist/src/docker-compose-environment/started-docker-compose-environment';
+import { DockerComposeEnvironment, StartedDockerComposeEnvironment } from 'testcontainers';
+import { ComposeDownOptions } from 'testcontainers/build/container-runtime';
 import _ from 'lodash';
 
 let environment: StartedDockerComposeEnvironment;
@@ -29,7 +28,7 @@ export const initDockerCompose = (
   };
 };
 
-export const closeDockerCompose = (_options?: Partial<DockerComposeDownOptions>) => {
+export const closeDockerCompose = (_options?: Partial<ComposeDownOptions>) => {
   return async (): Promise<void> => {
     console.info('🐳 Terminate docker-compose...');
     try {

diff --git a/packages/test-utils/src/testcontainers/testContainersTD.ts b/packages/test-utils/src/testcontainers/testContainersTD.ts
@@ -1,6 +1,11 @@
-import { GenericContainer, StartedTestContainer, TestContainer, Wait } from 'testcontainers';
-import { RandomUuid } from 'testcontainers/dist/src/uuid';
-import { StopOptions } from 'testcontainers/dist/src/test-container';
+import {
+  GenericContainer,
+  RandomUuid,
+  StartedTestContainer,
+  StopOptions,
+  TestContainer,
+  Wait,
+} from 'testcontainers';
 import _ from 'lodash';
 
 import { ITestContainerOptions, Env } from './types';
@@ -23,6 +28,7 @@ export default class TestContainersTD {
   /**
    * Get instance
    */
+
   /* istanbul ignore next */
   public static getInstance(_image?: string, _options?: ITestContainerOptions): TestContainersTD {
     return (
@@ -119,6 +125,7 @@ export default class TestContainersTD {
   /**
    * Get envs
    */
+
   /* istanbul ignore next */
   public getEnvs(): Env {
     return _.has(this._options, 'envs') ? this._options.envs : null;

diff --git a/packages/test-utils/src/testcontainers/types.ts b/packages/test-utils/src/testcontainers/types.ts
@@ -1,4 +1,4 @@
-import { PortWithOptionalBinding } from 'testcontainers/dist/src/port';
+import { PortWithOptionalBinding } from 'testcontainers/build/utils/port';
 
 export declare type Env = {
   [key in string]: any;