chef-provisioning-aws 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4c4e48ec76622cc159966e0862a69e92dcc794
-  data.tar.gz: 6db5dc3f481f314c3abc02d8389d773e84cd01b7
+  metadata.gz: eda6856be96232e40cce33671b0ed5b92ea9b693
+  data.tar.gz: 58a87deccbffab115c4799f7244030e1d60021d8
 SHA512:
-  metadata.gz: 31a85827c948b002ccc16889f9e075f1689b05d26a38a24ce6bf871b94b609dcf828b7baf3f1cec46e4d0f270bd129fed9a1bf66fe0ad63fb4413c3ba41a712f
-  data.tar.gz: f7d87089964113885f12dcfe193af3dbc7fb39d0bbb955fd4da53bb30c682701c54d6b35a051f922300ecbd848dd1ac87e0b963509af212f1a8d8ef02469c801
+  metadata.gz: d9b18ddd408a632dd03005160807a3fd398f9326009df0dfe27b270860a0beeba6173bca3c39feec22b990ead226075e1507fa35b89689a4d98078341658952b
+  data.tar.gz: ef03d0848060e8bc2097eba525cc33f61d22fcc5ee544205f3ba09af55b75ea8597dc654c41f8d471a216a89900edef409a95b606a20d066a3e2e44b7f8b7a64

data/lib/chef/provider/aws_eip_address.rb

@@ -0,0 +1,85 @@
+require 'chef/provider/aws_provider'
+require 'chef/provisioning/machine_spec'
+require 'cheffish'
+
+class Chef::Provider::AwsEipAddress < Chef::Provider::AwsProvider
+
+  action :create do
+    if existing_ip == nil
+      converge_by "Creating new EIP address in #{new_resource.region_name}" do
+        eip = ec2.elastic_ips.create :vpc => new_resource.associate_to_vpc
+        new_resource.public_ip eip.public_ip
+        new_resource.domain eip.domain
+        new_resource.instance_id eip.instance_id
+      end
+    else
+      new_resource.public_ip existing_ip.public_ip
+      new_resource.domain existing_ip.domain
+      new_resource.instance_id existing_ip.instance_id
+    end
+    new_resource.save
+  end
+
+  action :delete do
+    if existing_ip
+      converge_by "Deleting EIP Address #{new_resource.name} in #{new_resource.region_name}" do
+        #if it's attached to something in a vpc, disassociate first
+        if existing_ip.instance_id != nil && existing_ip.domain == 'vpc'
+          existing_ip.disassociate
+        end
+        existing_ip.delete
+        new_resource.delete
+      end
+    end
+  end
+
+  action :associate do
+    converge_by "Associating EIP Address #{new_resource.name} in #{new_resource.region_name}" do
+      if existing_ip == nil
+        action_create
+      end
+        eip = ec2.elastic_ips[new_resource.public_ip]
+      begin
+        spec = Chef::Provisioning::ChefMachineSpec.get(new_resource.machine)
+        if spec == nil
+          Chef::Application.fatal!("Could not find machine #{new_resource.machine}")
+        else
+          eip.associate :instance => spec.location['instance_id']
+        end
+        new_resource.instance_id eip.instance_id
+      rescue => e
+        Chef::Application.fatal!("Error Associating EIP: #{e}")
+      end
+      new_resource.save
+    end
+  end
+
+  action :disassociate do
+    converge_by "Disassociating EIP Address #{new_resource.name} in #{new_resource.region_name}" do
+      begin
+        if existing_ip != nil
+          existing_ip.disassociate
+          new_resource.instance_id nil
+          new_resource.save
+        else
+          Chef::Log.warn("No EIP found to disassociate")
+        end
+      rescue => e
+        Chef::Application.fatal!("Error Disassociating EIP: #{e}")
+      end
+    end
+  end
+
+  def existing_ip
+    new_resource.hydrate
+    @existing_ip ||=  new_resource.public_ip == nil ? nil : begin
+      eip = ec2.elastic_ips[new_resource.public_ip]
+      eip
+    rescue => e
+      Chef::Application.fatal!("Error looking for EIP Address: #{e}")
+      nil
+    end
+  end
+
+
+end

data/lib/chef/provider/aws_key_pair.rb

