bcome 1.4.0 → 2.0.0

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

@@ -35,7 +35,7 @@ module ::Bcome::Ssh
       ssh_connect!
       { success: true }
     rescue Exception => e
-      { success: false, error: e }
+      { success: false, error: e, backtrace: e.backtrace }
     end
 
     def scp
@@ -57,17 +57,17 @@ module ::Bcome::Ssh
       nil
     end
 
-    def put_str(string, remote_path)
-      raise Bcome::Exception::MissingParamsForScp, "'put' requires a string and a remote_path" if string.to_s.empty? || remote_path.to_s.empty?
+    def put_str(string, remote_path, silence_progress = false)
+      raise Bcome::Exception::MissingParamsForScp, "'put' requires a string and a remote_path" if string.nil? || remote_path.to_s.empty?
 
-      puts "\n(#{@context_node.namespace})\s".namespace + "Uploading from string to #{remote_path}\n".informational
+      puts "\n(#{@context_node.namespace})\s".namespace + "Uploading from string to #{remote_path}\n".informational unless silence_progress
 
       begin
         scp.upload!(StringIO.new(string), remote_path) do |_ch, name, sent, total|
-          puts "#{name}: #{sent}/#{total}".progress
+          puts "#{name}: #{sent}/#{total}".progress unless silence_progress
         end
-      rescue Exception => e # scp just throws generic exceptions :-/
-        puts e.message.error
+      rescue StandardError => e
+        raise ::Bcome::Exception::Generic, e.message
       end
       nil
     end

data/lib/objects/ssh/proxy_chain.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Bcome::Ssh
+  class ProxyChain
+    attr_reader :hops
+
+    def initialize(wrangler)
+      @hops = wrangler.hops
+    end
+
+    def eql?(other_chain)
+      hops == other_chain.hops
+    end
+
+    def ==(other_chain)
+      eql?(other_chain)
+    end
+  end
+end

data/lib/objects/ssh/proxy_chain_link.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Bcome::Ssh
+  class ProxyChainLink
+    attr_reader :link
+
+    def initialize(node)
+      @link = {}
+      init(node.machines)
+    end
+
+    protected
+
+    def init(machines)
+      machines.each do |machine|
+        proxy_chain = machine.proxy_chain
+
+        if key = @link.keys.detect { |key| key.eql?(proxy_chain) }
+          @link[key] << machine
+        else
+          @link[proxy_chain] = [machine]
+        end
+      end
+    end
+  end
+end

data/lib/objects/ssh/proxy_hop.rb

@@ -2,23 +2,33 @@
 
 module Bcome::Ssh
   class ProxyHop
-    attr_reader :parent
+    include Bcome::Draw
+
+    attr_reader :parent, :config, :host, :bcome_proxy_node
 
     def initialize(config, context_node, parent)
       @config = config
       @context_node = context_node
       @parent = parent
+      set_host
     end
 
     def proxy_details
       @config.merge(
         proxy_host: host,
         user: user
-      )
+      ).except!(:bastion_host_user, :fallback_bastion_host_user)
     end
 
-    def host
-      @host ||= get_host
+    def pretty_proxy_details(n = 1)
+      lines = ["proxy\s".bc_cyan + "[#{n}]"]
+
+      lines << "bcome node\s".bc_yellow + @bcome_proxy_node.keyed_namespace if @bcome_proxy_node
+
+      lines << "host\s".bc_yellow + host
+      lines << "user\s".bc_yellow + user
+
+      lines
     end
 
     def user
@@ -29,6 +39,14 @@ module Bcome::Ssh
       !parent.nil?
     end
 
+    def ==(other)
+      config == other.config
+    end
+
+    def eql?(other)
+      config == other.config
+    end
+
     def get_ssh_string(_is_first_hop = false)
       con_str = "#{user}@#{host}"
       con_str
@@ -63,39 +81,50 @@ module Bcome::Ssh
     end
 
     def get_user
