@fishawack/lab-env 4.6.0 → 4.7.0

package/CHANGELOG.md

@@ -1,9 +1,13 @@
 ## Changelog
 
+### 4.7.0 (2022-12-20)
+* [Feature] --debug flag that shows extra information about running commands
+* [Feature] Added newly setup AWS accounts to the client prompts on `fw provision`
+
 ### 4.6.0 (2022-11-30)
-* [Fix] Drupal now uses httpd so that htaccess files are respected
-* [Fix] No longer mount env file into drupal php env container as env variables
-* [Fix] Drupal now has wordpress upload limits of 500M
+* [Bug] Drupal now uses httpd so that htaccess files are respected
+* [Bug] No longer mount env file into drupal php env container as env variables
+* [Bug] Drupal now has wordpress upload limits of 500M
 
 ### 4.5.0 (2022-11-21)
 * [Feature] Preset choice on `fw diagnose` now gives commands suitable to option chosen

package/cli.js

@@ -25,6 +25,10 @@ const args = hideBin(process.argv);
             .scriptName("fw")
             .parserConfiguration({
                 'unknown-options-as-args': true
+            })
+            .option('debug', {
+                global: true,
+                description: `Show extra information to help debug issues`
             });
         
         // Repo commands

package/commands/create/services/aws/index.js

@@ -6,7 +6,7 @@ module.exports.iam = require("./iam.js");
 
 module.exports.slug = (repo, client, branch) => s3Safe(`${branch}-${repo}-${client}`);
 
-module.exports.clients = ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'ptc', 'jazz', 'pfizer', 'heron', 'novartis', 'training', 'merck', 'acadia', 'travere', 'roche', 'utc', 'bayer', 'alcon', 'uhc', 'chiesi', '3m', 'sarepta', 'ipsen', 'novocure'];
+module.exports.clients = ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'ptc', 'jazz', 'pfizer', 'heron', 'novartis', 'training', 'merck', 'acadia', 'travere', 'roche', 'utc', 'bayer', 'alcon', 'uhc', 'chiesi', '3m', 'sarepta', 'ipsen', 'novocure', 'anthem'];
 
 module.exports.static = async (name, account, tags = [], credentials = []) => {
     let s3 = await module.exports.s3.createS3Bucket(name, account, tags);

package/globals.js

@@ -137,12 +137,16 @@ if(platform === 'laravel'){
 }
 
 try{
-    services = execSync(`${docker} ps --services --filter "status=running" 2>/dev/null`, {encoding: 'utf8'});
+    services = execSync(`${docker} ps --services --filter "status=running"`, {encoding: 'utf8', stdio: 'pipe'});
     running = services.trim().length;
     exec = `exec ${process.env.CI_BUILD_ID ? '-T' : ''}`;
     method = running ? exec : 'run --rm --service-ports';
     run = `${method} core bash -l`;
-} catch(e){}
+} catch(e){
+    if(args.find(d => d === '--debug')){
+        console.log(utilities.colorize(e.stderr, 'error'));
+    }
+}
 
 // Always allow commands that don't require a repository through
 if(args[0] !== 'diag' && args[0] !== 'diagnose' && args[0] !== 'origin' && args[0] !== '--version' && args[0] !== '--help' && args[0] !== 'new' && args[0] !== 'key' && args[0] !== 'dekey'){
@@ -155,7 +159,7 @@ if(args[0] !== 'diag' && args[0] !== 'diagnose' && args[0] !== 'origin' && args[
         console.log(`${utilities.colorize(`@fishawack/lab-env`, 'title')} diagnosis is ${utilities.colorize(`outdated`, 'warning')}.\n\nRun ${utilities.colorize(`fw diagnose`, 'success')} to reconfigure.`);
     // Stop here if docker process not running
     } else if(!services) {
-        console.log(`${utilities.colorize(`Docker`, 'info')} does not appear to be running...`);
+        console.log(`${utilities.colorize(`Docker`, 'info')} does not appear to be running...\n\nRun ${utilities.colorize(`fw --debug`, 'success')} for more information`);
         process.exit();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {