chef-provisioning 2.0.0 → 2.0.1

data/Rakefile

@@ -1,55 +1,55 @@
-require 'bundler'
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-desc "run specs"
-RSpec::Core::RakeTask.new(:spec) do |task|
-  task.pattern = 'spec/**/*_spec.rb'
-end
-
-desc "run core gem specs and generated driver specs"
-task :all => ["driver:spec", :spec]
-
-FAKE_DIR = "chef-provisioning-fake"
-
-namespace :driver do
-  desc "generate a '#{FAKE_DIR}' driver"
-  task :generate do
-    sh "./bin/generate_driver fake"
-  end
-
-  desc "run specs for #{FAKE_DIR}"
-  task :spec do
-    sh "cd #{FAKE_DIR} && bundle exec rspec"
-  end
-
-  desc "generate a #{FAKE_DIR} driver and run its specs"
-  task :verify => [:generate, :spec]
-
-  task :clean do
-    sh "rm -rf #{FAKE_DIR}"
-  end
-
-  desc "generate a fresh #{FAKE_DIR} driver, run its specs, and delete it"
-  task :cycle do
-    Rake::Task['driver:clean'].invoke
-    Rake::Task['driver:clean'].reenable
-    Rake::Task['driver:verify'].invoke
-    Rake::Task['driver:clean'].invoke
-  end
-end
-
-require "chef/provisioning/version"
-
-begin
-  require 'github_changelog_generator/task'
-
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    config.future_release = Chef::Provisioning::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,Exclude From 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
+require 'bundler'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+desc "run specs"
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+end
+
+desc "run core gem specs and generated driver specs"
+task :all => ["driver:spec", :spec]
+
+FAKE_DIR = "chef-provisioning-fake"
+
+namespace :driver do
+  desc "generate a '#{FAKE_DIR}' driver"
+  task :generate do
+    sh "./bin/generate_driver fake"
+  end
+
+  desc "run specs for #{FAKE_DIR}"
+  task :spec do
+    sh "cd #{FAKE_DIR} && bundle exec rspec"
+  end
+
+  desc "generate a #{FAKE_DIR} driver and run its specs"
+  task :verify => [:generate, :spec]
+
+  task :clean do
+    sh "rm -rf #{FAKE_DIR}"
+  end
+
+  desc "generate a fresh #{FAKE_DIR} driver, run its specs, and delete it"
+  task :cycle do
+    Rake::Task['driver:clean'].invoke
+    Rake::Task['driver:clean'].reenable
+    Rake::Task['driver:verify'].invoke
+    Rake::Task['driver:clean'].invoke
+  end
+end
+
+require "chef/provisioning/version"
+
+begin
+  require 'github_changelog_generator/task'
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.future_release = Chef::Provisioning::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,Exclude From 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

@@ -1,38 +1,38 @@
-$:.unshift(File.dirname(__FILE__) + '/lib')
-require 'chef/provisioning/version'
-
-Gem::Specification.new do |s|
-  s.name = 'chef-provisioning'
-  s.version = Chef::Provisioning::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.extra_rdoc_files = ['README.md', 'CHANGELOG.md', 'LICENSE' ]
-  s.summary = 'A library for creating machines and infrastructures idempotently in Chef.'
-  s.description = s.summary
-  s.author = 'John Keiser'
-  s.email = 'jkeiser@chef.io'
-  s.homepage = 'http://github.com/chef/chef-provisioning/README.md'
-
-  s.required_ruby_version = ">= 2.2.2"
-
-  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.2'
-  s.add_dependency 'cheffish', '~> 4.0'
-  s.add_dependency 'winrm', '~> 1.3'
-  s.add_dependency "mixlib-install",  "~> 1.0"
-
-  s.add_development_dependency 'chef', '~> 12.1', "!= 12.4.0"  # 12.4.0 is incompatible.
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'github_changelog_generator'
-
-  s.bindir       = "bin"
-  s.executables  = %w( )
-
-  s.require_path = 'lib'
-  s.files = %w(Gemfile Rakefile LICENSE README.md CHANGELOG.md) + Dir.glob("*.gemspec") +
-      Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
-end
+$:.unshift(File.dirname(__FILE__) + '/lib')
+require 'chef/provisioning/version'
+
+Gem::Specification.new do |s|
+  s.name = 'chef-provisioning'
+  s.version = Chef::Provisioning::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.extra_rdoc_files = ['README.md', 'CHANGELOG.md', 'LICENSE' ]
+  s.summary = 'A library for creating machines and infrastructures idempotently in Chef.'
+  s.description = s.summary
+  s.author = 'John Keiser'
+  s.email = 'jkeiser@chef.io'
+  s.homepage = 'http://github.com/chef/chef-provisioning/README.md'
+
+  s.required_ruby_version = ">= 2.2.2"
+
+  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.2'
+  s.add_dependency 'cheffish', '~> 4.0'
+  s.add_dependency 'winrm-fs', '~> 1.0'
+  s.add_dependency "mixlib-install",  "~> 1.0"
+
+  s.add_development_dependency 'chef', '~> 12.1', "!= 12.4.0"  # 12.4.0 is incompatible.
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'github_changelog_generator'
+
+  s.bindir       = "bin"
+  s.executables  = %w( )
+
+  s.require_path = 'lib'
+  s.files = %w(Gemfile Rakefile LICENSE README.md CHANGELOG.md) + Dir.glob("*.gemspec") +
+      Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+end