@@ -176,7 +176,7 @@ class Chef::Provider::AwsKeyPair < Chef::Provider::AwsProvider
     @current_resource = Chef::Resource::AwsKeyPair.new(new_resource.name, run_context)
 
     current_key_pair = ec2.key_pairs[new_resource.name]
-    if current_key_pair
+    if current_key_pair && current_key_pair.exists?
       @current_fingerprint = current_key_pair ? current_key_pair.fingerprint : nil
     else
       current_resource.action :delete

data/lib/chef/provider/aws_s3_bucket.rb

@@ -7,6 +7,20 @@ class Chef::Provider::AwsS3Bucket < Chef::Provider::AwsProvider
       converge_by "Creating new S3 bucket #{fqn}" do
         bucket = s3.buckets.create(fqn)
         bucket.tags['Name'] = new_resource.name
+        if new_resource.enable_website_hosting
+          bucket.website_configuration = AWS::S3::WebsiteConfiguration.new(
+            new_resource.website_options)
+        end
+      end
+    elsif requires_modification?
+      converge_by "Modifying S3 Bucket #{fqn}" do
+        if existing_bucket.website_configuration == nil && new_resource.enable_website_hosting || 
+          existing_bucket.website_configuration != nil && new_resource.enable_website_hosting
+          existing_bucket.website_configuration = AWS::S3::WebsiteConfiguration.new(
+            new_resource.website_options)
+        else
+          existing_bucket.remove_website_configuration
+        end
       end
     end
 
@@ -29,13 +43,29 @@ class Chef::Provider::AwsS3Bucket < Chef::Provider::AwsProvider
     @existing_bucket ||= s3.buckets[fqn] if s3.buckets[fqn].exists?
   end
 
-  # Fully qualified bucket name (i.e resource_region unless otherwise specified)
-  def id
-    new_resource.bucket_name
+  def requires_modification?
+    if existing_bucket.website_configuration == nil
+      new_resource.enable_website_hosting
+    else
+      !new_resource.enable_website_hosting ||
+        !compare_website_configuration
+    end
   end
 
-  def fqn
-    super.gsub('_', '-')
+  def compare_website_configuration
+    # This is incomplete, routing rules have many optional values, so its
+    # possible aws will put in default values for those which won't be in
+    # the requested config.
+    new_web_config = new_resource.website_options
+    current_web_config = existing_bucket.website_configuration.to_hash
+
+    current_web_config[:index_document] == new_web_config.fetch(:index_document, {}) &&
+      current_web_config[:error_document] == new_web_config.fetch(:error_document, {}) &&
+      current_web_config[:routing_rules] == new_web_config.fetch(:routing_rules, [])
   end
 
+  # Fully qualified bucket name (i.e resource_region unless otherwise specified)
+  def id
+    new_resource.bucket_name || new_resource.name
+  end
 end

data/lib/chef/provisioning/aws_driver/credentials.rb

@@ -1,10 +1,11 @@
 require 'inifile'
 require 'csv'
+require 'chef/mixin/deep_merge'
 
 class Chef
 module Provisioning
 module AWSDriver
-  # Reads in a credentials file in Amazon's download format and presents the credentials to you
+  # Reads in credential files in Amazon's download format and presents the credentials to you
   class Credentials
     def initialize
       @credentials = {}
@@ -12,6 +13,7 @@ module AWSDriver
     end
 
     include Enumerable
+    include Chef::Mixin::DeepMerge
 
     def default
       if @credentials.size == 0
@@ -32,8 +34,16 @@ module AWSDriver
       @credentials.each(&block)
     end
 
-    def load_ini(credentials_ini_file)
-      inifile = IniFile.load(File.expand_path(credentials_ini_file))
+    def load_inis(config_ini_file, credentials_ini_file = nil)
+      @credentials = load_config_ini(config_ini_file)
+      @credentials = deep_merge!(@credentials,
+                                 load_credentials_ini(credentials_ini_file)
+                                ) if credentials_ini_file
+    end
+
+    def load_config_ini(config_ini_file)
+      inifile = IniFile.load(File.expand_path(config_ini_file))
+      config = {}
       if inifile
         inifile.each_section do |section|
           if section =~ /^\s*profile\s+(.+)$/ || section =~ /^\s*(default)\s*/
