@milaboratories/pl-deployments 1.1.0 → 1.1.1

package/dist/ssh/__tests__/common-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common-utils.d.ts","sourceRoot":"","sources":["../../../src/ssh/__tests__/common-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAK3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAS1C,eAAO,MAAM,eAAe,QAAkC,CAAC;AAC/D,eAAO,MAAM,iBAAiB,QAA2C,CAAC;AAC1E,eAAO,MAAM,eAAe,QAA4D,CAAC;AACzF,eAAO,MAAM,SAAS,QAA0E,CAAC;AAEjG,wBAAsB,+BAA+B,kBAqBpD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,UAE9C;AAED,wBAAgB,YAAY,SAM3B;AAED,wBAAgB,cAAc,IAAI,MAAM,CAGvC;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB/E;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,oBAAoB;;;EAKtE;AAgBD,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,oBAAoB,EAAE,KAAK,GAAE,OAAe,GAAG,aAAa,CAY1G;AAED,wBAAsB,OAAO,CAAC,SAAS,EAAE,oBAAoB,iBAc5D"}
+{"version":3,"file":"common-utils.d.ts","sourceRoot":"","sources":["../../../src/ssh/__tests__/common-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAK3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAS1C,eAAO,MAAM,eAAe,QAAkC,CAAC;AAC/D,eAAO,MAAM,iBAAiB,QAA2C,CAAC;AAC1E,eAAO,MAAM,eAAe,QAAwE,CAAC;AACrG,eAAO,MAAM,SAAS,QAAsF,CAAC;AAE7G,wBAAsB,+BAA+B,kBAqBpD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,UAE9C;AAED,wBAAgB,YAAY,SAM3B;AAED,wBAAgB,cAAc,IAAI,MAAM,CAGvC;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoB/E;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,oBAAoB;;;EAKtE;AAgBD,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,oBAAoB,EAAE,KAAK,GAAE,OAAe,GAAG,aAAa,CAY1G;AAED,wBAAsB,OAAO,CAAC,SAAS,EAAE,oBAAoB,iBAc5D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-deployments",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "pl-version": "1.18.3",
   "description": "MiLaboratories Platforma Backend code service run wrapper",
   "types": "./dist/index.d.ts",

package/src/local/pl.test.ts

@@ -117,7 +117,7 @@ async function readTestConfig() {
 }
 
 async function prepareDirForTestConfig() {
-  const dir = upath.join(__dirname, '..', '.test');
+  const dir = upath.join(__dirname, '..', '..', '.test');
   await fs.rm(dir, { recursive: true, force: true });
   await fs.mkdir(dir);
 

package/src/ssh/__tests__/common-utils.ts

@@ -14,18 +14,18 @@ const privateKeyPath = getPathForFile('private-key.private');
 
 export const localFileUpload = getPathForFile('test-file.txt');
 export const localFileDownload = getPathForFile('test-file-download.txt');
-export const downloadsFolder = path.resolve(__dirname, '..', 'test-assets', 'downloads');
-export const recUpload = path.resolve(__dirname, '..', 'test-assets', 'downloads', 'rec-upload');
+export const downloadsFolder = path.resolve(__dirname, '..', '..', '..', 'test-assets', 'downloads');
+export const recUpload = path.resolve(__dirname, '..', '..', '..', 'test-assets', 'downloads', 'rec-upload');
 
 export async function createTestDirForRecursiveUpload() {
-  const pathBase = path.resolve(__dirname, '..', 'test-assets', 'downloads', 'rec-upload', 'sub-1');
-  const path2 = path.resolve(__dirname, '..', 'test-assets', 'downloads', 'rec-upload', 'sub-1', 'sub-1-1');
+  const pathBase = path.resolve(__dirname, '..', '..', '..', 'test-assets', 'downloads', 'rec-upload', 'sub-1');
+  const path2 = path.resolve(__dirname, '..', '..', '..', 'test-assets', 'downloads', 'rec-upload', 'sub-1', 'sub-1-1');
 
   await mkdir(pathBase, { recursive: true });
   await mkdir(path2, { recursive: true });
 
   for (let i = 0; i < 19; i++) {
-    const path2 = path.resolve(__dirname, '..', 'test-assets', 'downloads', 'rec-upload', 'sub-1', `sub-1-${i}`);
+    const path2 = path.resolve(__dirname, '..', '..', '..', 'test-assets', 'downloads', 'rec-upload', 'sub-1', `sub-1-${i}`);
     await mkdir(path2, { recursive: true });
 
     for (let i = 0; i < 3; i++) {
@@ -41,7 +41,7 @@ export async function createTestDirForRecursiveUpload() {
 }
 
 export function getPathForFile(fileName: string) {
-  return path.resolve(__dirname, '..', 'test-assets', fileName);
+  return path.resolve(__dirname, '..', '..', '..', 'test-assets', fileName);
 }
 
 export function generateKeys() {
@@ -69,7 +69,7 @@ export async function initContainer(name: string): Promise<StartedTestContainer>
 
   if (!fromCacheContainer) {
     generateKeys();
-    const container1 = await GenericContainer.fromDockerfile(path.resolve(__dirname, '..'))
+    const container1 = await GenericContainer.fromDockerfile(path.resolve(__dirname, '..', '..', '..'))
       .withCache(true)
       .build(`pl-ssh-test-container-${name}:1.0.0`, { deleteOnExit: false });
 
@@ -88,7 +88,7 @@ export function getContainerHostAndPort(container: StartedTestContainer) {
 
 function logToFile(message: string) {
   const logFileName = 'log.txt';
-  const logFilePath = path.join(__dirname, logFileName);
+  const logFilePath = path.join(__dirname, '..', '..', '..', 'test-assets', logFileName);
 
   const timestamp = new Date().toISOString();
   const logMessage = `[${timestamp}] ${message}\n`;

package/src/ssh/__tests__/pl-docker.test.ts

@@ -12,7 +12,7 @@ import * as plpath from '../pl_paths';
 let sshPl: SshPl;
 const testContainer = await initContainer('pl');
 
-const downloadDestination = upath.resolve(__dirname, '..', 'test-assets', 'downloads');
+const downloadDestination = upath.resolve(__dirname, '..', '..', '..', 'test-assets', 'downloads');
 
 async function cleanUp() {
   const version = getDefaultPlVersion();

package/src/ssh/__tests__/ssh-docker.test.ts

@@ -1,3 +1,4 @@
+import type { StartedTestContainer } from 'testcontainers';
 import { describe, it, beforeAll, afterAll, expect } from 'vitest';
 import { writeFileSync, readFileSync } from 'fs';
 import { SshClient } from '../ssh';
@@ -6,9 +7,10 @@ import { downloadsFolder, cleanUp, getConnectionForSsh, getContainerHostAndPort,
 import { ConsoleLoggerAdapter } from '@milaboratories/ts-helpers';
 
 let client: SshClient;
-const testContainer = await initContainer('ssh');
+let testContainer: StartedTestContainer;
 
 beforeAll(async () => {
+  testContainer = await initContainer('ssh');
   client = await SshClient.init(new ConsoleLoggerAdapter(), getConnectionForSsh(testContainer));
 });
 

package/src/ssh/Dockerfile

@@ -1,29 +0,0 @@
-FROM node:20
-
-RUN apt-get update && \
-    apt-get install -y openssh-server && \
-    mkdir /var/run/sshd
-
-# RUN echo 'root:rootpassword' | chpasswd
-
-RUN useradd 'pl-doctor'
-RUN echo 'pl-doctor:pl-doctor-password' | chpasswd
-
-RUN sed -i 's/^#PasswordAuthentication yes/PasswordAuthentication no/' /etc/ssh/sshd_config && \
-    sed -i 's/^#PubkeyAuthentication yes/PubkeyAuthentication yes/' /etc/ssh/sshd_config
-
-RUN apt-get install -y locales && \
-    locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-
-EXPOSE 22 3001
-
-COPY ./test-assets/pub-key.pub /home/pl-doctor/.ssh/authorized_keys
-COPY ./test-assets/simple-server.js /home/pl-doctor/simple-server.js
-
-RUN chmod 755 /home/pl-doctor
-RUN chown pl-doctor:pl-doctor /home/pl-doctor
-
-RUN chmod +x /home/pl-doctor/simple-server.js
-
-CMD ["/bin/bash", "-c", "/usr/sbin/sshd -D & node /home/pl-doctor/simple-server.js"]

package/src/ssh/test-assets/simple-server.js

@@ -1,10 +0,0 @@
-const http = require('http');
-const PORT = 3001;
-const MESSAGE = "Hello, this is a simple Node.js server!";
-const server = http.createServer((req, res) => {
-  res.writeHead(200, { 'Content-Type': 'text/plain' });
-  res.end(MESSAGE);
-});
-server.listen(PORT, () => {
-  console.log(`Server is running on port ${PORT}`);
-});