@govuk-pay/cli 0.0.45 → 0.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@govuk-pay/cli",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "description": "GOV.UK Pay Command Line Interface",
   "bin": {
     "pay": "bin/cli.js",

package/src/commands/local/docker_compose_controller.js

@@ -19,6 +19,9 @@ const dockerComposeController = {
     },
     build(composeFilePath) {
         (0, node_child_process_1.spawnSync)('docker', ['compose', '--file', composeFilePath, 'build'], { shell: true, stdio: 'inherit' });
+    },
+    recreate(composeFilePath, service) {
+        (0, node_child_process_1.spawnSync)('docker', ['compose', '--file', composeFilePath, 'up', '-d', service], { shell: true, stdio: 'inherit' });
     }
 };
 exports.default = dockerComposeController;

package/src/commands/local/subcommands/restart.js

@@ -18,6 +18,11 @@ const builder = (yargs) => {
         .positional('app', {
         type: 'string',
         description: 'Container to restart'
+    })
+        .option('force', {
+        type: 'boolean',
+        default: false,
+        description: 'Force recreate (not just restart) the container, this will bring in changes to the .env files.'
     });
 };
 exports.builder = builder;
@@ -25,6 +30,7 @@ exports.handler = restartHandler;
 async function restartHandler(argv) {
     await (0, standardContent_1.showHeader)();
     const service = argv.app;
+    const force = argv.force;
     const renderedTempaltesPath = (0, configs_js_1.ensureConfigDirectory)(exports.DOCKER_COMPOSE_RENDERED_TEMPLATES_PATH);
     const composeFilePath = (0, last_up_record_js_1.getLastUp)(renderedTempaltesPath);
     if (composeFilePath === undefined) {
@@ -32,7 +38,13 @@ async function restartHandler(argv) {
     }
     const composeFileName = node_path_1.default.basename(composeFilePath);
     const clusterName = composeFileName.substring(0, composeFileName.lastIndexOf('.yaml'));
-    console.log(`\nRestarting '${service} in cluster ${clusterName}`);
-    docker_compose_controller_js_1.default.restart(composeFilePath, service);
+    if (force) {
+        console.log(`\nForce recreating '${service} in cluster ${clusterName}`);
+        docker_compose_controller_js_1.default.recreate(composeFilePath, service);
+    }
+    else {
+        console.log(`\nRestarting '${service}' in cluster ${clusterName}`);
+        docker_compose_controller_js_1.default.restart(composeFilePath, service);
+    }
 }
 exports.default = restartHandler;

package/src/commands/tunnel.js

@@ -44,7 +44,7 @@ async function readInputForReadOrWriteDBAccess() {
         input: process.stdin,
         output: process.stdout
     });
-    let answer = await rl.question('Do you require read-only access, or write-access to the database? [R/w]: ');
+    let answer = await rl.question('Do you require read-only, read-write, or admin  access to the database? [R/w/a]: ');
     rl.close();
     if (answer === undefined || answer === '') {
         answer = 'R';
@@ -52,11 +52,15 @@ async function readInputForReadOrWriteDBAccess() {
     }
     if (answer === 'R' || answer === 'r') {
         printGreen('Database read-only access requested');
-        return 'read-only';
+        return 'readonly';
     }
     else if (answer === 'w') {
         printGreen('Database write access requested');
-        return 'write';
+        return 'readwrite';
+    }
+    else if (answer === 'a') {
+        printGreen('Admin access requested');
+        return 'admin';
     }
     else {
         printError('Invalid option entered. Exiting..');
@@ -415,9 +419,12 @@ async function printHowToTunnelText(application, environment, dbEngineVersion, d
 }
 async function getDbUser(environment, application, dbAccessType) {
     let paramName;
-    if (dbAccessType === 'write') {
+    if (dbAccessType === 'admin') {
         paramName = `${environment}_${application}.db_user`;
     }
+    else if (dbAccessType === 'readwrite') {
+        paramName = `${environment}_${application}.db_support_user_readwrite`;
+    }
     else {
         paramName = `${environment}_${application}.db_support_user_readonly`;
     }
@@ -434,17 +441,23 @@ async function getDbUser(environment, application, dbAccessType) {
     }
 }
 function getPayLowPassDbSecretName(environment, user, dbAccessType) {
-    if (dbAccessType === 'write') {
+    if (dbAccessType === 'admin') {
         return `aws/rds/application_users/${environment.split('-')[0]}/${user}`;
     }
+    else if (dbAccessType === 'readwrite') {
+        return `aws/rds/support_readwrite_users/${environment.split('-')[0]}/${user}`;
+    }
     else {
         return `aws/rds/support_readonly_users/${environment.split('-')[0]}/${user}`;
     }
 }
 function getPaySecretsPasswordName(dbAccessType) {
-    if (dbAccessType === 'write') {
+    if (dbAccessType === 'admin') {
         return 'DB_PASSWORD';
     }
+    if (dbAccessType === 'readwrite') {
+        return 'DB_SUPPORT_PASSWORD_READWRITE';
+    }
     else {
         return 'DB_SUPPORT_PASSWORD_READONLY';
     }