chef-provisioning-aws 2.2.2 → 3.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8493fa5ba480a6d3f285a70ed8b11d36576332c
-  data.tar.gz: da96881084a9ea489e95e4c5b337635a0f7a1091
+  metadata.gz: be58e21bd868bb850a868eb9e28d8cddbd845c7a
+  data.tar.gz: a700bfd36411280a8b69193c646ff9d413abe911
 SHA512:
-  metadata.gz: a6564d4a495ceb70502964e0ebe9a85236bf34395a02e579e2bacb09016f5615ed6a0ae1ce650309dbabe133c284af94c00841828eb440063ae8bc6b3853e090
-  data.tar.gz: a69529c284fbd20aa5f34b7ac84d0bb1d8383999309b7c45adf503d5208c89042521b0b0f82061f543c73d7ca13d3e0da70cb346737522f732bb67fd8834d0c6
+  metadata.gz: 3020304e7089b18d519ea75b9fc537174af9b553733d12d1a572bca11433184851da1e7aa1eda5f5ec2f9e0e4c786a80a1238ee7fd9ea7ab0dab9df0ce5e3be4
+  data.tar.gz: a10dac39f023c3fc0bc6ddc5ec7d9c53bc89206d140f44815e86e5853df4f4da8cd819e2a550cd5b0dafe298e851727335505b71bad7d61171c828842f1312ce

data/README.md

@@ -305,7 +305,7 @@ The `AWSProvider` class will automatically try to call `converge_tags` when runn
 def aws_tagger
   @aws_tagger ||= begin
     rds_strategy = Chef::Provisioning::AWSDriver::TaggingStrategy::RDS.new(
-      new_resource.driver.rds.client,
+      new_resource.driver.rds,
       construct_arn(new_resource),
       new_resource.aws_tags
     )

data/chef-provisioning-aws.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'chef-provisioning', '>= 1.0', '< 3.0'
 
-  s.add_dependency 'aws-sdk-v1', '>= 1.59.0'
   s.add_dependency 'aws-sdk', ['>= 2.2.18', '< 3.0']
   s.add_dependency 'retryable', '~> 2.0', '>= 2.0.1'
   s.add_dependency 'ubuntu_ami', '~> 0.4', '>= 0.4.1'

data/lib/chef/provider/aws_auto_scaling_group.rb

@@ -14,16 +14,18 @@ class Chef::Provider::AwsAutoScalingGroup < Chef::Provisioning::AWSDriver::AWSPr
       options = desired_options.dup
       options[:min_size] ||= 1
       options[:max_size] ||= 1
+      options[:auto_scaling_group_name] = new_resource.name
+      options[:launch_configuration_name] = new_resource.launch_configuration if new_resource.launch_configuration
+      options[:load_balancer_names] = new_resource.load_balancers if new_resource.load_balancers
 
-      aws_obj = new_resource.driver.auto_scaling.groups.create(
-        new_resource.name, options)
+      aws_obj = new_resource.driver.auto_scaling_resource.create_group(options)
 
       new_resource.scaling_policies.each do |policy_name, policy|
-        aws_obj.scaling_policies.put(policy_name.to_s, policy)
+        aws_obj.put_scaling_policy(policy_name: policy_name, adjustment_type: policy[:adjustment_type], scaling_adjustment: policy[:scaling_adjustment])
       end
 
       new_resource.notification_configurations.each do |config|
-        aws_obj.notification_configurations.create(config)
+        aws_obj.client.put_notification_configuration(auto_scaling_group_name: aws_obj.name, topic_arn: config[:topic], notification_types: config[:types])
       end
 
       aws_obj
@@ -36,14 +38,15 @@ class Chef::Provider::AwsAutoScalingGroup < Chef::Provisioning::AWSDriver::AWSPr
 
   def destroy_aws_object(group)
     converge_by "delete Auto Scaling group #{new_resource.name} in #{region}" do
-      group.delete!
+      group.delete(force_delete: true)
+      group.wait_until_not_exists
     end
   end
 
   def desired_options
     @desired_options ||= begin
       options = new_resource.options.dup
-      %w(launch_configuration min_size max_size availability_zones desired_capacity load_balancers).each do |var|
+      %w( min_size max_size availability_zones desired_capacity ).each do |var|
         var = var.to_sym
         value = new_resource.public_send(var)
         options[var] = value if value

