bcome 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5175174eb843f0f210c02ca12ded004f75d77368
-  data.tar.gz: ffd09a8ba7edc0df044a17b55db02d3176e0feee
+  metadata.gz: 8e5a43822b034da12c4c66c06a83ecba12ddc7f7
+  data.tar.gz: 903781f913e606b995658e265f6b9eca35d7c995
 SHA512:
-  metadata.gz: 855151285002aa2270d025f97ff85c8beead1f3b7aabcad797bcd8eb03885c38f296a2ad1f1e01c2b1be6631a3d9ba724f57fae6046e6132f8ec8e95ae3e9ee9
-  data.tar.gz: 09500dc2f2ac59b5a1c70252c07ca0bbc665f32eac78a52fc1ded53d3e9d79ba09d0367ac56921eab5d56d9ddd300665924640733d3e0d436150badbec7f55db
+  metadata.gz: 8dce77759769673ecfb59617ce4cc884fb52a21c46c9b6576bf7a82deda540d274882351c1818db3eed2a62f64f0675b48a9f06a5c620e25d60af4bc08c2eba2
+  data.tar.gz: 2641aed669f870e423c6845c03fe08af7069264c674799313f763132541811c4f6a63de7f99fe898869d69f89890518b9a11120fe67d20bd734b3af1526ef8f3

data/lib/bcome.rb

@@ -11,6 +11,7 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'pp'
 require 'awesome_print'
+require 'io/console'
 
 require_all "#{File.dirname(__FILE__)}/../patches"
 require_all "#{File.dirname(__FILE__)}/../lib/objects"

data/lib/objects/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.2'.freeze
 end

data/lib/objects/encryptor.rb

@@ -23,8 +23,8 @@ module Bcome
     end
 
     def prompt_for_key
-      message = "Please enter an encryption key (and if your data is already encrypted, you must provide the same key): ".informational
-      @key = ::Readline.readline("\n#{message}", true).squeeze('').to_s
+      print "Please enter an encryption key (and if your data is already encrypted, you must provide the same key): ".informational
+      @key = STDIN.noecho(&:gets).chomp
       puts "\n"
     end
 

data/lib/objects/modules/workspace_commands.rb

@@ -102,7 +102,6 @@ module Bcome::WorkspaceCommands
       desc += "\t"
       desc += is_active ? key.to_s.resource_key : key.to_s.resource_key_inactive
       desc += "\s" * (12 - key.length)
-      attribute_value = value == :identifier ? attribute_value.underline : attribute_value
       desc += is_active ? attribute_value.resource_value : attribute_value.resource_value_inactive
       desc += "\n"
       desc = desc unless is_active

data/lib/objects/node/base.rb

@@ -57,6 +57,10 @@ module Bcome::Node
       ssh_driver.has_proxy?
     end
 
+    def identifier=(new_identifier)
+      @identifier = new_identifier
+    end
+
     def proxy
       ssh_driver.proxy
     end
@@ -108,8 +112,14 @@ module Bcome::Node
 
     def validate_identifier
       @identifier = DEFAULT_IDENTIFIER if is_top_level_node? && !@identifier && !is_a?(::Bcome::Node::Server::Base)
-      raise ::Bcome::Exception::MissingIdentifierOnView.new(@views.inspect) unless @identifier
-      raise ::Bcome::Exception::InvalidIdentifier.new("'#{@identifier}' contains whitespace") if @identifier =~ /\s/
+
+      @identifier = "NO-ID_#{Time.now.to_i}" unless @identifier
+
+      #raise ::Bcome::Exception::MissingIdentifierOnView.new(@views.inspect) unless @identifier
+      @identifier.gsub!(/\s/, "_") # Remove whitespace 
+      @identifier.gsub!("-", "_") # change hyphens to undescores, hyphens don't play well in var names in irb
+
+      #raise ::Bcome::Exception::InvalidIdentifier.new("'#{@identifier}' contains whitespace") if @identifier =~ /\s/
     end
 
     def requires_description?

data/lib/objects/node/factory.rb

@@ -7,6 +7,7 @@ module Bcome::Node
     CONFIG_PATH = 'bcome'.freeze
     DEFAULT_CONFIG_NAME = 'networks.yml'.freeze
     SERVER_OVERRIDE_CONFIG_NAME = 'machines-data.yml'.freeze
