bcome 1.4.0 → 2.0.0

data/lib/objects/node/server/static.rb

@@ -7,13 +7,17 @@ module Bcome::Node::Server
     end
 
     def initialize(params)
-      config = params[:views]
-      @identifier = config[:identifier]
-      @public_ip_address = config[:public_ip_address]
-      @internal_ip_address = config[:internal_ip_address]
-      @cloud_tags = config[:cloud_tags]
-      @description = config[:description]
-      verify_we_have_at_least_one_interface(config)
+      @view_config = params[:views]
+
+      set_cloud_tags
+
+      @identifier = @view_config[:identifier]
+      @public_ip_address = @view_config[:public_ip_address]
+      @internal_ip_address = @view_config[:internal_ip_address]
+      @cloud_tags = @view_config[:cloud_tags]
+      @description = @view_config[:description]
+      verify_we_have_at_least_one_interface
+      verify_identifier_and_description
       super
     end
 
@@ -27,8 +31,17 @@ module Bcome::Node::Server
 
     attr_reader :description
 
-    def verify_we_have_at_least_one_interface(config)
-      raise Bcome::Exception::MissingIpaddressOnServer, config unless has_at_least_one_interface?
+    def set_cloud_tags
+      @view_config[:cloud_tags] = ::Bcome::Node::Meta::Cloud.new(@view_config[:cloud_tags]) unless @view_config[:cloud_tags].is_a?(::Bcome::Node::Meta::Cloud)
+    end
+
+    def verify_we_have_at_least_one_interface
+      raise Bcome::Exception::MissingIpaddressOnServer, @view_config unless has_at_least_one_interface?
+    end
+
+    def verify_identifier_and_description
+      raise Bcome::Exception::Generic, "Your static server defined by #{@view_config} is missing a description" unless @description
+      raise Bcome::Exception::Generic, "Your static server defined by #{@view_config} is missing an identifier" unless @identifier
     end
 
     def has_at_least_one_interface?

data/lib/objects/orchestration/base.rb

@@ -10,7 +10,13 @@ module Bcome::Orchestration
     def do_execute
       raise Bcome::Exception::MissingExecuteOnRegistryObject, self.class.to_s unless respond_to?(:execute)
 
-      execute
+      begin
+        execute
+      rescue ::Bcome::Exception::Base => bcome_exception
+        show_backtrace = true unless bcome_exception.is_a?(::Bcome::Exception::InvalidMetaDataEncryptionKey)
+        bcome_exception.pretty_display(show_backtrace)
+        raise ::Bcome::Exception::UserOrchestrationError, self.class.to_s
+      end
     end
 
     def method_missing(method_sym, *_arguments)

data/lib/objects/orchestration/interactive_terraform.rb

@@ -11,14 +11,19 @@ module Bcome::Orchestration
     QUIT = '\\q'
     COMMAND_PROMPT = "enter command or '#{QUIT}' to quit: " + 'terraform'.informational + "\s"
 
+    def initialize(*params)
+      super
+      raise ::Bcome::Exception::Generic, "Missing terraform configuration directory #{path_to_env_config}" unless File.exist?(path_to_env_config)
+    end
+
     def execute
       show_intro_text
       wait_for_command_input
     end
 
     def show_intro_text
-      puts "\n"
-      puts "INTERACTIVE TERRAFORM\n".underline
+      puts "\n\n"
+      puts "Interactive Terraform\n".underline
       puts "Namespace:\s" + @node.namespace.to_s.informational
       puts "Configuration Path:\s" + "#{path_to_env_config}/*".informational
       puts "\nConfigured metadata:\s" + terraform_metadata.inspect.informational
@@ -29,13 +34,6 @@ module Bcome::Orchestration
     # PROCESSING INTERACTIVE COMMANDS
     #
     def process_command(raw_command)
-      if raw_command =~ /destroy/
-        are_you_sure_message = "Are you SURE you want to 'destroy'? Make sure you know what will be destroyed before you continue. (y/n):".warning
-        response = wait_for_input(are_you_sure_message)
-        response = wait_for_input(are_you_sure_message) until %w[y n].include?(response)
-        return if response == 'n'
-      end
-
       full_command = command(raw_command)
       @node.execute_local(full_command)
       wait_for_command_input
@@ -78,8 +76,6 @@ module Bcome::Orchestration
       end
 
       all_vars[:ssh_user] = @node.ssh_driver.user
-      all_vars[:ssh_key_path] = @node.ssh_driver.ssh_keys.first
-
       all_vars.collect { |key, value| "-var #{key}=\"#{value}\"" }.join("\s")
     end
 
