awspec 0.33.0 → 0.34.0

data/lib/awspec/helper/finder/security_group.rb

@@ -1,29 +1,28 @@
 module Awspec::Helper
   module Finder
     module SecurityGroup
-      def find_security_group(id)
+      def find_security_group(sg_id)
         res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'group-id', values: [id] }]
+                                                    filters: [{ name: 'group-id', values: [sg_id] }]
                                                   })
-
-        return res[:security_groups].first if res[:security_groups].count == 1
+        resource = res.security_groups.single_resource(sg_id)
+        return resource if resource
         res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'group-name', values: [id] }]
+                                                    filters: [{ name: 'group-name', values: [sg_id] }]
                                                   })
-
-        return res[:security_groups].first if res[:security_groups].count == 1
+        resource = res.security_groups.single_resource(sg_id)
+        return resource if resource
         res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'tag:Name', values: [id] }]
+                                                    filters: [{ name: 'tag:Name', values: [sg_id] }]
                                                   })
-
-        return res[:security_groups].first if res[:security_groups].count == 1
+        res.security_groups.single_resource(sg_id)
       end
 
       def select_security_group_by_vpc_id(vpc_id)
         res = ec2_client.describe_security_groups({
                                                     filters: [{ name: 'vpc-id', values: [vpc_id] }]
                                                   })
-        res[:security_groups]
+        res.security_groups
       end
     end
   end

data/lib/awspec/helper/finder/ses.rb

@@ -3,10 +3,10 @@ module Awspec::Helper
     module Ses
       def find_ses_identity(id)
         res = ses_client.list_identities
-        ret = res[:identities].select do |identity|
+        ret = res.identities.select do |identity|
           identity == id
         end
-        ret.first if ret.count == 1
+        ret.single_resource(id)
       end
     end
   end

data/lib/awspec/helper/finder/subnet.rb

@@ -0,0 +1,24 @@
+module Awspec::Helper
+  module Finder
+    module Subnet
+      def find_subnet(subnet_id)
+        res = ec2_client.describe_subnets({
+                                            filters: [{ name: 'subnet-id', values: [subnet_id] }]
+                                          })
+        resource = res.subnets.single_resource(subnet_id)
+        return resource if resource
+        res = ec2_client.describe_subnets({
+                                            filters: [{ name: 'tag:Name', values: [subnet_id] }]
+                                          })
+        res.subnets.single_resource(subnet_id)
+      end
+
+      def select_subnet_by_vpc_id(vpc_id)
+        res = ec2_client.describe_subnets({
+                                            filters: [{ name: 'vpc-id', values: [vpc_id] }]
+                                          })
+        res.subnets
+      end
+    end
+  end
+end

data/lib/awspec/helper/finder/vpc.rb

@@ -5,65 +5,50 @@ module Awspec::Helper
         res = ec2_client.describe_vpcs({
                                          filters: [{ name: 'vpc-id', values: [id] }]
                                        })
-        return res[:vpcs].first if res[:vpcs].count == 1
+        resource = res.vpcs.single_resource(id)
+        return resource if resource
         res = ec2_client.describe_vpcs({
                                          filters: [{ name: 'tag:Name', values: [id] }]
                                        })
-        return res[:vpcs].first if res[:vpcs].count == 1
+        res.vpcs.single_resource(id)
       end
 
       def find_route_table(route_table_id)
         res = ec2_client.describe_route_tables({
                                                  filters: [{ name: 'route-table-id', values: [route_table_id] }]
                                                })
-        return res[:route_tables].first if res[:route_tables].count == 1
+        resource = res.route_tables.single_resource(route_table_id)
+        return resource if resource
         res = ec2_client.describe_route_tables({
                                                  filters: [{ name: 'tag:Name', values: [route_table_id] }]
                                                })
-        return res[:route_tables].first if res[:route_tables].count == 1
+        res.route_tables.single_resource(route_table_id)
       end
 
       def find_network_acl(id)
         res = ec2_client.describe_network_acls({
                                                  filters: [{ name: 'network-acl-id', values: [id] }]
                                                })