+    LOCAL_OVERRIDE_CONFIG_NAME = 'me.yml'.freeze
 
     INVENTORY_KEY = 'inventory'.freeze
     COLLECTION_KEY = 'collection'.freeze
@@ -122,6 +123,23 @@ module Bcome::Node
       raise Bcome::Exception::InvalidNetworkConfig, 'Invalid yaml in machines data config' + e.message
     end
 
+    def local_data
+      @local_data ||= load_local_data
+    end  
+
+    def local_data_path
+      "#{CONFIG_PATH}/#{LOCAL_OVERRIDE_CONFIG_NAME}"
+    end
+
+    def load_local_data
+      return {} unless File.exist?(local_data_path)
+      config = YAML.load_file(local_data_path) 
+      return {} if config.nil?
+      return config
+    rescue ArgumentError, Psych::SyntaxError => e
+      raise Bcome::Exception::InvalidNetworkConfig, 'Invalid yaml in machines data config' + e.message
+    end
+
     def is_running_deprecated_configs?
       File.exist?("bcome/config/platform.yml")
     end

data/lib/objects/node/inventory/base.rb

@@ -60,7 +60,7 @@ module Bcome::Node::Inventory
     end
 
     def tags(identifier = nil)
-      direct_invoke_server(:tags, identifier)
+      identifier.nil? ? direct_invoke_all_servers(:tags) : direct_invoke_server(:tags, identifier)
     end
 
     def direct_invoke_server(method, identifier)
@@ -76,6 +76,11 @@ module Bcome::Node::Inventory
       end
     end
 
+    def direct_invoke_all_servers(method)
+      resources.active.each {|m| m.send(method) }
+      return
+    end
+
     def cache_nodes_in_memory
       @cache_handler.do_cache_nodes!
     end

data/lib/objects/node/inventory/defined.rb

@@ -29,6 +29,7 @@ module Bcome::Node::Inventory
     end
 
     def reload
+      resources.reset_duplicate_nodes!
       do_reload
       puts "\nDone. Hit 'ls' to see the refreshed inventory.\n".informational
     end
@@ -99,9 +100,13 @@ module Bcome::Node::Inventory
 
     def load_dynamic_nodes
       raw_servers = fetch_server_list
+
       raw_servers.each do |raw_server|
         resources << ::Bcome::Node::Server::Dynamic.new_from_fog_instance(raw_server, self)
       end
+
+      resources.rename_initial_duplicate if resources.should_rename_initial_duplicate?
+
     end
 
     def fetch_server_list

data/lib/objects/node/inventory/subselect.rb

@@ -31,10 +31,16 @@ module Bcome::Node::Inventory
       'sub-inventory'
     end
 
+    def reload
+      do_reload
+    end
+
     def do_reload
+      parent_inventory.resources.reset_duplicate_nodes!
       parent_inventory.do_reload
       resources.run_subselect
       update_nodes
+      return
     end
 
     private

data/lib/objects/node/meta_data_loader.rb

@@ -17,12 +17,25 @@ module Bcome::Node
     end
 
     def data_for_namespace(namespace)
-      data[namespace.to_sym] ? data[namespace.to_sym] : {}
+      static_data = data[namespace.to_sym] ? data[namespace.to_sym] : {}
+      static_data.merge(terraform_data_for_namespace(namespace))
+    end
+
+    def terraform_data_for_namespace(namespace)
+      parser = Bcome::Terraform::Parser.new(namespace)
+      attributes = parser.attributes
+      if attributes.keys.any?
+        {
+          "terraform_attributes" => attributes
+        }
+      else
+        {}
+      end
     end
 
     def prompt_for_decryption_key
-      message = "Please enter your metadata encryption key: ".informational
-      @decryption_key = ::Readline.readline("\n#{message}", true).squeeze('').to_s
+      print "\nEnter your decryption key: ".informational
+      @decryption_key = STDIN.noecho(&:gets).chomp
     end
 
     def load_file_data_for(filepath)
@@ -48,7 +61,7 @@ module Bcome::Node
           raise Bcome::Exception::InvalidMetaDataConfig, "Error: #{e.message}"
         end
       end
-      all_meta_data
+      return all_meta_data
     end
   end
 end

data/lib/objects/node/resources/base.rb

@@ -22,6 +22,10 @@ module Bcome::Node::Resources
       @nodes << node
     end
 