data/lib/chef/provider/aws_dhcp_options.rb

@@ -14,18 +14,24 @@ class Chef::Provider::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSProvide
     end
 
     converge_by "create DHCP options #{new_resource.name} in #{region}" do
-      dhcp_options = new_resource.driver.ec2.dhcp_options.create(options)
-      retry_with_backoff(AWS::EC2::Errors::InvalidDhcpOptionsID::NotFound) do
-        dhcp_options.tags['Name'] = new_resource.name
-      end
-      dhcp_options
+      create_dhcp_options options
+    end
+  end
+
+  def create_dhcp_options options
+    options = options.map{|k,v| {key: k.to_s.gsub('_', '-'), values: Array(v).map(&:to_s)}}
+    ec2_resource = ::Aws::EC2::Resource.new(new_resource.driver.ec2)
+    dhcp_options = ec2_resource.create_dhcp_options({dhcp_configurations: options})
+    retry_with_backoff(::Aws::EC2::Errors::InvalidDhcpOptionIDNotFound) do
+      dhcp_options.create_tags({tags: [{key: "Name", value: new_resource.name}]})
     end
+    dhcp_options
   end
 
   def update_aws_object(dhcp_options)
     # Verify unmodifiable attributes of existing dhcp_options
-    config = dhcp_options.configuration
-    differing_options = desired_options.select { |name, value| config[name] != value }
+    config = dhcp_options.data.to_h[:dhcp_configurations].map{|a|{a[:key].gsub('-', '_').to_sym => a[:values].map{|k|k[:value]} }}.reduce Hash.new, :merge
+    differing_options = desired_options.select { |name, value| config[name] != Array(value).map(&:to_s) }
     if !differing_options.empty?
       old_dhcp_options = dhcp_options
       # Report what we are trying to change ...
@@ -36,14 +42,18 @@ class Chef::Provider::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSProvide
 
       # create new dhcp_options
       if action_handler.should_perform_actions
-        dhcp_options = AWS.ec2(config: dhcp_options.config).dhcp_options.create(config.merge(desired_options))
+        dhcp_options = create_dhcp_options(config.merge(desired_options))
       end
       action_handler.report_progress "create DHCP options #{dhcp_options.id} with new attributes in #{region}"
 
       # attach dhcp_options to existing vpcs
-      old_dhcp_options.vpcs.each do |vpc|
-        action_handler.perform_action "attach DHCP options #{dhcp_options.id} to vpc #{vpc.id}" do
-          vpc.dhcp_options = dhcp_options
+      ec2_resource = ::Aws::EC2::Resource.new(new_resource.driver.ec2)
+      ec2_resource.vpcs.each do |vpc|
+        if vpc.dhcp_options_id == old_dhcp_options.id
+          dhcp_options.associate_with_vpc({
+            dry_run: false,
+            vpc_id: vpc.id, # required
+          })
         end
       end
 

data/lib/chef/provider/aws_ebs_volume.rb

@@ -39,9 +39,9 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   def create_aws_object
     volume = nil
     converge_by "create #{new_resource} in #{region}" do
-      volume = new_resource.driver.ec2.volumes.create(initial_options)
-      retry_with_backoff(AWS::EC2::Errors::InvalidVolumeID::NotFound) do
-        volume.tags['Name'] = new_resource.name
+      volume = new_resource.driver.ec2_resource.create_volume(initial_options)
+      retry_with_backoff(::Aws::EC2::Errors::InvalidVolumeNotFound) do
+        new_resource.driver.ec2_resource.create_tags(resources: [volume.volume_id],tags: [{key: "Name", value: new_resource.name}])
       end
       volume
     end
@@ -54,8 +54,8 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
 
   def update_aws_object(volume)
     if initial_options.has_key?(:availability_zone)
-      if availability_zone != volume.availability_zone_name
-        raise "#{new_resource}.availability_zone is #{availability_zone}, but actual volume has availability_zone_name set to #{volume.availability_zone_name}.  Cannot be modified!"
+      if availability_zone != volume.availability_zone
+        raise "#{new_resource}.availability_zone is #{availability_zone}, but actual volume has availability_zone_name set to #{volume.availability_zone}.  Cannot be modified!"
       end
     end
     if initial_options.has_key?(:size)