-        return res[:network_acls].first if res[:network_acls].count == 1
+        resource = res.network_acls.single_resource(id)
+        return resource if resource
         res = ec2_client.describe_network_acls({
                                                  filters: [{ name: 'tag:Name', values: [id] }]
                                                })
-        return res[:network_acls].first if res[:network_acls].count == 1
+        res.network_acls.single_resource(id)
       end
 
       def select_route_table_by_vpc_id(vpc_id)
         res = ec2_client.describe_route_tables({
                                                  filters: [{ name: 'vpc-id', values: [vpc_id] }]
                                                })
-        res[:route_tables]
+        res.route_tables
       end
 
       def select_network_acl_by_vpc_id(vpc_id)
         res = ec2_client.describe_network_acls({
                                                  filters: [{ name: 'vpc-id', values: [vpc_id] }]
                                                })
-        res[:network_acls]
-      end
-
-      def find_subnet(subnet_id)
-        res = ec2_client.describe_subnets({
-                                            filters: [{ name: 'subnet-id', values: [subnet_id] }]
-                                          })
-        return res[:subnets].first if res[:subnets].count == 1
-        res = ec2_client.describe_subnets({
-                                            filters: [{ name: 'tag:Name', values: [subnet_id] }]
-                                          })
-        return res[:subnets].first if res[:subnets].count == 1
-      end
-
-      def select_subnet_by_vpc_id(vpc_id)
-        res = ec2_client.describe_subnets({
-                                            filters: [{ name: 'vpc-id', values: [vpc_id] }]
-                                          })
-        res[:subnets]
+        res.network_acls
       end
 
       def find_vpc_peering_connection(vpc_peering_connection_id)
@@ -75,7 +60,8 @@ module Awspec::Helper
                                                               }
                                                             ]
                                                           })
-        return res[:vpc_peering_connections].first if res[:vpc_peering_connections].count == 1
+        resource = res.vpc_peering_connections.single_resource(vpc_peering_connection_id)
+        return resource if resource
         res = ec2_client.describe_vpc_peering_connections({
                                                             filters: [
                                                               {
@@ -84,7 +70,7 @@ module Awspec::Helper
                                                               }
                                                             ]
                                                           })
-        return res[:vpc_peering_connections].first if res[:vpc_peering_connections].count == 1
+        res.vpc_peering_connections.single_resource(vpc_peering_connection_id)
       end
     end
   end

data/lib/awspec/helper/type.rb

@@ -19,18 +19,16 @@ module Awspec
         end
       end
 
-      # deprecated resource type
-      def auto_scaling_group(name)
-        puts ''
-        puts Color.on_red(Color.white('!!! `auto_scaling_group` type is deprecated. use `autoscaling_group` !!!'))
-        Awspec::Type::AutoscalingGroup.new(name)
+      def self.deprecate_resource_type(old_type, new_type)
+        define_method(old_type) do |*args, &block|
+          puts ''
+          warn Color.on_red(Color.white("!!! `#{old_type}` type is deprecated. use `#{new_type}` !!!"))
+          send(new_type, *args, &block)
+        end
       end
 
-      def s3(name)
-        puts ''
-        puts Color.on_red(Color.white('!!! `s3` type is deprecated. use `s3_bucket` !!!'))
-        Awspec::Type::S3Bucket.new(name)
-      end
+      deprecate_resource_type :auto_scaling_group, :autoscaling_group
+      deprecate_resource_type :s3, :s3_bucket
     end
   end
 end

data/lib/awspec/matcher/have_route.rb

@@ -20,7 +20,7 @@ RSpec::Matchers.define :have_route do |destination|
   chain :destination do |dest|
     # rubocop:disable Metrics/LineLength
     puts ''
