taste_tester 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43e9bbdc0fa2bccc9c0bca3f4c749d6c0b4f356
-  data.tar.gz: 941177bd83e37b1830ca0f24add48768261541e9
+  metadata.gz: 13e9b1fb00c7044fe801ccb1158bbaacbbe30dd9
+  data.tar.gz: 3fcd362ea2bbdfed358847a485a695c9669d44df
 SHA512:
-  metadata.gz: 7446d6bef3d9f68860d2747a1a67141dcb3eb9fbbb9751713811afed02da87e192db4b4e473d11433fb908b4eafd14960ef610de052fbd3e8e3c82c5ccb037f2
-  data.tar.gz: db111fd123f9faff1a37b40f128e2e8a2041b27ad5be234dd62e2cf99bede17218cbbb5450543c1b999f5eed001fce18f1f8150309155e8bf250b208081d2f73
+  metadata.gz: f4da6aa14ee5b8c3f732eae1480f9793318b377f1574bf1bb12f2ec8b39c91edd8e8635d9ebd6e9042bf62a767ae55655ee447b0b47bfb83fbba4d1b13832e66
+  data.tar.gz: 67db565bdee6e84b0ad23c73183f88af0873ac12a84ae1451c8587038222634e0bf6888ef1e9a30280631586ad7a350087ad7a2f74f249f3a324f208a3a2395a

data/README.md

@@ -1,6 +1,7 @@
 # Taste Tester
 