@@ -105,11 +101,9 @@ module Bcome::Orchestration
 
     # Formulate a terraform command
     def command(raw_command)
-      # if raw_command == "init"
-      #  "cd #{path_to_env_config} ; terraform #{raw_command} #{backend_config_parameter_string}"
-      # else
-      "cd #{path_to_env_config} ; terraform #{raw_command} #{var_string}"
-      # end
+      cmd = "cd #{path_to_env_config} ; terraform #{raw_command}"
+      cmd = "#{cmd} #{var_string}" if raw_command =~ Regexp.new(/^apply$|plan|destroy|refresh/)
+      cmd
     end
   end
 end

data/lib/objects/registry/command/external.rb

@@ -31,14 +31,18 @@ module Bcome::Registry::Command
           raise Bcome::Exception::MissingArgumentForRegistryCommand, error_message_suffix
         end
 
-        substitute_with = [TrueClass, FalseClass].include?(substitute_with.class) ? (substitute_with ? 'true' : 'false') : substitute_with
+        substitute_with = if [TrueClass, FalseClass].include?(substitute_with.class)
+                            substitute_with ? 'true' : 'false'
+                          else
+                            substitute_with
+                          end
         substituted_command.gsub!("%#{substitution}%", substitute_with)
       end
       substituted_command
     end
 
     def namespace_command(node, command)
-      "#{command} bcome_context=\"#{node.keyed_namespace}\""
+      "bcome_context=\"#{node.keyed_namespace}\" #{command}"
     end
 
     def local_command_substitutions

data/lib/objects/registry/command/group.rb

@@ -62,7 +62,11 @@ module Bcome::Registry::Command
 
           puts tab_spacing + command_key.resource_key + item_spacing(command_key) + description.resource_value
 
-          usage_string = in_console_session? ? command_key.to_s : "bcome #{@node.keyed_namespace.empty? ? '' : "#{@node.keyed_namespace}:"}#{command_key}"
+          usage_string = if in_console_session?
+                           command_key.to_s
+                         else
+                           "bcome #{@node.keyed_namespace.empty? ? '' : "#{@node.keyed_namespace}:"}#{command_key}"
+                         end
           puts tab_spacing + ("\s" * menu_item_spacing_length) + 'usage: '.instructional + usage_string
 
           if defaults.keys.any?

data/lib/objects/registry/loader.rb

@@ -20,6 +20,9 @@ module Bcome::Registry
       data.each do |key, commands|
         begin
           if /^#{key}$/.match(node.keyed_namespace)
+
+            next if commands.nil?
+
             commands.each do |c|
               unless c[:console_command]
                 error_message = "Registry method is missing key 'console_command'."

data/lib/objects/ssh/command.rb

@@ -16,17 +16,13 @@ module ::Bcome::Ssh
       @node = nil
     end
 
-    def pretty_result
-      is_success? ? 'success'.success : 'failure'.error
-    end
-
     def output
       cmd_output = @stdout
 
-      unless is_success?
-        cmd_output += "\nExit code: #{@exit_code}"
-        cmd_output += "\nSTDERR: #{@stderr}" unless @stderr.empty?
-      end
+      cmd_output += "\nExit code:" + "\s#{@exit_code}"
+
+      cmd_output += "\nSTDERR: #{@stderr}" if exit_code == 1 && !@stderr.empty?
+
       "\n#{cmd_output}"
     end
 

data/lib/objects/ssh/command_exec.rb

@@ -18,6 +18,8 @@ module ::Bcome::Ssh
 
     def print_output
       print "#{@output_string}\n\n"
+    rescue StandardError => e
+      puts "Could not print #{@output_string.inspect}"
     end
 
     def execute!
@@ -33,7 +35,7 @@ module ::Bcome::Ssh
           ssh_exec!(ssh, command) # retry, once
         end
 
-        output_append("\n(#{node.namespace})$".terminal_prompt + ">\s#{command.raw} (#{command.pretty_result})\n")
+        output_append("\n(#{node.namespace})$".terminal_prompt + ">\s#{command.raw}\n")
         output_append(command.output.to_s)
       end
 

data/lib/objects/ssh/connection_wrangler.rb

@@ -4,19 +4,17 @@ require 'net/ssh/proxy/jump'
 
 module Bcome::Ssh
   class ConnectionWrangler
+    attr_accessor :proxy_details
+
     def initialize(ssh_driver)
       @ssh_driver = ssh_driver
       @config = ssh_driver.config[:proxy]
       @context_node = ssh_driver.context_node
       @user = ssh_driver.user