@@ -63,9 +63,9 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
         raise "#{new_resource}.size is #{new_resource.size}, but actual volume has size set to #{volume.size}.  Cannot be modified!"
       end
     end
-    if initial_options.has_key?(:snapshot)
-      if initial_options[:snapshot] != volume.snapshot.id
-        raise "#{new_resource}.snapshot is #{new_resource.snapshot}, but actual volume has snapshot set to #{volume.snapshot.id}.  Cannot be modified!"
+    if initial_options.has_key?(:snapshot_id)
+      if initial_options[:snapshot_id] != volume.snapshot_id
+        raise "#{new_resource}.snapshot is #{new_resource.snapshot}, but actual volume has snapshot set to #{volume.snapshot_id}.  Cannot be modified!"
       end
     end
     if initial_options.has_key?(:iops)
@@ -74,7 +74,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
       end
     end
     if initial_options.has_key?(:volume_type)
-      if initial_options[:volume_type] != volume.type
+      if initial_options[:volume_type] != volume.volume_type
         raise "#{new_resource}.volume_type is #{new_resource.volume_type}, but actual volume has type set to #{volume.type}.  Cannot be modified!"
       end
     end
@@ -86,7 +86,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def destroy_aws_object(volume)
-    detach(volume) if volume.status == :in_use
+    detach(volume) if volume.state == "in-use"
     delete(volume)
   end
 
@@ -119,20 +119,20 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def update_attachment(volume)
-    status = volume.status
+    status = new_resource.driver.ec2_resource.volume(volume.id).state
     #
     # If we were told to attach the volume to a machine, do so
     #
-    if expected_instance.is_a?(AWS::EC2::Instance) || expected_instance.is_a?(::Aws::EC2::Instance)
+    if expected_instance.is_a?(::Aws::EC2::Instance) || expected_instance.is_a?(::Aws::EC2::Instance)
       case status
-      when :in_use
+      when "in-use"
         # We don't want to attempt to reattach to the same instance and device
         attachment = current_attachment(volume)
-        if attachment.instance.id != expected_instance.id || attachment.device != new_resource.device
+        if attachment.instance_id != expected_instance.id || attachment.device != new_resource.device
           detach(volume)
           attach(volume)
         end
-      when :available
+      when "available"
         attach(volume)
       when nil
         raise VolumeNotFoundError.new(new_resource)
@@ -147,7 +147,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
       case status
       when nil
         Chef::Log.warn VolumeNotFoundError.new(new_resource)
-      when :in_use
+      when "in-use"
         detach(volume)
       end
     end
@@ -155,23 +155,24 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def wait_for_volume_status(volume, expected_status)
-    initial_status = volume.status
     log_callback = proc {
       Chef::Log.info("waiting for #{new_resource} status to change to #{expected_status}...")
     }
 
-    Retryable.retryable(:tries => 30, :sleep => 2, :on => VolumeStatusTimeoutError, :ensure => log_callback) do
-      raise VolumeStatusTimeoutError.new(new_resource, initial_status, expected_status) if volume.status != expected_status
+    Retryable.retryable(:tries => 120, :sleep => 2, :on => VolumeStatusTimeoutError, :ensure => log_callback) do
+      status = new_resource.driver.ec2_resource.volume(volume.id).state
+      expected_status = "in-use" if expected_status.to_s.eql?("in_use")
+      raise VolumeStatusTimeoutError.new(new_resource, status, expected_status) if status != expected_status.to_s
     end
   end
 
   def detach(volume)
     attachment = current_attachment(volume)
-    instance = attachment.instance
+    instance = attachment.instance_id
     device   = attachment.device
 
-    converge_by "detach #{new_resource} from #{new_resource.machine} (#{instance.instance_id})" do
-      volume.detach_from(instance, device)
+    converge_by "detach #{new_resource} from #{new_resource.machine} (#{instance})" do
+      volume.detach_from_instance(instance_id: instance, device: device)
     end
 
     converge_by "wait for #{new_resource} to detach" do
@@ -182,7 +183,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
 
   def attach(volume)
     converge_by "attach #{new_resource} to #{new_resource.machine} (#{expected_instance.instance_id}) to device #{new_resource.device}" do
