govuk-connect 0.1.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8646130db048f402534738fffea6fca312d926909b4bfaf96a99a0d87a6625
-  data.tar.gz: d4011ee86eddef1e2f0ac7e643bfaaf757baf713612cd808822c84eef715ac5d
+  metadata.gz: 0a1b3a80c3eec55973d5a21f131f0a12d836578d702488f9eed8cf20acf1042d
+  data.tar.gz: d91a53b4f152ba3609e71b4e4bdbe0918bb8090443b950ddefd3811dc19cbe6d
 SHA512:
-  metadata.gz: 0cf8916a2150a946b616cfed84feae2b9333116cec946bb77179ea3074e64758552dde756872857178596a3163a5dce898daf11ca2c363223d714aef845abf94
-  data.tar.gz: 809217f4589312c5fad4fa008f9eba535c622f87d0fe2222d944528b25c7772bb3d5d029be8d4c3f97a6e637c0e9c444afefe59cdc35532c5b3c9d4f6513f264
+  metadata.gz: ff8f442e71c562b001119fb5c5eb92958d3e1b2a1da7dd31f9ca2d6483e693a62ca383797ced30d2130662ef1ce94a8aa3c5d6e890124066bbc914edfdcef52e
+  data.tar.gz: fa0ecc08631861e15aa2cfd6dacb3299e1783df665b2e3e4b0b9eec9c45019819fbb40c7e9a491fc66bf03a72b44da1bb88428efebadbe5955f58676e2cbd69c

data/lib/govuk_connect/cli.rb

@@ -15,37 +15,41 @@ class GovukConnect::CLI
     self.class.bold(string)
   end
 
-  USAGE_BANNER = "Usage: govuk-connect TYPE TARGET [options]".freeze
+  USAGE_BANNER = "Usage: gds govuk connect TYPE TARGET [options]".freeze
 
   EXAMPLES = <<-EXAMPLES.freeze
-    govuk-connect ssh --environment integration backend
+    gds govuk connect ssh --environment integration backend
 
-    govuk-connect app-console --environment staging publishing-api
+    gds govuk connect scp-push --environment integration backend filename.txt /tmp/
 
-    govuk-connect app-dbconsole -e integration whitehall_backend/whitehall
+    gds govuk connect scp-pull --environment integration backend /tmp/filename.txt ~/Downloads/
 
-    govuk-connect rabbitmq -e staging aws/rabbitmq
+    gds govuk connect app-console --environment staging publishing-api
 
-    govuk-connect sidekiq-monitoring -e integration
+    gds govuk connect app-dbconsole -e integration whitehall_backend/whitehall
+
+    gds govuk connect rabbitmq -e staging aws/rabbitmq
+
+    gds govuk connect sidekiq-monitoring -e integration
   EXAMPLES
 
   MACHINE_TARGET_DESCRIPTION = <<-DOCS.freeze
-    The ssh, rabbitmq and sidekiq-monitoring connection types target
+    The ssh, scp-*, rabbitmq and sidekiq-monitoring connection types target
     machines.
 
     The machine can be specified by name, for example:
 
-      govuk-connect ssh -e integration #{bold('backend')}
+      gds govuk connect ssh -e integration #{bold('backend')}
 
     If the hosting provider is ambiguous, you'll need to specify it prior
     to the name, for example:
 
-      govuk-connect ssh -e staging #{bold('aws/')}backend
+      gds govuk connect ssh -e staging #{bold('aws/')}backend
 
     If you want to connect to a specific machine, you can specify a number
     after the name, for example:
 
-      govuk-connect ssh -e integration backend#{bold(':2')}
+      gds govuk connect ssh -e integration backend#{bold(':2')}
   DOCS
 
   APP_TARGET_DESCRIPTION = <<-DOCS.freeze
@@ -54,17 +58,17 @@ class GovukConnect::CLI
 
     The application is specified by name, for example:
 
-      govuk-connect app-console -e integration #{bold('publishing-api')}
+      gds govuk connect app-console -e integration #{bold('publishing-api')}
 
     If the node class is ambiguous, you'll need to specify it prior to
     the name, for example:
 