data/lib/chef/provider/load_balancer.rb

@@ -1,75 +1,75 @@
-require 'chef/provider/lwrp_base'
-require 'openssl'
-require 'chef/provisioning/chef_provider_action_handler'
-
-class Chef
-  class Provider
-    class LoadBalancer < Chef::Provider::LWRPBase
-      provides :load_balancer
-
-      def action_handler
-        @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
-      end
-
-      def whyrun_supported?
-        true
-      end
-
-      def new_driver
-        @new_driver ||= run_context.chef_provisioning.driver_for(new_resource.driver)
-      end
-
-      def chef_managed_entry_store
-        @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
-      end
-
-      action :create do
-        lb_spec = chef_managed_entry_store.get_or_new(:load_balancer, new_resource.name)
-
-        Chef::Log.debug "Creating load balancer: #{new_resource.name}; loaded #{lb_spec.inspect}"
-        if new_resource.machines
-          machine_specs = new_resource.machines.map { |machine| get_machine_spec!(machine) }
-        end
-
-        new_driver.allocate_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
-        lb_spec.save(action_handler)
-        new_driver.ready_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
-      end
-
-      action :destroy do
-        lb_spec = chef_managed_entry_store.get(:load_balancer, new_resource.name)
-        if lb_spec
-          new_driver.destroy_load_balancer(action_handler, lb_spec, lb_options)
-        end
-      end
-
-      private
-
-      def get_machine_spec!(machine_name)
-        Chef::Log.debug "Getting machine spec for #{machine_name}"
-        Provisioning.chef_managed_entry_store(new_resource.chef_server).get!(:machine, machine_name)
-      end
-
-      def lb_options
-        @lb_options ||= begin
-          configs = []
-          configs << new_resource.load_balancer_options if new_resource.load_balancer_options
-
-          # See documentation in machine.rb provider
-          (self.class.additional_lb_option_keys || []).each do |k|
-            configs << { k => new_resource.public_send(k)} if new_resource.public_send(k)
-          end
-          Cheffish::MergedConfig.new(*configs)
-        end
-      end
-
-      def self.additional_lb_option_keys
-        @@additional_lb_option_keys ||= []
-      end
-
-    end
-  end
-end
-
-require 'chef/provisioning/chef_managed_entry_store'
-Chef::Provisioning::ChefManagedEntryStore.type_names_for_backcompat[:load_balancer] = "loadbalancers"
+require 'chef/provider/lwrp_base'
+require 'openssl'
+require 'chef/provisioning/chef_provider_action_handler'
+
+class Chef
+  class Provider
+    class LoadBalancer < Chef::Provider::LWRPBase
+      provides :load_balancer
+
+      def action_handler
+        @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
+      end
+
+      def whyrun_supported?
+        true
+      end
+
+      def new_driver
+        @new_driver ||= run_context.chef_provisioning.driver_for(new_resource.driver)
+      end
+
+      def chef_managed_entry_store
+        @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
+      end
+
+      action :create do
+        lb_spec = chef_managed_entry_store.get_or_new(:load_balancer, new_resource.name)
+
+        Chef::Log.debug "Creating load balancer: #{new_resource.name}; loaded #{lb_spec.inspect}"
+        if new_resource.machines
+          machine_specs = new_resource.machines.map { |machine| get_machine_spec!(machine) }
+        end
+
+        new_driver.allocate_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
+        lb_spec.save(action_handler)
+        new_driver.ready_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
+      end
+
+      action :destroy do
+        lb_spec = chef_managed_entry_store.get(:load_balancer, new_resource.name)
+        if lb_spec
+          new_driver.destroy_load_balancer(action_handler, lb_spec, lb_options)
+        end
+      end
+
+      private
+
+      def get_machine_spec!(machine_name)
+        Chef::Log.debug "Getting machine spec for #{machine_name}"
+        Provisioning.chef_managed_entry_store(new_resource.chef_server).get!(:machine, machine_name)
+      end
+
+      def lb_options
+        @lb_options ||= begin
+          configs = []
+          configs << new_resource.load_balancer_options if new_resource.load_balancer_options
+
+          # See documentation in machine.rb provider
+          (self.class.additional_lb_option_keys || []).each do |k|
+            configs << { k => new_resource.public_send(k)} if new_resource.public_send(k)
+          end
+          Cheffish::MergedConfig.new(*configs)
+        end
+      end
+
+      def self.additional_lb_option_keys
+        @@additional_lb_option_keys ||= []
+      end
+
+    end
+  end
+end
+
+require 'chef/provisioning/chef_managed_entry_store'
+Chef::Provisioning::ChefManagedEntryStore.type_names_for_backcompat[:load_balancer] = "loadbalancers"