@@ -43,14 +53,27 @@ module AWSDriver
               result
             end
             profile[:name] = profile_name
-            @credentials[profile_name] = profile
+            config[profile_name] = profile
           end
         end
-      else
-        # Get it to throw an error
-        File.open(File.expand_path(credentials_ini_file)) do
+      end
+      config
+    end
+
+    def load_credentials_ini(credentials_ini_file)
+      inifile = IniFile.load(File.expand_path(credentials_ini_file))
+      config = {}
+      if inifile
+        inifile.each_section do |section|
+          profile = inifile[section].inject({}) do |result, pair|
+            result[pair[0].to_sym] = pair[1]
+            result
+          end
+          profile[:name] = section
+          config[section] = profile
         end
       end
+      config
     end
 
     def load_csv(credentials_csv_file)
@@ -66,8 +89,13 @@ module AWSDriver
 
     def load_default
       config_file = ENV['AWS_CONFIG_FILE'] || File.expand_path('~/.aws/config')
+      credentials_file = ENV['AWS_CREDENTIAL_FILE'] || File.expand_path('~/.aws/credentials')
       if File.file?(config_file)
-        load_ini(config_file)
+        if File.file?(credentials_file)
+          load_inis(config_file, credentials_file)
+        else
+          load_inis(config_file)
+        end
       end
     end
 

data/lib/chef/provisioning/aws_driver/driver.rb

@@ -56,8 +56,6 @@ module AWSDriver
       security_group_name = lb_options[:security_group_name] || 'default'
       security_group_id = lb_options[:security_group_id]
 
-      # TODO confused: this variable doesn't appear to be used?
-#        default_sg = ec2.security_groups.filter('group-name', 'default')
       security_group = if security_group_id.nil?
                          ec2.security_groups.filter('group-name', security_group_name).first
                        else
@@ -186,6 +184,18 @@ module AWSDriver
     end
 
     def destroy_load_balancer(action_handler, lb_spec, lb_options)
+      return if lb_spec == nil
+
+      actual_elb = load_balancer_for(lb_spec)
+      if actual_elb && actual_elb.exists?
+        # Remove ELB from AWS
+        action_handler.perform_action "Deleting EC2 ELB #{lb_spec.id}" do
+          actual_elb.delete
+        end
+      end
+
+      # Remove LB spec from databag
+      lb_spec.delete(action_handler)
     end
 
     # Image methods
@@ -201,7 +211,7 @@ module AWSDriver
     # Machine methods
     def allocate_machine(action_handler, machine_spec, machine_options)
       actual_instance = instance_for(machine_spec)
-      if actual_instance == nil || !actual_instance.exists?
+      if actual_instance == nil || !actual_instance.exists? || actual_instance.status == :terminated
         image_id = machine_options[:image_id] || default_ami_for_region(@region)
         bootstrap_options = machine_options[:bootstrap_options] || {}
         bootstrap_options[:image_id] = image_id
@@ -252,14 +262,14 @@ module AWSDriver
 
     def destroy_machine(action_handler, machine_spec, machine_options)
       instance = instance_for(machine_spec)
-      if instance
+      if instance && instance.exists?
         # TODO do we need to wait_until(action_handler, machine_spec, instance) { instance.status != :shutting_down } ?
         action_handler.perform_action "Terminate #{machine_spec.name} (#{machine_spec.location['instance_id']}) in #{@region} ..." do
           instance.terminate
           machine_spec.location = nil
         end
       else
-        Chef::Log.warn "Unable to find and destroy instance for #{machine_spec.inspect}"
+        Chef::Log.warn "Instance #{machine_spec.location['instance_id']} doesn't exist for #{machine_spec.name}"
       end
 
       strategy = convergence_strategy_for(machine_spec, machine_options)
@@ -365,6 +375,8 @@ module AWSDriver
           'ami-996706a3'
         when 'eu-west-1'
           'ami-4ab46b3d'
+        when 'eu-central-1'
+          'ami-7c3c0a61'
         when 'sa-east-1'
           'ami-6770d87a'
         when 'us-east-1'
@@ -380,7 +392,7 @@ module AWSDriver
 
     def create_ssh_transport(machine_spec, machine_options, instance)
       ssh_options = ssh_options_for(machine_spec, machine_options, instance)
