chef-provisioning-fog 0.15.0 → 0.15.1

data/lib/chef/provisioning/fog_driver/version.rb

@@ -1,7 +1,7 @@
-class Chef
-module Provisioning
-module FogDriver
-  VERSION = '0.15.0'
-end
-end
-end
+class Chef
+  module Provisioning
+    module FogDriver
+      VERSION = '0.15.1'
+    end
+  end
+end

data/lib/chef/resource/fog_key_pair.rb

@@ -1,34 +1,34 @@
-require 'chef/provisioning'
-
-class Chef::Resource::FogKeyPair < Chef::Resource::LWRPBase
-  self.resource_name = 'fog_key_pair'
-
-  def initialize(*args)
-    super
-    @driver = run_context.chef_provisioning.current_driver
-  end
-
-  actions :create, :delete, :nothing
-  default_action :create
-
-  attribute :driver
-  # Private key to use as input (will be generated if it does not exist)
-  attribute :private_key_path, :kind_of => String
-  # Public key to use as input (will be generated if it does not exist)
-  attribute :public_key_path, :kind_of => String
-  # List of parameters to the private_key resource used for generation of the key
-  attribute :private_key_options, :kind_of => Hash
-
-  # TODO what is the right default for this?
-  attribute :allow_overwrite, :kind_of => [TrueClass, FalseClass], :default => false
-
-  # Proc that runs after the resource completes.  Called with (resource, private_key, public_key)
-  def after(&block)
-    block ? @after = block : @after
-  end
-
-  # We are not interested in Chef's cloning behavior here.
-  def load_prior_resource(*args)
-    Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
-  end
-end
+require 'chef/provisioning'
+
+class Chef::Resource::FogKeyPair < Chef::Resource::LWRPBase
+  self.resource_name = 'fog_key_pair'
+
+  def initialize(*args)
+    super
+    @driver = run_context.chef_provisioning.current_driver
+  end
+
+  actions :create, :delete, :nothing
+  default_action :create
+
+  attribute :driver
+  # Private key to use as input (will be generated if it does not exist)
+  attribute :private_key_path, :kind_of => String
+  # Public key to use as input (will be generated if it does not exist)
+  attribute :public_key_path, :kind_of => String
+  # List of parameters to the private_key resource used for generation of the key
+  attribute :private_key_options, :kind_of => Hash
+
+  # TODO what is the right default for this?
+  attribute :allow_overwrite, :kind_of => [TrueClass, FalseClass], :default => false
+
+  # Proc that runs after the resource completes.  Called with (resource, private_key, public_key)
+  def after(&block)
+    block ? @after = block : @after
+  end
+
+  # We are not interested in Chef's cloning behavior here.
+  def load_prior_resource(*args)
+    Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
+  end
+end

data/spec/spec_helper.rb

@@ -1,18 +1,18 @@
-$:.unshift File.expand_path('../../lib', __FILE__)
-$:.unshift File.expand_path('../support', __FILE__)
-require 'fog'
-require 'chef/provisioning'
-require 'chef/provisioning/fog_driver'
-
-RSpec.configure do |config|
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-end
-
-Fog.mock!
+$:.unshift File.expand_path('../../lib', __FILE__)
+$:.unshift File.expand_path('../support', __FILE__)
+require 'fog'
+require 'chef/provisioning'
+require 'chef/provisioning/fog_driver'
+
+RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+
+Fog.mock!

data/spec/support/aws/config-file.csv

@@ -1,2 +1,2 @@
-User Name,Access Key Id,Secret Access Key
-test,12345,abcde
+User Name,Access Key Id,Secret Access Key
+test,12345,abcde

data/spec/support/aws/ini-file.ini

@@ -1,10 +1,10 @@
-[default]
-  aws_access_key_id = 12345
-  aws_secret_access_key = abcde
-  aws_session_token = mysecret
-  region = us-east-1
-
-[profile test]
-  aws_access_key_id = foobar
-  aws_secret_access_key = canteloupe
-  region = us-east-1
+[default]
+  aws_access_key_id = 12345
+  aws_secret_access_key = abcde
+  aws_session_token = mysecret
+  region = us-east-1
+
+[profile test]
+  aws_access_key_id = foobar
+  aws_secret_access_key = canteloupe
+  region = us-east-1

data/spec/support/chef_metal_fog/providers/testdriver.rb