-    puts Color.on_red(Color.white('!!! route_table destination is deprecated. see https://github.com/k1LoW/awspec/pull/65 !!!'))
+    warn Color.on_red(Color.white('!!! route_table destination is deprecated. see https://github.com/k1LoW/awspec/pull/65 !!!'))
     # rubocop:enable Metrics/LineLength
     @use_destination = true
     @destination = dest

data/lib/awspec/stub/duplicated_resource_type.rb

@@ -0,0 +1,26 @@
+Aws.config[:ec2] = {
+  stub_responses: {
+    describe_vpcs: {
+      vpcs: [
+        {
+          vpc_id: 'vpc-ab123cde',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-vpc'
+            }
+          ]
+        },
+        {
+          vpc_id: 'vpc-cd456efg',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-vpc'
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

data/lib/awspec/stub/lambda.rb

@@ -5,9 +5,12 @@ Aws.config[:lambda] = {
         {
           function_name: 'my-lambda-function-name',
           function_arn: 'arn:aws:lambda:us-east-1:123456789012:function:my-lambda-function-name',
-          runtime: 'nodejs',
+          description: 'My Lambda Function',
+          runtime: 'python2.7',
+          handler: 'lambda_function.lambda_handler',
           timeout: 5,
-          memory_size: 256
+          memory_size: 256,
+          code_size: 1234
         }
       ]
     },

data/lib/awspec/type/ami.rb

@@ -5,7 +5,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_ami(id)
-      @id = @resource_via_client[:image_id] if @resource_via_client
+      @id = @resource_via_client.image_id if @resource_via_client
     end
 
     STATES = %w(
@@ -15,7 +15,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource_via_client[:state] == state
+        @resource_via_client.state == state
       end
     end
   end

data/lib/awspec/type/autoscaling_group.rb

@@ -3,7 +3,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_autoscaling_group(id)
-      @id = @resource_via_client[:auto_scaling_group_arn] if @resource_via_client
+      @id = @resource_via_client.auto_scaling_group_arn if @resource_via_client
     end
 
     def has_elb?(name)

data/lib/awspec/type/base.rb

@@ -35,7 +35,7 @@ module Awspec::Type
 
     def self.tags_allowed
       define_method :has_tag? do |key, value|
-        tags = @resource_via_client[:tags]
+        tags = @resource_via_client.tags
         return false unless tags
         tags.any? { |t| t['key'] == key && t['value'] == value }
       end

data/lib/awspec/type/cloudwatch_alarm.rb

@@ -3,19 +3,19 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_cloudwatch_alarm(id)
-      @id = @resource_via_client[:alarm_arn] if @resource_via_client
+      @id = @resource_via_client.alarm_arn if @resource_via_client
     end
 
     def has_ok_action?(name)
-      @resource_via_client[:ok_actions].include?(name)
+      @resource_via_client.ok_actions.include?(name)
     end
 
     def has_alarm_action?(name)
-      @resource_via_client[:alarm_actions].include?(name)
+      @resource_via_client.alarm_actions.include?(name)
     end
 
     def has_insufficient_data_action?(name)
-      @resource_via_client[:insufficient_data_actions].include?(name)
+      @resource_via_client.insufficient_data_actions.include?(name)
     end
   end
 end

data/lib/awspec/type/directconnect_virtual_interface.rb

@@ -3,7 +3,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_virtual_interface(id)
-      @id = @resource_via_client[:virtual_interface_id] if @resource_via_client
+      @id = @resource_via_client.virtual_interface_id if @resource_via_client
     end
 
     STATES = %w(
@@ -13,7 +13,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource_via_client[:virtual_interface_state] == state
+        @resource_via_client.virtual_interface_state == state
       end
     end
   end

data/lib/awspec/type/ebs.rb

@@ -5,7 +5,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_ebs(id)
-      @id = @resource_via_client[:volume_id] if @resource_via_client
+      @id = @resource_via_client.volume_id if @resource_via_client
     end
 
     STATES = %w(
@@ -14,16 +14,16 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource_via_client[:state] == state
+        @resource_via_client.state == state
       end
     end
 
     def attached_to?(instance_id)
       instance = find_ec2(instance_id)
       return false unless instance
-      return false unless @resource_via_client[:attachments]
-      @resource_via_client[:attachments][0][:instance_id] == instance[:instance_id] && \
-        @resource_via_client[:attachments][0][:state] == 'attached'
+      return false unless @resource_via_client.attachments
+      @resource_via_client.attachments.first.instance_id == instance.instance_id && \
+        @resource_via_client.attachments.first.state == 'attached'
     end
   end
 end

data/lib/awspec/type/ec2.rb

@@ -6,7 +6,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_ec2(id)
-      @id = @resource_via_client[:instance_id] if @resource_via_client
+      @id = @resource_via_client.instance_id if @resource_via_client
     end
 
     STATES = %w(
@@ -16,13 +16,13 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource_via_client[:state][:name] == state
+        @resource_via_client.state.name == state
       end
     end
 
     def disabled_api_termination?
       ret = find_ec2_attribute(@id, 'disableApiTermination')
-      ret[:disable_api_termination][:value]
+      ret.disable_api_termination.value
     end
 
     def has_eip?(ip_address = nil)
@@ -31,32 +31,32 @@ module Awspec::Type
       }
       option[:public_ips] = [ip_address] if ip_address
       ret = ec2_client.describe_addresses(option)
-      return ret[:addresses].count == 1 if ip_address
-      return ret[:addresses].count > 0 unless ip_address
+      return ret.addresses.count == 1 if ip_address
+      return ret.addresses.count > 0 unless ip_address
     end
 
     def has_security_group?(sg_id)
-      sgs = @resource_via_client[:security_groups]
+      sgs = @resource_via_client.security_groups
       ret = sgs.find do |sg|
-        sg[:group_id] == sg_id || sg[:group_name] == sg_id
+        sg.group_id == sg_id || sg.group_name == sg_id
       end
       return true if ret
       sg2 = find_security_group(sg_id)
       return false unless sg2.tag_name == sg_id
       sgs.find do |sg|
-        sg[:group_id] == sg2[:group_id]
+        sg.group_id == sg2.group_id
       end
     end
 
     def has_ebs?(volume_id)
-      blocks = @resource_via_client[:block_device_mappings]
+      blocks = @resource_via_client.block_device_mappings
       ret = blocks.find do |block|
-        next false unless block[:ebs]
-        block[:ebs][:volume_id] == volume_id
+        next false unless block.ebs
+        block.ebs.volume_id == volume_id
       end
       return true if ret
       blocks2 = find_ebs(volume_id)
-      blocks2[:attachments].find do |attachment|
+      blocks2.attachments.find do |attachment|
         attachment.instance_id == @id
       end
     end

data/lib/awspec/type/elasticache.rb

@@ -3,7 +3,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_cache_cluster(id)
-      @id = @resource_via_client[:cache_cluster_id] if @resource_via_client
+      @id = @resource_via_client.cache_cluster_id if @resource_via_client
     end
 
     STATES = %w(
@@ -15,17 +15,17 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource_via_client[:cache_cluster_status] == state
+        @resource_via_client.cache_cluster_status == state
       end
     end
 
     def has_cache_parameter_group?(group_name)
-      @resource_via_client[:cache_parameter_group][:cache_parameter_group_name] == group_name
+      @resource_via_client.cache_parameter_group.cache_parameter_group_name == group_name
     end
 
     def vpc_id
-      cache_subnet_group = find_cache_subnet_group(@resource_via_client[:cache_subnet_group_name])
-      cache_subnet_group[:vpc_id] if cache_subnet_group
+      cache_subnet_group = find_cache_subnet_group(@resource_via_client.cache_subnet_group_name)
+      cache_subnet_group.vpc_id if cache_subnet_group
     end
   end
 end