-      username = machine_spec.location['ssh_username'] || default_ssh_username
+      username = machine_spec.location['ssh_username'] || machine_options[:ssh_username] || default_ssh_username
       if machine_options.has_key?(:ssh_username) && machine_options[:ssh_username] != machine_spec.location['ssh_username']
         Chef::Log.warn("Server #{machine_spec.name} was created with SSH username #{machine_spec.location['ssh_username']} and machine_options specifies username #{machine_options[:ssh_username]}.  Using #{machine_spec.location['ssh_username']}.  Please edit the node and change the chef_provisioning.location.ssh_username attribute if you want to change it.")
       end
@@ -444,6 +456,10 @@ module AWSDriver
     end
 
     def convergence_strategy_for(machine_spec, machine_options)
+      # Tell Ohai that this is an EC2 instance so that it runs the EC2 plugin
+      machine_options[:convergence_options] ||= {}
+      machine_options[:convergence_options][:ohai_hints] = { 'ec2' => ''}
+
       # Defaults
       if !machine_spec.location
         return Chef::Provisioning::ConvergenceStrategy::NoConverge.new(machine_options[:convergence_options], config)

data/lib/chef/provisioning/aws_driver/resources.rb

@@ -1,4 +1,4 @@
-resources = %w(sqs_queue sns_topic ebs_volume s3_bucket auto_scaling_group launch_config vpc security_group)
+resources = %w(sqs_queue sns_topic ebs_volume s3_bucket auto_scaling_group launch_config vpc security_group eip_address)
 
 resources.each do |r|
   Chef::Log.debug "AWS driver loading resource: #{r}"

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

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module AWSDriver
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end
 end
 end

data/lib/chef/resource/aws_eip_address.rb

@@ -0,0 +1,29 @@
+require 'chef/resource/aws_resource'
+require 'chef/provisioning/aws_driver'
+require 'chef/provisioning/machine_spec'
+
+class Chef::Resource::AwsEipAddress < Chef::Resource::AwsResource
+  self.resource_name = 'aws_eip_address'
+  self.databag_name = 'eip_addresses'
+
+  actions :create, :delete, :nothing, :associate, :disassociate
+  default_action :associate
+
+  stored_attribute :public_ip
+  stored_attribute :domain
+
+  attribute :name, :kind_of => String, :name_attribute => true
+  attribute :associate_to_vpc, :kind_of => [TrueClass, FalseClass], :default => false
+  attribute :machine, :kind_of => String
+  attribute :instance_id, :kind_of => String
+
+  def initialize(*args)
+    super
+  end
+
+  def after_created
+    super
+  end
+
+
+end

data/lib/chef/resource/aws_s3_bucket.rb

@@ -10,6 +10,8 @@ class Chef::Resource::AwsS3Bucket < Chef::Resource::AwsResource
 
   attribute :name, :kind_of => String, :name_attribute => true
   attribute :bucket_name, :kind_of => String
+  attribute :enable_website_hosting, :kind_of => [TrueClass, FalseClass], :default => false
+  attribute :website_options, :kind_of => Hash
 
   def initialize(*args)
     super

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'chef/dsl/recipe'
+require 'chef/provisioning'
+require 'chef/provisioning/aws_driver'
+
+RSpec.configure do |rspec|
+  rspec.run_all_when_everything_filtered = true
+  rspec.filter_run :focus
+  rspec.order = 'random'
+  rspec.expect_with(:rspec) { |c| c.syntax = :expect }
+  rspec.before { allow($stdout).to receive(:write) }
+end

data/spec/unit/aws_driver/credentials_spec.rb