@@ -1,16 +1,16 @@
-class Chef
-module Provisioning
-class FogDriver::Providers
-  class TestDriver < Chef::Provisioning::FogDriver
-    Chef::Provisioning::FogDriver.register_provider_class('TestDriver', Chef::Provisioning::FogDriver::Providers::TestDriver)
-
-    attr_reader :config
-    def initialize(driver_url, config)
-      super
-    end
-
-    def self.compute_options_for(provider, id, config)
-      [config, 'test']
-    end
-  end
-end
+class Chef
+module Provisioning
+class FogDriver::Providers
+  class TestDriver < Chef::Provisioning::FogDriver
+    Chef::Provisioning::FogDriver.register_provider_class('TestDriver', Chef::Provisioning::FogDriver::Providers::TestDriver)
+
+    attr_reader :config
+    def initialize(driver_url, config)
+      super
+    end
+
+    def self.compute_options_for(provider, id, config)
+      [config, 'test']
+    end
+  end
+end

data/spec/unit/chef/provisioning/fog_driver/driver_spec.rb

@@ -1,71 +1,71 @@
-require 'chef/provisioning/fog_driver/driver'
-
-describe Chef::Provisioning::FogDriver::Driver do
-  let(:driver) { Chef::Provisioning::FogDriver::Driver.new("fog:OpenStack", {}) }
-
-  before(:each) do
-    Chef::Provisioning::FogDriver::Driver.send(:public, *Chef::Provisioning::FogDriver::Driver.protected_instance_methods)
-  end
-
-  describe "#determine_remote_host" do
-    let(:machine_spec) { double("machine_spec", :reference => reference, :name => 'name') }
-    let(:server) { double("server", :private_ip_address => 'private', :public_ip_address => 'public', :ip_addresses => ['first_ip_address'])}
-
-    context "when 'use_private_ip_for_ssh' is specified in the machine_spec.reference" do
-      let(:reference) { { 'use_private_ip_for_ssh' => true } }
-      it "returns the private ip" do
-        expect(driver.determine_remote_host(machine_spec, server)).to eq('private')
-        expect(reference).to eq( {'transport_address_location' => :private_ip} )
-      end
-    end
-
-    context "when 'transport_address_location' is set to :private_ip" do
-      let(:reference) { { 'transport_address_location' => :private_ip } }
-      it "returns the private ip" do
-        expect(driver.determine_remote_host(machine_spec, server)).to eq('private')
-      end
-    end
-
-    context "when 'transport_address_location' is set to :ip_addresses" do
-      let(:reference) { { 'transport_address_location' => :ip_addresses } }
-      it "returns the first ip_address from array" do
-        expect(driver.determine_remote_host(machine_spec, server)).to eq('first_ip_address')
-      end
-    end
-
-    context "when 'transport_address_location' is set to :public_ip" do
-      let(:reference) { { 'transport_address_location' => :public_ip } }
-      it "returns the public ip" do
-        expect(driver.determine_remote_host(machine_spec, server)).to eq('public')
-      end
-    end
-
-    context "when machine_spec.reference does not specify the transport type" do
-      let(:reference) { Hash.new }
-
-      context "when the machine does not have a public_ip_address" do
-        let(:server) { double("server", :private_ip_address => 'private', :public_ip_address => nil, :ip_addresses => ['first_ip_address'])}
-
-        it "returns the private ip" do
-          expect(driver.determine_remote_host(machine_spec, server)).to eq('private')
-        end
-      end
-
-      context "when the machine has a public_ip_address" do
-        let(:server) { double("server", :private_ip_address => 'private', :public_ip_address => 'public', :ip_addresses => ['first_ip_address'])}
-
-        it "returns the public ip" do
-          expect(driver.determine_remote_host(machine_spec, server)).to eq('public')
-        end
-      end
-
-      context "when the machine does not have a public_ip_address or private_ip_address" do
-        let(:server) { double("server", :private_ip_address => nil, :public_ip_address => nil, :ip_addresses => ['first_ip_address'], :id => 'id')}
-
-        it "raises an error" do
-          expect {driver.determine_remote_host(machine_spec, server)}.to raise_error("Server #{server.id} has no private or public IP address!")
-        end
-      end
-    end
-  end
-end
+require 'chef/provisioning/fog_driver/driver'
+
+describe Chef::Provisioning::FogDriver::Driver do
+  let(:driver) { Chef::Provisioning::FogDriver::Driver.new("fog:OpenStack", {}) }
+
+  before(:each) do
+    Chef::Provisioning::FogDriver::Driver.send(:public, *Chef::Provisioning::FogDriver::Driver.protected_instance_methods)
+  end
+
+  describe "#determine_remote_host" do
+    let(:machine_spec) { double("machine_spec", :reference => reference, :name => 'name') }
+    let(:server) { double("server", :private_ip_address => 'private', :public_ip_address => 'public', :ip_addresses => ['first_ip_address'])}
+
+    context "when 'use_private_ip_for_ssh' is specified in the machine_spec.reference" do
+      let(:reference) { { 'use_private_ip_for_ssh' => true } }
+      it "returns the private ip" do
+        expect(driver.determine_remote_host(machine_spec, server)).to eq('private')
+        expect(reference).to eq( {'transport_address_location' => :private_ip} )
+      end
+    end
+
+    context "when 'transport_address_location' is set to :private_ip" do
+      let(:reference) { { 'transport_address_location' => :private_ip } }
+      it "returns the private ip" do
+        expect(driver.determine_remote_host(machine_spec, server)).to eq('private')
+      end
+    end
+
+    context "when 'transport_address_location' is set to :ip_addresses" do
+      let(:reference) { { 'transport_address_location' => :ip_addresses } }
+      it "returns the first ip_address from array" do
+        expect(driver.determine_remote_host(machine_spec, server)).to eq('first_ip_address')
+      end
+    end
+
+    context "when 'transport_address_location' is set to :public_ip" do
+      let(:reference) { { 'transport_address_location' => :public_ip } }
+      it "returns the public ip" do
+        expect(driver.determine_remote_host(machine_spec, server)).to eq('public')
+      end
+    end
+
+    context "when machine_spec.reference does not specify the transport type" do
+      let(:reference) { Hash.new }
+
+      context "when the machine does not have a public_ip_address" do
+        let(:server) { double("server", :private_ip_address => 'private', :public_ip_address => nil, :ip_addresses => ['first_ip_address'])}
+
+        it "returns the private ip" do
+          expect(driver.determine_remote_host(machine_spec, server)).to eq('private')
+        end
+      end
+
+      context "when the machine has a public_ip_address" do
+        let(:server) { double("server", :private_ip_address => 'private', :public_ip_address => 'public', :ip_addresses => ['first_ip_address'])}
+
+        it "returns the public ip" do
+          expect(driver.determine_remote_host(machine_spec, server)).to eq('public')
+        end
+      end
+
+      context "when the machine does not have a public_ip_address or private_ip_address" do
+        let(:server) { double("server", :private_ip_address => nil, :public_ip_address => nil, :ip_addresses => ['first_ip_address'], :id => 'id')}
+
+        it "raises an error" do
+          expect {driver.determine_remote_host(machine_spec, server)}.to raise_error("Server #{server.id} has no private or public IP address!")
+        end
+      end
+    end
+  end
+end

