chef-provisioning-fog 0.26.1 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c77d661a5523160576f2a32f6806078ed44046235fcf6effe98317b7de885042
-  data.tar.gz: 2d5faf9cbce70c193b25f74b6a93167655cb73aa3d51595a9d0364005176c7e2
+  metadata.gz: 912a97376ebbc1b45d706a956c7241188f6fd1bba92ce4273ecacd2db661856c
+  data.tar.gz: c8fb2165d27495e7708dd054b35c38f75308f50cd239a19978a5e94a69c4694d
 SHA512:
-  metadata.gz: d3b45b2860a0f5237572b5f114ffd50dc10f1f1c24eed6ef6de7e38a1f02c2fc5dc486509d3057332597778a1ffcc1ecf6ac1ed624d219a4f0835756accd5bdb
-  data.tar.gz: 308fa541c12dcd5230a279dfb0491645111f9220799ee288b445942d4e62873bbdbf1318de7343f0f530ddad83fa759de945a9cee9c706d1ed234572ddc8b175
+  metadata.gz: 224c9427b2c417cc689c2e3353d032204a41442ce6d738966ee4a191026345c56337295740d6e4baab94d1b345f7016092d45d7e7e1e63e2dddbbad85102922a
+  data.tar.gz: b1f447b26a576a522b779d2de8d7ee1002f7b74996ad7e9f99a38fe979b67a0a10eb33090b10abb3640c5a7b33383e9467c7b36271192e852fa35dbb103c486a

data/Gemfile

@@ -1,17 +1,38 @@
 source "https://rubygems.org"
-gemfile
+
 gemspec
 
 group :development do
+  gem "chef"
+  gem "chefstyle", "~> 0.10.0"
   # fog-google and fog-aws have been removed as direct deps, but are necessary for testing
-  gem "fog-google"
   gem "fog-aws"
+  gem "fog-google"
   # fog is necessary for fog-cloudstack
   gem "fog"
-  gem "chef"
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'rb-readline'
-  gem 'simplecov'
-  gem 'winrm-elevated'
+  gem "guard"
+  gem "guard-rspec"
+  gem "rake"
+  gem "rspec", "~> 3.0"
+  gem "simplecov"
+  gem "winrm-elevated"
 end
+
+group :debug do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-stack_explorer"
+  gem "rb-readline"
+end
+
+group :docs do
+  gem "github-markup"
+  gem "redcarpet"
+  gem "yard"
+end
+
+instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/Rakefile

@@ -1,19 +1,30 @@
-require 'bundler'
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-desc "run specs"
-task :spec do
-  sh "bundle exec rspec"
-end
+RSpec::Core::RakeTask.new(:spec)
 
 begin
-  require "github_changelog_generator/task"
+  require "yard"
+  YARD::Rake::YardocTask.new(:docs)
+rescue LoadError
+  puts "yard is not available. bundle install first to make sure all dependencies are installed."
+end
 
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    config.future_release = Chef::Provisioning::FogDriver::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,Question".split(",")
+task :console do
+  require "irb"
+  require "irb/completion"
+  ARGV.clear
+  IRB.start
+end
+
+begin
+  require "chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:chefstyle) do |task|
+    task.options << "--display-cop-names"
   end
 rescue LoadError
+  puts "chefstyle gem is not installed"
 end
+
+task default: :spec

data/chef-provisioning-fog.gemspec

@@ -1,43 +1,40 @@
-$:.unshift(File.dirname(__FILE__) + '/lib')
-require 'chef/provisioning/fog_driver/version'
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/lib")
+require "chef/provisioning/fog_driver/version"
 
 Gem::Specification.new do |s|
-  s.name = 'chef-provisioning-fog'
+  s.name = "chef-provisioning-fog"
   s.version = Chef::Provisioning::FogDriver::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.extra_rdoc_files = ['README.md', 'LICENSE' ]
-  s.summary = 'Driver for creating Fog instances in Chef Provisioning.'
+  s.summary = "Driver for creating Fog instances in Chef Provisioning."
   s.description = s.summary