-[![Build Status](https://travis-ci.org/facebook/taste-tester.svg)](http://travis-ci.org/facebook/taste-tester)
+[![TravisCI](https://travis-ci.org/facebook/taste-tester.svg)](http://travis-ci.org/facebook/taste-tester)
+[![CircleCI](https://circleci.com/gh/facebook/taste-tester.svg?style=svg)](https://circleci.com/gh/facebook/taste-tester)
 
 ## Intro
 Ohai!

data/bin/taste-tester

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib')
-
-# rubocop:disable UnusedBlockArgument, AlignParameters
+$LOAD_PATH.unshift(__dir__ + '/../lib')
 
 require 'rubygems'
 require 'time'
@@ -219,20 +217,22 @@ MODES:
       options[:linkonly] = true
     end
 
-    opts.on(
-      '-L', '--locallink', 'Configure the local chef client without ssh.'
-    ) do
-      options[:locallink] = true
+    opts.on('--transport TRANSPORT', ['locallink', 'ssh', 'noop'],
+            "Set the transport\n" +
+            "\t\tssh       - [default] Use SSH to talk to remote host\n" +
+            "\t\tlocallink - Assume the remote host is ourself\n" +
+            "\t\tnoop      - Ignore all remote commands") do |transport|
+      options[:transport] = transport
     end
 
     opts.on(
       '-t', '--testing-timestamp TIME',
-        'Until when should the host remain in testing.' +
-        ' Anything parsable is ok, such as "5/18 4:35" or "16/9/13".'
+      'Until when should the host remain in testing.' +
+      ' Anything parsable is ok, such as "5/18 4:35" or "16/9/13".'
     ) do |time|
       begin
         options[:testing_until] = Time.parse(time)
-      rescue
+      rescue StandardError
         logger.error("Invalid date: #{time}")
         exit 1
       end
@@ -240,8 +240,8 @@ MODES:
 
     opts.on(
       '-t', '--testing-time TIME',
-        'How long should the host remain in testing.' +
-        ' Takes a simple relative time string, such as "45m", "4h" or "2d".'
+      'How long should the host remain in testing.' +
+      ' Takes a simple relative time string, such as "45m", "4h" or "2d".'
     ) do |time|
       m = time.match(/^(\d+)([d|h|m]+)$/)
       if m
@@ -407,6 +407,6 @@ MODES:
   end
 end
 
-if __FILE__ == $PROGRAM_NAME
+if $PROGRAM_NAME == __FILE__
   include TasteTester
 end

data/lib/taste_tester/client.rb

@@ -52,8 +52,9 @@ module TasteTester
         logger,
       )
       unless @repo.exists?
-        raise "Could not open repo from #{TasteTester::Config.repo}"
+        fail "Could not open repo from #{TasteTester::Config.repo}"
       end
+      @track_symlinks = TasteTester::Config.track_symlinks
     end
 
     def checks
@@ -136,6 +137,7 @@ module TasteTester
           :databag_dir =>
             TasteTester::Config.relative_databag_dir,
         },
+        @track_symlinks,
       )
 
       cbs = changeset.cookbooks

data/lib/taste_tester/commands.rb

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# rubocop:disable UnusedBlockArgument, UnusedMethodArgument
 require 'taste_tester/server'
 require 'taste_tester/host'
 require 'taste_tester/config'
@@ -84,7 +83,7 @@ module TasteTester
           logger,
         )
         unless repo.exists?
-          raise "Could not open repo from #{TasteTester::Config.repo}"
+          fail "Could not open repo from #{TasteTester::Config.repo}"
         end
       end
       unless TasteTester::Config.skip_pre_test_hook ||
@@ -162,7 +161,7 @@ module TasteTester
       client.skip_checks = true if TasteTester::Config.skip_repo_checks
       client.force = true if TasteTester::Config.force_upload
       client.upload
-    rescue => exception
+    rescue StandardError => exception
       # 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

data/lib/taste_tester/config.rb

@@ -41,6 +41,7 @@ module TasteTester
     timestamp false
     user 'root'
     ref_file "#{ENV['HOME']}/.chef/taste-tester-ref.json"
+    knife_config "#{ENV['HOME']}/.chef/knife-#{ENV['USER']}-taste-tester.rb"
     checksum_dir "#{ENV['HOME']}/.chef/checksums"
     skip_repo_checks false
     chef_client_command 'chef-client'
@@ -55,6 +56,8 @@ module TasteTester
     chef_config_path '/etc/chef'
     chef_config 'client.rb'
     my_hostname nil
+    track_symlinks false
+    transport 'ssh'
 
     skip_pre_upload_hook false
     skip_post_upload_hook false

data/lib/taste_tester/exceptions.rb

@@ -20,5 +20,7 @@ module TasteTester
     end
     class LocalLinkError < StandardError
     end
+    class NoOpError < StandardError
+    end
   end
 end

data/lib/taste_tester/hooks.rb

@@ -26,34 +26,27 @@ module TasteTester
     extend BetweenMeals::Util
 
     # Do stuff before we upload to chef-zero
-    def self.pre_upload(_dryrun, _repo, _last_ref, _cur_ref)
-    end
+    def self.pre_upload(_dryrun, _repo, _last_ref, _cur_ref); end
 
     # Do stuff after we upload to chef-zero
-    def self.post_upload(_dryrun, _repo, _last_ref, _cur_ref)
-    end
+    def self.post_upload(_dryrun, _repo, _last_ref, _cur_ref); end
 
     # Do stuff before we put hosts in test mode
-    def self.pre_test(_dryrun, _repo, _hosts)
-    end
+    def self.pre_test(_dryrun, _repo, _hosts); end
 
     # This should return an array of commands to execute on
     # remote systems.
-    def self.test_remote_cmds(_dryrun, _hostname)
-    end
+    def self.test_remote_cmds(_dryrun, _hostname); end
 
     # Should return a string with extra stuff to shove
     # in the remote client.rb
-    def self.test_remote_client_rb_extra_code(_hostname)
-    end
+    def self.test_remote_client_rb_extra_code(_hostname); end
 
     # Do stuff after we put hosts in test mode
-    def self.post_test(_dryrun, _repo, _hosts)
-    end
+    def self.post_test(_dryrun, _repo, _hosts); end
 
     # Additional checks you want to do on the repo
-    def self.repo_checks(_dryrun, _repo)
-    end
+    def self.repo_checks(_dryrun, _repo); end
 
     def self.get(file)
       path = File.expand_path(file)

data/lib/taste_tester/host.rb

@@ -20,6 +20,7 @@ require 'open3'
 require 'colorize'
 
 require 'taste_tester/ssh'
+require 'taste_tester/noop'
 require 'taste_tester/locallink'
 require 'taste_tester/tunnel'
 
@@ -72,12 +73,14 @@ module TasteTester
     end
 
     def get_transport
-      if TasteTester::Config.locallink
-        transport = TasteTester::LocalLink.new
+      case TasteTester::Config.transport
+      when 'locallink'
+        TasteTester::LocalLink.new
+      when 'noop'
+        TasteTester::NoOp.new
       else
-        transport = TasteTester::SSH.new(@name)
+        TasteTester::SSH.new(@name)
       end
-      transport
     end
 
     def test
@@ -99,7 +102,7 @@ module TasteTester
       transport << 'logger -t taste-tester Moving server into taste-tester' +
         " for #{@user}"
       transport << touchcmd
-      transport << "echo -n '#{@serialized_config}' | base64 --decode" +
+      transport << "/bin/echo -n '#{@serialized_config}' | base64 --decode" +
         " > #{TasteTester::Config.chef_config_path}/client-taste-tester.rb"
       transport << "rm -vf #{TasteTester::Config.chef_config_path}/" +
         TasteTester::Config.chef_config
@@ -209,7 +212,7 @@ module TasteTester
         "-d @#{TasteTester::Config.testing_end_time.to_i} +'%Y-%m-%d %T')\" " +
         "#{TasteTester::Config.timestamp_file}; fi",
       ).delete("\n")
-      "echo -n '#{touch}' | base64 --decode | bash"
+      "/bin/echo -n '#{touch}' | base64 --decode | bash"
     end
 
     def config
@@ -221,7 +224,7 @@ module TasteTester
         url << ":#{TasteTester::State.port}" if TasteTester::State.port
       end
       # rubocop:disable Metrics/LineLength
-      ttconfig = <<-eos
+      ttconfig = <<-EOS
 # TasteTester by #{@user}
 # Prevent people from screwing up their permissions
 if Process.euid != 0
@@ -235,22 +238,22 @@ chef_server_url '#{url}'
 ssl_verify_mode :verify_none
 ohai.plugin_path << '#{TasteTester::Config.chef_config_path}/ohai_plugins'
 
-eos
+EOS
       # rubocop:enable Metrics/LineLength
 
       extra = TasteTester::Hooks.test_remote_client_rb_extra_code(@name)
       if extra
-        ttconfig += <<-eos
+        ttconfig += <<-EOS
 # Begin user-hook specified code
         #{extra}
 # End user-hook secified code
 
-        eos
+        EOS
       end
 
-      ttconfig += <<-eos
+      ttconfig += <<-EOS
 puts 'INFO: Running on #{@name} in taste-tester by #{@user}'
-      eos
+      EOS
       return ttconfig
     end
   end

data/lib/taste_tester/locallink.rb

@@ -41,7 +41,7 @@ module TasteTester
 
     def run!
       @status, @output = exec!(cmd, logger)
-    rescue => e
+    rescue StandardError => e
       logger.error(e.message)
       raise TasteTester::Exceptions::LocalLinkError
     end

data/lib/taste_tester/logging.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# rubocop:disable ClassVars, UnusedMethodArgument, UnusedBlockArgument
+# rubocop:disable ClassVars
 require 'logger'
 
 module TasteTester
@@ -50,14 +50,14 @@ module TasteTester
     def formatter
       return @@formatter_proc if @@formatter_proc
       if @@use_log_formatter
-        proc do |severity, datetime, progname, msg|
+        proc do |severity, datetime, _progname, msg|
           if severity == 'ERROR'
             msg = msg.red
           end
           "[#{datetime.strftime('%Y-%m-%dT%H:%M:%S%:z')}] #{severity}: #{msg}\n"
         end
       else
-        proc do |severity, datetime, progname, msg|
+        proc do |severity, _datetime, _progname, msg|
           msg.to_s.prepend("#{severity}: ") unless severity == 'WARN'
           if severity == 'ERROR'
             msg = msg.to_s.red
@@ -68,3 +68,4 @@ module TasteTester
     end
   end
 end
+# rubocop:enable ClassVars

data/lib/taste_tester/noop.rb

@@ -0,0 +1,67 @@
+# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
+
+# Copyright 2013-present Facebook
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'taste_tester/exceptions'
+
+module TasteTester
+  # Wrapper for running commands on local system
+  class NoOp
+    include TasteTester::Logging
+    include BetweenMeals::Util
+
+    attr_reader :output
+
+    def initialize
+      print_noop_warning
+      @host = 'localhost'
+      @user = ENV['USER']
+      @cmds = []
+    end
+
+    def print_noop_warning
+      # This needs to be a Class var as this class is initialized more
+      # than once in a given tt run and we only want to warn once.
+      # rubocop:disable Style/ClassVars
+      @@printedwarning ||= logger.warn(
+        'No-op plugin active, no remote commands will be run!',
+      )
+      # rubocop:enable Style/ClassVars
+    end
+
+    def add(string)
+      @cmds << string
+    end
+
+    alias << add
+
+    def run
+      run!
+    end
+
+    def run!
+      cmd
+      [0, "# TasteTester by #{@user}"]
+    end
+
+    private
+
+    def cmd
+      @cmds.each do |cmd|
+        logger.info("No-op, faking run of: '#{cmd}' on #{@host}")
+      end
+    end
+  end
+end

data/lib/taste_tester/server.rb

@@ -41,7 +41,7 @@ module TasteTester
       unless File.directory?(ref_dir)
         begin
           FileUtils.mkpath(ref_dir)
-        rescue => e
+        rescue StandardError => e
           logger.warn("Chef temp dir #{ref_dir} missing and can't be created")
           logger.warn(e)
         end
@@ -65,7 +65,7 @@ module TasteTester
         @addr = '::'
         begin
           @host = TasteTester::Config.my_hostname || Socket.gethostname
-        rescue
+        rescue StandardError
           logger.error('Unable to find fqdn')
           exit 1
         end
@@ -140,6 +140,7 @@ module TasteTester
         :role_dir => TasteTester::Config.roles,
         :cookbook_dirs => TasteTester::Config.cookbooks,
         :checksum_dir => TasteTester::Config.checksum_dir,
+        :config => TasteTester::Config.knife_config,
       )
       knife.write_user_config
     end