data/spec/unit/fog_driver_spec.rb

@@ -1,32 +1,32 @@
-require 'spec_helper'
-require 'chef/provisioning/fog_driver'
-
-describe Chef::Provisioning::FogDriver do
-
-  describe ".from_url" do
-    subject { Chef::Provisioning::FogDriver.from_provider('TestDriver', {}) }
-
-    it "should return the correct class" do
-      expect(subject).to be_an_instance_of Chef::Provisioning::FogDriver::Providers::TestDriver
-    end
-
-    it "should call the target compute_options_for" do
-      expect(Chef::Provisioning::FogDriver::Providers::TestDriver).to receive(:compute_options_for)
-        .with('TestDriver', anything, {}).and_return([{}, 'test']).twice
-      subject
-    end
-
-  end
-
-  describe "when creating a new class" do
-    it "should return the correct class" do
-      test = Chef::Provisioning::FogDriver.new('fog:TestDriver:foo', {})
-      expect(test).to be_an_instance_of Chef::Provisioning::FogDriver::Providers::TestDriver
-    end
-
-    it "should populate config" do
-      test = Chef::Provisioning::FogDriver.new('fog:TestDriver:foo', {test: "chef_provisioning"})
-      expect(test.config[:test]).to eq "chef_provisioning"
-    end
-  end
-end
+require 'spec_helper'
+require 'chef/provisioning/fog_driver'
+
+describe Chef::Provisioning::FogDriver do
+
+  describe ".from_url" do
+    subject { Chef::Provisioning::FogDriver.from_provider('TestDriver', {}) }
+
+    it "should return the correct class" do
+      expect(subject).to be_an_instance_of Chef::Provisioning::FogDriver::Providers::TestDriver
+    end
+
+    it "should call the target compute_options_for" do
+      expect(Chef::Provisioning::FogDriver::Providers::TestDriver).to receive(:compute_options_for)
+        .with('TestDriver', anything, {}).and_return([{}, 'test']).twice
+      subject
+    end
+
+  end
+
+  describe "when creating a new class" do
+    it "should return the correct class" do
+      test = Chef::Provisioning::FogDriver.new('fog:TestDriver:foo', {})
+      expect(test).to be_an_instance_of Chef::Provisioning::FogDriver::Providers::TestDriver
+    end
+
+    it "should populate config" do
+      test = Chef::Provisioning::FogDriver.new('fog:TestDriver:foo', {test: "chef_provisioning"})
+      expect(test.config[:test]).to eq "chef_provisioning"
+    end
+  end
+end

