Release 1.3.7

jellesiderius · Aug 8, 2024 · 6e1fc6e · 6e1fc6e
1 parent 4a97265
commit 6e1fc6e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 9 deletions.
diff --git a/config/databases/production.json.sample b/config/databases/production.json.sample
@@ -12,7 +12,8 @@
             "localProjectUrl": "example1.development",
             "wordpress": false,
             "commandsFolder": "commands/example-project",
-            "stagingUsername": "staging-username-1-placeholder"
+            "stagingUsername": "staging-username-1-placeholder",
+            "sshKeyName": "id_ed25519, will search in ~/ssh/"
         },
         "production-username-2-placeholder": {
             "username": "example2",
@@ -26,7 +27,8 @@
             "localProjectUrl": "example2.development",
             "wordpress": false,
             "commandsFolder": "commands/example-project",
-            "stagingUsername": "staging-username-2-placeholder"
+            "stagingUsername": "staging-username-2-placeholder",
+            "sshKeyName": "id_ed25519, will search in ~/ssh/"
         }
     }
 }
diff --git a/config/databases/staging.json.sample b/config/databases/staging.json.sample
@@ -11,7 +11,8 @@
             "externalPhpPath": "",
             "localProjectUrl": "example1.development",
             "wordpress": false,
-            "commandsFolder": "commands/example-project"
+            "commandsFolder": "commands/example-project",
+            "sshKeyName": "id_ed25519, will search in ~/ssh/"
         },
         "staging-username-2-placeholder": {
             "username": "example2",
@@ -24,7 +25,8 @@
             "externalPhpPath": "",
             "localProjectUrl": "example2.development",
             "wordpress": false,
-            "commandsFolder": "commands/example-project"
+            "commandsFolder": "commands/example-project",
+            "sshKeyName": "id_ed25519, will search in ~/ssh/"
         }
     }
 }
diff --git a/dist/models/databasesModel.js b/dist/models/databasesModel.js
diff --git a/dist/models/databasesModel.js.map b/dist/models/databasesModel.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mage-db-sync",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "Database synchronizer for Magento, based on Magerun",
   "author": {
     "name": "Jelle Siderius"

diff --git a/src/models/databasesModel.ts b/src/models/databasesModel.ts
@@ -4,6 +4,7 @@ import stagingDatabases from "../../config/databases/staging.json";
 import productionDatabases from "../../config/databases/production.json";
 import path from "path";
 import fs from "fs";
+import os from "os";
 
 class DatabasesModel {
 	public databasesList: { [k: string]: any } = [];
@@ -20,7 +21,8 @@ class DatabasesModel {
 		'localProjectUrl': '',
 		'commandsFolder': '',
 		'stagingUsername': '',
-		'externalElasticsearchPort': ''
+		'externalElasticsearchPort': '',
+		'sshKeyLocation': ''
 	};
 
 	public databaseDataSecond = {
@@ -78,6 +80,11 @@ class DatabasesModel {
 					// @ts-ignore
 					databaseDataType.externalElasticsearchPort = database.externalElasticsearchPort;
 				}
+				// @ts-ignore
+				if (database.sshKeyName) {
+					// @ts-ignore
+					config.customConfig.sshKeyLocation = os.userInfo().homedir + '/.ssh/' + database.sshKeyName;
+				}
 
 				// @ts-ignore
 				if (database.commandsFolder) {