data/lib/taste_tester/ssh.rb

@@ -43,7 +43,7 @@ module TasteTester
 
     def run!
       @status, @output = exec!(cmd, logger)
-    rescue => e
+    rescue StandardError => e
       # rubocop:disable LineLength
       error = <<-MSG
 SSH returned error while connecting to #{TasteTester::Config.user}@#{@host}

data/lib/taste_tester/state.rb

@@ -29,13 +29,13 @@ module TasteTester
     include ::BetweenMeals::Util
 
     def initialize
-      ref_dir = File.dirname(File.expand_path(
-                               TasteTester::Config.ref_file,
-      ))
+      ref_dir = File.dirname(
+        File.expand_path(TasteTester::Config.ref_file),
+      )
       unless File.directory?(ref_dir)
         begin
           FileUtils.mkpath(ref_dir)
-        rescue => e
+        rescue StandardError => e
           logger.error("Chef temp dir #{ref_dir} missing and can't be created")
           logger.error(e)
           exit(1)
@@ -108,7 +108,7 @@ module TasteTester
 
     def self.read(key)
       JSON.parse(File.read(TasteTester::Config.ref_file))[key.to_s]
-    rescue => e
+    rescue StandardError => e
       logger.debug(e)
       nil
     end
@@ -122,7 +122,7 @@ module TasteTester
     def merge(vals)
       begin
         state = JSON.parse(File.read(TasteTester::Config.ref_file))