-      volume.attach_to(expected_instance, new_resource.device)
+      volume.attach_to_instance(instance_id: expected_instance.id, device: new_resource.device)
     end
 
     converge_by "wait for #{new_resource} to attach" do
@@ -206,7 +207,8 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
       }
 
       Retryable.retryable(:tries => 30, :sleep => 2, :on => VolumeStatusTimeoutError, :ensure => log_callback) do
-        raise VolumeStatusTimeoutError.new(new_resource, 'exists', 'deleted') if volume.exists?
+        result = new_resource.driver.ec2_resource.volume(volume.id) if volume.id
+        raise VolumeStatusTimeoutError.new(new_resource, "exists", "deleted") if new_resource.exists?(result)
       end
       volume
     end

data/lib/chef/provider/aws_eip_address.rb

@@ -20,32 +20,32 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
     converge_by "create Elastic IP address in #{region}" do
       associate_to_vpc = new_resource.associate_to_vpc
       if associate_to_vpc.nil?
-        if desired_instance.is_a?(AWS::EC2::Instance) || desired_instance.is_a?(::Aws::EC2::Instance)
+        if desired_instance.is_a?(::Aws::EC2::Instance) || desired_instance.is_a?(::Aws::EC2::Instance)
           associate_to_vpc = !!desired_instance.vpc_id
           Chef::Log.debug "Since associate_to_vpc is not specified and instance #{new_resource.machine} (#{desired_instance.id}) and #{associate_to_vpc ? "is" : "is not"} in a VPC, setting associate_to_vpc to #{associate_to_vpc}."
         end
       end
-      new_resource.driver.ec2.elastic_ips.create vpc: new_resource.associate_to_vpc
+      new_resource.driver.ec2.allocate_address vpc: new_resource.associate_to_vpc
     end
   end
 
   def update_aws_object(elastic_ip)
     if !new_resource.associate_to_vpc.nil?
-      if !!new_resource.associate_to_vpc != !!elastic_ip.vpc?
-        raise "#{new_resource.to_s}.associate_to_vpc = #{new_resource.associate_to_vpc}, but actual IP address has vpc? set to #{elastic_ip.vpc?}.  Cannot be modified!"
+      if new_resource.associate_to_vpc != (elastic_ip.domain == "vpc")
+        raise "#{new_resource}.associate_to_vpc = #{new_resource.associate_to_vpc}, but actual IP address has vpc? set to #{(elastic_ip.domain == 'vpc')}.  Cannot be modified!"
       end
     end
   end
 
   def destroy_aws_object(elastic_ip)
     #if it's attached to something in a vpc, disassociate first
-    if elastic_ip.instance_id != nil && elastic_ip.domain == 'vpc'
+    if !elastic_ip.instance_id.nil? && elastic_ip.domain == "vpc"
       converge_by "dissociate Elastic IP address #{new_resource.name} (#{elastic_ip.public_ip}) from #{elastic_ip.instance_id}" do
-        elastic_ip.disassociate
+        new_resource.driver.ec2.disassociate_address public_ip: elastic_ip.public_ip
       end
     end
     converge_by "delete Elastic IP address #{new_resource.name} (#{elastic_ip.public_ip}) in #{region}" do
-      elastic_ip.delete
+      new_resource.driver.ec2.release_address allocation_id: elastic_ip.allocation_id
     end
   end
 
@@ -66,10 +66,10 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
     #
     # If we were told to associate the IP to a machine, do so
     #
-    if desired_instance.is_a?(AWS::EC2::Instance) || desired_instance.is_a?(::Aws::EC2::Instance)
+    if desired_instance.is_a?(::Aws::EC2::Instance) || desired_instance.is_a?(::Aws::EC2::Instance)
       if desired_instance.id != elastic_ip.instance_id
         converge_by "associate Elastic IP address #{new_resource.name} (#{elastic_ip.public_ip}) with #{new_resource.machine} (#{desired_instance.id})" do
-          elastic_ip.associate instance: desired_instance.id
+          new_resource.driver.ec2.associate_address instance_id: desired_instance.id, allocation_id: elastic_ip.allocation_id
         end
       end
 
@@ -77,13 +77,12 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
     # If we were told to set the association to false, disassociate it.
     #
     else