+      set_proxy_details
     end
 
     ## Accessors --
-
-    def proxy_details
-      hops.reverse.collect(&:proxy_details)
-    end
-
     def first_hop
       hops.reverse.first
     end
@@ -41,7 +39,7 @@ module Bcome::Ssh
     def get_ssh_command(config = {}, _proxy_only = false)
       cmd = has_hop? ? 'ssh -J' : 'ssh'
       cmd += "\s" + hops.collect(&:get_ssh_string).join(',') if has_hop?
-      cmd += "\s#{@ssh_driver.node_level_ssh_key_connection_string}\s#{@ssh_driver.user}@#{target_machine_ingress_ip}"
+      cmd += "\s#{@ssh_driver.user}@#{target_machine_ingress_ip}"
 
       config[:as_pseudo_tty] ? "#{cmd} -t" : cmd
     end
@@ -54,19 +52,29 @@ module Bcome::Ssh
     end
 
     def get_local_port_forward_command(start_port, end_port)
-      # TODO: - below check is not actaully true... you might still want to proxy over SSH...
+      # TODO: - below check is not actually true... you might still want to proxy over SSH...
       raise ::Bcome::Exception::InvalidPortForwardRequest, 'Connections to this node are not via a proxy. Rather than port forward, try connecting directly.' unless has_hop?
 
       cmd = "ssh -N -L #{start_port}:localhost:#{end_port} -J"
       cmd += "\s" + hops.collect(&:get_ssh_string).join(',') if has_hop?
-      cmd += "\s#{@ssh_driver.node_level_ssh_key_connection_string}\s#{@ssh_driver.user}@#{target_machine_ingress_ip}"
+      cmd += "\s#{@ssh_driver.user}@#{target_machine_ingress_ip}"
 
       cmd
     end
 
+    def hops
+      @hops ||= set_hops
+    end
+
     protected
 
+    def set_proxy_details
+      @proxy_details ||= hops.compact.collect(&:proxy_details)
+    end
+
     def target_machine_ingress_ip
+      return @context_node.internal_ip_address if @context_node.local_network?
+
       unless has_hop?
         raise ::Bcome::Exception::InvalidProxyConfig, "missing target ip address for #{@context_node.identifier}. Perhaps you meant to configure a proxy?" unless @context_node.public_ip_address
       end
@@ -74,10 +82,6 @@ module Bcome::Ssh
       has_hop? ? @context_node.internal_ip_address : @context_node.public_ip_address
     end
 
-    def hops
-      @hops ||= set_hops
-    end
-
     private
 
     def set_hops
@@ -85,21 +89,34 @@ module Bcome::Ssh
 
       parent = nil
       iterable_configs.each do |config|
-        hop = set_proxy_hop(config, parent)
+        hop = get_proxy_hop(config, parent)
+  
+        if @context_node.is_same_machine?(hop.bcome_proxy_node)
+          # We don't hop through ourselves.  If we're reached ourselves in the proxy chain,
+          # then we'll break the chain at that point.
+          break
+        end  
+
+        # Set proxy hop
         hop_collection << hop
         parent = hop
       end
 
-      hop_collection
+      hop_collection.compact
     end
 
-    def set_proxy_hop(config, parent)
+    def get_proxy_hop(config, parent)
       config[:fallback_bastion_host_user] = @ssh_driver.fallback_bastion_host_user
-      ::Bcome::Ssh::ProxyHop.new(config, @context_node, parent)
+      h = ::Bcome::Ssh::ProxyHop.new(config, @context_node, parent)
+      return h
     end
 
     def iterable_configs
-      @iterable ||= @config ? (@config.is_a?(Hash) ? [@config] : @config) : []
+      @iterable ||= if @config
+                      @config.is_a?(Hash) ? [@config] : @config
+                    else
+                      []
+                    end
     end
   end
 end

data/lib/objects/ssh/connector.rb

@@ -32,6 +32,7 @@ module Bcome
         return if number_unconnected_machines == 0 && !ping?
 
         if show_progress?
+          print "\n"
           wrap_indicator type: :progress, size: @servers_to_connect.size, title: 'Opening connections' do
             open_connections
           end
@@ -66,18 +67,19 @@ module Bcome
       def open_connections
         @servers_to_connect.pmap do |machine|
           begin