-      rescue
+      rescue StandardError
         state = {}
       end
       state.merge!(vals)
@@ -132,7 +132,7 @@ module TasteTester
       )
       ff.write(state.to_json)
       ff.close
-    rescue => e
+    rescue StandardError => e
       logger.error('Unable to write the reffile')
       logger.debug(e)
       exit 0

data/lib/taste_tester/tunnel.rb

@@ -38,21 +38,19 @@ module TasteTester
       @port = TasteTester::Config.tunnel_port
       logger.info("Setting up tunnel on port #{@port}")
       @status, @output = exec!(cmd, logger)
-    rescue
+    rescue StandardError
       logger.error 'Failed bringing up ssh tunnel'
       exit(1)
     end
 
     def cmd
-      if TasteTester::Config.user != 'root'
-        pid = '$$'
-      else
-        pid = '\\$\\$'
-      end
-      cmds = "ps -p #{pid} -o pgid | grep -v PGID" +
+      @max_ping = @delta_secs / 10
+      pid = '$$'
+      @ts = TasteTester::Config.testing_end_time.strftime('%y%m%d%H%M.%S')
+      cmds = "ps -o pgid= -p $(ps -o ppid= -p #{pid}) | sed \"s| ||g\" " +
              " > #{TasteTester::Config.timestamp_file} &&" +