+    def should_rename_initial_duplicate?
+      return false
+    end
+
     def clear!
       @disabled_resources = []
     end
@@ -75,7 +79,7 @@ module Bcome::Node::Resources
     end
 
     def for_identifier(identifier)
-      resource = @nodes.select { |node| node.identifier == identifier }.first
+      resource = @nodes.select { |node| node.identifier == identifier }.last
       resource
     end
 

data/lib/objects/node/resources/inventory.rb

@@ -7,13 +7,33 @@ module Bcome::Node::Resources
           # We remove the static server from our selection
           @nodes.delete(existing_node)
         else
-          exception_message = "#{node.identifier} is not unique within namespace #{node.parent.namespace}"
-          raise Bcome::Exception::NodeIdentifiersMustBeUnique, exception_message
+          duplicate_nodes[node.identifier] = duplicate_nodes[node.identifier] ? (duplicate_nodes[node.identifier] + 1) : 2
+          count = duplicate_nodes[node.identifier]
+          node.identifier = "#{node.identifier}_#{count}"
         end
       end
       @nodes << node
     end
 
+    def should_rename_initial_duplicate?
+      return true
+    end    
+
+    def rename_initial_duplicate
+      duplicate_nodes.each do |node_identifier, count|
+        node = for_identifier(node_identifier)
+        node.identifier = "#{node.identifier}_1"
+      end 
+    end
+
+    def duplicate_nodes
+      @duplicate_nodes ||= {}
+    end
+
+    def reset_duplicate_nodes!
+      @duplicate_nodes = {}
+    end   
+
     def dynamic_nodes
       active.select(&:dynamic_server?)
     end

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

@@ -134,7 +134,8 @@ module Bcome::Node::Server
     end
 
     def pseudo_tty(command)
-      ssh_cmd = ssh_driver.ssh_command.gsub("ssh", "ssh -t")
+      as_pseudo_tty = true
+      ssh_cmd = ssh_driver.ssh_command(as_pseudo_tty)
       tty_command = "#{ssh_cmd} '#{command}'"
       execute_local(tty_command)
     end

data/lib/objects/orchestration/interactive_terraform.rb

@@ -0,0 +1,80 @@
+module Bcome::Orchestration
+  class InteractiveTerraform < Bcome::Orchestration::Base 
+
+    QUIT = "\\q"
+    COMMAND_PROMPT = "enter command or '#{QUIT}' to quit: " + "terraform".informational + "\s"
+
+    def execute
+      show_intro_text
+      wait_for_command_input
+    end
+ 
+    def show_intro_text
+      puts "\n"
+      puts "INTERACTIVE TERRAFORM\n".underline
+      puts "Namespace:\s" + "#{@node.namespace}".informational
+      puts "Configuration Path:\s" + "#{path_to_env_config}/*".informational
+      puts "\nConfigured metadata:\s" + terraform_metadata.inspect.informational
+
+      puts "\nAny commands you enter here will be passed directly to Terraform in your configuration path scope."
+    end
+
+    # PROCESSING INTERACTIVE COMMANDS
+    #
+    def process_command(raw_command)
+      full_command = command(raw_command)
+      @node.execute_local(full_command)
+      wait_for_command_input
+    end
+
+    # HANDLING USER INPUT
+    #
+    def wait_for_command_input
+      raw_command = wait_for_input
+      unless raw_command == QUIT
+        process_command(raw_command)
+      end
+    end
+ 
+    def wait_for_input(message = COMMAND_PROMPT)
+      ::Readline.readline("\n#{message}", true).squeeze('').to_s
+    end 
+
+    # COMMAND PROCESSING
+    def terraform_metadata
+      @terraform_metadata ||= @node.metadata.fetch("terraform", @node.metadata.fetch(:terraform, {}))
+    end  
+
+    # Get the terraform variables for this stack, and merge in with our EC2 access keys
+    def form_var_string
+      terraform_vars = terraform_metadata
+      ec2_credentials = @node.network_driver.raw_fog_credentials
+     
+      cleaned_data = terraform_vars.select{|k,v|
+        !v.is_a?(Hash) && !v.is_a?(Array)
+      } # we can't yet handle nested terraform metadata on the command line so no arrays or hashes
+
+      all_vars = cleaned_data.merge({
+        :access_key => ec2_credentials["aws_access_key_id"],
+        :secret_key => ec2_credentials["aws_secret_access_key"]
+      })
+
+      all_vars.collect{|key, value| "-var #{key}=\"#{value}\""}.join("\s")
+    end
+
+    def var_string
+      @var_string ||= form_var_string
+    end
+
+    # Retrieve the path to the terraform configurations for this stack
+    def path_to_env_config
+      @path_to_env_config ||= "terraform/environments/#{@node.namespace.gsub(":","_")}"
+    end
+
+    # Formulate a terraform command
+    def command(raw_command)
+      "cd #{path_to_env_config} ; terraform #{raw_command} #{var_string}"
+    end
+
+  end
+end

