@govuk-pay/cli 0.0.44 → 0.0.46

package/package.json

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

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

@@ -19,6 +19,11 @@ const builder = (yargs) => {
         type: 'boolean',
         default: false,
         description: 'Launch psql inside the apps database container (no psql history)'
+    })
+        .option('superuser', {
+        type: 'boolean',
+        default: false,
+        description: 'Connect to the database as the postgres superuser'
     });
 };
 exports.builder = builder;
@@ -27,6 +32,7 @@ async function dbHandler(argv) {
     await (0, standardContent_1.showHeader)();
     const service = argv.app_name;
     const docker = argv.docker;
+    const asSuperuser = argv.superuser;
     if (!(service in servicesConfig)) {
         console.error(`The service specified (${service}) was not defined in the service_config.yaml file`);
         return;
@@ -37,14 +43,14 @@ async function dbHandler(argv) {
         return;
     }
     if (docker) {
-        launchPsqlInDocker(serviceConfig);
+        launchPsqlInDocker(serviceConfig, asSuperuser);
     }
     else if (!psqlAvailable()) {
         console.warn('PSQL installation not found locally.');
-        launchPsqlInDocker(serviceConfig);
+        launchPsqlInDocker(serviceConfig, asSuperuser);
     }
     else {
-        launchPsql(serviceConfig);
+        launchPsql(serviceConfig, asSuperuser);
     }
 }
 exports.default = dbHandler;
@@ -55,7 +61,7 @@ function psqlAvailable() {
     }
     return false;
 }
-function launchPsqlInDocker(serviceConfig) {
+function launchPsqlInDocker(serviceConfig, asSuperuser) {
     console.log('Running psql in running app db container.');
     console.log('Note: This means you wont have a psql history, and one will not survive restarts of pay local');
     (0, node_child_process_1.spawn)('docker', [
@@ -66,18 +72,18 @@ function launchPsqlInDocker(serviceConfig) {
         `${serviceConfig.name}_db`,
         'psql',
         '--host', `${serviceConfig.name}_db`,
-        '--user', serviceConfig.name,
+        '--user', asSuperuser ? 'postgres' : serviceConfig.name,
         '--dbname', serviceConfig.name
     ], { stdio: 'inherit', shell: true });
 }
-function launchPsql(serviceConfig) {
+function launchPsql(serviceConfig, asSuperuser) {
     if (serviceConfig.db_port === undefined) {
         throw new Error(`Service config for ${serviceConfig.name} is missing db_port specification`);
     }
     (0, node_child_process_1.spawn)('psql', [
         '--host', '127.0.0.1',
         '--port', `${serviceConfig.db_port}`,
-        '--user', serviceConfig.name,
+        '--user', asSuperuser ? 'postgres' : serviceConfig.name,
         '--dbname', serviceConfig.name
     ], {
         stdio: 'inherit',

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';
     }