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

data/lib/chef/resource/aws_cache_subnet_group.rb

@@ -5,7 +5,7 @@ require 'chef/resource/aws_subnet'
 # @see http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/ElastiCache/Client/V20140930.html#create_cache_subnet_group-instance_method
 class Chef::Resource::AwsCacheSubnetGroup < Chef::Provisioning::AWSDriver::AWSResource
   # Note: There isn't actually an SDK class for Elasticache.
-  aws_sdk_type AWS::ElastiCache, id: :group_name
+  aws_sdk_type ::Aws::ElastiCache, id: :group_name
 
   # See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/ElastiCache/Client/V20140930.html#create_cache_subnet_group-instance_method
   # for information on possible values for each attribute. Values are passed
@@ -24,9 +24,9 @@ class Chef::Resource::AwsCacheSubnetGroup < Chef::Provisioning::AWSDriver::AWSRe
 
   # Subnets
   #
-  # @param :subnets [ String, Array, AwsSubnet, AWS::EC2::Subnet ] One or more subnets in the subnet group.
+  # @param :subnets [ String, Array, AwsSubnet, ::Aws::EC2::Subnet ] One or more subnets in the subnet group.
   attribute :subnets,
-            kind_of: [ String, Array, AwsSubnet, AWS::EC2::Subnet ],
+            kind_of: [ String, Array, AwsSubnet, ::Aws::EC2::Subnet ],
             required: true,
             coerce: proc { |v| [v].flatten }
 
@@ -35,7 +35,7 @@ class Chef::Resource::AwsCacheSubnetGroup < Chef::Provisioning::AWSDriver::AWSRe
       driver.elasticache
         .describe_cache_subnet_groups(cache_subnet_group_name: group_name)
         .data[:cache_subnet_groups].first
-    rescue AWS::ElastiCache::Errors::CacheSubnetGroupNotFoundFault
+    rescue ::Aws::ElastiCache::Errors::CacheSubnetGroupNotFoundFault
       nil
     end
   end

data/lib/chef/resource/aws_cloudsearch_domain.rb

@@ -11,7 +11,7 @@ module AWS
 end
 
 class Chef::Resource::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSResource
-  aws_sdk_type ::AWS::CloudSearch::Domain
+  aws_sdk_type ::Aws::CloudSearchDomain
   attribute :name, kind_of: String, name_attribute: true
   attribute :cloudsearch_api_version, equal_to: ["20130101", "20110201"], default: "20130101"
 

data/lib/chef/resource/aws_cloudwatch_alarm.rb

@@ -14,7 +14,7 @@ class Chef::Resource::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSRes
   attribute :evaluation_periods, :kind_of => Integer
   attribute :period, :kind_of => [Integer,Float], coerce: proc {|v| v.to_f}
   attribute :statistic, :kind_of => String
-  attribute :threshold, :kind_of => Integer
+  attribute :threshold, :kind_of => [Integer,Float]
   attribute :insufficient_data_actions, :kind_of => Array, coerce: proc {|v| [v].flatten}
   attribute :ok_actions, :kind_of => Array, coerce: proc {|v| [v].flatten}
   attribute :alarm_actions, :kind_of => Array, coerce: proc {|v| [v].flatten}

data/lib/chef/resource/aws_dhcp_options.rb

@@ -13,7 +13,7 @@ require 'chef/provisioning/aws_driver/aws_resource_with_entry'
 class Chef::Resource::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type AWS::EC2::DHCPOptions
+  aws_sdk_type ::Aws::EC2::DhcpOptions
 
   #
   # The Chef "idempotence name" of this DHCP options set.
@@ -53,7 +53,14 @@ class Chef::Resource::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSResourc
 
   def aws_object
     driver, id = get_driver_and_id
-    result = driver.ec2.dhcp_options[id] if id
-    result && result.exists? ? result : nil
+    ec2_resource = ::Aws::EC2::Resource.new(driver.ec2)
+    result = ec2_resource.dhcp_options(id) if id
+    result && exists?(result) ? result : nil
+  end
+
+  def exists?(result)
+    return true if result.data
+  rescue ::Aws::EC2::Errors::InvalidDhcpOptionIDNotFound
+    return false
   end
 end

data/lib/chef/resource/aws_ebs_volume.rb

@@ -4,11 +4,11 @@ require 'chef/resource/aws_instance'
 class Chef::Resource::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type AWS::EC2::Volume, backcompat_data_bag_name: 'ebs_volumes'
