Merge pull request garygrossgarten#19 from garygrossgarten/resolve-us…

…er-pw Resolve user pw
vomaksh · Nov 21, 2020 · 106e952 · 106e952
2 parents 59f4f89 + e6fa90e
commit 106e952
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/.github/workflows/ssh-example-test.yml b/.github/workflows/ssh-example-test.yml
@@ -18,6 +18,13 @@ jobs:
           username: garygrossgarten
           password: ${{ secrets.PASSPHRASE }}
           privateKey: ${{ secrets.PRIVATE_KEY}}
+      - name: User/Pw
+        uses: ./
+        with:
+          command: ls -a
+          host: ${{ secrets.HOST }}
+          username: garygrossgarten
+          password: ${{ secrets.PASSPHRASE }}  
       - name: This step should fail
         uses: ./
         with:

diff --git a/dist/index.js b/dist/index.js
@@ -11311,16 +11311,20 @@ function connect(host = 'localhost', username, port = 22, privateKey, password,
         const ssh = new node_ssh_1.NodeSSH();
         console.log(`Establishing a SSH connection to ${host}.`);
         try {
-            yield ssh.connect({
+            const config = {
                 host: host,
                 port: port,
                 username: username,
                 password: password,
                 passphrase: passphrase,
-                privateKey: privateKey,
                 tryKeyboard: tryKeyboard,
                 onKeyboardInteractive: tryKeyboard ? keyboard_1.keyboardFunction(password) : null
-            });
+            };
+            if (privateKey) {
+                console.log('using provided private key');
+                config.privateKey = privateKey;
+            }
+            yield ssh.connect(config);
             console.log(`🤝 Connected to ${host}.`);
         }
         catch (err) {

diff --git a/lib/index.js b/lib/index.js
@@ -56,16 +56,20 @@ function connect(host = 'localhost', username, port = 22, privateKey, password,
         const ssh = new node_ssh_1.NodeSSH();
         console.log(`Establishing a SSH connection to ${host}.`);
         try {
-            yield ssh.connect({
+            const config = {
                 host: host,
                 port: port,
                 username: username,
                 password: password,
                 passphrase: passphrase,
-                privateKey: privateKey,
                 tryKeyboard: tryKeyboard,
                 onKeyboardInteractive: tryKeyboard ? keyboard_1.keyboardFunction(password) : null
-            });
+            };
+            if (privateKey) {
+                console.log('using provided private key');
+                config.privateKey = privateKey;
+            }
+            yield ssh.connect(config);
             console.log(`🤝 Connected to ${host}.`);
         }
         catch (err) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garygrossgarten/github-action-ssh",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Run commands on a remote server via SSH.",
   "repository": {
     "type": "git",

diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,5 @@
 import * as core from '@actions/core';
-import {NodeSSH} from 'node-ssh';
+import {Config, NodeSSH} from 'node-ssh';
 import {keyboardFunction} from './keyboard';
 
 async function run() {
@@ -43,16 +43,20 @@ async function connect(
   console.log(`Establishing a SSH connection to ${host}.`);
 
   try {
-    await ssh.connect({
+    const config: Config = {
       host: host,
       port: port,
       username: username,
       password: password,
       passphrase: passphrase,
-      privateKey: privateKey,
       tryKeyboard: tryKeyboard,
       onKeyboardInteractive: tryKeyboard ? keyboardFunction(password) : null
-    });
+    };
+    if (privateKey) {
+      console.log('using provided private key');
+      config.privateKey = privateKey;
+    }
+    await ssh.connect(config);
     console.log(`🤝 Connected to ${host}.`);
   } catch (err) {
     console.error(`⚠️ The GitHub Action couldn't connect to ${host}.`, err);