@govuk-pay/cli 0.0.33 → 0.0.35

package/package.json

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

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

@@ -39,7 +39,7 @@ services:
         condition: service_healthy
     {{/if}}
     healthcheck:
-      test: ["CMD", "wget", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
+      test: ["CMD", "wget", "-Y", "off", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
       interval: 10s
       timeout: 5s
       retries: 12
@@ -82,7 +82,7 @@ services:
       - HTTP_PROXY_PORT=8080
       - HTTPS_PROXY_PORT=8080
       - HTTP_PROXY_SCHEME=http
-      - NO_PROXY={{noProxyEnvVar}}
+      - NO_PROXY={{../noProxyEnvVar}}
       {{/if}}
 
       {{#if hasSQSQueues}}
@@ -134,7 +134,7 @@ services:
         condition: service_healthy
     {{/if}}
     healthcheck:
-      test: ["CMD", "wget", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
+      test: ["CMD", "wget", "-Y", "off", "-O", "/dev/null", "http://{{name}}:{{port}}/healthcheck"]
       interval: 10s
       timeout: 5s
       retries: 12
@@ -225,7 +225,7 @@ services:
     image: governmentdigitalservice/pay-egress:latest-master
     container_name: egress
     volumes:
-      - "{{defaultServiceConfigsPath}}/egress/squid.conf:/etc/squid/squid.conf"
+      - "{{defaultServiceConfigsPath}}/services/egress/squid.conf:/etc/squid/squid.conf"
     networks:
       pay_local_mimic_aws_vpc:
         ipv4_address: 172.18.0.253

package/src/commands/tunnel.js

@@ -366,15 +366,15 @@ async function printHowToTunnelText(application, environment, dbEngineVersion, d
     const paySecretsPasswordName = getPaySecretsPasswordName(dbAccessType);
     printGreen(`\nConnected tunnel to ${application} RDS database in ${environment} on port 65432\n`);
     printGreen('Copy DB credentials to clipboard (in another window) using pay-low-pass:');
-    printGreen(`  pay-low-pass ${payLowPassDbSecretName} | pbcopy`);
+    printGreen(`    pay-low-pass ${payLowPassDbSecretName} | pbcopy`);
     printGreen('Alternatively, fetch credentials from pay secrets:');
-    printGreen(`  pay secrets fetch ${environment} ${application} ${paySecretsPasswordName} | pbcopy`);
+    printGreen(`    pay secrets fetch ${environment} ${application} ${paySecretsPasswordName} | pbcopy`);
     printGreen('Open psql with:');
-    printGreen(`  psql -h localhost -p 65432 -U ${dbUser} -d ${application}`);
+    printGreen(`    psql -h 127.0.0.1 -p 65432 -U ${dbUser} -d ${application}`);
     printGreen('Alternatively connect using docker instead of needing psql installed locally and set the password automatically using pay-low-pass:');
-    printGreen(`   docker run --rm -ti postgres:${dbEngineVersion}-alpine psql --host docker.for.mac.localhost --port 65432 --user ${dbUser} --dbname ${application}`);
+    printGreen(`    docker run --rm -ti postgres:${dbEngineVersion}-alpine psql --host docker.for.mac.localhost --port 65432 --user ${dbUser} --dbname ${application}`);
     printGreen('Or even more conveniently connect using a docker container and set the password automatically using pay-low-pass:');
-    printGreen(`   docker run -e "PGPASSWORD=$(pay-low-pass ${payLowPassDbSecretName})" --rm -ti postgres:${dbEngineVersion}-alpine psql --host docker.for.mac.localhost --port 65432 --user ${dbUser} --dbname ${application}\n`);
+    printGreen(`    docker run -e "PGPASSWORD=$(pay-low-pass ${payLowPassDbSecretName})" --rm -ti postgres:${dbEngineVersion}-alpine psql --host docker.for.mac.localhost --port 65432 --user ${dbUser} --dbname ${application}\n`);
 }
 async function getDbUser(environment, application, dbAccessType) {
     let paramName;