-      if elastic_ip.associated?
+      if !(elastic_ip.association_id.nil?)
         converge_by "disassociate Elastic IP address #{new_resource.name} (#{elastic_ip.public_ip}) from #{elastic_ip.instance_id} in #{region}" do
-          aws_object.disassociate
+          new_resource.driver.ec2.disassociate_address public_ip: elastic_ip.public_ip
         end
       end
     end
-
   end
 
 end

data/lib/chef/provider/aws_image.rb

@@ -12,7 +12,7 @@ class Chef::Provider::AwsImage < Chef::Provisioning::AWSDriver::AWSProvider
     unless instance_id
       # This is an old image and doesn't have the tag added - lets try and find it from the block device mapping
       image.block_device_mappings.map do |dev, opts|
-        snapshot = new_resource.driver.ec2.snapshots[opts[:snapshot_id]]
+        snapshot = new_resource.driver.ec2_resource.snapshot(opts[:snapshot_id])
         desc = snapshot.description
         m = /CreateImage\(([^\)]+)\)/.match(desc)
         if m

data/lib/chef/provider/aws_internet_gateway.rb

@@ -17,9 +17,10 @@ class Chef::Provider::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSPro
     desired_vpc = Chef::Resource::AwsVpc.get_aws_object(new_resource.vpc, resource: new_resource) if new_resource.vpc
 
     converge_by "create internet gateway #{new_resource.name} in region #{region}" do
-      internet_gateway = new_resource.driver.ec2.internet_gateways.create
-      retry_with_backoff(AWS::EC2::Errors::InvalidInternetGatewayID::NotFound) do
-        internet_gateway.tags['Name'] = new_resource.name
+      ec2_resource = ::Aws::EC2::Resource.new(new_resource.driver.ec2)
+      internet_gateway = ec2_resource.create_internet_gateway
+      retry_with_backoff(::Aws::EC2::Errors::InvalidInternetGatewayIDNotFound) do
+        internet_gateway.create_tags({tags: [{key: "Name", value: new_resource.name}]})
       end
 
       if desired_vpc
@@ -31,11 +32,15 @@ class Chef::Provider::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSPro
   end
 
   def update_aws_object(internet_gateway)
-    current_vpc = internet_gateway.vpc
+    ec2_resource = new_resource.driver.ec2.describe_internet_gateways(:internet_gateway_ids=>[internet_gateway.id])
+    current_vpc = ec2_resource.internet_gateways.first.attachments.first
 
     if new_resource.vpc
       desired_vpc = Chef::Resource::AwsVpc.get_aws_object(new_resource.vpc, resource: new_resource)
-      if current_vpc != desired_vpc
+      current_vpc_id = current_vpc.vpc_id unless current_vpc.nil?
+      desired_vpc_id = desired_vpc.vpc_id unless desired_vpc.nil?
+      if current_vpc_id != desired_vpc_id
+        detach_vpc(internet_gateway)
         attach_vpc(desired_vpc, internet_gateway)
       end
     end
@@ -51,7 +56,7 @@ class Chef::Provider::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSPro
   private
 
   def attach_vpc(vpc, desired_gateway)
-    if vpc.internet_gateway && vpc.internet_gateway != desired_gateway
+    if vpc.internet_gateways.first && vpc.internet_gateways.first != desired_gateway
       current_driver = self.new_resource.driver
       current_chef_server = self.new_resource.chef_server
       Cheffish.inline_resource(self, action) do
@@ -64,14 +69,17 @@ class Chef::Provider::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSPro
       end
     end
     converge_by "attach vpc #{vpc.id} to #{desired_gateway.id}" do
-      desired_gateway.vpc = vpc
+      desired_gateway.attach_to_vpc(vpc_id: vpc.id)
     end
   end
 
   def detach_vpc(internet_gateway)
-    if internet_gateway.vpc
-      converge_by "detach vpc #{internet_gateway.vpc.id} from internet gateway #{internet_gateway.id}" do
-        internet_gateway.detach(internet_gateway.vpc)
+    ec2_resource = new_resource.driver.ec2.describe_internet_gateways(:internet_gateway_ids=>[internet_gateway.id])
+    vpcid = ec2_resource.internet_gateways.first.attachments.first
+    vpc_id = vpcid.vpc_id unless vpcid.nil?
+    if vpc_id
+      converge_by "detach vpc #{vpc_id} from internet gateway #{internet_gateway.id}" do
+        internet_gateway.detach_from_vpc(vpc_id: vpc_id)
       end
     end
   end