+  aws_sdk_type ::Aws::EC2::Volume, backcompat_data_bag_name: 'ebs_volumes'
 
   attribute :name,    kind_of: String, name_attribute: true
 
-  attribute :machine,           kind_of: [ String, FalseClass, AwsInstance, AWS::EC2::Instance, ::Aws::EC2::Instance ]
+  attribute :machine,           kind_of: [ String, FalseClass, AwsInstance, ::Aws::EC2::Instance, ::Aws::EC2::Instance ]
 
   attribute :availability_zone, kind_of: String, default: 'a'
   attribute :size,              kind_of: Integer, default: 8
@@ -25,7 +25,13 @@ class Chef::Resource::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSResourceW
 
   def aws_object
     driver, id = get_driver_and_id
-    result = driver.ec2.volumes[id] if id
-    result && result.exists? && ![:deleted, :deleting].include?(result.status) ? result : nil
+    result = driver.ec2_resource.volume(id) if id
+    result && exists?(result) && ![:deleted, :deleting].include?(result.state) ? result : nil
+  end
+  
+  def exists?(result)
+    return true if result.data
+  rescue ::Aws::EC2::Errors::InvalidVolumeNotFound
+    return false
   end
 end

data/lib/chef/resource/aws_eip_address.rb

@@ -1,7 +1,7 @@
 require 'chef/provisioning/aws_driver/aws_resource_with_entry'
 
 class Chef::Resource::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
-  aws_sdk_type AWS::EC2::ElasticIp, option_names: [ :public_ip ], id: :public_ip, managed_entry_id_name: 'public_ip', backcompat_data_bag_name: 'eip_addresses'
+  aws_sdk_type ::Aws::OpsWorks::Types::ElasticIp, option_names: [ :public_ip ], id: :public_ip, managed_entry_id_name: 'public_ip', backcompat_data_bag_name: 'eip_addresses'
 
   attribute :name, kind_of: String, name_attribute: true
 
@@ -12,12 +12,12 @@ class Chef::Resource::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSResource
   # Like other aws_id_attributes, this is read-only - you cannot provide it and expect
   # aws to honor it
   attribute :public_ip, kind_of: String, aws_id_attribute: true,
-    default: lazy { name =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/ ? name : nil }
+                        default: lazy { name =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/ ? name : nil }
 
   def aws_object
     driver, public_ip = get_driver_and_id
-    result = driver.ec2.elastic_ips[public_ip] if public_ip
-    result && result.exists? ? result : nil
+    result = driver.ec2.describe_addresses.addresses.find { |b| b.public_ip == public_ip }
+    result && !result.empty? ? result : nil
   end
 
   def action(*args)

data/lib/chef/resource/aws_elasticsearch_domain.rb

@@ -10,7 +10,7 @@ end
 class Chef::Resource::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type ::AWS::Elasticsearch::Domain
+  aws_sdk_type ::Aws::CloudSearchDomain
 
   attribute :domain_name, kind_of: String, name_attribute: true
 

data/lib/chef/resource/aws_iam_role.rb

@@ -44,7 +44,7 @@ class Chef::Resource::AwsIamRole < Chef::Provisioning::AWSDriver::AWSResource
   #
   # TODO: add when we get a policy resource
   #
-  # attribute :managed_policies, kind_of: [Array, String, ::Aws::Iam::Policy, AwsIamPolicy], coerce: proc { |value| [value].flatten }
+  # attribute :managed_policies, kind_of: [Array, String, ::Aws::IAM::Policy, AwsIamPolicy], coerce: proc { |value| [value].flatten }
 
   def aws_object
     driver.iam_resource.role(name).load

data/lib/chef/resource/aws_internet_gateway.rb

@@ -12,7 +12,7 @@
 class Chef::Resource::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type AWS::EC2::InternetGateway, id: :id
+  aws_sdk_type ::Aws::EC2::InternetGateway, id: :id
 
   require 'chef/resource/aws_vpc'
 
@@ -34,7 +34,7 @@ class Chef::Resource::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSRes
   # - An actual `aws_vpc` resource.
   # - An AWS `VPC` object.
   #
-  attribute :vpc, kind_of: [ String, AwsVpc, AWS::EC2::VPC ]
+  attribute :vpc, kind_of: [ String, AwsVpc, ::Aws::EC2::Vpc ]
 
   attribute :internet_gateway_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^igw-[a-f0-9]{8}$/ ? name : nil
@@ -42,7 +42,14 @@ class Chef::Resource::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSRes
 
   def aws_object
     driver, id = get_driver_and_id