-      govuk-connect app-console -e integration #{bold('whitehall_backend/')}whitehall
+      gds govuk connect app-console -e integration #{bold('whitehall_backend/')}whitehall
 
     If you want to connect to a specific machine, you can specify a
     number after the name, for example:
 
-      govuk-connect app-console -e integration publishing-api#{bold(':2')}
+      gds govuk connect app-console -e integration publishing-api#{bold(':2')}
   DOCS
 
   CONNECTION_TYPE_DESCRIPTIONS = {
@@ -75,10 +79,13 @@ class GovukConnect::CLI
     "sidekiq-monitoring" => "Setup port forwarding to the Sidekiq Monitoring application.",
   }.freeze
 
-  RABBITMQ_PORT = 15672
+  RABBITMQ_PORT = 15_672
   SIDEKIQ_MONITORING_PORT = 3211
 
   JUMPBOXES = {
+    test: {
+      aws: "jumpbox.pink.test.govuk.digital",
+    },
     ci: {
       carrenza: "ci-jumpbox.integration.publishing.service.gov.uk",
     },
@@ -96,7 +103,7 @@ class GovukConnect::CLI
   }.freeze
 
   def log(message)
-    warn message if $verbose
+    warn message if @verbose
   end
 
   def print_empty_line
@@ -125,10 +132,12 @@ class GovukConnect::CLI
       costs[0] = i
       nw = i - 1 # j == 0; nw is lev(i-1, j)
       (1..string2.length).each do |j|
-        costs[j], nw = [
-          costs[j] + 1, costs[j - 1] + 1,
-          string1[i - 1] == string2[j - 1] ? nw : nw + 1
-        ].min, costs[j]
+        costs[j] = [
+          costs[j] + 1,
+          costs[j - 1] + 1,
+          string1[i - 1] == string2[j - 1] ? nw : nw + 1,
+        ].min
+        nw = costs[j]
       end
     end
     costs[string2.length]
@@ -176,7 +185,7 @@ class GovukConnect::CLI
     tries = 0
 
     while tries <= 10
-      port = rand(32768...61000)
+      port = rand(32_768...61_000)
 
       return port if port_free? port
 
@@ -228,7 +237,7 @@ class GovukConnect::CLI
   def ssh_username
     @ssh_username ||= begin
       if File.exist? config_file
-        config_ssh_username = YAML::load_file(config_file)["ssh_username"]
+        config_ssh_username = YAML.load_file(config_file)["ssh_username"]
       end
 
       config_ssh_username || ENV["USER"]
@@ -237,7 +246,7 @@ class GovukConnect::CLI
 
   def ssh_identity_file
     @ssh_identity_file ||= begin
-      YAML::load_file(config_file)["ssh_identity_file"] if File.exist? config_file
+      YAML.load_file(config_file)["ssh_identity_file"] if File.exist? config_file
     end
   end
 
@@ -257,13 +266,14 @@ class GovukConnect::CLI
     log "debug: looking up classes in #{hosting}/#{environment}"
     command = [
       "ssh",
-      "-o", "ConnectTimeout=2", # Show a failure quickly
+      "-o",
+      "ConnectTimeout=2", # Show a failure quickly
       *ssh_identity_arguments,
       user_at_host(
         ssh_username,
         jumpbox_for_environment_and_hosting(environment, hosting),
       ),
-      "govuk_node_list --classes"
+      "govuk_node_list --classes",
     ].join(" ")
 
     log "debug: running command: #{command}"
@@ -287,13 +297,14 @@ class GovukConnect::CLI
   def get_domains_for_node_class(target, environment, hosting, ssh_username)
     command = [
       "ssh",
-      "-o", "ConnectTimeout=2", # Show a failure quickly
+      "-o",
+      "ConnectTimeout=2", # Show a failure quickly
       *ssh_identity_arguments,
       user_at_host(
         ssh_username,
         jumpbox_for_environment_and_hosting(environment, hosting),
       ),
-      "govuk_node_list -c #{target}"
+      "govuk_node_list -c #{target}",
     ].join(" ")
 
     output, status = Open3.capture2(command)
@@ -305,7 +316,11 @@ class GovukConnect::CLI
       exit 1
     end
 