data/lib/objects/parser/bread_crumb.rb

@@ -25,7 +25,7 @@ module Bcome::Parser
     end
 
     def validate!
-      raise Bcome::Exception::InvalidBcomeBreadcrumb.new "- letters, numbers & underscores only" unless @raw_crumbs =~ /^([a-z0-9A-Z_]+)(:\s*[a-z0-9A-Z_]+)*:?$/i
+      #raise Bcome::Exception::InvalidBcomeBreadcrumb.new "- letters, numbers & underscores only" unless @raw_crumbs =~ /^([a-z0-9A-Z_]+)(:\s*[a-z0-9A-Z_]+)*:?$/i
     end
   end
 end

data/lib/objects/ssh/connection_handler.rb

@@ -45,7 +45,7 @@ module Bcome::Ssh
       # from bcome, so, we'll sweep up failures and re-try to connect up to MAX_CONNECTION_ATTEMPTS.  Once connected, we're generally good - and any subsequent connection failures
       # within a specific session will be handled ad-hoc and re-connection is automatic.
       while @servers_to_connect.any? && connection_attempt <= MAX_CONNECTION_ATTEMPTS
-        puts connection_attempt == 0 ? 'Initiating connections'.informational : 'Retrying failed connections'.warning
+        puts "Retrying failed connections\n".warning if connection_attempt > 1
         do_connect
         connection_attempt += 1
       end
@@ -69,7 +69,7 @@ module Bcome::Ssh
       if @servers_to_connect.any?
         puts "Failed to connect to #{@servers_to_connect.size} nodes".error
       else
-        puts 'All nodes reachable'.success
+        puts 'All nodes reachable   '.success
       end
     end
 

data/lib/objects/ssh/driver.rb

@@ -50,9 +50,14 @@ module Bcome::Ssh
     end
 
     def has_proxy?
+      return false if proxy_config_value && proxy_config_value == -1
       !@config[:proxy].nil?
     end
 
+    def proxy_config_value
+      @config[:proxy]
+    end
+
     def proxy_connection_string
       "ssh #{PROXY_CONNECT_PREFIX} #{bastion_host_user}@#{@proxy_data.host}"
     end
@@ -70,15 +75,28 @@ module Bcome::Ssh
       bootstrap? && @bootstrap_settings.bastion_host_user ? @bootstrap_settings.bastion_host_user : @proxy_data.bastion_host_user ? @proxy_data.bastion_host_user : user
     end
 
-    def ssh_command
+    def ssh_command(as_pseudo_tty = false)
       return bootstrap_ssh_command if bootstrap? && @bootstrap_settings.ssh_key_path
+
       if has_proxy?
-        "ssh #{PROXY_SSH_PREFIX} #{bastion_host_user}@#{@proxy_data.host}\" #{user}@#{@context_node.internal_ip_address}"
+        "#{as_pseudo_tty ? "ssh -t" : "ssh"} #{PROXY_SSH_PREFIX} #{bastion_host_user}@#{@proxy_data.host}\" #{node_level_ssh_key_connection_string}#{user}@#{@context_node.internal_ip_address}"
       else
-        "ssh #{user}@#{@context_node.public_ip_address}"
+        "#{as_pseudo_tty ? "ssh -t" : "ssh"} #{node_level_ssh_key_connection_string}#{user}@#{@context_node.public_ip_address}"
       end
     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
+      return (@config[:ssh_keys]) ? @config[:ssh_keys].first : nil
+    end
+
     def local_port_forward(start_port, end_port)
       if has_proxy?
         
@@ -109,7 +127,25 @@ module Bcome::Ssh
     end
 
     def user
