govuk-connect 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8646130db048f402534738fffea6fca312d926909b4bfaf96a99a0d87a6625
-  data.tar.gz: d4011ee86eddef1e2f0ac7e643bfaaf757baf713612cd808822c84eef715ac5d
+  metadata.gz: caebe6cb74e7454207be9c5415c147d5afc710bc2767b3784a0a314cba233762
+  data.tar.gz: 11cddb0747edba0ccb1a96ba45cbc454a4a19f37ef46395bc057a9eb7814ec52
 SHA512:
-  metadata.gz: 0cf8916a2150a946b616cfed84feae2b9333116cec946bb77179ea3074e64758552dde756872857178596a3163a5dce898daf11ca2c363223d714aef845abf94
-  data.tar.gz: 809217f4589312c5fad4fa008f9eba535c622f87d0fe2222d944528b25c7772bb3d5d029be8d4c3f97a6e637c0e9c444afefe59cdc35532c5b3c9d4f6513f264
+  metadata.gz: bec29749ec1eb4024f91bffd6147594796b165556f98b5bfcb9c2be4a0b983cd01681ae9e3938e54c75a0d344661a8dc3bf198d4d7a59040fc4108cd2e4af19f
+  data.tar.gz: 2cb2274d0ef354af3639b76d4b0464f5b9fe2c663805e21177f9fa8a82e41b7b932aad46ce020418f136da1149154617ebfd6a34c00a70a8d0ab2e06fe4768ca

data/lib/govuk_connect/cli.rb

@@ -75,10 +75,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 +99,7 @@ class GovukConnect::CLI
   }.freeze
 
   def log(message)
-    warn message if $verbose
+    warn message if @verbose
   end
 
   def print_empty_line
@@ -125,10 +128,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 +181,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 +233,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 +242,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 +262,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 +293,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)
@@ -327,12 +334,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"),
       )
 
@@ -511,7 +518,7 @@ class GovukConnect::CLI
       app_name,
       environment,
       hosting,
-      )
+    )
 
     unless node_class
       error "error: application '#{app_name}' not found."
@@ -551,11 +558,11 @@ 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
@@ -627,14 +634,15 @@ class GovukConnect::CLI
     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,
-      )
+      ),
     ]
 
     if command
@@ -647,7 +655,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"
@@ -679,14 +688,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 +708,6 @@ class GovukConnect::CLI
 
   def parse_options(argv)
     options = {}
-
-    # rubocop:disable Metrics/BlockLength
     @option_parser = OptionParser.new do |opts|
       opts.banner = USAGE_BANNER
 
@@ -723,7 +730,7 @@ 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
@@ -751,7 +758,6 @@ class GovukConnect::CLI
         exit
       end
     end
-    # rubocop:enable Metrics/BlockLength
 
     @option_parser.parse!(argv)
 
@@ -842,19 +848,19 @@ class GovukConnect::CLI
 
   def types
     @types ||= {
-      "app-console" => Proc.new do |target, environment, args, _options|
+      "app-console" => proc do |target, environment, args, _options|
         check_for_target(target)
         check_for_additional_arguments("app-console", args)
         govuk_app_command(target, environment, "console")
       end,
 
-      "app-dbconsole" => Proc.new do |target, environment, args, _options|
+      "app-dbconsole" => proc do |target, environment, args, _options|
         check_for_target(target)
         check_for_additional_arguments("app-dbconsole", args)
         govuk_app_command(target, environment, "dbconsole")
       end,
 
-      "rabbitmq" => Proc.new do |target, environment, args, _options|
+      "rabbitmq" => proc do |target, environment, args, _options|
         check_for_additional_arguments("rabbitmq", args)
 
         target ||= "rabbitmq"
@@ -876,7 +882,7 @@ class GovukConnect::CLI
         )
       end,
 
-      "sidekiq-monitoring" => Proc.new do |target, environment, args, _options|
+      "sidekiq-monitoring" => proc do |target, environment, args, _options|
         check_for_additional_arguments("sidekiq-monitoring", args)
         ssh(
           target || "backend",
@@ -885,7 +891,7 @@ class GovukConnect::CLI
         )
       end,
 
-      "ssh" => Proc.new do |target, environment, args, options|
+      "ssh" => proc do |target, environment, args, options|
         check_for_target(target)
 
         if options.key? :hosting

data/lib/govuk_connect/version.rb

@@ -1,3 +1,3 @@
 module GovukConnect
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".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.2.0
 platform: ruby
 authors:
 - Government Digital Service
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-06-24 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.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.16.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
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: govuk-connect command line tool
 test_files: []