-    output.split("\n").sort
+    if hosting == :aws
+      output.split("\n")
+    else
+      output.split("\n").sort
+    end
   end
 
   def govuk_directory
@@ -327,12 +342,12 @@ class GovukConnect::CLI
     hieradata_file = File.join(local_hieradata_root, "#{environment}.yaml")
     log "debug: reading #{hieradata_file}"
 
-    environment_specific_hieradata = YAML::load_file(hieradata_file)
+    environment_specific_hieradata = YAML.load_file(hieradata_file)
 
     if environment_specific_hieradata["node_class"]
       environment_specific_hieradata["node_class"]
     else
-      common_hieradata = YAML::load_file(
+      common_hieradata = YAML.load_file(
         File.join(local_hieradata_root, "common.yaml"),
       )
 
@@ -390,7 +405,7 @@ class GovukConnect::CLI
       print_empty_line
       info "specify the node class and application mame, for example: "
       node_classes.each do |node_class|
-        info "\n  govuk-connect app-console -e #{environment} #{node_class}/#{app_name}"
+        info "\n  gds govuk connect app-console -e #{environment} #{node_class}/#{app_name}"
       end
       print_empty_line
 
@@ -434,7 +449,7 @@ class GovukConnect::CLI
       print_empty_line
       info "specify the hosting provider and node type, for example: "
       hosting_providers.each do |hosting_provider|
-        info "\n  govuk-connect ssh #{bold(hosting_provider)}/#{node_type}"
+        info "\n  gds govuk connect ssh #{bold(hosting_provider)}/#{node_type}"
       end
       info "\n"
 
@@ -511,7 +526,7 @@ class GovukConnect::CLI
       app_name,
       environment,
       hosting,
-      )
+    )
 
     unless node_class
       error "error: application '#{app_name}' not found."
@@ -551,90 +566,27 @@ class GovukConnect::CLI
 
   def ssh(
     target,
-        environment,
-        command: false,
-        port_forward: false,
-        additional_arguments: []
-      )
+    environment,
+    command: false,
+    port_forward: false,
+    additional_arguments: []
+  )
     log "debug: ssh to #{target} in #{environment}"
 
-    # Split something like aws/backend:2 in to :aws, 'backend', 2
-    hosting, name, number = parse_hosting_name_and_number(target)
-
-    if name.end_with? ".internal"
-      ssh_target = name
-      hosting = :aws
-    elsif name.end_with? ".gov.uk"
-      ssh_target = name
-      hosting = :carrenza
-    else
-      # The hosting might not have been provided, so check if necessary
-      hosting ||= hosting_for_target_and_environment(target, environment)
-
-      domains = get_domains_for_node_class(
-        name,
-        environment,
-        hosting,
-        ssh_username,
-      )
-
-      if domains.length.zero?
-        error "error: couldn't find #{name} in #{hosting}/#{environment}"
-
-        node_types = govuk_node_list_classes(environment, hosting)
-
-        similar_node_types = strings_similar_to(name, node_types)
-
-        if similar_node_types.any?
-          info "\ndid you mean:"
-          similar_node_types.each { |s| info " - #{s}" }
-        else
-          info "\nall node types:"
-          node_types.each { |s| info " - #{s}" }
-        end
-
-        exit 1
-      elsif domains.length == 1
-        ssh_target = domains.first
-
-        info "There is #{bold('one machine')} to connect to"
-      else
-        n_machines = bold("#{domains.length} machines")
-        info "There are #{n_machines} of this class"
-
-        if number
-          unless number.positive?
-            print_empty_line
-            error "error: invalid machine number '#{number}', it must be > 0"
-            exit 1
-          end
-
-          unless number <= domains.length
-            print_empty_line
-            error "error: cannot connect to machine number: #{number}"
-            exit 1
-          end
-
-          ssh_target = domains[number - 1]
-          info "Connecting to number #{number}"
-        else
-          ssh_target = domains.sample
-          info "Connecting to a random machine (number #{domains.find_index(ssh_target) + 1})"
-        end
-      end
-    end
+    target, hosting = ssh_target(target, environment)
 
     ssh_command = [
       "ssh",
       *ssh_identity_arguments,
-      "-J", user_at_host(
+      "-J",
+      user_at_host(
         ssh_username,
         jumpbox_for_environment_and_hosting(environment, hosting),
       ),
       user_at_host(
         ssh_username,
-        ssh_target,
-      )
+        target,
+      ),
     ]
 
     if command