data/spec/unit/providers/aws/credentials_spec.rb

@@ -1,45 +1,45 @@
-require 'chef/provisioning/fog_driver/providers/aws/credentials'
-
-describe Chef::Provisioning::FogDriver::Providers::AWS::Credentials do
-  describe "#load_ini" do
-    let(:aws_credentials_ini_file) { File.join(File.expand_path('../../../../support', __FILE__), 'aws/ini-file.ini') }
-
-    before do
-      described_class.load_ini(aws_credentials_ini_file)
-    end
-
-    it "should load a default profile" do
-      expect(described_class['default']).to include(:aws_access_key_id)
-    end
-
-    it "should load the correct values" do
-      expect(described_class['default'][:aws_access_key_id]).to eq "12345"
-      expect(described_class['default'][:aws_secret_access_key]).to eq "abcde"
-      expect(described_class['default'][:region]).to eq "us-east-1"
-      expect(described_class['default'][:aws_session_token]).to eq "mysecret"
-    end
-
-    it "should load several profiles" do
-      expect(described_class.keys.length).to eq 2
-    end
-  end
-
-  describe "#load_csv" do
-    let(:aws_credentials_csv_file) { File.join(File.expand_path('../../../../support', __FILE__), 'aws/config-file.csv') }
-    before do
-      described_class.load_csv(aws_credentials_csv_file)
-    end
-
-    it "should load a single profile" do
-      expect(described_class['default']).to include(:aws_access_key_id)
-    end
-
-    it "should load the correct values" do
-      expect(described_class['default'][:aws_access_key_id]).to eq "12345"
-    end
-
-    it "should load several profiles" do
-      expect(described_class.keys.length).to eq 2
-    end
-  end
-end
+require 'chef/provisioning/fog_driver/providers/aws/credentials'
+
+describe Chef::Provisioning::FogDriver::Providers::AWS::Credentials do
+  describe "#load_ini" do
+    let(:aws_credentials_ini_file) { File.join(File.expand_path('../../../../support', __FILE__), 'aws/ini-file.ini') }
+
+    before do
+      described_class.load_ini(aws_credentials_ini_file)
+    end
+
+    it "should load a default profile" do
+      expect(described_class['default']).to include(:aws_access_key_id)
+    end
+
+    it "should load the correct values" do
+      expect(described_class['default'][:aws_access_key_id]).to eq "12345"
+      expect(described_class['default'][:aws_secret_access_key]).to eq "abcde"
+      expect(described_class['default'][:region]).to eq "us-east-1"
+      expect(described_class['default'][:aws_session_token]).to eq "mysecret"
+    end
+
+    it "should load several profiles" do
+      expect(described_class.keys.length).to eq 2
+    end
+  end
+
+  describe "#load_csv" do
+    let(:aws_credentials_csv_file) { File.join(File.expand_path('../../../../support', __FILE__), 'aws/config-file.csv') }
+    before do
+      described_class.load_csv(aws_credentials_csv_file)
+    end
+
+    it "should load a single profile" do
+      expect(described_class['default']).to include(:aws_access_key_id)
+    end
+
+    it "should load the correct values" do
+      expect(described_class['default'][:aws_access_key_id]).to eq "12345"
+    end
+
+    it "should load several profiles" do
+      expect(described_class.keys.length).to eq 2
+    end
+  end
+end