-      @config[:bastion_host_user] || @config[:fallback_bastion_host_user]
+      # If an explicit user has been set for this hop, use it.
+      return @config[:bastion_host_user] if @config[:bastion_host_user]
+
+      # Otherwise, if our proxy hop is a defined bcome server, i.e. it exists in the network map, we can infer the user and so we'll use that.
+      return @bcome_proxy_node.ssh_driver.user if @bcome_proxy_node
+
+      # Otherwise, we'll fallback
+      @config[:fallback_bastion_host_user]
     end
 
-    def get_host
-      raise Bcome::Exception::InvalidProxyConfig, 'Missing host id or namespace' unless @config[:host_id] || @config[:namespace]
+    def set_host
+      raise Bcome::Exception::InvalidProxyConfig, 'Missing host id or namespace' unless @config[:node_identifier] || @config[:host_id] || @config[:namespace]
       raise Bcome::Exception::InvalidProxyConfig, 'Missing host lookup method' unless @config[:host_lookup]
 
       host_lookup_method = valid_host_lookups[@config[:host_lookup].to_sym]
       raise Bcome::Exception::InvalidProxyConfig, "#{@config[:host_lookup]} is not a valid host lookup method" unless host_lookup_method
 
-      h = send(host_lookup_method)
-
-      h
+      @host = send(host_lookup_method)
     end
 
     def get_host_or_ip_from_config
       @config[:host_id]
     end
 
+    # Older lookup - within same parent-child tree only. Retained for backwards compatibility
     def get_host_by_inventory_node
-      identifier = @config[:host_id]
-      resource = @context_node.recurse_resource_for_identifier(identifier)
-      raise Bcome::Exception::CantFindProxyHostByIdentifier, identifier unless resource
-      raise Bcome::Exception::ProxyHostNodeDoesNotHavePublicIp, identifier unless resource.public_ip_address
+      identifier = @config[:host_id] || @config[:node_identifier]
+      @bcome_proxy_node = @context_node.recurse_resource_for_identifier(identifier)
+      raise Bcome::Exception::CantFindProxyHostByIdentifier, identifier unless @bcome_proxy_node
+      raise Bcome::Exception::ProxyHostNodeDoesNotHavePublicIp, identifier unless @bcome_proxy_node.public_ip_address
 
-      resource.public_ip_address
+      bcome_node_host
     end
 
+    # Newer lookup - across entire network
     def get_host_by_namespace
-      node = ::Bcome::Orchestrator.instance.get(@config[:namespace])
-      raise Bcome::Exception::CantFindProxyHostByNamespace, @config[:namespace] unless node
+      @bcome_proxy_node = ::Bcome::Orchestrator.instance.get(@config[:namespace])
+      raise Bcome::Exception::CantFindProxyHostByNamespace, @config[:namespace] unless @bcome_proxy_node
+
+      bcome_node_host
+    end
 
-      node.public_ip_address
+    def bcome_node_host
+      @bcome_proxy_node.public_ip_address || @bcome_proxy_node.internal_ip_address
     end
   end
 end

data/lib/objects/ssh/script_exec.rb

@@ -2,19 +2,18 @@
 
 module ::Bcome::Ssh
   class ScriptExec
-    SCRIPTS_PATH = 'bcome/scripts'
-
     class << self
-      def execute(server, script_name)
-        executor = new(server, script_name)
+      def execute(server, path_to_script)
+        executor = new(server, path_to_script)
         executor.execute
       end
     end
 
-    def initialize(server, script_name)
+    def initialize(server, path_to_script)
       @server = server
-      @script_name = script_name
+      @path_to_script = path_to_script
       @ssh_driver = server.ssh_driver
+      @output_string = ''
     end
 
     def execute
@@ -24,23 +23,22 @@ module ::Bcome::Ssh
     end
 
     def execute_command
