@govuk-pay/cli 0.0.20 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@govuk-pay/cli",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "GOV.UK Pay Command Line Interface",
   "bin": {
     "pay": "bin/cli.js",
@@ -10,12 +10,16 @@
   "keywords": [],
   "author": "",
   "license": "MIT",
+  "engines": {
+    "node": ">= 18.x"
+  },
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.641.0",
     "@aws-sdk/client-ecs": "^3.637.0",
     "@aws-sdk/client-rds": "^3.637.0",
     "@aws-sdk/client-ssm": "^3.651.1",
     "openurl": "^1.1.1",
+    "semver": "^7.6.3",
     "ts-standard": "^12.0.2"
   },
   "files": [

package/readme.md

@@ -1,6 +1,21 @@
 # pay-cli
 GOV.UK Pay Command Line Interface
 
+## Installation and migration guide
+
+If you have used the Ruby CLI in the past, there are some additional steps required:
+
+- Remove references to `pay` from your `.bashrc` (or other autostart shell script, `.bash_profile`, `.zshrc`, `.zprofile`, etc).
+- Check `which pay`, if it points to `~/.rbenv/shims/pay` or similar, remove that script. Ideally, it should return `pay not found`.
+- Restart your shell to clear functions and environment variables leftover.
+
+To install the Node.js CLI:
+
+- Run `npm install -g @govuk-pay/cli`. If npm was installed through Homebrew, you shouldn't need to use sudo to install packages.
+- Run `pay` to see if you are running the new version (new features such as `pay tunnel` should be available), if not check `which pay` in case you are using an older version.
+
+There is nothing more to do, you're done! To update, run `npm install -g @govuk-pay/cli` again, there are version check notifications if you are behind a version.
+
 ## Usage
 
 This is published to NPM, you can install it globally using `npm install -g @govuk-pay/cli`,

package/resources/legacy-ruby-cli/lib/pay_cli/commands/local/app_client.rb

@@ -85,7 +85,7 @@ module PayCLI::Commands::Local::AppClient
 
   def self.create_service()
     service_data = {
-        service_name: 'My service'
+        service_name: {en: 'My service', cy: 'Welsh name for My service'}
     }
 
     post("#{base_url 'adminusers'}/v1/api/services", service_data)

package/resources/legacy-ruby-cli/lib/pay_cli/commands/local/config.yaml

@@ -122,6 +122,7 @@ selfservice:
     - admin
     - endtoend
     - webhooks
+    - toolbox
 products-ui:
   name: products-ui
   proxy: true

package/resources/legacy-ruby-cli/lib/pay_cli/commands/local/files/all.yaml

@@ -3,6 +3,7 @@ services:
     adminusers_db:
       image: postgres:15.6
       environment:
+        - BIND_HOST=0.0.0.0
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
       logging:
@@ -23,6 +24,7 @@ services:
     connector_db:
       image: postgres:15.6
       environment:
+        - BIND_HOST=0.0.0.0
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
       logging:
@@ -43,6 +45,7 @@ services:
     publicauth_db:
       image: postgres:15.6
       environment:
+        - BIND_HOST=0.0.0.0
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
       logging:
@@ -63,6 +66,7 @@ services:
     products_db:
       image: postgres:15.6
       environment:
+        - BIND_HOST=0.0.0.0
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
       logging:
@@ -83,6 +87,7 @@ services:
     ledger_db:
       image: postgres:15.6
       environment:
+        - BIND_HOST=0.0.0.0
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
       logging:
@@ -103,6 +108,7 @@ services:
     webhooks_db:
       image: postgres:15.6
       environment:
+        - BIND_HOST=0.0.0.0
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
       logging:
@@ -132,6 +138,7 @@ services:
         - services/java_app.env
         - services/adminusers.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=9700
@@ -194,6 +201,7 @@ services:
         - services/java_app.env
         - services/connector.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=9300
@@ -255,6 +263,7 @@ services:
         - services/java_app.env
         - services/cardid.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=9900
@@ -303,6 +312,7 @@ services:
         - services/java_app.env
         - services/publicauth.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=9600
@@ -352,6 +362,7 @@ services:
         - services/java_app.env
         - services/publicapi.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=9100
@@ -401,6 +412,7 @@ services:
         - services/java_app.env
         - services/products.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=18000
@@ -454,6 +466,7 @@ services:
         - services/java_app.env
         - services/ledger.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=10700
@@ -514,8 +527,9 @@ services:
       networks:
         - pay_local_mimic_aws_vpc
   
+  
     webhooks:
-      image: governmentdigitalservice/pay-webhooks:latest-master
+      image: governmentdigitalservice/pay-webhooks:local
       
       depends_on:
         webhooks_db:
@@ -525,6 +539,7 @@ services:
         - services/java_app.env
         - services/webhooks.env
       environment:
+        - BIND_HOST=192.168.0.111
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=10800
@@ -566,23 +581,25 @@ services:
         - PRODUCTS-UI_URL=http://localhost:10400
         - STUBS_URL=http://localhost:3030
         - TOOLBOX_URL=http://localhost:3040
+      working_dir: '/app'
       mem_limit: 2G
+      user: root
       logging:
         driver: "json-file"
       ports:
-        - "10800:10800"
-        - "10801:10801"
+          - "10800:10800"
+          - "10801:10801"
       container_name: webhooks
       networks:
         - pay_local_mimic_aws_vpc
   
   
-  
     frontend:
       image: governmentdigitalservice/pay-frontend:latest-master
       
       env_file: services/frontend.env
       environment:
+        - BIND_HOST=0.0.0.0
         - SECURE_COOKIE_OFF=true
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
@@ -625,6 +642,7 @@ services:
       
       env_file: services/selfservice.env
       environment:
+        - BIND_HOST=0.0.0.0
         - SECURE_COOKIE_OFF=true
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
@@ -667,6 +685,7 @@ services:
       
       env_file: services/products-ui.env
       environment:
+        - BIND_HOST=0.0.0.0
         - SECURE_COOKIE_OFF=true
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
@@ -709,6 +728,7 @@ services:
       
       env_file: services/stubs.env
       environment:
+        - BIND_HOST=0.0.0.0
         - SECURE_COOKIE_OFF=true
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
@@ -751,6 +771,7 @@ services:
       
       env_file: services/toolbox.env
       environment:
+        - BIND_HOST=0.0.0.0
         - SECURE_COOKIE_OFF=true
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true

package/resources/legacy-ruby-cli/lib/pay_cli/commands/local/files/docker-compose.erb

@@ -3,6 +3,7 @@ services:
     <%= db[:name] %>:
       image: postgres:15.6
       environment:
+        - BIND_HOST=0.0.0.0
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
       logging:
@@ -32,6 +33,7 @@ services:
         - services/java_app.env
         - services/<%= app[:name] %>.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=<%= app[:port] %>
@@ -115,6 +117,7 @@ services:
         - services/java_app.env
         - services/<%= app[:name] %>.env
       environment:
+        - BIND_HOST=0.0.0.0
         - RUN_MIGRATION=true
         - RUN_APP=true
         - PORT=<%= app[:port] %>
@@ -198,6 +201,7 @@ services:
       <% end %>
       env_file: services/<%= app[:name] %>.env
       environment:
+        - BIND_HOST=0.0.0.0
         - SECURE_COOKIE_OFF=true
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
@@ -256,6 +260,7 @@ services:
         - "$WORKSPACE/pay-<%= app[:name] %>:/app"
       <% end %>
       environment:
+        - BIND_HOST=0.0.0.0
         - SECURE_COOKIE_OFF=true
         - RUN_APP=true
         - DISABLE_APPMETRICS=true
@@ -306,6 +311,7 @@ services:
     <%= app[:name] %>:
       image: governmentdigitalservice/pay-docker-nginx-proxy:latest-master
       environment:
+        - BIND_HOST=0.0.0.0
         - PROXY_SERVICE_HOST=http://<%= app[:proxy_host] %>
         - PROXY_SERVICE_PORT=<%= app[:proxy_port] %>
         - HTTPS_LISTEN_PORT=<%= app[:port] %>

package/resources/legacy-ruby-cli/lib/pay_cli/commands/local.rb

@@ -89,7 +89,6 @@ class PayCLI::Commands::Local < Thor
       threads = []
       (@local_java_apps + @local_node_apps).each do |app|
         check_for_local_repo("pay-#{app[:name]}")
-        check_cardid_data if app[:name] == 'cardid'
 
         threads << Thread.new do
           ws_dir = Pathname.new(ENV['WORKSPACE']).join("pay-#{app[:name]}")
@@ -406,16 +405,6 @@ class PayCLI::Commands::Local < Thor
       end
     end
 
-    def check_cardid_data
-      cardid_path = File.join(ENV['WORKSPACE'], 'pay-cardid')
-
-      unless Dir.exist?(File.join(cardid_path, 'data', 'sources'))
-        abort '❌ pay-cardid does not have the cardid-data submodule updated. '\
-          'Run `git submodule update --init && git -C data pull origin master` in '\
-          "#{cardid_path} to init and update the cardid-data submodule"
-      end
-    end
-
     def npm_install(repo_name)
       repo_path = File.join(ENV['WORKSPACE'], repo_name)
       `cd #{repo_path} && npm install >>/dev/null 2>&1`

package/src/core/commandRouter.js

@@ -10,6 +10,7 @@ const legacy_1 = __importDefault(require("../commands/legacy"));
 const help_1 = __importDefault(require("../commands/help"));
 const tunnel_js_1 = __importDefault(require("../commands/tunnel.js"));
 const package_json_1 = __importDefault(require("../../package.json"));
+const semver_1 = __importDefault(require("semver"));
 const handlers = new Map();
 handlers.set('browse', {
     handler: browse_js_1.default
@@ -87,7 +88,10 @@ async function runHandler(commandName, commandHandler) {
 }
 async function checkVersion() {
     try {
-        const { version: currentVersion } = package_json_1.default;
+        const { version: currentVersion, engines: { node: requiredNodeVersion } } = package_json_1.default;
+        if (!semver_1.default.satisfies(process.version, requiredNodeVersion)) {
+            console.log(`Required Node.js version is ${requiredNodeVersion}, you are running ${process.version}. Please upgrade before continuing.`);
+        }
         const { version: remoteVersion } = await fetch('https://registry.npmjs.org/@govuk-pay/cli/latest')
             .then(async (r) => await r.json());
         if (currentVersion !== remoteVersion) {