opscode-pushy-client 2.3.0 → 2.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 35aaa8aa957140b06ed1c7bd1fa8850734e46153
-  data.tar.gz: 5788b3fd6c36560be520628c756b20d96bdc646d
+SHA256:
+  metadata.gz: bd455699417a076f318d51e9521395d286698a06f00a2dbfe0e35d227edc351f
+  data.tar.gz: 03017f2efa50c78b3afc558714c497e584771521f183bf743880b308a5959a12
 SHA512:
-  metadata.gz: 65ab5d3e8402b98c5ce319c9c254188912e5be20330f45369bbac4cc9376e9c7216432c15c6b123d32d2a1248efb5d3faf26f54c1d516ee7e606ee74a7971f99
-  data.tar.gz: a5bac0ca2e7d48e6a0b0a445bac6244c353ff80e18e99c1b549dcb2eb2bba281f76d502826c3eceeb9b1cba3bf00217602f94da83fc86fbc0676c688a3c33f3c
+  metadata.gz: 6c0e0a19acc56d240fd0d9b75612db7e533ee71dd7c7b1c7a00af9aae6764333a617a3da0bef4d04a70445adeb55b2f83d21e668c966ce90d3c8491365605c34
+  data.tar.gz: 1c71e5968153037ad0fcfe8c2d13d8dbdb858106243e56aa994d46e3c04b609155b3ed66ae8f32374cf42cce1102f2c33149e1fd5cdfda7ad603170e98b8742d

data/CHANGELOG.md

@@ -1,4 +1,53 @@
 # Chef Push Client Changes