-             " touch -t #{TasteTester::Config.testing_end_time}" +
-             " #{TasteTester::Config.timestamp_file} && sleep #{@delta_secs}"
+             " touch -t #{@ts} #{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.
@@ -62,14 +60,14 @@ module TasteTester
       cmd = "#{TasteTester::Config.ssh_command} " +
             "-T -o BatchMode=yes -o ConnectTimeout=#{@timeout} " +
             '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ' +
-            '-o ServerAliveInterval=10 -o ServerAliveCountMax=6 ' +
+            "-o ServerAliveInterval=10 -o ServerAliveCountMax=#{@max_ping} " +
             "-f -R #{@port}:localhost:#{@server.port} "
       if TasteTester::Config.user != 'root'
         cc = Base64.encode64(cmds).delete("\n")
         cmd += "#{TasteTester::Config.user}@#{@host} \"echo '#{cc}' | base64" +
                ' --decode | sudo bash -x"'
       else
-        cmd += "root@#{@host} \"#{cmds}\""
+        cmd += "root@#{@host} '#{cmds}'"
       end
       cmd
     end
@@ -85,7 +83,8 @@ module TasteTester
       end
       cmd = "( [ -s #{TasteTester::Config.timestamp_file} ]" +
             " && #{sudo}kill -9 -- " +
-            "-\$(cat #{TasteTester::Config.timestamp_file}); true )"
+            "-\$(cat #{TasteTester::Config.timestamp_file}) 2>/dev/null; " +
+            ' true )'
       ssh << cmd
       ssh.run!
     end

data/scripts/taste-untester

@@ -14,6 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+CONFIG_PATH='/etc/chef'
+CONFIG_NAME='client'
+
+CONFIG_FILE="${CONFIG_FILE:-/etc/taste-untester-config}"
+if [ -e "$CONFIG_FILE" ]; then
+  source "$COFNIG_FILE"
+fi
+
 CONFLINK='/etc/chef/client.rb'
 PRODCONF='/etc/chef/client-prod.rb'
 CERTLINK='/etc/chef/client.pem'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taste_tester
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: between_meals
@@ -115,6 +115,7 @@ files:
 - lib/taste_tester/host.rb
 - lib/taste_tester/locallink.rb
 - lib/taste_tester/logging.rb
+- lib/taste_tester/noop.rb
 - lib/taste_tester/server.rb
 - lib/taste_tester/ssh.rb
 - lib/taste_tester/state.rb
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Taste Tester