-    result = driver.ec2.internet_gateways[id] if id
-    result && result.exists? ? result : nil
+    ec2_resource = ::Aws::EC2::Resource.new(driver.ec2)
+    result = ec2_resource.internet_gateway(id) if id
+    result && exists?(result) ? result : nil
+  end
+
+  def exists?(result)
+    return true if result.data
+  rescue ::Aws::EC2::Errors::InvalidInternetGatewayIDNotFound
+    return false
   end
 end

data/lib/chef/resource/aws_key_pair.rb

@@ -1,7 +1,7 @@
 require 'chef/provisioning/aws_driver/aws_resource'
 
 class Chef::Resource::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSResource
-  aws_sdk_type AWS::EC2::KeyPair, id: :name
+  aws_sdk_type ::Aws::EC2::KeyPair, id: :name
 
   # Private key to use as input (will be generated if it does not exist)
   attribute :private_key_path, :kind_of => String
@@ -14,7 +14,8 @@ class Chef::Resource::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSResource
   attribute :allow_overwrite, :kind_of => [TrueClass, FalseClass], :default => false
 
   def aws_object
-    result = driver.ec2.key_pairs[name]
-    result && result.exists? ? result : nil
+    resource = ::Aws::EC2::Resource.new(driver.ec2)
+    result = resource.key_pairs.find{|b| b.name==name}
+    result
   end
 end

data/lib/chef/resource/aws_launch_configuration.rb

@@ -1,15 +1,16 @@
 require 'chef/provisioning/aws_driver/aws_resource'
 
 class Chef::Resource::AwsLaunchConfiguration < Chef::Provisioning::AWSDriver::AWSResource
-  aws_sdk_type AWS::AutoScaling::LaunchConfiguration, id: :name
+  aws_sdk_type ::Aws::AutoScaling::LaunchConfiguration, id: :name
 
   attribute :name,          kind_of: String, name_attribute: true
-  attribute :image,         kind_of: [ String, AWS::EC2::Image, ::Aws::EC2::Image ]
+  attribute :image,         kind_of: [ String, ::Aws::EC2::Image, ::Aws::EC2::Image ]
   attribute :instance_type, kind_of: String
   attribute :options,       kind_of: Hash,   default: {}
 
   def aws_object
-    result = driver.auto_scaling.launch_configurations[name]
-    result && result.exists? ? result : nil
+    launchconfig = ::Aws::AutoScaling::LaunchConfiguration.new(name,{client: driver.auto_scaling_client} )
+    result = launchconfig.data
+    result
   end
 end

data/lib/chef/resource/aws_load_balancer.rb

@@ -4,7 +4,7 @@ require 'chef/provisioning/aws_driver/aws_taggable'
 class Chef::Resource::AwsLoadBalancer < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type AWS::ELB::LoadBalancer
+  aws_sdk_type ::Aws::AutoScaling::LoadBalancer
 
   attribute :name, kind_of: String,  name_attribute: true
 
@@ -13,7 +13,18 @@ class Chef::Resource::AwsLoadBalancer < Chef::Provisioning::AWSDriver::AWSResour
   }
 
   def aws_object
-    result = driver.elb.load_balancers[name]
-    result && result.exists? ? result : nil
+    result=nil
+    begin
+      result = driver.elb.describe_load_balancers({ load_balancer_names: [name] }).load_balancer_descriptions
+      if result.length == 1
+        result = result[0]
+      else
+        raise "Must have 0 or 1 load balancers which match name!"
+      end
+    rescue ::Aws::ElasticLoadBalancing::Errors::LoadBalancerNotFound => e
+      Chef::Log.debug("No loadbalancer named #{name} - returning nil!")
+      result = nil
+    end 
+    result
   end
 end

data/lib/chef/resource/aws_nat_gateway.rb

@@ -15,7 +15,7 @@
 # We provide this class because the AWS SDK V2 does not provide it (as of
 # May 2016). We copied the pattern in their SDK so when they do add a real
 # resource there shouldn't be a need for much translation.
-class Aws::EC2::NatGateway < Aws::Resources::Resource
+class Aws::EC2::NatGateway < ::Aws::Resources::Resource
   attr_reader :resource, :id, :nat_gateway_id, :vpc_id, :subnet_id, :nat_gateway_addresses
 
   def initialize(id, options = {})
@@ -84,7 +84,7 @@ class Chef::Resource::AwsNatGateway < Chef::Provisioning::AWSDriver::AWSResource
   # - An actual `aws_eip_address` resource.
   # - nil, meaning that no EIP exists yet and needs to be created.
   #