-      local_path_to_script = "#{SCRIPTS_PATH}/#{@script_name}.sh"
-      raise Bcome::Exception::OrchestrationScriptDoesNotExist, local_path_to_script unless File.exist?(local_path_to_script)
+      raise Bcome::Exception::OrchestrationScriptDoesNotExist, @path_to_script unless File.exist?(@path_to_script)
 
-      execute_script_command = "#{@ssh_driver.ssh_command} \"bash -s\" < #{local_path_to_script}"
+      execute_script_command = "#{@ssh_driver.ssh_command} \"bash -s\" < #{@path_to_script}"
       command = ::Bcome::Command::Local.run(execute_script_command)
       command
     end
 
     def pretty_print(command)
-      output_append("\n(#{@server.namespace})$".terminal_prompt + "> ./#{SCRIPTS_PATH}/#{@script_name}.sh - \s#{command.pretty_result}\n")
+      output_append("\n(#{@server.namespace})$".terminal_prompt + "> ./#{@path_to_script} - \s#{command.pretty_result}\n")
       output_append(command.stdout) # append stderr
       output_append "\nSTDERR: #{command.stderr}" if command.failed?
       puts "\n\n#{@output_string}\n\n"
     end
 
     def output_append(output_string)
-      @output_string = "#{@output_string}#{output_string}"
+      @output_string += "#{@output_string}#{output_string}"
     end
   end
 end

data/lib/objects/startup.rb

@@ -15,9 +15,15 @@ module Bcome
         ::Bcome::Encryptor.instance.pack
       when 'unpack_metadata'
         ::Bcome::Encryptor.instance.unpack
+      when 'diff_metadata'
+        ::Bcome::Encryptor.instance.diff
+      when 'init'
+        ::Bcome::Initialization::Factory.do
       else
         bootup
       end
+    rescue Bcome::Exception::Base => e
+      e.pretty_display
     end
 
     def bootup
@@ -26,7 +32,7 @@ module Bcome
       clean_up
     rescue ::Bcome::Exception::Base => e
       clean_up
-      puts e.pretty_display
+      e.pretty_display
     rescue Excon::Error::Socket => e
       clean_up
       puts "\nNo network access - please check your connection and try again\n".error

data/lib/objects/terraform/output.rb

@@ -25,7 +25,11 @@ module Bcome::Terraform
 
       # Until this feature is officially featured, failure to get terraform data will fail silently
       # One thing not decided upon yet is how to indicate that we wish to load terraform data or not.
-      return {} if get_output_result.failed?
+      if get_output_result.failed?
+        raise "Received authorisation error retrieving metadata from Terraform outputs for namespace #{@namespace}. Command was '#{get_output_command}'. Are you authorised to access the TFstate?" if get_output_result.stderr =~ /HTTP response code 401/
+
+        return {}
+      end
 
       JSON.parse(get_output_result.stdout)
     end

data/lib/objects/workspace.rb

@@ -22,10 +22,20 @@ class ::Bcome::Workspace
 
     @context.irb_workspace = main_context.workspace if main_context
     @context.previous_irb_workspace = params[:current_context] if params[:current_context]
+
+    show_welcome if params[:show_welcome]
+
     spawn_into_console_for_context
     nil
   end
 
+  def show_welcome
+    puts "\n\n"
+    puts "Welcome to bcome v#{::Bcome::Version.release}".bc_yellow
+    puts "\nType\s" + 'menu'.underline + "\sfor a command list, or\s" + 'registry'.underline + "\sfor your custom tasks."
+    puts "\n\n"
+  end
+
   def console_set!
     @console_set = true
   end

data/patches/irb.rb

@@ -40,9 +40,43 @@ module IRB
     end
   end
 
