chore: build

deepkit · Oct 10, 2023 · 386b66c · 386b66c
1 parent 063da8f
commit 386b66c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,9 +21,10 @@ jobs:
                 - "40000-40009:40000-40009"
         storage-sftp:
             image: atmoz/sftp:alpine
+            env:
+                 SFTP_USERS: user:123:::upload
             ports:
                 - "22:22"
-            options: user:123:::upload
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}

diff --git a/packages/storage-sftp/src/sftp-adapter.ts b/packages/storage-sftp/src/sftp-adapter.ts
@@ -3,7 +3,7 @@ import Client, { ConnectOptions, FileInfo } from 'ssh2-sftp-client';
 import { Readable } from 'stream';
 import { asyncOperation } from '@deepkit/core';
 
-export interface StorageFtpOptions {
+export interface StorageFtpOptions extends ConnectOptions {
     /**
      * The root path where all files are stored. Optional, default is )" (standard working directory of FTP server_.
      */
@@ -28,8 +28,6 @@ export interface StorageFtpOptions {
 
     password: string;
 
-    options?: ConnectOptions;
-
     permissions: {
         file: {
             public: number; //default 0o644
@@ -78,7 +76,6 @@ export class StorageSftpAdapter implements StorageAdapter {
 
     constructor(options: Partial<StorageFtpOptions> = {}) {
         Object.assign(this.options, options);
-        if (options.options) Object.assign(this.options, options.options);
         this.client = new Client();
         this.client.on('end', (err) => {
             this.closed = true;

diff --git a/packages/storage-sftp/tests/storage.spec.ts b/packages/storage-sftp/tests/storage.spec.ts
@@ -12,7 +12,7 @@ setAdapterFactory(async () => {
         root: 'upload'
     });;
     if (platform() === 'darwin') {
-        // docker run -d --name storage-sftp -p 22:22 -d atmoz/sftp user:123:::upload
+        // docker run -d --name storage-sftp -p 22:22 -e SFTP_USERS=user:123:::upload -d atmoz/sftp:alpine
         adapter = new StorageSftpAdapter({
             host: 'storage-sftp.orb.local',
             user: 'user',