@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+describe Chef::Provisioning::AWSDriver::Credentials do
+  context 'loading config INI files' do
+    let(:personal_credentials) do
+      { region: 'us-west-2',
+        aws_access_key_id: 'AKIAPERSONALKEY',
+        aws_secret_access_key: 'personalsecretaccesskey',
+        name: 'personal'
+      }
+    end
+
+    let(:work_iam_credentials) do
+      { region: 'us-east-1',
+        aws_access_key_id: 'AKIAWORKIAMKEY',
+        aws_secret_access_key: 'workiamsecretaccesskey',
+        name: 'work_iam'
+      }
+    end
+
+    let(:config_ini_file) do
+      @config ||= begin
+        ini = Tempfile.new('config_ini')
+        ini.write(
+          ['[profile personal]',
+           'region = us-west-2',
+           '[profile work_iam]',
+           'region = us-east-1'
+          ].join("\n")
+        )
+        ini.rewind
+        ini
+      end
+      @config
+    end
+
+    let(:credential_ini_file) do
+      @creds ||= begin
+        ini = Tempfile.new('credential_ini')
+        ini.write(
+          ['[personal]',
+           'aws_access_key_id = AKIAPERSONALKEY',
+           'aws_secret_access_key = personalsecretaccesskey',
+           '[work_iam]',
+           'aws_access_key_id = AKIAWORKIAMKEY',
+           'aws_secret_access_key = workiamsecretaccesskey'
+          ].join("\n")
+        )
+        ini.rewind
+        ini
+      end
+      @creds
+    end
+
+    let(:unified_config_ini_file) do
+      @ini ||= begin
+        ini = Tempfile.new('unified_config_ini')
+        ini.write(
+          ['[profile personal]',
+           'region = us-west-2',
+           'aws_access_key_id = AKIAPERSONALKEY',
+           'aws_secret_access_key = personalsecretaccesskey',
+           '[profile work_iam]',
+           'region = us-east-1',
+           'aws_access_key_id = AKIAWORKIAMKEY',
+           'aws_secret_access_key = workiamsecretaccesskey'
+          ].join("\n")
+        )
+        ini.rewind
+        ini
+      end
+      @ini
+    end
+
+    context 'unified config ini file' do
+      %w(work_iam personal).each do |profile|
+        it "loads the '#{profile}' profile from a unified config file" do
+          ENV['AWS_DEFAULT_PROFILE'] = profile
+          ENV['AWS_CREDENTIAL_FILE'] = nil
+          ENV['AWS_CONFIG_FILE'] = unified_config_ini_file.path
+          allow(File)
+            .to receive(:file?)
+            .with(File.expand_path('~/.aws/credentials'))
+            .and_return(false)
+          allow(File)
+            .to receive(:file?)
+            .with(File.expand_path(unified_config_ini_file.path))
+            .and_return(true)
+
+          expect(described_class.new.default)
+            .to eq(send("#{profile}_credentials"))
+        end
+      end
+    end
+
+    context 'separate config and credential ini files' do
+      %w(work_iam personal).each do |profile|
+        it "loads the '#{profile}' profile from a separate config files" do
+          ENV['AWS_DEFAULT_PROFILE'] = profile
+          ENV['AWS_CREDENTIAL_FILE'] = credential_ini_file.path
+          ENV['AWS_CONFIG_FILE'] = config_ini_file.path
+
+          expect(described_class.new.default)
+            .to eq(send("#{profile}_credentials"))
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.16.4
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +54,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -93,6 +107,7 @@ files:
 - Rakefile
 - lib/chef/provider/aws_auto_scaling_group.rb
 - lib/chef/provider/aws_ebs_volume.rb
+- lib/chef/provider/aws_eip_address.rb
 - lib/chef/provider/aws_key_pair.rb
 - lib/chef/provider/aws_launch_config.rb
 - lib/chef/provider/aws_provider.rb
@@ -112,6 +127,7 @@ files:
 - lib/chef/resource/aws_auto_scaling_group.rb
 - lib/chef/resource/aws_ebs_mount.rb
 - lib/chef/resource/aws_ebs_volume.rb
+- lib/chef/resource/aws_eip_address.rb
 - lib/chef/resource/aws_key_pair.rb
 - lib/chef/resource/aws_launch_config.rb
 - lib/chef/resource/aws_resource.rb
@@ -120,6 +136,8 @@ files:
 - lib/chef/resource/aws_sns_topic.rb
 - lib/chef/resource/aws_sqs_queue.rb
 - lib/chef/resource/aws_vpc.rb
+- spec/spec_helper.rb
+- spec/unit/aws_driver/credentials_spec.rb
 homepage: https://github.com/opscode/chef-provisioning-aws
 licenses: []
 metadata: {}