+  module ExtendCommandBundle
+    class << self
+      # Allow us to redefine 'quit' by preventing it getting aliased in the first place.
+      def overriden_extend_object(*params)
+        # Remove 'quit', as we want to write our own
+        @ALIASES.delete([:quit, :irb_exit, 1])
+
+        original_extend_object(*params)
+      end
+      alias original_extend_object extend_object
+      alias extend_object overriden_extend_object
+    end
+
+    def quit(*_params)
+      ::Bcome::Bootup.instance.close_ssh_connections
+      ::Bcome::Ssh::TunnelKeeper.instance.close_tunnels
+      ::Bcome::LoadingBar::PidBucket.instance.stop_all
+      exit!
+    end
+
+    def back
+      # Allow navigation back up a namespace tree, or 'exit' if at the highest level, or at the point of entry
+      irb_exit(0)
+    end
+  end
+
   class Context
     def overriden_evaluate(*_params)
-      evaluate_without_overriden(*_params)
+      if _params.last.is_a?(Hash)
+        # Ruby 2.7.0 compatibility: "Using the last argument as keyword parameters is deprecated" ; hence splat the last argument
+        last = _params.pop
+        without_last = _params - [last]
+        evaluate_without_overriden(*without_last, **last)
+      else
+        # previous rubies...
+        evaluate_without_overriden(*_params)
+      end
     rescue ::Bcome::Exception::Base => e
       puts e.pretty_display
     end

data/patches/string.rb

@@ -1,10 +1,23 @@
 # frozen_string_literal: true
 
 require 'rainbow'
+require 'fileutils'
 
 class String
   include StringColourStylesheet
 
+  def ansi?
+    Strings::ANSI.ansi?(self)
+  end
+
+  def sanitize
+    ansi? ? Strings::ANSI.sanitize(self) : self
+  end
+
+  def is_file_or_directory?
+    File.directory?(self) || File.exist?(self)
+  end
+
   # with thanks to http://simianuprising.com/wp-content/uploads/2012/08/solarized-reference-horizontal.png
   def colour_codes
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
-- Guillaume Roderick (Webzakimbo)
-autorequire: 
+- Webzakimbo
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +171,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: tty-cursor
+  name: strings-ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -171,22 +185,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: tty-cursor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
-description: Orchestration & Automation framework for the Cloud.
+        version: 0.2.0
+description: Generate custom management interfaces from simple configuration and Ruby
+  code. On-premise, cloud, hybrid & multi-cloud. Amazon AWS (EC2) & Google Cloud (GCP)
+  integration with more cloud providers coming. Fully extensible. Free for commercial
+  and non-commercial use.
 email:
-- guillaume@webzakimbo.com
+- info@webzakimbo.com
 executables:
 - bcome
 extensions: []
@@ -203,9 +220,13 @@ files:
 - lib/objects/driver/ec2.rb
 - lib/objects/driver/gcp.rb
 - lib/objects/driver/gcp/authentication/api_key.rb
+- lib/objects/driver/gcp/authentication/base.rb
 - lib/objects/driver/gcp/authentication/oauth.rb
+- lib/objects/driver/gcp/authentication/oauth_client_config.rb
+- lib/objects/driver/gcp/authentication/oauth_session_store.rb
 - lib/objects/driver/gcp/authentication/service_account.rb
-- lib/objects/driver/static.rb
+- lib/objects/driver/gcp/authentication/signet/service_account.rb
+- lib/objects/driver/gcp/authentication/utilities.rb
 - lib/objects/encryptor.rb
 - lib/objects/exception/argument_error_invoking_method_from_command_line.rb
 - lib/objects/exception/base.rb
@@ -223,8 +244,11 @@ files:
 - lib/objects/exception/could_not_retrieve_terraform_output.rb
 - lib/objects/exception/deprecation_warning.rb
 - lib/objects/exception/duplicate_command_line_argument_key.rb
+- lib/objects/exception/ec2_driver_missing_authorization_keys.rb
 - lib/objects/exception/ec2_driver_missing_provisioning_region.rb