+<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
+<!-- latest_release 2.4.11 -->
+## [2.4.11](https://github.com/chef/opscode-pushy-client/tree/2.4.11) (2018-04-24)
+
+#### Merged Pull Requests
+- expeditor config: bundle update every time [#155](https://github.com/chef/opscode-pushy-client/pull/155) ([lamont-granquist](https://github.com/lamont-granquist))
+<!-- latest_release -->
+
+<!-- release_rollup since=2.4.8 -->
+### Changes since 2.4.8 release
+
+#### Merged Pull Requests
+- expeditor config: bundle update every time [#155](https://github.com/chef/opscode-pushy-client/pull/155) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 2.4.11 -->
+- refactor timeout on message send [#152](https://github.com/chef/opscode-pushy-client/pull/152) ([jeremymv2](https://github.com/jeremymv2)) <!-- 2.4.10 -->
+- Optimize `get_config` by eliminating extensive retry behavior [#151](https://github.com/chef/opscode-pushy-client/pull/151) ([jeremymv2](https://github.com/jeremymv2)) <!-- 2.4.9 -->
+<!-- release_rollup -->
+
+<!-- latest_stable_release -->
+## [2.4.8](https://github.com/chef/opscode-pushy-client/tree/2.4.8) (2018-02-05)
+
+#### Merged Pull Requests
+- Add CODEOWNERS file [#148](https://github.com/chef/opscode-pushy-client/pull/148) ([schisamo](https://github.com/schisamo))
+- Add AIX support [#149](https://github.com/chef/opscode-pushy-client/pull/149) ([jeremiahsnapp](https://github.com/jeremiahsnapp))
+- update dependency versions [#150](https://github.com/chef/opscode-pushy-client/pull/150) ([jaymalasinha](https://github.com/jaymalasinha))
+<!-- latest_stable_release -->
+
+## [2.4.5](https://github.com/chef/opscode-pushy-client/tree/2.4.5) (2017-11-03)
+
+#### Merged Pull Requests
+- Wrap ZMQ request in timeout [#143](https://github.com/chef/opscode-pushy-client/pull/143) ([nsdavidson](https://github.com/nsdavidson))
+
+## [2.4.4](https://github.com/chef/opscode-pushy-client/tree/2.4.4) (2017-09-21)
+
+#### Merged Pull Requests
+- Update Expeditor config to meet 0.5.0 requirements [#142](https://github.com/chef/opscode-pushy-client/pull/142) ([tduffield](https://github.com/tduffield))
+- Update ruby to 2.4.2 [#145](https://github.com/chef/opscode-pushy-client/pull/145) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
+- Updating bundler to 1.15.4. Some README updates. [#146](https://github.com/chef/opscode-pushy-client/pull/146) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
+
+## [2.4.1](https://github.com/chef/opscode-pushy-client/tree/2.4.1) (2017-08-16)
+
+#### Merged Pull Requests
+- Perform version bump on correct path [#134](https://github.com/chef/opscode-pushy-client/pull/134) ([schisamo](https://github.com/schisamo))
+- Ensure version bump sed matches the correct line [#135](https://github.com/chef/opscode-pushy-client/pull/135) ([schisamo](https://github.com/schisamo))
+- Update SHA1 fingerprint for MSI signing cert [#136](https://github.com/chef/opscode-pushy-client/pull/136) ([schisamo](https://github.com/schisamo))
+- Update the CHANGELOG when push-client is promoted to stable [#137](https://github.com/chef/opscode-pushy-client/pull/137) ([tduffield](https://github.com/tduffield))
+- Allow push jobs to build libzmq from source on windows [#128](https://github.com/chef/opscode-pushy-client/pull/128) ([ksubrama](https://github.com/ksubrama))
+- Add Option to manage environment variables that could be overwritten  [#140](https://github.com/chef/opscode-pushy-client/pull/140) ([jaym](https://github.com/jaym))
+
+
 
 ## 2.2.0
 
@@ -85,4 +134,4 @@
 
 * Add Apache 2 license and headers in preparation for open sourcing.
 
-* Unify gem and repo tag versioning scheme.
+* Unify gem and repo tag versioning scheme.

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    opscode-pushy-client (2.3.0)
-      chef (>= 12.19, < 14.0)
+    opscode-pushy-client (2.4.11)
+      chef (>= 12.19, < 15.0)
       ffi-rzmq
-      ohai (>= 8.23, < 14.0)
+      ohai (>= 8.23, < 15.0)
       uuidtools
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     builder (3.2.3)
-    chef (13.0.118)
+    chef (14.0.202)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.0.118)
+      chef-config (= 14.0.202)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -25,14 +25,14 @@ GEM
       iniparse (~> 1.4)
       iso8601 (~> 0.9.1)
       mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 1.4)
+      mixlib-authentication (~> 2.0)
       mixlib-cli (~> 1.7)
-      mixlib-log (~> 1.3)
+      mixlib-log (~> 2.0, >= 2.0.3)
       mixlib-shellout (~> 2.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 5.0)
+      net-ssh (~> 4.2)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 13.0)
+      ohai (~> 14.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
       rspec-core (~> 3.5)
@@ -43,10 +43,10 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (13.0.118-universal-mingw32)
+    chef (14.0.202-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.0.118)
+      chef-config (= 14.0.202)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -56,14 +56,14 @@ GEM
       iniparse (~> 1.4)
       iso8601 (~> 0.9.1)
       mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 1.4)
+      mixlib-authentication (~> 2.0)
       mixlib-cli (~> 1.7)
-      mixlib-log (~> 1.3)
+      mixlib-log (~> 2.0, >= 2.0.3)
       mixlib-shellout (~> 2.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 5.0)
+      net-ssh (~> 4.2)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 13.0)
+      ohai (~> 14.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
       rspec-core (~> 3.5)
@@ -84,110 +84,113 @@ GEM
       win32-service (~> 0.8.7)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
-    chef-config (13.0.118)
+    chef-config (14.0.202)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (13.0.0)
+      tomlrb (~> 1.2)
+    chef-zero (14.0.6)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 1.3)
+      mixlib-log (~> 2.0)
       rack (~> 2.0)
       uuidtools (~> 2.1)
     diff-lcs (1.3)
     erubis (2.7.0)
-    ffi (1.9.18)
-    ffi (1.9.18-x86-mingw32)
-    ffi-rzmq (2.0.5)
+    ffi (1.9.23)
+    ffi (1.9.23-x64-mingw32)
+    ffi (1.9.23-x86-mingw32)
+    ffi-rzmq (2.0.6)
       ffi-rzmq-core (>= 1.0.6)
     ffi-rzmq-core (1.0.6)
       ffi
     ffi-win32-extensions (1.0.3)
       ffi
-    ffi-yajl (2.3.0)
+    ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
-    hashie (3.5.5)
-    highline (1.7.8)
-    iniparse (1.4.2)
+    hashie (3.5.7)
+    highline (1.7.10)
+    iniparse (1.4.4)
     ipaddress (0.8.3)
     iso8601 (0.9.1)
     libyajl2 (1.2.0)
     mixlib-archive (0.4.1)
       mixlib-log
-    mixlib-authentication (1.4.1)
-      mixlib-log
+    mixlib-authentication (2.0.0)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.4)
-    mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    mixlib-shellout (2.2.7-universal-mingw32)
+    mixlib-config (2.2.6)
+      tomlrb
+    mixlib-log (2.0.4)
+    mixlib-shellout (2.3.2)
+    mixlib-shellout (2.3.2-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
+    net-ssh (4.2.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    ohai (13.0.1)
-      chef-config (>= 12.5.0.alpha.1, < 14)
+    ohai (14.0.29)
+      chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli
       mixlib-config (~> 2.0)
-      mixlib-log (>= 1.7.1, < 2.0)
+      mixlib-log (~> 2.0, >= 2.0.1)
       mixlib-shellout (~> 2.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    plist (3.2.0)
+    plist (3.4.0)
     proxifier (1.0.3)
-    public_suffix (2.0.5)
-    rack (2.0.1)
-    rake (12.0.0)
-    rdoc (5.1.0)
+    public_suffix (3.0.2)
+    rack (2.0.5)
+    rake (12.3.1)
+    rdoc (6.0.3)
     rdp-ruby-wmi (0.3.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    serverspec (2.38.0)
+    serverspec (2.41.3)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.53)
+      specinfra (~> 2.72)
     sfl (2.3)
-    specinfra (2.67.8)
+    specinfra (2.73.3)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
     syslog-logger (1.6.8)
     systemu (2.6.5)
+    tomlrb (1.2.6)
     uuidtools (2.1.5)
     win32-api (1.5.3-universal-mingw32)
     win32-dir (0.5.1)
@@ -217,8 +220,8 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
   x86-mingw32
-  x86-mswin32
 
 DEPENDENCIES
   ffi
@@ -239,4 +242,4 @@ DEPENDENCIES
   windows-pr
 
 BUNDLED WITH
-   1.14.6
+   1.16.1

data/RELEASE_NOTES.md

@@ -0,0 +1,9 @@
+# Push Jobs Client Release Notes
+
+## 2.4.9
+
+This release ships with notable fixes for a long standing issue where the Client could become deadlocked after encoutering network disruptions communicating with the Server.
+
+*Note*
+
+Due to the nature of the fixes above we are eager to hear your feedback on _any_ changes obeserved from the typical behavior of previous Client versions!

data/RELEASE_PROCESS.md

@@ -39,7 +39,7 @@ Currently, push-client must be manually tested to verify that it behaves correct
 ### Building and Releasing the Release
 
 - [ ] Tag the opscode-pushy-client repository with the release version: `git
-  tag -a VERSION_NUMBER`.
+  tag -a VERSION_NUMBER`. - This is currently done by Chef Expediter.
 
 - [ ] Push the new tag: `git push origin master --tags`.
 

data/VERSION

@@ -0,0 +1 @@
+2.4.11

data/lib/pushy_client.rb

@@ -23,7 +23,11 @@ require_relative 'pushy_client/periodic_reconfigurer'
 require_relative 'pushy_client/whitelist'
 require 'ohai'
 require 'uuidtools'
-require 'ffi-rzmq'
+if RUBY_PLATFORM =~ /aix/
+  require 'rbzmq/zmq'
+else
+  require 'ffi-rzmq'
+end
 require 'cgi'
 
 class PushyClient
@@ -36,6 +40,7 @@ class PushyClient
     @hostname        = options[:hostname]
     @file_dir        = options[:file_dir] || '/tmp/pushy'
     @file_dir_expiry = options[:file_dir_expiry] || 86400
+    @allowed_overwritable_env_vars = options[:allowed_overwritable_env_vars]
 
     @allow_unencrypted = options[:allow_unencrypted] || false
     @client_curve_pub_key, @client_curve_sec_key = ZMQ::Util.curve_keypair
@@ -76,6 +81,7 @@ class PushyClient
   attr_accessor :whitelist
   attr_reader :incarnation_id
   attr_reader :legacy_mode # indicate we've fallen back to 1.x
+  attr_reader :allowed_overwritable_env_vars
 
   # crypto
   attr_reader :client_curve_pub_key
@@ -172,6 +178,10 @@ class PushyClient
     @protocol_handler.send_heartbeat(sequence)
   end
 
+  def update_reconfigure_deadline(delay)
+    @periodic_reconfigurer.update_reconfigure_deadline(delay)
+  end
+
   def commit(job_id, command, opts)
     @job_runner.commit(job_id, command, opts)
   end
@@ -214,27 +224,55 @@ class PushyClient
     resource = "/pushy/config/#{node_name}"
 
     Chef::Log.info "[#{node_name}] Retrieving configuration from #{chef_server_url}/#{resource}: ..."
-    esc_key = CGI::escape(@client_curve_pub_key)
+    esc_key = CGI.escape(@client_curve_pub_key)
     version = PushyClient::PROTOCOL_VERSION
     resource = "pushy/config/#{node_name}?ccpk=#{esc_key}&version=#{version}"
 
-    config = rest.get(resource)
+    Chef::Config[:rest_timeout] = 5
+
+    if @config.nil?
+      # We are being called from the `start` method not `trigger_reconfigure`
+      # so we know this is the first time fetching the config after a clean service start/restart.
+      # We therefore want to give ample opportunity to fetch the config, otherwise
+      # we raise and exception and the service stops - hopefully to be started again
+      # on the next chef-client run by push-jobs cookbook.
+
+      Chef::Config[:http_retry_delay] = 30
+      Chef::Config[:http_retry_count] = 5
+    else
+      # We have already fetched the config once, therefore we're being called from `trigger_reconfigure`
+      # Here we do not want the typical retry behavior from Chef::HTTP since `reconfigure` already
+      # implements an effective retry mechanism. Otherwise, `reconfigure` threads have the potential to
+      # start to pile up.
+
+      Chef::Config[:http_retry_delay] = 0
+      Chef::Config[:http_retry_count] = 0
+    end
+
+    begin
+      config = rest.get(resource)
+    rescue
+      Chef::Log.info('Could not download push jobs config')
+      update_reconfigure_deadline(120)
+      raise 'Could not download push jobs config'
+    end
 
-    if config.has_key?("curve_public_key")
-    # Version 2.0  or greater, we should use encryption
+    if config && config.key?('curve_public_key')
+      # Version 2.0  or greater, we should use encryption
       @using_curve = true
       @legacy_mode = false
-    elsif allow_unencrypted then
+    elsif allow_unencrypted
       @using_curve = false
       @legacy_mode = true
       Chef::Log.info "[#{node_name}] No key returned from server; falling back to 1.x protocol (no encryption)"
     else
-      msg = "[#{node_name}] Exiting: No key returned from server; server may be using 1.x protocol. The config flag 'allow_unencrypted' disables encryption and allows use of 1.x server. Use with caution!"
+      msg = "[#{node_name}] Exiting: No key returned from server; server may be using 1.x protocol. \
+        The config flag 'allow_unencrypted' disables encryption and allows use of 1.x server. Use with caution!"
       Chef::Log.error msg
       Kernel.abort msg
       config = nil
     end
-    return config
+    config
   end
 
   # XXX Should go in a separate file

data/lib/pushy_client/cli.rb

@@ -132,7 +132,8 @@ class PushyClient
         :whitelist       => Chef::Config[:whitelist] || { 'chef-client' => 'chef-client' },
         :hostname        => ohai[:hostname],
         :filedir         => Chef::Config[:file_dir],
-        :allow_unencrypted => Chef::Config[:allow_unencrypted]
+        :allow_unencrypted => Chef::Config[:allow_unencrypted],
+        :allowed_overwritable_env_vars => Chef::Config[:allowed_overwritable_env_vars]
       )
 
       @client.start