-  s.authors     = ['John Keiser', "Chris McClimans", "Taylor Carpenter", "Wavell Watson", "JJ Asghar"]
-  s.email = ['john@johnkeiser.com', 'hh@vulk.co', 't@vulk.co', 'w@vulk.co','jj@chef.io']
-  s.homepage = 'https://github.com/chef/chef-provisioning-fog'
+  s.authors     = ["John Keiser", "Chris McClimans", "Taylor Carpenter", "Wavell Watson", "JJ Asghar"]
+  s.email = ["john@johnkeiser.com", "hh@vulk.co", "t@vulk.co", "w@vulk.co", "jj@chef.io"]
+  s.homepage = "https://github.com/chef/chef-provisioning-fog"
+  s.license = "Apache-2.0"
+  s.required_ruby_version = ">= 2.1.9"
 
-  s.add_dependency 'chef-provisioning', '>= 1.0', '< 3.0'
-  s.add_dependency 'cheffish', '>= 13.1.0', '< 15.0'
+  s.add_dependency "chef-provisioning", ">= 1.0", "< 3.0"
+  s.add_dependency "cheffish", ">= 13.1.0", "< 15.0"
   #
   # NOTE: the `fog` direct dependency has been removed from chef-provisioning-fog, if there is no meta-gem
   # then users _must_ install the fog dependency manually (`chef gem install fog` for chefdk).  this affects
   # at least cloudstack and vcair users.  aws users should use chef-provisioning-aws.
   #
   # s.add_dependency 'fog-aws'     # Deliberately removed: chef-provisioning-aws is preferred
-  s.add_dependency 'fog-digitalocean'
+  s.add_dependency "fog-digitalocean"
   # s.add_dependency 'fog-google'  # Deliberately removed: fog-google is broken with newer google-api-client
-  s.add_dependency 'fog-joyent'
-  s.add_dependency 'fog-openstack'
-  s.add_dependency 'fog-rackspace'
-  s.add_dependency 'fog-scaleway'
-  s.add_dependency 'fog-softlayer'
-  s.add_dependency 'fog-xenserver'
-  s.add_dependency 'retryable'
-  s.add_dependency 'winrm-elevated'
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rake'
+  s.add_dependency "fog-joyent"
+  s.add_dependency "fog-openstack"
+  s.add_dependency "fog-rackspace"
+  s.add_dependency "fog-scaleway"
+  s.add_dependency "fog-softlayer"
+  s.add_dependency "fog-xenserver"
+  s.add_dependency "retryable"
+  s.add_dependency "winrm-elevated"
 
   s.bindir       = "bin"
-  s.executables  = %w( )
+  s.executables  = %w{}
 
-  s.require_path = 'lib'
-  s.files = %w(Gemfile Rakefile LICENSE README.md) + Dir.glob("*.gemspec") +
-      Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+  s.require_path = "lib"
+  s.files = %w{Gemfile Rakefile LICENSE} + Dir.glob("*.gemspec") +
+    Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 end

data/lib/chef/provider/fog_key_pair.rb

@@ -1,9 +1,7 @@
-# coding: utf-8
-require 'chef/provider/lwrp_base'
-require 'chef/provisioning/fog_driver/driver'
+require "chef/provider/lwrp_base"
+require "chef/provisioning/fog_driver/driver"
 
 class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
-
   use_inline_resources
 
   def whyrun_supported?
@@ -18,11 +16,11 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
     if current_resource_exists?
       converge_by "delete #{key_description}" do
         case new_driver.compute_options[:provider]
-        when 'DigitalOcean'
+        when "DigitalOcean"
           compute.destroy_ssh_key(@current_id)
-        when 'Joyent'
+        when "Joyent"
           compute.delete_key(@current_id)
-        when 'OpenStack', 'Rackspace'
+        when "OpenStack", "Rackspace"
           compute.key_pairs.destroy(@current_id)
         else
           compute.key_pairs.delete(new_resource.name)
@@ -57,12 +55,12 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       end
 
       case new_driver.compute_options[:provider]
