@govuk-pay/cli 0.0.47 → 0.0.49

package/package.json

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

package/resources/pay-local/templates/docker-compose.hbs

@@ -18,6 +18,7 @@ services:
       retries: 5
     volumes:
       - {{../defaultServiceConfigsPath}}/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+      - {{name}}:/var/lib/postgresql/data
     ports:
     - "{{port}}:5432"
     networks:
@@ -277,3 +278,8 @@ networks:
       driver: default
       config:
         - subnet: 172.18.0.0/24
+
+volumes:
+  {{#each dbServices}}
+    {{name}}:
+  {{/each}}

package/src/commands/tunnel.js

@@ -35,6 +35,10 @@ const builder = (yargs) => {
     }).positional('application', {
         describe: 'The application to connect to',
         choices: constants_js_1.APPLICATIONS
+    }).option('database', {
+        type: 'string',
+        alias: 'd',
+        describe: 'The DBInstanceIdentifier of the database to connect to. Useful when there are multiple databases for an application.'
     });
 };
 exports.builder = builder;
@@ -89,7 +93,7 @@ async function tunnelHandler(argv) {
     try {
         printWarningToUser();
         const dbAccessType = await readInputForReadOrWriteDBAccess();
-        const database = await getDatabaseDetails(environment, application);
+        const database = await getDatabaseDetails(environment, application, argv.database);
         bastionTask = await startBastion(environment, maximumDuration);
         console.log(`${FORMAT.bel}${FORMAT.yellow}The bastion service will terminate in ${maximumDuration} minutes.${FORMAT.reset}`);
         const warnTimeout = setTimeout(() => {
@@ -299,22 +303,24 @@ async function stopBastion(task, environment) {
     }
     console.log('Stopping Bastion');
 }
-async function getDatabaseDetails(environment, application) {
+async function getDatabaseDetails(environment, application, dBInstanceIdentifier) {
     const describeDbCommand = new client_rds_1.DescribeDBInstancesCommand({});
     const describeDbCommandResponse = await rds.send(describeDbCommand);
     if (describeDbCommandResponse.DBInstances == null || describeDbCommandResponse.DBInstances.length < 1) {
         throw new Error(`Failed to find the database for ${application} in ${environment}`);
     }
-    const appDatabases = describeDbCommandResponse.DBInstances
+    let appDatabases = describeDbCommandResponse.DBInstances
         .filter(s => s.DBInstanceIdentifier?.startsWith(`${environment}-${application}`));
+    if (dBInstanceIdentifier !== null && dBInstanceIdentifier !== undefined) {
+        console.log(`Using provided database instance identifier: ${dBInstanceIdentifier}`);
+        appDatabases = appDatabases.filter(s => s.DBInstanceIdentifier === dBInstanceIdentifier);
+    }
     if (appDatabases.length === 0) {
         throw new Error(`Failed to find the database for ${application} in ${environment}`);
     }
     else if (appDatabases.length > 1) {
-        // TODO: Allow an argument to specify the exact database name. Print out how
-        // to re-run the describeDbCommand specifying the required database.
         const databaseNames = appDatabases.map(d => d.DBInstanceIdentifier).join(':');
-        throw new Error(`There are multiple matching databases: ${databaseNames}`);
+        throw new Error(`There are multiple matching databases: ${databaseNames}. Re-run with the --database option to select the correct one.`);
     }
     else {
         return appDatabases[0];