chef-provisioning 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61583af178b0e390bfb0d73e544ea1c28ae5ef8c
-  data.tar.gz: 1c5c95f663d16dc2f76652fb3e40844e8c986b47
+  metadata.gz: b74d8382b16381913bc3607db51e0ec5c00db19a
+  data.tar.gz: 75b2979d44492c4f37925babe8ee872f1ef2f69d
 SHA512:
-  metadata.gz: 6df6459bd2fb26feec964e99318fc814a58cff4a878233c814793fe6ca1e11203744f849f89ed823842d06b1aecfb8ca175b65e11f4a55f2784ef1c434ea095b
-  data.tar.gz: b5255c3719f59705c8dbfe71801f9d309b79c291c5a1d73c7f5439cc1913d2a915617e54e37adf9c55d80366b0ac7165079f589d1142ed2af70764671003b9ea
+  metadata.gz: bf096a63be29a06fd54291bc3d75d9c7fff2bea359b8e4825a454aea075b008c3f0c1d24d01d8ba1de1e398c192de0df4e64a1ef0999867a19fcbc3c5b63052a
+  data.tar.gz: 2d0f1630b268b13c7547e991fc3cfdb66216e0f37ace235e2d05009c29aa21a8da3362ee4498e2c48e75bb0e211ef49228915ec5e41bdd8b68d31346b027be89

data/CHANGELOG.md

@@ -1,10 +1,35 @@
 # Change Log
 
