bcome 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdf4b817e9c7afb1b0b5508a811e2e74a71a6b97
-  data.tar.gz: 881ae215c6873cc81b5214f2876cd13833ce1ae1
+  metadata.gz: 815c945bf4581f86eb3b246bc8c3c2f50590722e
+  data.tar.gz: fc57c0bd29952acb549553a5a421523b8e02ce83
 SHA512:
-  metadata.gz: c67f27ca6e33d761311f9bf8c226e774b10516b9f14d2bade52e8d04e2e9df35b48e0e8ad53c1199b4fa18381e8e7a3fe51ddf9e52d05035aab15024be5c4472
-  data.tar.gz: c610e971283f6cc178d746a4eb1ceca8b619ac66d4a76bd1353eb2c999ab5da48c4075d7d02f7da4197ac253ab928a02c31a5e4f9cb6ce0a0032017fc73df5ec
+  metadata.gz: 211fdcf4946327294f6562bc386de71ace4261754a92311221984d5180608299e9088320709906658d8dc2dac4d1599502536b8d9f4c4b84290ca07c42266030
+  data.tar.gz: 778cede06f00dc1e154aab3c65f531d8a171c5d298f5b162ecf219df42efad388508513c69576a817abf06b63591be4ee8d708cf2193b5cb5616eb7c5bafd82e

data/lib/objects/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/objects/command/local.rb

@@ -8,7 +8,7 @@ module Bcome::Command
       command
     end
 
-    attr_reader :stdout, :stderr
+    attr_reader :stdout, :stderr, :process_status
 
     def initialize(command, success_exit_codes = [0])
       @command = command

data/lib/objects/driver/ec2.rb

@@ -1,5 +1,8 @@
 module Bcome::Driver
   class Ec2 < Bcome::Driver::Base
+  
+    PATH_TO_FOG_CREDENTIALS = "#{ENV['HOME']}/.fog".freeze
+
     def initialize(*params)
       super
       raise Bcome::Exception::Ec2DriverMissingProvisioningRegion, params.inspect unless provisioning_region
@@ -22,6 +25,10 @@ module Bcome::Driver
       fog_client.servers.all({})
     end
 
+    def raw_fog_credentials
+      @raw_fog_credentials ||= YAML.load_file(PATH_TO_FOG_CREDENTIALS)[credentials_key]
+    end
+
     def credentials_key
       @params[:credentials_key]
     end

data/lib/objects/node/attributes.rb

@@ -41,7 +41,7 @@ module Bcome::Node::Attributes
   def recurse_hash_data_for_instance_var(instance_var_name, parent_key)
     instance_data = instance_variable_defined?(instance_var_name) ? instance_variable_get(instance_var_name) : {}
     instance_data ||= {}
-    instance_data = parent.send(parent_key).merge(instance_data) if has_parent?
+    instance_data = parent.send(parent_key).deep_merge(instance_data) if has_parent?
     instance_data
   end
 end

data/lib/objects/node/factory.rb

@@ -6,6 +6,8 @@ module Bcome::Node
 
     CONFIG_PATH = 'bcome'.freeze
     DEFAULT_CONFIG_NAME = 'networks.yml'.freeze
+    SERVER_OVERRIDE_CONFIG_NAME = 'machines-data.yml'.freeze
+
     INVENTORY_KEY = 'inventory'.freeze
     COLLECTION_KEY = 'collection'.freeze
     SUBSELECT_KEY = 'inventory-subselect'.freeze
@@ -24,6 +26,10 @@ module Bcome::Node
       "#{CONFIG_PATH}/#{config_file_name}"
     end
 
+    def machines_data_path
+      "#{CONFIG_PATH}/#{SERVER_OVERRIDE_CONFIG_NAME}"
+    end
+
     def config_file_name
       @config_file_name ||= ENV['CONF'] ? ENV['CONF'] : DEFAULT_CONFIG_NAME
     end
@@ -46,7 +52,7 @@ module Bcome::Node
       raise Bcome::Exception::InvalidNetworkConfig, 'missing config type' unless config[:type]
 
       klass = klass_for_view_type[config[:type]]
-
+ 
       raise Bcome::Exception::InvalidNetworkConfig, "invalid config type #{config[:type]}" unless klass
 
       node = klass.new(views: config, parent: parent)
@@ -84,6 +90,14 @@ module Bcome::Node
       @estate_config ||= reformat_config(load_estate_config)
     end
 
+    def machines_data
+      @machines_data ||= load_machines_data
+    end
+
+    def machines_data_for_namespace(namespace)
+      machines_data[namespace] ? machines_data[namespace] : {}
+    end
+
     def rewrite_estate_config(data)
       File.open(config_path, 'w') do |file|
         file.write data.to_yaml