-  attribute :eip_address, kind_of: [ String, AWS::EC2::ElasticIp, AwsEipAddress, nil ], default: nil
+  attribute :eip_address, kind_of: [ String, ::Aws::OpsWorks::Types::ElasticIp, AwsEipAddress, nil ], default: nil
 
   attribute :nat_gateway_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^nat-[A-Fa-f0-9]{17}$/ ? name : nil

data/lib/chef/resource/aws_network_acl.rb

@@ -5,7 +5,7 @@ require 'chef/resource/aws_subnet'
 class Chef::Resource::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type AWS::EC2::NetworkACL
+  aws_sdk_type ::Aws::EC2::NetworkAcl
 
   #
   # The name of this network acl.
@@ -20,7 +20,7 @@ class Chef::Resource::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSResource
   # - An actual `aws_vpc` resource.
   # - An AWS `VPC` object.
   #
-  attribute :vpc, kind_of: [ String, AwsVpc, AWS::EC2::VPC ]
+  attribute :vpc, kind_of: [ String, AwsVpc, ::Aws::EC2::Vpc ]
 
   #
   # Accepts rules in the format:
@@ -50,14 +50,14 @@ class Chef::Resource::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSResource
 
   def aws_object
     driver, id = get_driver_and_id
-    result = driver.ec2.network_acls[id] if id
-    begin
-      # network_acls don't have an `exists?` method so have to query an attribute
-      result.vpc_id
-      result
-    rescue AWS::EC2::Errors::InvalidNetworkAclID::NotFound
-      nil
-    end
+    result = driver.ec2_resource.network_acl(id) if id
+    result && exists?(result) ? result : nil
+  end
+
+  def exists?(result)
+    return true if result.data
+  rescue ::Aws::EC2::Errors::InvalidNetworkAclIDNotFound
+    return false
   end
 
 end

data/lib/chef/resource/aws_network_interface.rb

@@ -5,7 +5,7 @@ require 'chef/resource/aws_eip_address'
 class Chef::Resource::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type AWS::EC2::NetworkInterface, option_names: []
+  aws_sdk_type ::Aws::EC2::NetworkInterface, option_names: []
 
   attribute :name,                   kind_of: String, name_attribute: true
 
@@ -13,7 +13,7 @@ class Chef::Resource::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSRe
     name =~ /^eni-[a-f0-9]{8}$/ ? name : nil
   }
 
-  attribute :subnet,                 kind_of: [ String, AWS::EC2::Subnet, AwsSubnet ]
+  attribute :subnet,                 kind_of: [ String, ::Aws::EC2::Subnet, AwsSubnet ]
 
   attribute :private_ip_address,     kind_of: String
 
@@ -21,16 +21,22 @@ class Chef::Resource::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSRe
 
   attribute :security_groups,        kind_of: Array #(Array<SecurityGroup>, Array<String>)
 
-  attribute :machine,                kind_of: [ String, FalseClass, AwsInstance, AWS::EC2::Instance, ::Aws::EC2::Instance ]
+  attribute :machine,                kind_of: [ String, FalseClass, AwsInstance, ::Aws::EC2::Instance, ::Aws::EC2::Instance ]
 
   attribute :device_index,           kind_of: Integer
 
   # TODO implement eip address association
-  #attribute :elastic_ip_address,     kind_of: [ String, AWS::EC2::ElasticIp, AwsEipAddress, FalseClass ]
+  #attribute :elastic_ip_address,     kind_of: [ String, ::Aws::OpsWorks::Types::ElasticIp, AwsEipAddress, FalseClass ]
 
   def aws_object
     driver, id = get_driver_and_id
-    result = driver.ec2.network_interfaces[id] if id
-    result && result.exists? ? result : nil
+    result = driver.ec2_resource.network_interface(id) if id
+    result && exists?(result) ? result : nil
+  end
+
+  def exists?(result)
+    return true if result.data
+  rescue ::Aws::EC2::Errors::InvalidNetworkInterfaceIDNotFound
+    return false
   end
 end

data/lib/chef/resource/aws_rds_parameter_group.rb

@@ -5,7 +5,7 @@ class Chef::Resource::AwsRdsParameterGroup < Chef::Provisioning::AWSDriver::AWSR
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
   # there is no class for a parameter group specifically
-  aws_sdk_type AWS::RDS
+  aws_sdk_type ::Aws::RDS
 
   attribute :name, kind_of: String, name_attribute: true
   attribute :db_parameter_group_family, kind_of: String, required: true
