formatron 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f65ce71a403a7fb9643dc55ded5f5db6e29ed56a
-  data.tar.gz: 017ba0b1ecf0fb92becc855038b3bc1023bba5cc
+  metadata.gz: e2901f1a146d9b969d04f487d57f0ff26a85db1b
+  data.tar.gz: 154a154b9e9f920fcccb41add3563dddbb6f4b18
 SHA512:
-  metadata.gz: 719acdc0c0e57bb503253f1a37c4b9543701a2112d9a069a4488ad50fc7b2a524d84d83b96771a3a683183652bfcb6d3c880f13385c0b0ea57616ef89b0de8d2
-  data.tar.gz: e429955eade1cd8f89039e43991583f02b47d00152a7389e120f133aa360ab072d6ec9bc7eb7b57a1c9993af12be21b5466864c533747adf49e4b2f8fe2c7dfe
+  metadata.gz: 0a120f2f78037c737316853b5aedf94baed0d0e6dadc90ed55a636e3a165c94e6992f5b37fa68f12408d61f9fe7b69c23d6a0e295d924888a86a47deb47988d0
+  data.tar.gz: 8389d7122ed58e0ba66408c674da5e9a6123fbb1c255a78502ea2b706741039f99e9e491f687612e8a80620ba8203377daf78b15dda79411b33b04a0aa38119b

data/lib/formatron/chef/knife.rb

@@ -150,6 +150,11 @@ class Formatron
         # rubocop:enable Metrics/LineLength
       end
 
+      def node_exists?(guid:)
+        command = "knife node show #{guid} -c #{@knife_file.path}"
+        Util::Shell.exec command
+      end
+
       def unlink
         @knife_file.unlink unless @knife_file.nil?
         @databag_secret_file.unlink unless @databag_secret_file.nil?

data/lib/formatron/chef/ssh.rb

@@ -0,0 +1,37 @@
+require 'formatron/util/ssh'
+
+class Formatron
+  class Chef
+    # Perform commands on chef nodes over SSH
+    class SSH
+      SSH_USER = 'ubuntu'
+
+      def initialize(keys:)
+        @keys = keys
+      end
+
+      def run_chef_client(hostname:, bastion_hostname:)
+        Formatron::Util::SSH.exec(
+          hostname: hostname,
+          bastion_hostname: bastion_hostname,
+          user: SSH_USER,
+          key: @keys.ec2_key,
+          command: 'sudo chef-client'
+        )
+      end
+
+      def bootstrapped?(hostname:, bastion_hostname:)
+        Formatron::Util::SSH.exec(
+          hostname: hostname,
+          bastion_hostname: bastion_hostname,
+          user: SSH_USER,
+          key: @keys.ec2_key,
+          command: '[ -f /etc/chef/client.pem ]'
+        )
+        true
+      rescue
+        false
+      end
+    end
+  end
+end

data/lib/formatron/chef.rb

@@ -3,6 +3,7 @@ require 'formatron/logger'
 require_relative 'chef/keys'
 require_relative 'chef/berkshelf'
 require_relative 'chef/knife'
+require_relative 'chef/ssh'
 
 class Formatron
   # manage the instance provisioning with Chef
@@ -59,6 +60,9 @@ class Formatron
         username: username,
         ssl_verify: ssl_verify
       )
+      @ssh = SSH.new(
+        keys: @keys
+      )
     end
     # rubocop:enable Metrics/ParameterLists
     # rubocop:enable Metrics/MethodLength
@@ -107,6 +111,73 @@ class Formatron
       end
       @knife.create_environment environment: guid
       @berkshelf.upload environment: guid, cookbook: cookbook
