@ps-aux/nodebup 0.9.10 → 0.11.1

package/lib/bup/pg/PgBackupController.js

@@ -76,21 +76,13 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
       await this.fs.inTmpDir('pg-backup', async dir => {
         const outputDir = _Path.AbsPath.from(dir);
 
-        this.log.info('Dumping database to a file');
+        this.log.info('Processing Postgres backup');
         const bashCmds = [`echo "*:*:*:*:${pass}" > ~/.pgpass`, `chmod 400 ~/.pgpass`, `pg_dumpall -d ${pgUrl}`]; // Don't forget that this itself might be run in docker
         // therefore volume mounts are not usable (will apply to the location at host)
 
-        const dumpOut = outputDir.resolve(this.outFileName);
-        const f = this.fs.writeStream(dumpOut);
-        await this.sh.asyncExec(`docker run --rm --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}'`, // f.write
-        data => {
-          f.write(data);
-        });
-        f.end();
-        this.log.info('Compressing');
-        const zipOutputName = `pg-backup-${this.now()}.zip`;
-        await this.zip.zipDir(outputDir, outputDir.resolve(zipOutputName));
-        this.fs.rmFile(dumpOut);
+        const zipOutPath = outputDir.resolve(`pg-backup-${this.now()}.sql.gz`);
+        this.log.info(`Dumping database to ${zipOutPath.str()}`);
+        await this.sh.exec(`docker run --rm --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}' | gzip> ${zipOutPath.str()}`);
         this.log.info('Uploading');
         storage.store(_Path.AbsPath.from(dir));
       });
@@ -112,16 +104,13 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
         // TODO add e2e test for docker
 
         const zipFile = this.fs.listFiles(dir)[0];
-        await this.zip.unzipDir(zipFile, dir);
-        this.fs.rmFile(zipFile);
-        const outFile = this.fs.listFiles(dir)[0];
-        this.log.debug('Will run psql import from %s', outFile.str()); // Database is set to 'postgres' so that also users which don't have db created can use db-less URL
+        this.log.debug('Will run psql import from %s', zipFile.str()); // Database is set to 'postgres' so that also users which don't have db created can use db-less URL
         // Restoring user needs to have the admin access anyway
 
         const connectionArgs = `-h ${con.host} -p ${con.port} -U ${con.username} -d postgres`; // Don't forget that this itself might be run in docker
         // therefore volume mounts are not usable (will apply to the location at host)
 
-        this.sh.exec(`docker run --network host -i ` + `-e PGPASSWORD=${con.password} ` + `postgres:${version} ` + `psql ${connectionArgs} -v ON_ERROR_STOP=0 < ${outFile.str()}`);
+        this.sh.exec(`gzip --decompress --stdout ${zipFile.str()} | docker run --network host -i ` + `-e PGPASSWORD=${con.password} ` + `postgres:${version} ` + `psql ${connectionArgs} -v ON_ERROR_STOP=0`);
       });
     });
   }

package/lib/cli/app.js

@@ -53,55 +53,63 @@ const restoreOptions = [backupTagOption, {
   convertCase: true
 }];
 
-const createApp = () => _nclif.CliApp.of({
-  commands: {
-    dir: (0, _nclif.cmdGroup)({
-      options: singleStorageOptions,
-      commands: {
-        backup: (0, _nclif.cmd)({
-          description: 'Backup a dir to the given storage',
-          options: backupOptions,
-          positionals: [{
-            name: 'path',
-            required: true
-          }],
-          run: (cmd, c) => c.get(_DirBackupController.DirBackupController).backup(cmd)
-        }),
-        restore: (0, _nclif.cmd)({
-          description: 'Restore the storage to the given dir',
-          options: restoreOptions,
-          positionals: [{
-            name: 'path',
-            required: true
-          }],
-          run: (cmd, c) => c.get(_DirBackupController.DirBackupController).restore(cmd)
-        })
-      }
-    }),
-    aggr: (0, _nclif.cmdGroup)({
-      commands: {
-        backup: (0, _nclif.cmd)({
-          description: 'Run backup',
-          options: [storageNameOpt],
-          positionals: [{
-            name: 'aggregateName',
-            required: true
-          }],
-          run: (a, c) => c.get(_AggregateBackupController.AggregateBackupController).backup(a.aggregateName)
-        })
-      }
-    }),
-    restic,
-    pg
-  }
-}).envConfig('NODEBUP').addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
-  config,
-  inputs
-}) => (0, _Context.createContext)(config, inputs));
+const createApp = () => {
+  const p = _nclif.CliApp.of({
+    binName: 'bup',
+    description: 'Data backup utility'
+  }, {
+    commands: {
+      dir: (0, _nclif.cmdGroup)({
+        options: singleStorageOptions,
+        commands: {
+          backup: (0, _nclif.cmd)({
+            description: 'Backup a dir to the given storage',
+            options: backupOptions,
+            positionals: [{
+              name: 'path',
+              required: true
+            }],
+            run: (cmd, c) => c.get(_DirBackupController.DirBackupController).backup(cmd)
+          }),
+          restore: (0, _nclif.cmd)({
+            description: 'Restore the storage to the given dir',
+            options: restoreOptions,
+            positionals: [{
+              name: 'path',
+              required: true
+            }],
+            run: (cmd, c) => c.get(_DirBackupController.DirBackupController).restore(cmd)
+          })
+        }
+      }),
+      aggr: (0, _nclif.cmdGroup)({
+        commands: {
+          backup: (0, _nclif.cmd)({
+            description: 'Run backup',
+            options: [storageNameOpt],
+            positionals: [{
+              name: 'aggregateName',
+              required: true
+            }],
+            run: (a, c) => c.get(_AggregateBackupController.AggregateBackupController).backup(a.aggregateName)
+          })
+        }
+      }),
+      restic,
+      pg
+    }
+  }).envConfig('NODEBUP').addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
+    config,
+    inputs
+  }) => (0, _Context.createContext)(config, inputs));
+
+  return p;
+};
 
 exports.createApp = createApp;
 const restic = (0, _nclif.cmdGroup)({
   options: singleStorageOptions,
+  description: 'Restic commands',
   commands: {
     'init-repo': (0, _nclif.cmd)({
       run: (_, c) => c.get(_ResticController.ResticController).initRepo()
@@ -121,6 +129,7 @@ const restic = (0, _nclif.cmdGroup)({
   }
 });
 const pg = (0, _nclif.cmdGroup)({
+  description: 'Postgres backup commands',
   options: [...singleStorageOptions, {
     name: 'pg-url',
     convertCase: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.9.10",
+  "version": "0.11.1",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
@@ -78,7 +78,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.1",
-    "@ps-aux/nclif": "^0.0.7-alpha.1",
+    "@ps-aux/nclif": "^0.9.0-alpha5",
     "@types/hapi__joi": "^17.1.8",
     "axios": "^0.24.0",
     "handlebars": "^4.7.7",