data/lib/chef/provider/aws_key_pair.rb

@@ -1,6 +1,6 @@
 require 'chef/provider/lwrp_base'
 require 'chef/provisioning/aws_driver/aws_provider'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
 
 class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
@@ -13,7 +13,7 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
   action :destroy do
     if current_resource_exists?
       converge_by "delete AWS key pair #{new_resource.name} on region #{region}" do
-        driver.ec2.key_pairs[new_resource.name].delete
+        driver.ec2.delete_key_pair({key_name:new_resource.name})
       end
     end
   end
@@ -75,8 +75,8 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
       if !new_fingerprints.any? { |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
-            driver.ec2.key_pairs[new_resource.name].delete
-            driver.ec2.key_pairs.import(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            driver.ec2.delete_key_pair({key_name:new_resource.name})
+            driver.ec2.import_key_pair({key_name: new_resource.name, public_key_material: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)})
           end
         else
           raise "#{key_description} with fingerprint #{@current_fingerprint} does not match local key fingerprint(s) #{new_fingerprints}, and allow_overwrite is false!"
@@ -88,7 +88,7 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
 
       # Create key
       converge_by "create #{key_description} from local key at #{new_resource.private_key_path}" do
-        driver.ec2.key_pairs.import(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        driver.ec2.import_key_pair({key_name: new_resource.name, public_key_material: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)})
       end
     end
   end
@@ -169,7 +169,7 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
 
     current_key_pair = new_resource.aws_object
     if current_key_pair
-      @current_fingerprint = current_key_pair.fingerprint
+      @current_fingerprint = current_key_pair.key_fingerprint
     else
       current_resource.action [:destroy]
     end

data/lib/chef/provider/aws_launch_configuration.rb

@@ -10,14 +10,12 @@ class Chef::Provider::AwsLaunchConfiguration < Chef::Provisioning::AWSDriver::AW
     image_id = Chef::Resource::AwsImage.get_aws_object_id(new_resource.image, resource: new_resource)
     instance_type = new_resource.instance_type || new_resource.driver.default_instance_type
     options = AWSResource.lookup_options(new_resource.options || options, resource: new_resource)
+    options[:launch_configuration_name] = new_resource.name if new_resource.name
+    options[:image_id] = image_id
+    options[:instance_type] = instance_type
 
     converge_by "create launch configuration #{new_resource.name} in #{region}" do
-      new_resource.driver.auto_scaling.launch_configurations.create(
-        new_resource.name,
-        image_id,
-        instance_type,
-        options
-      )
+      new_resource.driver.auto_scaling_client.create_launch_configuration(options)
     end
   end
 
@@ -25,7 +23,7 @@ class Chef::Provider::AwsLaunchConfiguration < Chef::Provisioning::AWSDriver::AW
     if new_resource.image
       image_id = Chef::Resource::AwsImage.get_aws_object_id(new_resource.image, resource: new_resource)
       if image_id != launch_configuration.image_id
-        raise "#{new_resource.to_s}.image = #{new_resource.image} (#{image.id}), but actual launch configuration has image set to #{launch_configuration.image_id}.  Cannot be modified!"
+        raise "#{new_resource.to_s}.image = #{new_resource.image}, but actual launch configuration has image set to #{launch_configuration.image_id}.  Cannot be modified!"
       end
     end
     if new_resource.instance_type
@@ -41,8 +39,8 @@ class Chef::Provider::AwsLaunchConfiguration < Chef::Provisioning::AWSDriver::AW
       # TODO add a timeout here.
       # TODO is InUse really a status guaranteed to go away??
       begin
-        launch_configuration.delete
-      rescue AWS::AutoScaling::Errors::ResourceInUse
+        new_resource.driver.auto_scaling_client.delete_launch_configuration(launch_configuration_name: launch_configuration.launch_configuration_name)
+      rescue ::Aws::AutoScaling::Errors::ResourceInUse
         sleep 5
         retry
       end