@@ -94,12 +108,20 @@ module Bcome::Node
       config = YAML.load_file(config_path).deep_symbolize_keys
       return config
     rescue ArgumentError, Psych::SyntaxError => e
-      raise Bcome::Exception::InvalidNetworkConfig, 'Invalid yaml in config' + e.message
+      raise Bcome::Exception::InvalidNetworkConfig, 'Invalid yaml in network config' + e.message
     rescue Errno::ENOENT
       raise Bcome::Exception::DeprecationWarning if is_running_deprecated_configs?
       raise Bcome::Exception::MissingNetworkConfig, config_path
     end
 
+    def load_machines_data
+      return {} unless File.exist?(machines_data_path)    
+      config = YAML.load_file(machines_data_path).deep_symbolize_keys
+      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/meta/base.rb

@@ -25,9 +25,11 @@ module Bcome::Node::Meta
       @data
     end
 
-    def fetch(key)
+    def fetch(key, default = nil)
       if @data.key?(key)
         @data[key]
+      elsif default
+        return default
       else
         raise Bcome::Exception::CantFindKeyInMetadata, key unless @data.key?(key)
       end

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

@@ -10,6 +10,17 @@ module Bcome::Node::Server
       @bootstrap = false
     end
 
+    # override a server namespace's parameters. This enables features such as specific SSH parameters for a specific server, e.g. my use case was a 
+    # single debian box within an ubuntu network, where I needed to access the machine bootstrapping mode with the 'admin' rather 'ubuntu' username.
+    def set_view_attributes
+      super
+      overridden_attributes = ::Bcome::Node::Factory.instance.machines_data_for_namespace(namespace.to_sym)
+      overridden_attributes.each do |override_key, override_value|
+        instance_variable_name = "@#{override_key}"
+        instance_variable_set(instance_variable_name, override_value)   
+      end
+    end
+
     def bootstrap?
       @bootstrap ? true : false
     end  
@@ -98,6 +109,10 @@ module Bcome::Node::Server
       base_items
     end
 
+    def local_port_forward(start_port, end_port)
+      ssh_driver.local_port_forward(start_port, end_port)
+    end
+
     def open_ssh_connection
       ssh_driver.ssh_connection  
     end

data/lib/objects/ssh/driver.rb

@@ -79,6 +79,27 @@ module Bcome::Ssh
       end
     end
 
+    def local_port_forward(start_port, end_port)
+      if has_proxy?
+        
+        if bootstrap?
+          tunnel_command = "ssh -N -L #{start_port}:#{@context_node.internal_ip_address}:#{end_port} -i #{@bootstrap_settings.ssh_key_path} #{bastion_host_user}@#{@proxy_data.host}"
+        else
+          tunnel_command = "ssh -N -L #{start_port}:#{@context_node.internal_ip_address}:#{end_port} #{bastion_host_user}@#{@proxy_data.host}"
+        end
+      else
+        if bootstrap?
+          tunnel_command = "ssh -i #{@bootstrap_settings.ssh_key_path} -N -L #{start_port}:#{@context_node.public_ip_address}:#{end_port}"
+        else
+          tunnel_command = "ssh -N -L #{start_port}:#{@context_node.public_ip_address}:#{end_port}"
+        end
+      end
+
+      tunnel = ::Bcome::Ssh::Tunnel::LocalPortForward.new(tunnel_command)
+      tunnel.open!
+      return tunnel
+    end
+
     def bootstrap_ssh_command
       if has_proxy?
         "ssh -i #{@bootstrap_settings.ssh_key_path} -t #{bastion_host_user}@#{@proxy_data.host} ssh -t #{user}@#{@context_node.internal_ip_address}"

data/lib/objects/ssh/tunnel/local_port_forward.rb

@@ -0,0 +1,20 @@
+module Bcome::Ssh::Tunnel
+  class LocalPortForward
+ 
+    def initialize(tunnel_command)
+      @tunnel_command = tunnel_command
+      @process_pid = nil
+    end 
+
+    def open!
+      puts "Opening tunnel: #{@tunnel_command}".informational
+      @process_pid = spawn(@tunnel_command)
+    end
+
+    def close!
+      puts "Closing tunnel with process pid ##{@process_pid}: #{@tunnel_command}".informational
+      ::Process.kill("HUP", @process_pid)
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -264,6 +264,7 @@ files:
 - lib/objects/ssh/driver.rb
 - lib/objects/ssh/proxy_data.rb
 - lib/objects/ssh/script_exec.rb
+- lib/objects/ssh/tunnel/local_port_forward.rb
 - lib/objects/system/local.rb
 - lib/objects/workspace.rb
 - patches/irb.rb