+      if @knife.node_exists? guid: guid
+        _reprovision_node(
+          bastion_hostname: bastion_hostname,
+          guid: guid,
+          cookbook_name: cookbook_name,
+          hostname: hostname
+        )
+      else
+        _bootstrap_node(
+          bastion_hostname: bastion_hostname,
+          guid: guid,
+          cookbook_name: cookbook_name,
+          hostname: hostname
+        )
+      end
+    end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
+
+    # rubocop:disable Metrics/MethodLength
+    def _reprovision_node(
+      bastion_hostname:,
+      guid:,
+      cookbook_name:,
+      hostname:
+    )
+      if @ssh.bootstrapped?(
+        bastion_hostname: bastion_hostname,
+        hostname: hostname
+      )
+        Formatron::LOG.info do
+          "Run chef-client on existing node #{guid}"
+        end
+        @ssh.run_chef_client(
+          bastion_hostname: bastion_hostname,
+          hostname: hostname
+        )
+      else
+        Formatron::LOG.info do
+          "node #{guid} exists but has not been bootstrapped, " \
+          'likely recreated so deleting node and bootstrapping again'
+        end
+        Formatron::LOG.info do
+          "Deleting node '#{guid}' from chef server: #{@chef_sub_domain}"
+        end
+        @knife.delete_node node: guid
+        Formatron::LOG.info do
+          "Deleting client '#{guid}' from chef server: #{@chef_sub_domain}"
+        end
+        @knife.delete_client client: guid
+        _bootstrap_node(
+          bastion_hostname: bastion_hostname,
+          guid: guid,
+          cookbook_name: cookbook_name,
+          hostname: hostname
+        )
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    # rubocop:disable Metrics/MethodLength
+    def _bootstrap_node(
+      bastion_hostname:,
+      guid:,
+      cookbook_name:,
+      hostname:
+    )
       Formatron::LOG.info do
         "Bootstrap node #{guid}"
       end
@@ -117,7 +188,6 @@ class Formatron
         hostname: hostname
       )
     end
-    # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
 
     # rubocop:disable Metrics/MethodLength
@@ -161,7 +231,9 @@ class Formatron
 
     private(
       :_chef_server_url,
-      :_hostname
+      :_hostname,
+      :_bootstrap_node,
+      :_reprovision_node
     )
   end
   # rubocop:enable Metrics/ClassLength

data/lib/formatron/util/ssh.rb

@@ -0,0 +1,47 @@
+require 'net/ssh'
+require 'net/ssh/proxy/command'
+require 'formatron/logger'
+
+class Formatron
+  module Util
+    # Perform commands on chef nodes over SSH
+    class SSH
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
+      def self.exec(hostname:, bastion_hostname:, user:, key:, command:)
+        proxy_command = Net::SSH::Proxy::Command.new(
+          "ssh #{user}@#{bastion_hostname} -W %h:%p"
+        ) unless hostname.eql? bastion_hostname
+        Net::SSH.start(
+          hostname,
+          user,
+          keys: [key],
+          proxy: proxy_command
+        ) do |ssh|
+          ssh.open_channel do |channel|
+            channel.exec(command) do |_ch, success|
+              fail "failed to start command: #{command}" unless success
+              channel.on_request('exit-status') do |_ch, data|
+                status = data.read_long
+                fail "`#{command}` exited with code #{status}" if status != 0
+              end
+              channel.on_data do |_ch, data|
+                data.each_line do |line|
+                  Formatron::LOG.info { line.chomp }
+                end
+              end
+              channel.on_extended_data do |_ch, _type, data|
+                data.each_line do |line|
+                  Formatron::LOG.info { line.chomp }
+                end
+              end
+            end
+          end
+          ssh.loop
+        end
+      end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

data/lib/formatron/version.rb

@@ -1,4 +1,4 @@
 # add version to class
 class Formatron
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/support/ssh_data.rb

@@ -0,0 +1,12 @@
+class Formatron
+  module Support
+    # Stub S3 get_object response class
+    class SSHData
+      attr_reader :read_long
+
+      def initialize(data)
+        @read_long = data
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formatron
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Peter Halliday
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -307,6 +307,7 @@ files:
 - lib/formatron/chef/berkshelf.rb
 - lib/formatron/chef/keys.rb
 - lib/formatron/chef/knife.rb
+- lib/formatron/chef/ssh.rb
 - lib/formatron/chef_clients.rb
 - lib/formatron/cli.rb
 - lib/formatron/cli/completion.rb
@@ -385,6 +386,7 @@ files:
 - lib/formatron/s3/path.rb
 - lib/formatron/util/dsl.rb
 - lib/formatron/util/shell.rb
+- lib/formatron/util/ssh.rb
 - lib/formatron/util/vpc.rb
 - lib/formatron/version.rb
 - support/cloudformation_describe_stacks_response.rb
@@ -392,6 +394,7 @@ files:
 - support/route53_get_hosted_zone_response.rb
 - support/s3_get_object_response.rb
 - support/s3_list_objects_response.rb
+- support/ssh_data.rb
 - support/template_test.rb
 homepage: https://github.com/pghalliday/formatron
 licenses:
@@ -413,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: AWS/Chef Deployment Tool