-           machine.open_ssh_connection(ping?)
-           if machine.has_ssh_connection?
-             @servers_to_connect -= [machine]
-             @connected_machines << machine
-             signal_success if show_progress?
-           else
-             signal_failure if show_progress?
-           end
+            machine.open_ssh_connection(ping?)
+
+            if machine.has_ssh_connection?
+              @servers_to_connect -= [machine]
+              @connected_machines << machine
+              signal_success if show_progress?
+            else
+              signal_failure if show_progress?
+            end
           rescue Errno::EPIPE, Bcome::Exception::CouldNotInitiateSshConnection, ::Bcome::Exception::InvalidProxyConfig => e
             signal_failure if show_progress?
             @connection_exceptions[machine] = e
-         end
+          end
         end
       end
 
@@ -85,6 +87,12 @@ module Bcome
 
       def set_servers
         @servers_to_connect = machines.dup
+
+        # Ensure that all connections are loaded. A machine might need to proxy through another that
+        # has not yet been loaded. Here we ensure that we've traversed the tree for all required nodes.
+        @servers_to_connect.each do |server|
+          server.ssh_driver.set_connection_wrangler
+        end
       end
 
       def number_unconnected_machines

data/lib/objects/ssh/driver.rb

@@ -20,21 +20,24 @@ module Bcome::Ssh
       @connection_wrangler ||= set_connection_wrangler
     end
 
+    def proxy_chain
+      @proxy_chain ||= ::Bcome::Ssh::ProxyChain.new(connection_wrangler)
+    end
+
     def set_connection_wrangler
-      @set_connection_wrangler ||= ::Bcome::Ssh::ConnectionWrangler.new(self)
+      @connection_wrangler = ::Bcome::Ssh::ConnectionWrangler.new(self)
     end
 
     def pretty_ssh_config
       config = {
         user: user,
-        ssh_keys: ssh_keys,
         timeout: timeout_in_seconds
       }
 
       if has_proxy?
         config[:proxy] = connection_wrangler.proxy_details
       else
-        config[:host_or_ip] = @context_node.public_ip_address
+        config[:host_or_ip] = node_host_or_ip
       end
 
       config
@@ -48,26 +51,12 @@ module Bcome::Ssh
       @config[:multi_hop_proxy]
     end
 
-    def node_level_ssh_key_connection_string
-      key_specified_at_node_level? ? "-i #{node_level_ssh_key}\s" : ''
-    end
-
-    def key_specified_at_node_level?
-      !node_level_ssh_key.nil?
-    end
-
-    def node_level_ssh_key
-      @config[:ssh_keys] ? @config[:ssh_keys].first : nil
-    end
-
     def has_multi_hop_proxy?
       !multi_hop_proxy_config.nil?
     end
 
     def has_proxy?
-      return false if proxy_config_value && proxy_config_value == -1
-
-      !@config[:proxy].nil?
+      return connection_wrangler.has_hop?
     end
   end
 end

data/lib/objects/ssh/driver_concerns/connection.rb

@@ -12,9 +12,8 @@ module ::Bcome::Ssh
       @connection = nil
       begin
         raise ::Bcome::Exception::InvalidProxyConfig, "missing target ip address for #{@context_node.identifier}. Perhaps you meant to configure a proxy?" unless node_host_or_ip
-
         @connection = ::Net::SSH.start(node_host_or_ip, user, net_ssh_params)
-      rescue Net::SSH::Proxy::ConnectError, Net::SSH::ConnectionTimeout => e
+      rescue Net::SSH::AuthenticationFailed, Net::SSH::Proxy::ConnectError, Net::SSH::ConnectionTimeout => e
         raise Bcome::Exception::CouldNotInitiateSshConnection, @context_node.namespace + "\s-\s#{e.message}"
       end
       @connection
@@ -45,13 +44,12 @@ module ::Bcome::Ssh
     end
 
     def node_host_or_ip
+      return @context_node.internal_ip_address if @context_node.local_network?
       has_proxy? ? @context_node.internal_ip_address : @context_node.public_ip_address
     end
 
     def net_ssh_params
-      raise Bcome::Exception::InvalidSshConfig, "Missing ssh keys for #{@context_node.namespace}" unless ssh_keys
-
-      params = { keys: ssh_keys, paranoid: false }
+      params = { paranoid: false }
       params[:proxy] = proxy if has_proxy?
       params[:timeout] = timeout_in_seconds
       params[:verbose] = :fatal # All but silent
@@ -63,12 +61,6 @@ module ::Bcome::Ssh
       @config[:timeout_in_seconds] ||= DEFAULT_TIMEOUT_IN_SECONDS
     end
 
-    ## SSH KEYS
-
-    def ssh_keys
-      @config[:ssh_keys]
-    end
-
     ## PROXYING --
 
     def proxy