-## [1.5.1](https://github.com/chef/chef-provisioning/tree/1.5.1) (2015-12-10)
-[Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.5.0...1.5.1)
+## [Unreleased](https://github.com/chef/chef-provisioning/tree/HEAD)
+
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.5.1...HEAD)
+
+**Implemented enhancements:**
+
+- Custom port forwards. [\#445](https://github.com/chef/chef-provisioning/pull/445) ([causton81](https://github.com/causton81))
+
+**Closed issues:**
+
+- Chef::Exceptions::ContentLengthMismatch Response body length XXXX does not match HTTP Content-Length header XXXX [\#446](https://github.com/chef/chef-provisioning/issues/446)
 
 **Merged pull requests:**
 
+- Fix Provisioning with Cheffish 1.x [\#496](https://github.com/chef/chef-provisioning/pull/496) ([jkeiser](https://github.com/jkeiser))
+- Add "rake changelog" task [\#491](https://github.com/chef/chef-provisioning/pull/491) ([jkeiser](https://github.com/jkeiser))
+- Stop using Chef::Provider::ChefNode directly \(cheffish 2.0 compat\) [\#490](https://github.com/chef/chef-provisioning/pull/490) ([jkeiser](https://github.com/jkeiser))
+- Allow cheffish 2.0 as a dep [\#489](https://github.com/chef/chef-provisioning/pull/489) ([jkeiser](https://github.com/jkeiser))
+- Updating to the latest release of net-ssh to consume net-ssh/net-ssh\#280 [\#485](https://github.com/chef/chef-provisioning/pull/485) ([tyler-ball](https://github.com/tyler-ball))
+
+## [v1.5.1](https://github.com/chef/chef-provisioning/tree/v1.5.1) (2015-12-10)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.5.0...v1.5.1)
+
+**Closed issues:**
+
+- machine resource is broken with 'stock' windows AMI [\#470](https://github.com/chef/chef-provisioning/issues/470)
+
+**Merged pull requests:**
+
+- Release preperation for 1.5.1 [\#479](https://github.com/chef/chef-provisioning/pull/479) ([tyler-ball](https://github.com/tyler-ball))
 - Require ResourceBuilder file before monkeypatching to ensure it is already defined [\#478](https://github.com/chef/chef-provisioning/pull/478) ([tyler-ball](https://github.com/tyler-ball))
 - Ensure target directory exists when using write\_file with WinRM [\#471](https://github.com/chef/chef-provisioning/pull/471) ([xenolinguist](https://github.com/xenolinguist))
 
@@ -13,7 +38,9 @@
 
 **Fixed bugs:**
 
+- Method failed 'StartsWith' [\#460](https://github.com/chef/chef-provisioning/issues/460)
 - :converge action should not re-install chef-client if the desired version is already installed [\#428](https://github.com/chef/chef-provisioning/issues/428)
+- machine converge property - no longer used? [\#427](https://github.com/chef/chef-provisioning/issues/427)
 - SSH available timeout needs to be configurable [\#362](https://github.com/chef/chef-provisioning/issues/362)
 - Making available? timeout use provided ssh\_options, fixes \#362 [\#466](https://github.com/chef/chef-provisioning/pull/466) ([tyler-ball](https://github.com/tyler-ball))
 - Pinning to mixlib-install 0.7.0 until 1.0 is out [\#464](https://github.com/chef/chef-provisioning/pull/464) ([tyler-ball](https://github.com/tyler-ball))
@@ -26,6 +53,7 @@
 
 **Merged pull requests:**
 
+- Preping 1.5.0 release [\#467](https://github.com/chef/chef-provisioning/pull/467) ([tyler-ball](https://github.com/tyler-ball))
 - Add gemspec files to allow bundler to run from the gem [\#461](https://github.com/chef/chef-provisioning/pull/461) ([ksubrama](https://github.com/ksubrama))
 - Pin mixlib-install more strictly. [\#459](https://github.com/chef/chef-provisioning/pull/459) ([sersut](https://github.com/sersut))
 
@@ -35,9 +63,14 @@
 **Fixed bugs:**
 
 - ohai\_hints should be be created at c:\chef\ohai\hints when provisioning windows nodes [\#433](https://github.com/chef/chef-provisioning/issues/433)
+- throw exception if Chef::Provisioning::Transport.:WinRM\#execute command is over 3040 chars [\#432](https://github.com/chef/chef-provisioning/issues/432)
 - Fix install\_sh\_arguments passing after the conversion to mixlib-install [\#452](https://github.com/chef/chef-provisioning/pull/452) ([irvingpop](https://github.com/irvingpop))
 - Windows ohai hints, fixes \#433 [\#435](https://github.com/chef/chef-provisioning/pull/435) ([hh](https://github.com/hh))
 
+**Merged pull requests:**
+
+- Preparing to release 1.4.1 [\#456](https://github.com/chef/chef-provisioning/pull/456) ([tyler-ball](https://github.com/tyler-ball))
+
 ## [v1.4.0](https://github.com/chef/chef-provisioning/tree/v1.4.0) (2015-09-16)
 [Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.3.0...v1.4.0)
 
@@ -73,6 +106,7 @@
 
 **Merged pull requests:**
 
+- IN PROGRESS: 1.4.0 changelog [\#444](https://github.com/chef/chef-provisioning/pull/444) ([jkeiser](https://github.com/jkeiser))
 - Remove dependency on chef gem [\#441](https://github.com/chef/chef-provisioning/pull/441) ([ksubrama](https://github.com/ksubrama))
 - Adding a CONTRIBUTING document [\#437](https://github.com/chef/chef-provisioning/pull/437) ([tyler-ball](https://github.com/tyler-ball))
 - Major generator/spec/Travis improvements [\#426](https://github.com/chef/chef-provisioning/pull/426) ([randomcamel](https://github.com/randomcamel))
@@ -806,4 +840,4 @@
 ## [v0.1](https://github.com/chef/chef-provisioning/tree/v0.1) (2013-12-21)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 gemspec
 
+gem 'github_changelog_generator'
 #gem 'mixlib-install', path: '../mixlib-install'
 #gem 'net-ssh', :path => '../net-ssh'
 #gem 'chef', :path => '../chef'
@@ -12,4 +13,6 @@ gemspec
 #gem 'chef-zero', :path => '../chef-zero'
 group :development do
 #  gem "berkshelf", github: "berkshelf/berkshelf"
+  # TODO we depend on the master branch until chef/chef is released
+  gem "chef", github: "chef/chef", branch: "master"
 end

data/README.md

@@ -199,7 +199,21 @@ with_machine_options({
   ssh_options: { # a list of options to Net::SSH.start
     :auth_methods => [ 'publickey' ], # DEFAULT
     :keys_only => true, # DEFAULT
-    :host_key_alias => "#{instance.id}.AWS" # DEFAULT
+    :host_key_alias => "#{instance.id}.AWS", # DEFAULT
+    :key_data => nil, # use key from ssh-agent instead of a local file; remember to ssh-add your keys!
+    :forward_agent => true, # you may want your ssh-agent to be available on your provisioned machines
+    :remote_forwards => [
+        # Give remote host access to squid proxy on provisioning node
+        {:remote_port => 3128, :local_host => 'localhost', :local_port => 3128,},
+        # Give remote host access to private git server
+        {:remote_port => 2222, :local_host => 'git.example.com', :local_port => 22,},
+    ],
+    # You can send net-ssh log info to the Chef::Log if you are having
+    # trouble with ssh.
+    :logger => Chef::Log,
+    # If you use :logger => Chef::Log and :verbose then your :verbose setting
+    # will override the global Chef::Config. Probably don't want to do this:
+    #:verbose => :warn,
   }
 })
 ```

data/Rakefile

@@ -37,4 +37,17 @@ namespace :driver do
     Rake::Task['driver:verify'].invoke
     Rake::Task['driver:clean'].invoke
   end
-end
+end
+
+begin
+  require 'github_changelog_generator/task'
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    # config.future_release = ChefZero::VERSION
+    config.enhancement_labels = "enhancement,Enhancement,New Feature".split(',')
+    config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(',')
+    config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog".split(',')
+  end
+rescue LoadError
+  # It's OK if the github_changelog_generator isn't there, that happens when we're testing older chef versions
+end

data/chef-provisioning.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
   s.email = 'jkeiser@chef.io'
   s.homepage = 'http://github.com/chef/chef-provisioning/README.md'
 
-  s.add_dependency 'net-ssh', '~> 2.0'
+  s.add_dependency 'net-ssh', '>= 2.9', '< 4.0'
   s.add_dependency 'net-scp', '~> 1.0'
   s.add_dependency 'net-ssh-gateway', '~> 1.2.0'
   s.add_dependency 'inifile', '~> 2.0'
-  s.add_dependency 'cheffish', '~> 1.3', '>= 1.3.1'  # 1.3.1 allows 'let' vars in unquoted recipes.
+  s.add_dependency 'cheffish', '>= 1.3.1', '< 3.0'  # 1.3.1 allows 'let' vars in unquoted recipes.
   s.add_dependency 'winrm', '~> 1.3'
   s.add_dependency "mixlib-install",  "~> 0.7.0"
 

data/lib/chef/provider/load_balancer.rb

@@ -1,5 +1,4 @@
 require 'chef/provider/lwrp_base'
-require 'chef/provider/chef_node'
 require 'openssl'
 require 'chef/provisioning/chef_provider_action_handler'
 

data/lib/chef/provider/machine.rb

@@ -1,5 +1,5 @@
 require 'chef/provider/lwrp_base'
-require 'chef/provider/chef_node'
+require 'chef/resource/chef_node'
 require 'openssl'
 require 'chef/provisioning/chef_provider_action_handler'
 
@@ -175,10 +175,16 @@ class Machine < Chef::Provider::LWRPBase
   end
 
   def load_current_resource
-    node_driver = Chef::Provider::ChefNode.new(new_resource, run_context)
-    node_driver.load_current_resource
-    json = node_driver.new_json
-    json['normal']['chef_provisioning'] = node_driver.current_json['normal']['chef_provisioning']
+    if defined?(Chef::Provider::ChefNode)
+      # Cheffish 1.x
+      node_provider = Chef::Provider::ChefNode.new(new_resource, run_context)
+    else
+      # Cheffish 2.x
+      node_provider = Chef::Resource::ChefNode.action_class.new(new_resource, run_context)
+    end
+    node_provider.load_current_resource
+    json = node_provider.new_json
+    json['normal']['chef_provisioning'] = node_provider.current_json['normal']['chef_provisioning']
     @machine_spec = chef_managed_entry_store.new_entry(:machine, new_resource.name, json)
   end
 

data/lib/chef/provider/machine_image.rb

@@ -1,5 +1,4 @@
 require 'chef/provider/lwrp_base'
-require 'chef/provider/chef_node'
 require 'openssl'
 require 'chef/provisioning/chef_provider_action_handler'
 

data/lib/chef/provisioning/transport/ssh.rb

@@ -42,6 +42,7 @@ module Provisioning
         @ssh_options = ssh_options
         @options = options
         @config = global_config
+        @remote_forwards = ssh_options.delete(:remote_forwards) { Array.new }
       end
 
       attr_reader :host
@@ -51,12 +52,25 @@ module Provisioning
       attr_reader :config
 
       def execute(command, execute_options = {})
-        Chef::Log.info("Executing #{options[:prefix]}#{command} on #{username}@#{host}")
+        Chef::Log.info("#{self.object_id} Executing #{options[:prefix]}#{command} on #{username}@#{host}")
         stdout = ''
         stderr = ''
         exitstatus = nil
         session # grab session outside timeout, it has its own timeout
+
         with_execute_timeout(execute_options) do
+          @remote_forwards.each do |forward_info|
+              # -R flag to openssh client allows optional :remote_host and
+              # requires the other values so let's do that too.
+              remote_host = forward_info.fetch(:remote_host, 'localhost')
+              remote_port = forward_info.fetch(:remote_port)
+              local_host = forward_info.fetch(:local_host)
+              local_port = forward_info.fetch(:local_port)
+
+              actual_port, actual_host = forward_port(local_port, local_host, remote_port, remote_host)
+              Chef::Log.info("#{host} forwarded remote #{actual_host}:#{actual_port} to local #{local_host}:#{local_port}")
+          end
+
           channel = session.open_channel do |channel|
             # Enable PTY unless otherwise specified, some instances require this
             unless options[:ssh_pty_enable] == false
@@ -85,6 +99,20 @@ module Provisioning
           end
 
           channel.wait
+
+          @remote_forwards.each do |forward_info|
+              # -R flag to openssh client allows optional :remote_host and
+              # requires the other values so let's do that too.
+              remote_host = forward_info.fetch(:remote_host, 'localhost')
+              remote_port = forward_info.fetch(:remote_port)
+              local_host = forward_info.fetch(:local_host)
+              local_port = forward_info.fetch(:local_port)
+
+              session.forward.cancel_remote(remote_port, remote_host)
+              session.loop { session.forward.active_remotes.include?([remote_port, remote_host]) }
+
+              Chef::Log.info("#{host} canceled remote forward #{remote_host}:#{remote_port}")
+          end
         end
 
         Chef::Log.info("Completed #{command} on #{username}@#{host}: exit status #{exitstatus}")
@@ -156,15 +184,17 @@ module Provisioning
           end
           uri.host = host
           uri.port = port
+          Chef::Log.info("Port forwarded: local URL #{local_url} is available to #{self.host} as #{uri.to_s} for the duration of this SSH connection.")
+        else
+          Chef::Log.info("#{host} not forwarding non-local #{local_url}")
         end
-        Chef::Log.info("Port forwarded: local URL #{local_url} is available to #{self.host} as #{uri.to_s} for the duration of this SSH connection.")
         uri.to_s
       end
 
       def disconnect
         if @session
           begin
-            Chef::Log.debug("Closing SSH session on #{username}@#{host}")
+            Chef::Log.info("Closing SSH session on #{username}@#{host}")
             @session.close
           rescue
           ensure
@@ -177,7 +207,7 @@ module Provisioning
         timeout = ssh_options[:timeout] || 10
         execute('pwd', :timeout => timeout)
         true
-      rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::EHOSTDOWN, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::Disconnect
+      rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::EHOSTDOWN, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::Disconnect, Net::SSH::ConnectionTimeout
         Chef::Log.debug("#{username}@#{host} unavailable: network connection failed or broke: #{$!.inspect}")
         disconnect
         false
@@ -199,7 +229,7 @@ module Provisioning
             if gateway? then gateway.ssh(host, username, ssh_start_opts)
             else Net::SSH.start(host, username, ssh_start_opts)
             end
-          rescue Timeout::Error
+          rescue Timeout::Error, Net::SSH::ConnectionTimeout
             Chef::Log.debug("Timed out connecting to SSH: #{$!}")
             raise InitialConnectTimeout.new($!)
           end
@@ -333,7 +363,7 @@ module Provisioning
 
           actual_remote_port, actual_remote_host = session.forward.active_remote_destinations[[local_port, local_host]]
           if !actual_remote_port
-            Chef::Log.debug("Forwarding local server #{local_host}:#{local_port} to #{username}@#{self.host}")
+            Chef::Log.info("Forwarding local server #{local_host}:#{local_port} to #{username}@#{self.host}")
 
             session.forward.remote(local_port, local_host, remote_port, remote_host) do |new_remote_port, new_remote_host|
 							actual_remote_host = new_remote_host

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -70,22 +76,22 @@ dependencies:
   name: cheffish
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A library for creating machines and infrastructures idempotently in Chef.