+- lib/objects/exception/empty_namespace_tree.rb
 - lib/objects/exception/failed_to_run_local_command.rb
+- lib/objects/exception/gcp_auth_service_account_missing_credentials.rb
 - lib/objects/exception/generic.rb
 - lib/objects/exception/interactive_session_halt.rb
 - lib/objects/exception/invalid_bcome_breadcrumb.rb
@@ -254,6 +278,7 @@ files:
 - lib/objects/exception/missing_description_on_view.rb
 - lib/objects/exception/missing_execute_on_registry_object.rb
 - lib/objects/exception/missing_gcp_authentication_scheme.rb
+- lib/objects/exception/missing_gcp_service_account_credentials_filename.rb
 - lib/objects/exception/missing_gcp_service_scopes.rb
 - lib/objects/exception/missing_identifier_on_view.rb
 - lib/objects/exception/missing_inventory_contributors.rb
@@ -271,6 +296,10 @@ files:
 - lib/objects/exception/proxy_host_node_does_not_have_public_ip_address.rb
 - lib/objects/exception/unknown_dynamic_server_type.rb
 - lib/objects/exception/unknown_method_for_namespace.rb
+- lib/objects/exception/user_orchestration_error.rb
+- lib/objects/initialization/factory.rb
+- lib/objects/initialization/structure.rb
+- lib/objects/initialization/utils.rb
 - lib/objects/interactive/session.rb
 - lib/objects/interactive/session_item/base.rb
 - lib/objects/interactive/session_item/capture_input.rb
@@ -281,7 +310,9 @@ files:
 - lib/objects/loading_bar/indicator/progress.rb
 - lib/objects/loading_bar/pid_bucket.rb
 - lib/objects/modules/context.rb
+- lib/objects/modules/draw.rb
 - lib/objects/modules/registry_management.rb
+- lib/objects/modules/tree.rb
 - lib/objects/modules/ui_output.rb
 - lib/objects/modules/workspace_commands.rb
 - lib/objects/modules/workspace_menu.rb
@@ -338,6 +369,8 @@ files:
 - lib/objects/ssh/driver_concerns/connection.rb
 - lib/objects/ssh/driver_concerns/functions.rb
 - lib/objects/ssh/driver_concerns/user.rb
+- lib/objects/ssh/proxy_chain.rb
+- lib/objects/ssh/proxy_chain_link.rb
 - lib/objects/ssh/proxy_hop.rb
 - lib/objects/ssh/script_exec.rb
 - lib/objects/ssh/tunnel/local_port_forward.rb
@@ -351,13 +384,25 @@ files:
 - patches/string-encrypt.rb
 - patches/string.rb
 - patches/string_stylesheet.rb
-homepage: https://github.com/webzakimbo/bcome-kontrol
+homepage: https://bcome.com
 licenses:
-- GPL-3.0
+- Nonstandard
 metadata:
-  documentation_uri: https://bcome-kontrol.readthedocs.io/en/latest/
-post_install_message: "\nWe'd love your feedback about this tool: \nHow can we improve?
-  \ Email guillaume@webzakimbo.com"
+  documentation_uri: https://docs.bcome.com/en/2.0.0
+  homepage_uri: https://bcome.com
+  source_code_uri: https://github.com/webzakimbo/bcome
+post_install_message: |2+
+
+    Welcome to Bcome, the DevOps Control Panel Framework
+
+    2.0.0 introduces a wealth of new features (including GCP integration), and some breaking changes.
+
+    Visit our new documentation site here: https://docs.bcome.com/en/2.0.0
+
+    See implementation demos at our guides site: https://guides.bcome.com/en/2.0.0
+
+    For full release notes see: https://github.com/webzakimbo/bcome/releases/tag/2.0.0
+
 rdoc_options: []
 require_paths:
 - lib
@@ -365,15 +410,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
-summary: A DevOps Application development framework
+summary: The DevOps Control Panel Framework
 test_files: []
+...