data/lib/chef/provider/machine.rb

@@ -1,219 +1,219 @@
-require 'chef/provider/lwrp_base'
-require 'chef/resource/chef_node'
-require 'openssl'
-require 'chef/provisioning/chef_provider_action_handler'
-
-class Chef
-class Provider
-class Machine < Chef::Provider::LWRPBase
-  provides :machine
-
-  def action_handler
-    @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
-  end
-  def action_handler=(value)
-    @action_handler = value
-  end
-
-  use_inline_resources
-
-  def whyrun_supported?
-    true
-  end
-
-  action :allocate do
-    if !new_driver
-      raise "Driver not specified for machine #{machine_spec.name}"
-    end
-    if current_driver && current_driver.driver_url != new_driver.driver_url
-      raise "Cannot move '#{machine_spec.name}' from #{current_driver.driver_url} to #{new_driver.driver_url}: machine moving is not supported.  Destroy and recreate."
-    end
-    new_driver.allocate_machine(action_handler, machine_spec, new_machine_options)
-    machine_spec.from_image ||= new_resource.from_image if new_resource.from_image
-    machine_spec.driver_url ||= new_driver.driver_url
-    machine_spec.save(action_handler)
-  end
-
-  action :ready do
-    action_allocate
-    machine = current_driver.ready_machine(action_handler, machine_spec, current_machine_options)
-    machine_spec.save(action_handler)
-    machine
-  end
-
-  action :setup do
-    machine = action_ready
-    begin
-      machine.setup_convergence(action_handler)
-      machine_spec.save(action_handler)
-      upload_files(machine)
-    ensure
-      machine.disconnect
-    end
-  end
-
-  action :converge do
-    machine = action_ready
-    begin
-      machine.setup_convergence(action_handler)
-      machine_spec.save(action_handler)
-      upload_files(machine)
-      # If we were asked to converge, or anything changed, or if a converge has never succeeded, converge.
-      if new_resource.converge
-        Chef::Log.info("Converging #{machine_spec.name} because 'converge true' is set ...")
-        machine.converge(action_handler)
-      elsif new_resource.converge.nil? && resource_updated?
-        Chef::Log.info("Converging #{machine_spec.name} because the resource was updated ...")
-        machine.converge(action_handler)
-      elsif !machine_spec.node['automatic'] || machine_spec.node['automatic'].size == 0
-        Chef::Log.info("Converging #{machine_spec.name} because it has never been converged (automatic attributes are empty) ...")
-        machine.converge(action_handler)
-      elsif new_resource.converge == false
-        Chef::Log.debug("Not converging #{machine_spec.name} because 'converge false' is set.")
-      end
-    ensure
-      machine.disconnect
-    end
-  end
-
-  action :converge_only do
-    if new_resource.converge == false
-      Chef::Log.debug("Not converging #{machine_spec.name} because 'converge false' is set.")
-    else
-      machine = run_context.chef_provisioning.connect_to_machine(machine_spec, current_machine_options)
-      begin
-        machine.converge(action_handler)
-      ensure
-        machine.disconnect
-      end
-    end
-  end
-
-  action :stop do
-    if current_driver
-      current_driver.stop_machine(action_handler, machine_spec, current_machine_options)
-    end
-  end
-
-  action :destroy do
-    if current_driver
-      current_driver.destroy_machine(action_handler, machine_spec, current_machine_options)
-    end
-    machine_spec.delete(action_handler)
-  end
-
-  attr_reader :machine_spec
-
-  def new_driver
-    run_context.chef_provisioning.driver_for(new_resource.driver)
-  end
-
-  def current_driver
-    if machine_spec.driver_url
-      run_context.chef_provisioning.driver_for(machine_spec.driver_url)
-    end
-  end
-
-  def from_image_spec
-    @from_image_spec ||= begin
-      if new_resource.from_image
-        chef_managed_entry_store.get!(:machine_image, new_resource.from_image)
-      else
-        nil
-      end
-    end
-  end
-
-  def new_machine_options
-    machine_options(new_driver)
-  end
-
-  def current_machine_options
-    machine_options(current_driver)
-  end
-
-  def machine_options(driver)
-    configs = []
-
-    configs << {
-      :convergence_options =>
-        [ :chef_server,
-          :allow_overwrite_keys,
-          :source_key, :source_key_path, :source_key_pass_phrase,
-          :private_key_options,
-          :ohai_hints,
-          :public_key_path, :public_key_format,
-          :admin, :validator,
-          :chef_config
-        ].inject({}) do |result, key|
-          result[key] = new_resource.send(key)
-          result
-        end
-    }
-
-    # The current use case for this is adding a new attribute `aws_tags` to
-    # the machine resource from the chef-provisioning-aws driver.  Because we
-    # want that attribute to work for the recipe DSL, it needs to be added at the
-    # Chef::Resource::Machine class level and not at an instance level.  Thus we
-    # also need to pull the additional_machine_option_keys (:aws_tags) from the
-    # Chef::Resource::Machine class level.  If you use two drivers (like AWS and
-    # Azure) then all machine instances will still have the `aws_tags` attribute
-    # DSL and will pass `:aws_tags` in on the machine_options.  They can simply
-    # be ignored by the Azure driver.
-    (self.class.additional_machine_option_keys || []).each do |k|
-      configs << { k => new_resource.send(k)} if new_resource.send(k)
-    end
-
-    configs << { from_image: new_resource.from_image } if new_resource.from_image
-    configs << new_resource.machine_options if new_resource.machine_options
-    configs << driver.config[:machine_options] if driver.config[:machine_options]
-    Cheffish::MergedConfig.new(*configs)
-  end
-
-  def self.additional_machine_option_keys
-    @@additional_machine_option_keys ||= []
-  end
-
-  def load_current_resource
-    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
-
-  def chef_managed_entry_store
-    @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
-  end
-
-  def self.upload_files(action_handler, machine, files)
-    if files
-      files.each_pair do |remote_file, local|
-        if local.is_a?(Hash)
-          if local[:local_path]
-            machine.upload_file(action_handler, local[:local_path], remote_file)
-          else
-            machine.write_file(action_handler, remote_file, local[:content])
-          end
-        else
-          machine.upload_file(action_handler, local, remote_file)
-        end
-      end
-    end
-  end
-
-  private
-
-  def upload_files(machine)
-    Machine.upload_files(action_handler, machine, new_resource.files)
-  end
-
-end
-end
-end
+require 'chef/provider/lwrp_base'
+require 'chef/resource/chef_node'
+require 'openssl'
+require 'chef/provisioning/chef_provider_action_handler'
+
+class Chef
+class Provider
+class Machine < Chef::Provider::LWRPBase
+  provides :machine
+
+  def action_handler
+    @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
+  end
+  def action_handler=(value)
+    @action_handler = value
+  end
+
+  use_inline_resources
+
+  def whyrun_supported?
+    true
+  end
+
+  action :allocate do
+    if !new_driver
+      raise "Driver not specified for machine #{machine_spec.name}"
+    end
+    if current_driver && current_driver.driver_url != new_driver.driver_url
+      raise "Cannot move '#{machine_spec.name}' from #{current_driver.driver_url} to #{new_driver.driver_url}: machine moving is not supported.  Destroy and recreate."
+    end
+    new_driver.allocate_machine(action_handler, machine_spec, new_machine_options)
+    machine_spec.from_image ||= new_resource.from_image if new_resource.from_image
+    machine_spec.driver_url ||= new_driver.driver_url
+    machine_spec.save(action_handler)
+  end
+
+  action :ready do
+    action_allocate
+    machine = current_driver.ready_machine(action_handler, machine_spec, current_machine_options)
+    machine_spec.save(action_handler)
+    machine
+  end
+
+  action :setup do
+    machine = action_ready
+    begin
+      machine.setup_convergence(action_handler)
+      machine_spec.save(action_handler)
+      upload_files(machine)
+    ensure
+      machine.disconnect
+    end
+  end
+
+  action :converge do
+    machine = action_ready
+    begin
+      machine.setup_convergence(action_handler)
+      machine_spec.save(action_handler)
+      upload_files(machine)
+      # If we were asked to converge, or anything changed, or if a converge has never succeeded, converge.
+      if new_resource.converge
+        Chef::Log.info("Converging #{machine_spec.name} because 'converge true' is set ...")
+        machine.converge(action_handler)
+      elsif new_resource.converge.nil? && resource_updated?
+        Chef::Log.info("Converging #{machine_spec.name} because the resource was updated ...")
+        machine.converge(action_handler)
+      elsif !machine_spec.node['automatic'] || machine_spec.node['automatic'].size == 0
+        Chef::Log.info("Converging #{machine_spec.name} because it has never been converged (automatic attributes are empty) ...")
+        machine.converge(action_handler)
+      elsif new_resource.converge == false
+        Chef::Log.debug("Not converging #{machine_spec.name} because 'converge false' is set.")
+      end
+    ensure
+      machine.disconnect
+    end
+  end
+
+  action :converge_only do
+    if new_resource.converge == false
+      Chef::Log.debug("Not converging #{machine_spec.name} because 'converge false' is set.")
+    else
+      machine = run_context.chef_provisioning.connect_to_machine(machine_spec, current_machine_options)
+      begin
+        machine.converge(action_handler)
+      ensure
+        machine.disconnect
+      end
+    end
+  end
+
+  action :stop do
+    if current_driver
+      current_driver.stop_machine(action_handler, machine_spec, current_machine_options)
+    end
+  end
+
+  action :destroy do
+    if current_driver
+      current_driver.destroy_machine(action_handler, machine_spec, current_machine_options)
+    end
+    machine_spec.delete(action_handler)
+  end
+
+  attr_reader :machine_spec
+
+  def new_driver
+    run_context.chef_provisioning.driver_for(new_resource.driver)
+  end
+
+  def current_driver
+    if machine_spec.driver_url
+      run_context.chef_provisioning.driver_for(machine_spec.driver_url)
+    end
+  end
+
+  def from_image_spec
+    @from_image_spec ||= begin
+      if new_resource.from_image
+        chef_managed_entry_store.get!(:machine_image, new_resource.from_image)
+      else
+        nil
+      end
+    end
+  end
+
+  def new_machine_options
+    machine_options(new_driver)
+  end
+
+  def current_machine_options
+    machine_options(current_driver)
+  end
+
+  def machine_options(driver)
+    configs = []
+
+    configs << {
+      :convergence_options =>
+        [ :chef_server,
+          :allow_overwrite_keys,
+          :source_key, :source_key_path, :source_key_pass_phrase,
+          :private_key_options,
+          :ohai_hints,
+          :public_key_path, :public_key_format,
+          :admin, :validator,
+          :chef_config
+        ].inject({}) do |result, key|
+          result[key] = new_resource.send(key)
+          result
+        end
+    }
+
+    # The current use case for this is adding a new attribute `aws_tags` to
+    # the machine resource from the chef-provisioning-aws driver.  Because we
+    # want that attribute to work for the recipe DSL, it needs to be added at the
+    # Chef::Resource::Machine class level and not at an instance level.  Thus we
+    # also need to pull the additional_machine_option_keys (:aws_tags) from the
+    # Chef::Resource::Machine class level.  If you use two drivers (like AWS and
+    # Azure) then all machine instances will still have the `aws_tags` attribute
+    # DSL and will pass `:aws_tags` in on the machine_options.  They can simply
+    # be ignored by the Azure driver.
+    (self.class.additional_machine_option_keys || []).each do |k|
+      configs << { k => new_resource.send(k)} if new_resource.send(k)
+    end
+
+    configs << { from_image: new_resource.from_image } if new_resource.from_image
+    configs << new_resource.machine_options if new_resource.machine_options
+    configs << driver.config[:machine_options] if driver.config[:machine_options]
+    Cheffish::MergedConfig.new(*configs)
+  end
+
+  def self.additional_machine_option_keys
+    @@additional_machine_option_keys ||= []
+  end
+
+  def load_current_resource
+    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
+
+  def chef_managed_entry_store
+    @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
+  end
+
+  def self.upload_files(action_handler, machine, files)
+    if files
+      files.each_pair do |remote_file, local|
+        if local.is_a?(Hash)
+          if local[:local_path]
+            machine.upload_file(action_handler, local[:local_path], remote_file)
+          else
+            machine.write_file(action_handler, remote_file, local[:content])
+          end
+        else
+          machine.upload_file(action_handler, local, remote_file)
+        end
+      end
+    end
+  end
+
+  private
+
+  def upload_files(machine)
+    Machine.upload_files(action_handler, machine, new_resource.files)
+  end
+
+end
+end
+end