-      when 'DigitalOcean'
-        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
-      when 'Joyent'
-        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :rfc4716md5fingerprint)]
-      when 'OpenStack', 'Rackspace'
-        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
+      when "DigitalOcean"
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, format: :openssh)]
+      when "Joyent"
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, format: :rfc4716md5fingerprint)]
+      when "OpenStack", "Rackspace"
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, format: :openssh)]
       else
         # “The nice thing about standards is that you have so many to
         # choose from.” - Andrew S. Tanenbaum
@@ -75,11 +73,11 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         #
         # So compute both possible AWS fingerprints and check if either of
         # them matches.
-        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :fingerprint)]
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, format: :fingerprint)]
         if RUBY_VERSION.to_f < 2.0
           if @@use_pkcs8.nil?
             begin
-              require 'openssl_pkcs8'
+              require "openssl_pkcs8"
               @@use_pkcs8 = true
             rescue LoadError
               Chef::Log.warn("The openssl_pkcs8 gem is not loaded: you may not be able to read key fingerprints created by some cloud providers.  gem install openssl_pkcs8 to fix!")
@@ -88,26 +86,26 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
           end
           if @@use_pkcs8
             new_fingerprints << Cheffish::KeyFormatter.encode(desired_private_key,
-                                  :format => :pkcs8sha1fingerprint)
+                                                              format: :pkcs8sha1fingerprint)
           end
         end
       end
 
-      if !new_fingerprints.any? { |f| compare_public_key f }
+      if new_fingerprints.none? { |f| compare_public_key f }
         if new_resource.allow_overwrite
           converge_by "update #{key_description} to match local key at #{new_resource.private_key_path}" do
             case new_driver.compute_options[:provider]
-            when 'DigitalOcean'
-              compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'Joyent'
-              compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'OpenStack'
-              compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'Rackspace'
-              compute.create_keypair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            when "DigitalOcean"
+              compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
+            when "Joyent"
+              compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
+            when "OpenStack"
+              compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
+            when "Rackspace"
+              compute.create_keypair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
             else
               compute.key_pairs.get(new_resource.name).destroy
-              compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+              compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
             end
           end
         else
@@ -121,16 +119,16 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       # Create key
       converge_by "create #{key_description} from local key at #{new_resource.private_key_path}" do
         case new_driver.compute_options[:provider]
-        when 'DigitalOcean'
-          compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'Joyent'
-          compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'OpenStack'
-          compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'Rackspace'
-          compute.create_keypair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        when "DigitalOcean"
+          compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
+        when "Joyent"
+          compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
+        when "OpenStack"
+          compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
+        when "Rackspace"
+          compute.create_keypair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
         else
-          compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+          compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
         end
       end
     end
@@ -147,7 +145,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       private_key private_key_path do
         public_key_path resource.public_key_path
         if resource.private_key_options
-          resource.private_key_options.each_pair do |key,value|
+          resource.private_key_options.each_pair do |key, value|
             send(key, value)
           end
         end
@@ -174,12 +172,12 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
   end
 
   def current_resource_exists?
-    @current_resource.action != [ :delete ]
+    @current_resource.action != [:delete]
   end
 
   def compare_public_key(new)
-    c = @current_fingerprint.split[0,2].join(' ')
-    n = new.split[0,2].join(' ')
+    c = @current_fingerprint.split[0, 2].join(" ")
+    n = new.split[0, 2].join(" ")
     c == n
   end
 
@@ -208,20 +206,20 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
   end
 
   def load_current_resource
-    if !new_driver.kind_of?(Chef::Provisioning::FogDriver::Driver)
-      raise 'fog_key_pair only works with fog_driver'
+    unless new_driver.is_a?(Chef::Provisioning::FogDriver::Driver)
+      raise "fog_key_pair only works with fog_driver"
     end
     @current_resource = Chef::Resource::FogKeyPair.new(new_resource.name, run_context)
     case new_driver.provider
