ridley-connectors 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec5f842e1868650e1d3b96151cdf19bce5e14b3b
-  data.tar.gz: 4222c806d597445c86f262e12939b2c656e017ff
+  metadata.gz: 7cc8a35d12c2f0a211941000d82e951c738d1f0b
+  data.tar.gz: 8793248c34607319be63abfbab2f0b5831f6ef2a
 SHA512:
-  metadata.gz: 652cd749bfc96324c766e62742b2c58c80d7256958de9a8a1005834b5365c8ea0159139305f7b53e5dfe0ff283095432555b791001f48e4e05361712e4041943
-  data.tar.gz: 53b528565d08da8ef009f60aad90083020bcf13ce81dfe0c6f48bb402c34782f92d144bf373f01b8d682e53e5f8f5931fc5de099bb3bf44ab09125ce4b1e5ea5
+  metadata.gz: b6c08b024e392d443a050676e690e591342973c6fb105b4961f904cf2b1937eff4f2516751d6a2ad9d292ae58bbb2afc1456c675dc8d736e8d7b75aeae9813ac
+  data.tar.gz: 74a3bba5e041055a7b2cfc02c38aff93132feeed3cbe4144d29f19f6c43c1897e9b9576f1a629339379aa01550d10d86673c5c3137a1a48d438dacde9f3a3919

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v.2.0.1
+
+* [#18](https://github.com/RiotGames/ridley-connectors/pull/18) Move more connector-specific code out of ridley and into ridley-connectors
+* [#19](https://github.com/RiotGames/ridley-connectors/pull/19) Add some extra logging to retrying connections to choose an appropriate connector
+* [#20](https://github.com/RiotGames/ridley-connectors/pull/20) Handle HostCommander, WinRM, and SSH actor crashes better
+
+## v.2.0.0
+
+* [#17](https://github.com/RiotGames/ridley-connectors/pull/17) Bump ridley dependency to 3.0.0
+
 ## v.1.7.1
 
 * [#16](https://github.com/RiotGames/ridley-connectors/pull/16) JRuby throws different exceptions when it can't connect to a node

data/bootstrappers/unix_omnibus.erb

@@ -0,0 +1,91 @@
+bash -c '
+<%= "export http_proxy=\"#{bootstrap_proxy}\"" if bootstrap_proxy -%>
+
+exists() {
+  if command -v $1 &>/dev/null
+  then
+    return 0
+  else
+    return 1
+  fi
+}
+
+install_chef() {
+  install_sh="http://opscode.com/chef/install.sh"
+  proxy_string="<%= "--proxy=on " if bootstrap_proxy %>"
+
+  if [[ $requested_chef_version != "" ]]; then
+    version_string="-v $requested_chef_version"
+  else
+    version_string=""
+  fi
+
+  if exists wget; then
+    bash <(wget ${proxy_string} ${install_sh} -O -) ${version_string}
+  else
+    if exists curl; then
+      bash <(curl -L ${proxy_string} ${install_sh}) ${version_string}
+    fi
+  fi
+}
+
+requested_chef_version="<%= chef_version %>"
+installed_chef_version="$(which chef-client &>/dev/null && chef-client -v | cut -f 2 -d " ")"
+
+if [[ ! $installed_chef_version ]]; then
+  install_chef
+elif [[ ($requested_chef_version != "") && ($installed_chef_version != $requested_chef_version) ]]; then
+  install_chef
+fi
+
+mkdir -p /etc/chef
+
+(
+cat <<'EOP'
+<%= validation_key %>
+EOP
+) > /tmp/validation.pem
+awk NF /tmp/validation.pem > /etc/chef/validation.pem
+rm /tmp/validation.pem
+chmod 0600 /etc/chef/validation.pem
+
+<% if encrypted_data_bag_secret -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
+<% end -%>
+
+<%# Generate Ohai Hints -%>
+<% unless hints.empty? -%>
+mkdir -p /etc/chef/ohai/hints
+
+<% hints.each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+<% end -%>
+
+(
+cat <<'EOP'
+<%= chef_config %>
+EOP
+) > /etc/chef/client.rb
+
+<%# Remove client pem if it already exists -%>
+rm /etc/chef/client.pem
+
+(
+cat <<'EOP'
+<%= first_boot %>
+EOP
+) > /etc/chef/first-boot.json
+
+<%= chef_run %>'

data/bootstrappers/windows_omnibus.erb

@@ -0,0 +1,113 @@
+@echo off
+
+rem Author:: Kyle Allan (<kallan@riotgames.com>)
+rem Original Author:
+rem
+rem Author:: Seth Chisamore (<schisam@oopscode.com>)
+rem Copyright:: Copyright (c) 2011 Opscode, Inc.
+rem License:: Apache License, Version 2.0
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+setlocal
+
+<%= "SETX HTTP_PROXY \"#{bootstrap_proxy}\"" if bootstrap_proxy %>
+mkdir <%= bootstrap_directory %>
+
+> <%= bootstrap_directory %>\wget.ps1 (
+ <%= windows_wget_powershell %>
+)
+
+rem Determine the version and the architecture
+
+FOR /F "tokens=1-8 delims=.[] " %%A IN ('ver') DO (
+set WinMajor=%%D
+set WinMinor=%%E
+set WinBuild=%%F
+)
+
+goto Version%WinMajor%.%WinMinor%
+
+rem If this is an unknown version of windows set the default
+set MACHINE_OS=2008r2
+goto architecture
+
+:Version6.0
+set MACHINE_OS=2008
+goto architecture
+
+:Version5.2
+set MACHINE_OS=2003r2
+goto architecture
+
+:Version6.1
+set MACHINE_OS=2008r2
+goto architecture
+
+:Version6.2
+set MACHINE_OS=2012
+goto architecture
+
+:architecture
+
+goto Architecture%PROCESSOR_ARCHITECTURE%
+
+rem If this is an unknown architecture set the default
+set MACHINE_ARCH=i686
+goto install
+
+:Architecturex86
+set MACHINE_ARCH=i686
+goto install
+
+:Architectureamd64
+set MACHINE_ARCH=x86_64
+goto install
+
+:install
+rem Install Chef using chef-client MSI installer
+
+set "VERSION_STRING=<%= chef_version %>"
+set "REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%&v=%VERSION_STRING%"
+set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
+set "FALLBACK_QUERY_STRING=&DownloadContext=PowerShell"
+
+powershell -ExecutionPolicy Unrestricted -NoProfile -NonInteractive "& '<%= bootstrap_directory %>\wget.ps1' '%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%' '%LOCAL_DESTINATION_MSI_PATH%'"
+
+<%= install_chef %>
+
+endlocal
+
+> <%= bootstrap_directory %>\validation.pem (
+ <%= validation_key %>
+)
+
+<% if encrypted_data_bag_secret -%>
+> <%= bootstrap_directory %>\encrypted_data_bag_secret (
+ <%= encrypted_data_bag_secret %>
+)
+<% end -%>
+
+> <%= bootstrap_directory %>\client.rb (
+ <%= chef_config %>
+)
+
+> <%= bootstrap_directory %>\first-boot.json (
+ <%= first_boot %>
+)
+
+SET "PATH=%PATH%;<%= env_path %>"
+SETX PATH "%PATH;<%= env_path %>"
+
+<%= chef_run %>

data/lib/ridley-connectors.rb

@@ -3,9 +3,19 @@ require 'celluloid/io'
 require 'ridley'
 
 module Ridley
+  class << self
+    # @return [Pathname]
+    def scripts
+      root.join('scripts')
+    end
+  end
+
   require_relative 'ridley-connectors/client'
+  require_relative 'ridley-connectors/bootstrap_context'
+  require_relative 'ridley-connectors/command_context'
   require_relative 'ridley-connectors/host_commander'
   require_relative 'ridley-connectors/host_connector'
   require_relative 'ridley-connectors/chef_objects/node_object'
   require_relative 'ridley-connectors/resources/node_resource'
+  require_relative 'ridley-connectors/errors'
 end

data/lib/ridley-connectors/bootstrap_context.rb

@@ -0,0 +1,100 @@
+require 'erubis'
+
+module Ridley
+  module BootstrapContext
+    class Base
+      class << self
+        def validate_options(options = {})
+          if options[:server_url].nil?
+            raise Errors::ArgumentError, "A server_url is required for bootstrapping"
+          end
+
+          if options[:validator_path].nil?
+            raise Errors::ArgumentError, "A path to a validator is required for bootstrapping"
+          end
+        end
+      end
+
+      attr_reader :template_file
+      attr_reader :bootstrap_proxy
+      attr_reader :chef_version
+      attr_reader :validator_path
+      attr_reader :encrypted_data_bag_secret
+      attr_reader :server_url
+      attr_reader :validator_client
+      attr_reader :node_name
+      attr_reader :attributes
+      attr_reader :run_list
+      attr_reader :environment
+      attr_reader :hints
+
+      def initialize(options = {})
+        options = options.reverse_merge(
+          validator_client: "chef-validator",
+          attributes: Hash.new,
+          run_list: Array.new,
+          environment: "_default",
+          sudo: true,
+          hints: Hash.new,
+          chef_version: "latest"
+        )
+        options[:template] ||= default_template
+        self.class.validate_options(options)
+
+        @template_file             = options[:template]
+        @bootstrap_proxy           = options[:bootstrap_proxy]
+        @chef_version              = options[:chef_version]
+        @sudo                      = options[:sudo]
+        @validator_path            = options[:validator_path]
+        @encrypted_data_bag_secret = options[:encrypted_data_bag_secret]
+        @hints                     = options[:hints]
+        @server_url                = options[:server_url]
+        @validator_client          = options[:validator_client]
+        @node_name                 = options[:node_name]
+        @attributes                = options[:attributes]
+        @run_list                  = options[:run_list]
+        @environment               = options[:environment]
+      end
+
+      # @return [String]
+      def bootstrap_command
+        raise RuntimeError, "abstract function: must be implemented on includer"
+      end
+
+      # @return [String]
+      def default_template
+        raise RuntimeError, "abstract function: must be implemented on includer"
+      end
+
+      # @return [Pathname]
+      def templates_path
+        Ridley.root.join('bootstrappers')
+      end
+
+      # @return [String]
+      def first_boot
+        JSON.fast_generate(attributes.merge(run_list: run_list))
+      end
+
+      # The validation key to create a new client for the node
+      #
+      # @raise [Ridley::Errors::ValidatorNotFound]
+      #
+      # @return [String]
+      def validation_key
+        IO.read(File.expand_path(validator_path)).chomp
+      rescue Errno::ENOENT
+        raise Errors::ValidatorNotFound, "Error bootstrapping: Validator not found at '#{validator_path}'"
+      end
+
+      # @return [Erubis::Eruby]
+      def template
+        Erubis::Eruby.new(IO.read(template_file).chomp)
+      end
+    end
+  end
+end
+
+Dir["#{File.dirname(__FILE__)}/bootstrap_context/*.rb"].sort.each do |path|
+  require_relative "bootstrap_context/#{File.basename(path, '.rb')}"
+end

data/lib/ridley-connectors/bootstrap_context/unix.rb

@@ -0,0 +1,66 @@
+module Ridley
+  module BootstrapContext
+    # Represents a binding that will be evaluated as an ERB template. When bootstrapping
+    # nodes, an instance of this class represents the customizable and necessary configurations
+    # needed by the Host in order to install and connect to Chef. By default, this class will be used
+    # when SSH is the best way to connect to the node.
+    class Unix < BootstrapContext::Base
+      attr_reader :sudo
+
+      # @option options [Boolean] :sudo (true)
+      #   bootstrap with sudo (default: true)
+      def initialize(options = {})
+        options = options.reverse_merge(sudo: true)
+        @sudo   = options[:sudo]
+        super(options)
+      end
+
+      # @return [String]
+      def boot_command
+        template.evaluate(self)
+      end
+
+      # @return [String]
+      def chef_config
+        body = <<-CONFIG
+  log_level        :info
+  log_location     STDOUT
+  chef_server_url  "#{server_url}"
+  validation_client_name "#{validator_client}"
+  CONFIG
+
+        if node_name.present?
+          body << %Q{node_name "#{node_name}"\n}
+        else
+          body << "# Using default node name (fqdn)\n"
+        end
+
+        if bootstrap_proxy.present?
+          body << %Q{http_proxy        "#{bootstrap_proxy}"\n}
+          body << %Q{https_proxy       "#{bootstrap_proxy}"\n}
+        end
+
+        if encrypted_data_bag_secret.present?
+          body << %Q{encrypted_data_bag_secret "#{bootstrap_directory}/encrypted_data_bag_secret"\n}
+        end
+
+        body
+      end
+
+      # @return [String]
+      def bootstrap_directory
+        "/etc/chef"
+      end
+
+      # @return [String]
+      def chef_run
+        "chef-client -j #{bootstrap_directory}/first-boot.json -E #{environment}"
+      end
+
+      # @return [String]
+      def default_template
+        templates_path.join('unix_omnibus.erb').to_s
+      end
+    end
+  end
+end

data/lib/ridley-connectors/bootstrap_context/windows.rb

@@ -0,0 +1,118 @@
+module Ridley
+  module BootstrapContext
+    # Represents a binding that will be evaluated as an ERB template. When bootstrapping
+    # nodes, an instance of this class represents the customizable and necessary configurations
+    # needed by the Host in order to install and connect to Chef. By default, this class will be used
+    # when WinRM is the best way to connect to the node.
+    #
+    # Windows Specific code written by Seth Chisamore (<schisamo@opscode.com>) in knife-windows
+    # https://github.com/opscode/knife-windows/blob/3b8886ddcfb928ca0958cd05b22f8c3d78bee86e/lib/chef/knife/bootstrap/windows-chef-client-msi.erb
+    # https://github.com/opscode/knife-windows/blob/78d38bbed358ac20107fc2b5b427f4b5e52e5cb2/lib/chef/knife/core/windows_bootstrap_context.rb
+    class Windows < BootstrapContext::Base
+      # @return [String]
+      def boot_command
+        template.evaluate(self)
+      end
+
+      # @return [String]
+      def chef_config
+        body = <<-CONFIG
+  log_level        :info
+  log_location     STDOUT
+  chef_server_url  "#{server_url}"
+  validation_client_name "#{validator_client}"
+  CONFIG
+
+        if node_name.present?
+          body << %Q{node_name "#{node_name}"\n}
+        else
+          body << "# Using default node name (fqdn)\n"
+        end
+
+        if bootstrap_proxy.present?
+          body << %Q{http_proxy        "#{bootstrap_proxy}"\n}
+          body << %Q{https_proxy       "#{bootstrap_proxy}"\n}
+        end
+
+        if encrypted_data_bag_secret.present?
+          body << %Q{encrypted_data_bag_secret '#{bootstrap_directory}\\encrypted_data_bag_secret'\n}
+        end
+
+        escape_and_echo(body)
+      end
+
+      # @return [String]
+      def bootstrap_directory
+        "C:\\chef"
+      end
+
+      # @return [String]
+      def validation_key
+        escape_and_echo(super)
+      end
+
+      # @return [String]
+      def chef_run
+        "chef-client -j #{bootstrap_directory}\\first-boot.json -E #{environment}"
+      end
+
+      # @return [String]
+      def default_template
+        templates_path.join('windows_omnibus.erb').to_s
+      end
+
+      # @return [String]
+      def encrypted_data_bag_secret
+        return unless @encrypted_data_bag_secret
+
+        escape_and_echo(@encrypted_data_bag_secret)
+      end
+
+      # Implements a Powershell script that attempts a simple
+      # 'wget' to download the Chef msi
+      #
+      # @return [String]
+      def windows_wget_powershell
+        win_wget_ps = <<-WGET_PS
+  param(
+   [String] $remoteUrl,
+   [String] $localPath
+  )
+
+  $webClient = new-object System.Net.WebClient;
+
+  $webClient.DownloadFile($remoteUrl, $localPath);
+  WGET_PS
+
+        escape_and_echo(win_wget_ps)
+      end
+
+      # @return [String]
+      def install_chef
+        'msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%"'
+      end
+
+      # @return [String]
+      def first_boot
+        escape_and_echo(super)
+      end
+
+      # @return [String]
+      def env_path
+        "C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin"
+      end
+
+      # @return [String]
+      def local_download_path
+        "%TEMP%\\chef-client-#{chef_version}.msi"
+      end
+
+      # escape WIN BATCH special chars
+      # and prefixes each line with an
+      # echo
+      def escape_and_echo(file_contents)
+        file_contents.gsub(/^(.*)$/, 'echo.\1').gsub(/([(<|>)^])/, '^\1')
+      end
+    end
+  end
+end