@@ -647,7 +599,8 @@ class GovukConnect::CLI
 
       ssh_command += [
         "-N",
-        "-L", "#{localhost_port}:127.0.0.1:#{port_forward}"
+        "-L",
+        "#{localhost_port}:127.0.0.1:#{port_forward}",
       ]
 
       info "Port forwarding setup, access:\n\n  http://127.0.0.1:#{localhost_port}/\n\n"
@@ -660,6 +613,44 @@ class GovukConnect::CLI
     exec(*ssh_command)
   end
 
+  def scp(
+    target,
+    environment,
+    files,
+    push: false,
+    additional_arguments: []
+  )
+    log "debug: scp #{push ? 'push' : 'pull'} to #{target} in #{environment}"
+
+    target, hosting = ssh_target(target, environment)
+
+    sources = files[0, files.length - 1]
+    destination = files[-1]
+
+    if push
+      destination = "#{target}:#{destination}"
+    else
+      sources = sources.map { |source| "#{target}:#{source}" }
+    end
+
+    scp_command = [
+      "scp",
+      *ssh_identity_arguments,
+      "-o",
+      "ProxyJump=#{user_at_host(ssh_username, jumpbox_for_environment_and_hosting(environment, hosting))}",
+      "-o",
+      "User=#{ssh_username}",
+      *additional_arguments,
+      "--",
+      *sources,
+      destination,
+    ]
+
+    info "\n#{bold('Running command:')} #{scp_command.join(' ')}\n\n"
+
+    exec(*scp_command)
+  end
+
   def rabbitmq_root_password_command(hosting, environment)
     hieradata_directory = {
       aws: "puppet_aws",
@@ -679,14 +670,14 @@ class GovukConnect::CLI
     uri = URI(url)
 
     host_to_hosting_and_environment = {
-     "ci-alert.integration.publishing.service.gov.uk" => %i[carrenza ci],
-     "alert.integration.publishing.service.gov.uk" => %i[aws integration],
-     "alert.staging.govuk.digital" => %i[aws staging],
-     "alert.blue.staging.govuk.digital" => %i[aws staging],
-     "alert.staging.publishing.service.gov.uk" => %i[carrenza staging],
-     "alert.production.govuk.digital" => %i[aws production],
-     "alert.blue.production.govuk.digital" => %i[aws production],
-     "alert.publishing.service.gov.uk" => %i[carrenza production],
+      "ci-alert.integration.publishing.service.gov.uk" => %i[carrenza ci],
+      "alert.integration.publishing.service.gov.uk" => %i[aws integration],
+      "alert.staging.govuk.digital" => %i[aws staging],
+      "alert.blue.staging.govuk.digital" => %i[aws staging],
+      "alert.staging.publishing.service.gov.uk" => %i[carrenza staging],
+      "alert.production.govuk.digital" => %i[aws production],
+      "alert.blue.production.govuk.digital" => %i[aws production],
+      "alert.publishing.service.gov.uk" => %i[carrenza production],
     }
 
     unless host_to_hosting_and_environment.key? uri.host
@@ -699,8 +690,6 @@ class GovukConnect::CLI
 
   def parse_options(argv)
     options = {}
-
-    # rubocop:disable Metrics/BlockLength
     @option_parser = OptionParser.new do |opts|
       opts.banner = USAGE_BANNER
 
@@ -723,12 +712,15 @@ class GovukConnect::CLI
         options[:port_forward] = o
       end
       opts.on("-v", "--verbose", "Enable more detailed logging") do
-        $verbose = true
+        @verbose = true
       end
 
-      opts.on("-h", "--help", "Prints usage information and examples") do
+      opts.on("-h", "--help", "Prints usage examples and information") do
         info opts
         print_empty_line
+        info bold("EXAMPLES")
+        info EXAMPLES
+        print_empty_line
         info bold("CONNECTION TYPES")
         types.keys.each do |x|
           info "  #{x}"
@@ -741,9 +733,6 @@ class GovukConnect::CLI
         print_empty_line
         info bold("APPLICATION TARGET")
         info APP_TARGET_DESCRIPTION
-        print_empty_line
-        info bold("EXAMPLES")
-        info EXAMPLES
         exit
       end
       opts.on("-V", "--version", "Prints version information") do
@@ -751,7 +740,6 @@ class GovukConnect::CLI
         exit
       end
     end
-    # rubocop:enable Metrics/BlockLength
 
     @option_parser.parse!(argv)
 
@@ -823,6 +811,94 @@ class GovukConnect::CLI
     [node_class, app_name, number]
   end
 
+  def target_from_options(target, options)
+    if options.key? :hosting
+      hosting, name, number = parse_hosting_name_and_number(target)
+      if hosting
+        error "error: hosting specified twice"
+        exit 1
+      end
+
+      {
+        hosting: options[:hosting],
+        name: name,
+        number: number,
+      }
+    else
+      target
+    end
+  end
+
+  def ssh_target(target, environment)
+    # Split something like aws/backend:2 in to :aws, 'backend', 2
+    hosting, name, number = parse_hosting_name_and_number(target)
+
+    if name.end_with? ".internal"
+      target = name
+      hosting = :aws
+    elsif name.end_with? ".gov.uk"
+      target = name
+      hosting = :carrenza
+    else
+      # The hosting might not have been provided, so check if necessary
+      hosting ||= hosting_for_target_and_environment(target, environment)
+
+      domains = get_domains_for_node_class(
+        name,
+        environment,
+        hosting,
+        ssh_username,
+      )
+
+      if domains.length.zero?
+        error "error: couldn't find #{name} in #{hosting}/#{environment}"
+
+        node_types = govuk_node_list_classes(environment, hosting)
+
+        similar_node_types = strings_similar_to(name, node_types)
+
+        if similar_node_types.any?
+          info "\ndid you mean:"
+          similar_node_types.each { |s| info " - #{s}" }
+        else
+          info "\nall node types:"
+          node_types.each { |s| info " - #{s}" }
+        end
+
+        exit 1
+      elsif domains.length == 1
+        target = domains.first
+
+        info "There is #{bold('one machine')} to connect to"
+      else
+        n_machines = bold("#{domains.length} machines")
+        info "There are #{n_machines} of this class"
+
+        if number
+          unless number.positive?
+            print_empty_line
+            error "error: invalid machine number '#{number}', it must be > 0"
+            exit 1
+          end
+
+          unless number <= domains.length
+            print_empty_line
+            error "error: cannot connect to machine number: #{number}"
+            exit 1
+          end
+
+          target = domains[number - 1]
+          info "Connecting to number #{number}"
+        else
+          target = domains.sample
+          info "Connecting to a random machine (number #{domains.find_index(target) + 1})"
+        end
+      end
+    end
+
+    [target, hosting]
+  end
+
   def check_for_target(target)
     unless target
       error "error: you must specify the target\n"
@@ -842,20 +918,23 @@ class GovukConnect::CLI
 
   def types
     @types ||= {
-      "app-console" => Proc.new do |target, environment, args, _options|
+      "app-console" => proc do |target, environment, args, extra_args, _options|
         check_for_target(target)
         check_for_additional_arguments("app-console", args)
+        check_for_additional_arguments("app-console", extra_args)
         govuk_app_command(target, environment, "console")
       end,
 
-      "app-dbconsole" => Proc.new do |target, environment, args, _options|
+      "app-dbconsole" => proc do |target, environment, args, extra_args, _options|
         check_for_target(target)
         check_for_additional_arguments("app-dbconsole", args)
+        check_for_additional_arguments("app-dbconsole", extra_args)
         govuk_app_command(target, environment, "dbconsole")
       end,
 
-      "rabbitmq" => Proc.new do |target, environment, args, _options|
+      "rabbitmq" => proc do |target, environment, args, extra_args, _options|
         check_for_additional_arguments("rabbitmq", args)
+        check_for_additional_arguments("rabbitmq", extra_args)
 
         target ||= "rabbitmq"
 
@@ -876,8 +955,9 @@ class GovukConnect::CLI
         )
       end,
 
-      "sidekiq-monitoring" => Proc.new do |target, environment, args, _options|
+      "sidekiq-monitoring" => proc do |target, environment, args, extra_args, _options|
         check_for_additional_arguments("sidekiq-monitoring", args)
+        check_for_additional_arguments("sidekiq-monitoring", extra_args)
         ssh(
           target || "backend",
           environment,
@@ -885,28 +965,50 @@ class GovukConnect::CLI
         )
       end,
 
-      "ssh" => Proc.new do |target, environment, args, options|
+      "ssh" => proc do |target, environment, args, extra_args, options|
         check_for_target(target)
+        target = target_from_options(target, options)
 
-        if options.key? :hosting
-          hosting, name, number = parse_hosting_name_and_number(target)
-          if hosting
-            error "error: hosting specified twice"
-            exit 1
-          end
+        ssh(
+          target,
+          environment,
+          port_forward: options[:port_forward],
+          additional_arguments: [args, extra_args].flatten,
+        )
+      end,
+
+      "scp-pull" => proc do |target, environment, args, extra_args, options|
+        check_for_target(target)
+        target = target_from_options(target, options)
 
-          target = {
-            hosting: options[:hosting],
-            name: name,
-            number: number,
-          }
+        if args.length < 2
+          error "error: need at least two filenames"
+          exit 1
         end
 
-        ssh(
+        scp(
           target,
           environment,
-          port_forward: options[:port_forward],
-          additional_arguments: args,
+          args,
+          additional_arguments: extra_args,
+        )
+      end,
+
+      "scp-push" => proc do |target, environment, args, extra_args, options|
+        check_for_target(target)
+        target = target_from_options(target, options)
+
+        if args.length < 2
+          error "error: need at least two filenames"
+          exit 1
+        end
+
+        scp(
+          target,
+          environment,
+          args,
+          push: true,
+          additional_arguments: extra_args,
         )
       end,
     }
@@ -915,26 +1017,21 @@ class GovukConnect::CLI
   def main(argv)
     check_ruby_version_greater_than(required_major: 2, required_minor: 0)
 
+    extra_arguments_after_double_dash = []
+
     double_dash_index = argv.index "--"
     if double_dash_index
-      # This is used in the case of passing extra options to ssh, the --
-      # acts as a separator, so to avoid optparse interpreting those
-      # options, split argv around -- before parsing the options
-      rest = argv[double_dash_index + 1, argv.length]
+      # This is used in the case of passing extra options to ssh and
+      # scp, the -- acts as a separator, so to avoid optparse
+      # interpreting those as options, split argv around -- before
+      # parsing the options
+      extra_arguments_after_double_dash = argv[double_dash_index + 1, argv.length]
       argv = argv[0, double_dash_index]
-
-      argv.clear
-      argv.concat argv
-
-      options = parse_options(argv)
-
-      type, target = argv
-    else
-      options = parse_options(argv)
-
-      type, target, *rest = argv
     end
 
+    govuk_connect_options = parse_options(argv)
+    type, target, *extra_arguments_before_double_dash = argv
+
     unless type
       error "error: you must specify the connection type\n"
 
@@ -967,7 +1064,7 @@ class GovukConnect::CLI
       exit 1
     end
 
-    environment = options[:environment]&.to_sym
+    environment = govuk_connect_options[:environment]&.to_sym
 
     unless environment
       error "error: you must specify the environment\n"
@@ -983,7 +1080,13 @@ class GovukConnect::CLI
       exit 1
     end
 
-    handler.call(target, environment, rest, options)
+    handler.call(
+      target,
+      environment,
+      extra_arguments_before_double_dash,
+      extra_arguments_after_double_dash,
+      govuk_connect_options,
+    )
   rescue Interrupt
     # Handle SIGTERM without printing a stacktrace
     exit 1

data/lib/govuk_connect/version.rb

@@ -1,3 +1,3 @@
 module GovukConnect
-  VERSION = "0.1.0".freeze
+  VERSION = "0.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-connect
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Government Digital Service
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.17.0
 description: Command line tool to connect to GOV.UK infrastructure
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
@@ -82,7 +82,7 @@ homepage: https://github.com/alphagov/govuk-connect
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: govuk-connect command line tool
 test_files: []