@@ -13,21 +13,21 @@ class Chef::Resource::AwsRdsParameterGroup < Chef::Provisioning::AWSDriver::AWSR
   attribute :parameters, kind_of: Array, default: []
 
   def aws_object
-    object = driver.rds.client.describe_db_parameter_groups(db_parameter_group_name: name)[:db_parameter_groups].first
+    object = driver.rds.describe_db_parameter_groups(db_parameter_group_name: name)[:db_parameter_groups].first
 
     # use paginated API to get all options
-    initial_request = driver.rds.client.describe_db_parameters(db_parameter_group_name: name, max_records: 100)
+    initial_request = driver.rds.describe_db_parameters(db_parameter_group_name: name, max_records: 100)
     marker = initial_request[:marker]
     parameters = initial_request[:parameters]
     while !marker.nil?
-      more_results = driver.rds.client.describe_db_parameters(db_parameter_group_name: name, max_records: 100, marker: marker)
+      more_results = driver.rds.describe_db_parameters(db_parameter_group_name: name, max_records: 100, marker: marker)
       parameters += more_results[:parameters]
       marker = more_results[:marker]
     end
-    object[:parameters] = parameters
+    # object[:parameters] = parameters
 
     object
-  rescue AWS::RDS::Errors::DBParameterGroupNotFound
+  rescue ::Aws::RDS::Errors::DBParameterGroupNotFound
     nil
   end
 

data/lib/chef/resource/aws_rds_subnet_group.rb

@@ -5,19 +5,18 @@ require 'chef/resource/aws_subnet'
 class Chef::Resource::AwsRdsSubnetGroup < Chef::Provisioning::AWSDriver::AWSRDSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type AWS::RDS
+  aws_sdk_type ::Aws::RDS
 
   attribute :name, kind_of: String, name_attribute: true
   attribute :description, kind_of: String, required: true
   attribute :subnets,
-            kind_of: [ String, Array, AwsSubnet, AWS::EC2::Subnet ],
+            kind_of: [ String, Array, AwsSubnet, ::Aws::EC2::Subnet ],
             required: true,
             coerce: proc { |v| [v].flatten }
 
   def aws_object
-    driver.rds.client
-      .describe_db_subnet_groups(db_subnet_group_name: name)[:db_subnet_groups].first
-  rescue AWS::RDS::Errors::DBSubnetGroupNotFoundFault
+    driver.rds.describe_db_subnet_groups(db_subnet_group_name: name)[:db_subnet_groups].first
+  rescue ::Aws::RDS::Errors::DBSubnetGroupNotFoundFault
     # triggered by describe_db_subnet_groups when the group can't
     # be found
     nil

data/lib/chef/resource/aws_route53_record_set.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-class Aws::Route53::Types::ResourceRecordSet
+class ::Aws::Route53::Types::ResourceRecordSet
   # removing AWS's trailing dots may not be the best thing, but otherwise our job gets much harder.
   def aws_key
     "#{name.sub(/\.$/, '')}"

data/lib/chef/resource/aws_route_table.rb

@@ -33,7 +33,7 @@ class Chef::Resource::AwsRouteTable < Chef::Provisioning::AWSDriver::AWSResource
   #
   # This is required for new route tables.
   #
-  attribute :vpc,    kind_of: [ String, AwsVpc, AWS::EC2::VPC ], required: true
+  attribute :vpc,    kind_of: [ String, AwsVpc, ::Aws::EC2::Vpc ], required: true
 
   #
   # Enable route propagation from one or more virtual private gateways

data/lib/chef/resource/aws_s3_bucket.rb

@@ -3,7 +3,7 @@ require 'chef/provisioning/aws_driver/aws_resource'
 class Chef::Resource::AwsS3Bucket < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type AWS::S3::Bucket, id: :name
+  aws_sdk_type ::Aws::S3::Bucket, id: :name
 
   attribute :name, :kind_of => String, :name_attribute => true
   attribute :options, :kind_of => Hash, :default => {}
@@ -12,7 +12,8 @@ class Chef::Resource::AwsS3Bucket < Chef::Provisioning::AWSDriver::AWSResource
   attribute :recursive_delete, :kind_of => [TrueClass, FalseClass], :default => false
 
   def aws_object
-    result = driver.s3.buckets[name]
+    resource = ::Aws::S3::Resource.new(driver.s3_client)
+    result = resource.buckets.find{|b| b.name==name}
     result && result.exists? ? result : nil
   end
 end