-    when 'DigitalOcean'
-      current_key_pair = compute.list_ssh_keys.body['ssh_keys'].select { |key| key['name'] == new_resource.name }.first
+    when "DigitalOcean"
+      current_key_pair = compute.list_ssh_keys.body["ssh_keys"].select { |key| key["name"] == new_resource.name }.first
       if current_key_pair
-        @current_id = current_key_pair['id']
+        @current_id = current_key_pair["id"]
         @current_fingerprint = current_key_pair ? compute.ssh_keys.get(@current_id).public_key : nil
       else
         current_resource.action :delete
       end
-    when 'Joyent'
+    when "Joyent"
       current_key_pair = begin
         compute.keys.get(new_resource.name)
       rescue Fog::Compute::Joyent::Errors::NotFound
@@ -230,17 +228,15 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       if current_key_pair
         @current_id = current_key_pair.name
         @current_fingerprint = if current_key_pair.respond_to?(:fingerprint)
-          current_key_pair.fingerprint
-        elsif current_key_pair.respond_to?(:key)
-          public_key, format = Cheffish::KeyFormatter.decode(current_key_pair.key)
-          public_key.fingerprint
-        else
-          nil
-        end
+                                 current_key_pair.fingerprint
+                               elsif current_key_pair.respond_to?(:key)
+                                 public_key, format = Cheffish::KeyFormatter.decode(current_key_pair.key)
+                                 public_key.fingerprint
+                               end
       else
         current_resource.action :delete
       end
-    when 'OpenStack', 'Rackspace'
+    when "OpenStack", "Rackspace"
       current_key_pair = compute.key_pairs.get(new_resource.name)
       if current_key_pair
         @current_id = current_key_pair.name

data/lib/chef/provider/scaleway_volume.rb

@@ -1,53 +1,51 @@
-require 'chef/provider/lwrp_base'
-require 'openssl'
-require 'chef/provisioning/chef_provider_action_handler'
-require 'chef/provisioning/chef_managed_entry_store'
+require "chef/provider/lwrp_base"
+require "openssl"
+require "chef/provisioning/chef_provider_action_handler"
+require "chef/provisioning/chef_managed_entry_store"
 
 class Chef
-class Provider
-class ScalewayVolume < Chef::Provider::LWRPBase
-  provides :scaleway_volume
-
-  def action_handler
-    @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
-  end
-
-  def load_current_resource
-  end
-
-  def whyrun_supported?
-    true
-  end
-
-  def volume_spec
-    @volume_spec ||= chef_managed_entry_store.get_or_new(:volume, new_resource.name)
-  end
-
-  # Get the driver specified in the resource
-  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
-    unless volume_spec.reference && new_driver.volume_for(volume_spec)
-      new_driver.create_volume(action_handler, volume_spec,
-                               new_resource.volume_options)
+  class Provider
+    class ScalewayVolume < Chef::Provider::LWRPBase
+      provides :scaleway_volume
+
+      def action_handler
+        @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
+      end
+
+      def load_current_resource; end
+
+      def whyrun_supported?
+        true
+      end
+
+      def volume_spec
+        @volume_spec ||= chef_managed_entry_store.get_or_new(:volume, new_resource.name)
+      end
+
+      # Get the driver specified in the resource
+      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
+        unless volume_spec.reference && new_driver.volume_for(volume_spec)
+          new_driver.create_volume(action_handler, volume_spec,
+                                   new_resource.volume_options)
+        end
+        new_resource.id = volume_spec.reference["id"]
+      end
+
+      action :destroy do
+        if volume_spec.reference && volume_spec.reference["id"]
+          new_driver.destroy_volume(action_handler, volume_spec,
+                                    new_resource.volume_options)
+          volume_spec.delete(action_handler)
+        end
+      end
     end
-    new_resource.id = volume_spec.reference['id']
   end
-
-  action :destroy do
-    if volume_spec.reference && volume_spec.reference['id']
-      new_driver.destroy_volume(action_handler, volume_spec,
-                                new_resource.volume_options)
-      volume_spec.delete(action_handler)
-    end
-  end
-end
-end
 end