-      bootstrap? && @bootstrap_settings.user ? @bootstrap_settings.user : @config[:user] ? @config[:user] : fallback_local_user
+      # If we're in bootstrapping mode and have a bootstrap user set, return it
+      return @bootstrap_settings.user if (bootstrap? && @bootstrap_settings.user)
+
+      # If we have a user explcitly set in the config, then return it
+      return @config[:user] if @config[:user]
+
+      # If the local user has explicitly overriden their user, return that
+      return overriden_local_user if overriden_local_user
+
+      # Else fall back to whichever local user is using bcome
+      fallback_local_user
+    end
+
+    def overriden_local_user
+      @overriden_local_user ||= get_overriden_local_user
+    end
+
+    def get_overriden_local_user
+      ::Bcome::Node::Factory.instance.local_data[:ssh_user]       
     end
 
     def fallback_local_user

data/lib/objects/terraform/parser.rb

@@ -0,0 +1,23 @@
+module Bcome::Terraform
+  class Parser
+    def initialize(namespace)
+      @namespace = namespace
+    end
+
+    def attributes
+      a = {}
+      resources.keys.each do |key|
+        a[key] = resources[key]["primary"]["attributes"]
+      end
+      a
+    end
+
+    def resources
+      state.resources
+    end
+
+    def state
+      @state ||= ::Bcome::Terraform::State.new(@namespace)
+    end
+  end
+end

data/lib/objects/terraform/state.rb

@@ -0,0 +1,34 @@
+module Bcome::Terraform
+  class State
+    require 'json'
+
+    TSTATE_FILENAME = "terraform.tfstate".freeze
+
+    def initialize(namespace)
+      @namespace = namespace
+    end
+
+    def terraform_installation_path
+      # Look for a terraform config installation in the path belonging to this node
+      @terraform_installation_path ||= "terraform/environments/#{@namespace.gsub(":","_")}"
+    end
+
+    def config_path
+      "#{terraform_installation_path}/#{TSTATE_FILENAME}"
+    end
+
+    def config_exists?
+      File.exist?(config_path)
+    end
+
+    def config
+      raise "No terraform tstate for this environment" unless config_exists?
+      JSON.parse(File.read(config_path))
+    end
+
+    def resources
+      return {} unless config_exists?
+      return config["modules"][0]["resources"]
+    end
+  end
+end

data/patches/irb.rb

@@ -3,7 +3,7 @@ require 'irb'
 module IRB
   class << self
     # with thanks: http://stackoverflow.com/questions/4749476/how-can-i-pass-arguments-to-irb-if-i-dont-specify-programfile
-    def parse_opts_with_ignoring_script
+    def parse_opts_with_ignoring_script(*params)
       arg = ARGV.first
       script = $PROGRAM_NAME
       parse_opts_without_ignoring_script

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -142,10 +142,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: 'Automation and real-time orchestration toolkit:  no more re-inventing
-  the wheel for common & basic dev ops tasks.  Network discovery / access machines
-  by SSH / deploy applications / apply orchestration / enable automation.  Amazon
-  EC2 integration'
+description: An orchestration framework for AWS EC2
 email:
 - guillaume@webzakimbo.com
 executables:
@@ -246,6 +243,7 @@ files:
 - lib/objects/node/server/dynamic.rb
 - lib/objects/node/server/static.rb
 - lib/objects/orchestration/base.rb
+- lib/objects/orchestration/interactive_terraform.rb
 - lib/objects/orchestrator.rb
 - lib/objects/parser/bread_crumb.rb
 - lib/objects/progress_bar.rb
@@ -268,12 +266,14 @@ files:
 - lib/objects/ssh/script_exec.rb
 - lib/objects/ssh/tunnel/local_port_forward.rb
 - lib/objects/system/local.rb
+- lib/objects/terraform/parser.rb
+- lib/objects/terraform/state.rb
 - lib/objects/workspace.rb
 - patches/irb.rb
 - patches/string-encrypt.rb
 - patches/string.rb
 - patches/string_stylesheet.rb
-homepage: https://github.com/webzakimbo/bcome-kontrol
+homepage: https://bcome-kontrol.readthedocs.io/en/latest/
 licenses:
 - GPL-3.0
 metadata: {}
@@ -296,5 +296,6 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Automation and real-time orchestration toolkit
+summary: Organise your world, then integrate absolutely whatever you want in pure
+  Ruby.
 test_files: []