taste_tester 0.0.7 → 0.0.8

data/bin/taste-tester

@@ -335,8 +335,13 @@ MODES:
   TasteTester::Logging.verbosity = TasteTester::Config.verbosity
   TasteTester::Logging.use_log_formatter = TasteTester::Config.timestamp
 
-  if File.exists?(File.expand_path(TasteTester::Config.plugin_path))
-    TasteTester::Hooks.get(File.expand_path(TasteTester::Config[:plugin_path]))
+  if TasteTester::Config.plugin_path
+    path = File.expand_path(TasteTester::Config.plugin_path)
+    unless File.exists?(path)
+      logger.error("Plugin not found (#{path})")
+      exit(1)
+    end
+    TasteTester::Hooks.get(path)
   end
 
   case mode.to_sym

data/lib/taste_tester/client.rb

@@ -34,6 +34,7 @@ module TasteTester
       @knife = BetweenMeals::Knife.new(
         :logger => logger,
         :user => @server.user,
+        :ssl => TasteTester::Config.use_ssl,
         :host => @server.host,
         :port => @server.port,
         :role_dir => TasteTester::Config.roles,

data/lib/taste_tester/commands.rb

@@ -108,7 +108,7 @@ module TasteTester
     def self.untest
       hosts = TasteTester::Config.servers
       unless hosts
-        logger.warn('You must provide a hostname')
+        logger.error('You must provide a hostname')
         exit(1)
       end
       server = TasteTester::Server.new
@@ -152,14 +152,21 @@ module TasteTester
       if TasteTester::Config.force_upload
         server.restart
       else
-        server.start unless TasteTester::Server.running?
+        server.start
       end
       client = TasteTester::Client.new(server)
       client.skip_checks = true if TasteTester::Config.skip_checks
       client.force = true if TasteTester::Config.force_upload
       client.upload
     rescue => exception
-      errors = ['Cannot find a cookbook named', 'Connection reset by peer']
+      # We're trying to recover from common chef-zero errors
+      # Most of them happen due to half finished uploads, which leave
+      # chef-zero in undefined state
+      errors = [
+        'Cannot find a cookbook named',
+        'Connection reset by peer',
+        'Object not found',
+      ]
       if errors.any? { |e| exception.to_s.match(/#{e}/im) }
         TasteTester::Config.force_upload = true
         unless @already_retried

data/lib/taste_tester/config.rb

@@ -34,8 +34,8 @@ module TasteTester
     role_dir 'roles'
     databag_dir 'databags'
     config_file '/etc/taste-tester-config.rb'
-    plugin_path '/etc/taste-tester-plugin.rb'
-    chef_zero_path '/opt/chef/embedded/bin/chef-zero'
+    plugin_path nil
+    chef_zero_path nil
     verbosity Logger::WARN
     timestamp false
     user 'root'
@@ -47,7 +47,9 @@ module TasteTester
     chef_port_range [5000, 5500]
     tunnel_port 4001
     timestamp_file '/etc/chef/test_timestamp'
-    use_ssh_tunnels true
+    use_ssh_tunnels false
+    use_ssl true
+    chef_zero_logging true
 
     skip_pre_upload_hook false
     skip_post_upload_hook false
@@ -63,7 +65,7 @@ module TasteTester
 
     def self.relative_cookbook_dirs
       cookbook_dirs.map do |x|
-        File.join(base_dir, x)
+        (base_dir && !base_dir.empty?) ? File.join(base_dir, x) : x
       end
     end
 
@@ -72,7 +74,7 @@ module TasteTester
     end
 
     def self.relative_role_dir
-      File.join(base_dir, role_dir)
+      (base_dir && !base_dir.empty?) ? File.join(base_dir, role_dir) : x
     end
 
     def self.databags
@@ -80,7 +82,7 @@ module TasteTester
     end
 
     def self.relative_databag_dir
-      File.join(base_dir, databag_dir)
+      (base_dir && !base_dir.empty?) ? File.join(base_dir, databag_dir) : x
     end
 
     def self.chef_port

data/lib/taste_tester/host.rb

@@ -176,10 +176,11 @@ module TasteTester
     private
 
     def config
+      scheme = TasteTester::Config.use_ssl ? 'https' : 'http'
       if TasteTester::Config.use_ssh_tunnels
-        url = "http://localhost:#{@tunnel.port}"
+        url = "#{scheme}://localhost:#{@tunnel.port}"
       else
-        url = "http://#{@server.host}:#{TasteTester::State.port}"
+        url = "#{scheme}://#{@server.host}:#{TasteTester::State.port}"
       end
       ttconfig = <<-eos
 # TasteTester by #{@user}
@@ -189,12 +190,13 @@ if Process.euid != 0
   Process.exit!
 end
 
-log_level                :info
-log_location             STDOUT
-chef_server_url          '#{url}'
+log_level :info
+log_location STDOUT
+chef_server_url '#{url}'
+ssl_verify_mode :verify_none
 Ohai::Config[:plugin_path] << '/etc/chef/ohai_plugins'
 
-      eos
+eos
 
       extra = TasteTester::Hooks.test_remote_client_rb_extra_code(@name)
       if extra

data/lib/taste_tester/server.rb

@@ -35,6 +35,7 @@ module TasteTester
       @state = TasteTester::State.new
       @ref_file = TasteTester::Config.ref_file
       ref_dir = File.dirname(File.expand_path(@ref_file))
+      @log_file = "#{ref_dir}/chef-zero.log"
       @zero_path = TasteTester::Config.chef_zero_path
       unless File.directory?(ref_dir)
         begin
@@ -47,6 +48,12 @@ module TasteTester
 
       @user = ENV['USER']
 
+      # SSL and logging are obvious, but SSH is also required since it
+      # determines if we listen only on localhost or not
+      @need_restart = @state.ssl != TasteTester::Config.use_ssl ||
+        @state.logging != TasteTester::Config.chef_zero_logging ||
+        @state.ssh != TasteTester::Config.use_ssh_tunnels
+
       # If we are using SSH tunneling listen on localhost, otherwise listen
       # on all addresses - both v4 and v6. Note that on localhost, ::1 is
       # v6-only, so we default to 127.0.0.1 instead.
@@ -65,8 +72,17 @@ module TasteTester
     end
 
     def start
-      return if TasteTester::Server.running?
-      logger.warn('Starting taste-tester server')
+      if TasteTester::Server.running?
+        if @need_restart
+          logger.warn('Restarting taste-tester server for config change')
+          stop_chef_zero
+          @need_restart = false
+        else
+          return
+        end
+      else
+        logger.warn('Starting taste-tester server')
+      end
       @state.wipe
       write_config
       start_chef_zero
@@ -82,6 +98,7 @@ module TasteTester
       logger.warn('Restarting taste-tester server')
       if TasteTester::Server.running?
         stop_chef_zero
+        @state.ref = nil
       end
       write_config
       start_chef_zero
@@ -116,6 +133,7 @@ module TasteTester
       knife = BetweenMeals::Knife.new(
         :logger => logger,
         :user => @user,
+        :ssl => TasteTester::Config.use_ssl,
         :host => @host,
         :port => port,
         :role_dir => TasteTester::Config.roles,
@@ -126,14 +144,18 @@ module TasteTester
     end
 
     def start_chef_zero
-      unless @state.port
-        @state.port = TasteTester::Config.chef_port
-      end
+      File.unlink(@log_file) if File.exists?(@log_file)
+      @state.update({
+        :port => TasteTester::Config.chef_port,
+        :ssl => TasteTester::Config.use_ssl,
+        :ssh => TasteTester::Config.use_ssh_tunnels,
+        :logging => TasteTester::Config.chef_zero_logging,
+      })
       logger.info("Starting chef-zero of port #{@state.port}")
-
-      Mixlib::ShellOut.new(
-        "#{chef_zero_path} --host #{@addr} --port #{@state.port} -d"
-      ).run_command.error!
+      cmd = "#{chef_zero_path} --host #{@addr} --port #{@state.port} -d"
+      cmd << " --log-file #{@log_file}" if TasteTester::Config.chef_zero_logging
+      cmd << ' --ssl' if TasteTester::Config.use_ssl
+      Mixlib::ShellOut.new(cmd).run_command.error!
     end
 
     def stop_chef_zero
@@ -145,6 +167,10 @@ module TasteTester
     end
 
     def chef_zero_path
+      if TasteTester::Config.chef_zero_path
+        return TasteTester::Config.chef_zero_path
+      end
+
       [
         '/opt/chef/bin/chef-zero',
         '/opt/chef/embedded/bin/chef-zero',

data/lib/taste_tester/ssh.rb

@@ -51,6 +51,7 @@ MSG
       # rubocop:enable LineLength
       error.lines.each { |x| logger.error x.strip }
       logger.error(e.message)
+      exit(1)
     end
 
     private

data/lib/taste_tester/state.rb

@@ -51,6 +51,30 @@ module TasteTester
       write(:port, port)
     end
 
+    def ssl
+      TasteTester::State.read(:ssl)
+    end
+
+    def ssl=(ssl)
+      write(:ssl, ssl)
+    end
+
+    def logging
+      TasteTester::State.read(:logging)
+    end
+
+    def logging=(logging)
+      write(:logging, logging)
+    end
+
+    def ssh
+      TasteTester::State.read(:ssh)
+    end
+
+    def ssh=(ssh)
+      write(:ssh, ssh)
+    end
+
     def ref
       TasteTester::State.read(:ref)
     end
@@ -59,6 +83,10 @@ module TasteTester
       write(:ref, ref)
     end
 
+    def update(vals)
+      merge(vals)
+    end
+
     def self.port
       TasteTester::State.read(:port)
     end
@@ -72,13 +100,17 @@ module TasteTester
 
     private
 
-    def write(key, value)
+    def write(key, val)
+      merge({key => val})
+    end
+
+    def merge(vals)
       begin
         state = JSON.parse(File.read(TasteTester::Config.ref_file))
       rescue
         state = {}
       end
-      state[key.to_s] = value
+      state.merge!(vals)
       ff = File.open(
         TasteTester::Config.ref_file,
         'w'

data/lib/taste_tester/tunnel.rb

@@ -44,13 +44,31 @@ module TasteTester
     end
 
     def cmd
-      cmds = "echo \\\$\\\$ > #{TasteTester::Config.timestamp_file} &&" +
-      " touch -t #{TasteTester::Config.testing_end_time}" +
-      " #{TasteTester::Config.timestamp_file} && sleep #{@delta_secs}"
+      if TasteTester::Config.user != 'root'
+        pid = '$$'
+      else
+        pid = '\\$\\$'
+      end
+      cmds = "ps -p #{pid} -o pgid | grep -v PGID > #{TasteTester::Config.timestamp_file} &&" +
+        " touch -t #{TasteTester::Config.testing_end_time}" +
+        " #{TasteTester::Config.timestamp_file} && sleep #{@delta_secs}"
+      # As great as it would be to have ExitOnForwardFailure=yes,
+      # we had multiple cases of tunnels dying
+      # if -f and ExitOnForwardFailure are used together.
+      # In most cases the first request from chef was "breaking" the tunnel,
+      # in a way that port was still open, but subsequent requests were hanging.
+      # This is reproducible and should be looked into.
       cmd = "ssh -T -o BatchMode=yes -o ConnectTimeout=#{@timeout} " +
+        '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ' +
         '-o ServerAliveInterval=10 -o ServerAliveCountMax=6 ' +
-        "-f -R #{@port}:localhost:#{@server.port} " +
-        "root@#{@host} \"#{cmds}\""
+        "-f -R #{@port}:localhost:#{@server.port} "
+      if TasteTester::Config.user != 'root'
+        cc = Base64.encode64(cmds).gsub(/\n/, '')
+        cmd += "#{TasteTester::Config.user}@#{@host} \"echo '#{cc}' | base64" +
+          ' --decode | sudo bash -x"'
+      else
+        cmd += "root@#{@host} \"#{cmds}\""
+      end
       cmd
     end
 
@@ -60,8 +78,12 @@ module TasteTester
       # surround this in paryns, and make sure as a whole it evaluates
       # to true so it doesn't mess up other things... even though this is
       # the only thing we're currently executing in this SSH.
-      ssh << "( [ -s #{TasteTester::Config.timestamp_file} ]" +
-        " && kill -9 -- -\$(cat #{TasteTester::Config.timestamp_file}); true )"
+      if TasteTester::Config.user != 'root'
+        sudo = 'sudo '
+      end
+      cmd = "( [ -s #{TasteTester::Config.timestamp_file} ]" +
+        " && #{sudo}kill -9 -- -\$(cat #{TasteTester::Config.timestamp_file}); true )"
+      ssh << cmd
       ssh.run!
     end
   end

metadata

@@ -1,111 +1,121 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: taste_tester
-version: !ruby/object:Gem::Version
-  version: 0.0.7
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
-authors:
+authors: 
 - Phil Dibowitz
 - Marcin Sawicki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-01-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: mixlib-config
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colorize
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: between_meals
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: between_meals
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Utility for testing Chef changes using chef-zero
 email: 
-executables:
+executables: 
 - taste-tester
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
 - LICENSE
-files:
+files: 
 - README.md
 - LICENSE
-- lib/taste_tester/hooks.rb
-- lib/taste_tester/logging.rb
-- lib/taste_tester/commands.rb
-- lib/taste_tester/tunnel.rb
 - lib/taste_tester/host.rb
-- lib/taste_tester/state.rb
+- lib/taste_tester/ssh.rb
+- lib/taste_tester/tunnel.rb
+- lib/taste_tester/server.rb
 - lib/taste_tester/client.rb
+- lib/taste_tester/hooks.rb
 - lib/taste_tester/config.rb
-- lib/taste_tester/server.rb
-- lib/taste_tester/ssh.rb
+- lib/taste_tester/logging.rb
+- lib/taste_tester/state.rb
+- lib/taste_tester/commands.rb
 - bin/taste-tester
 - scripts/taste-untester
 homepage: https://github.com/facebook/taste-tester
-licenses:
+licenses: 
 - Apache
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Taste Tester
 test_files: []
+