awspec 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93670776bfee37d66642109ff0753d21ec787a45
-  data.tar.gz: ac0cd0cd42c5389fb20b033779523f5453875810
+  metadata.gz: f1909c7febd232e63f4f01933058887c972a174e
+  data.tar.gz: cb3d860018b22a635823a714d05b86ae23db32b6
 SHA512:
-  metadata.gz: b4ebfe837caefcd8556221f041a151a9a7f3856da19ae114b87631235d65ceb29002edc04b7a1b61f3ca2603d0573043375c401c7715ab3f9ed4cffa04b750a3
-  data.tar.gz: 9584928a9101a96c6f688f6e26fafde38eef905ec972cf5a9047178d1dbbe22b88f90c0a611ff3008896cba1f712e2851e1116494a3a58d4d3e3524b8331a8a1
+  metadata.gz: 9f71aa2801687ba6a5d85329fd7613e4d64ac27477daa109df26fd604b18def3103129f5f2576188665a0db7dfba1dc6412e905b58b3fd33deb89e233474959e
+  data.tar.gz: d16c5744e51f88335da74c058c90b4fb6f55563f3766d5b27d6b1ec8f6138222875f496336dea431a53d10facca6f91b8b790a1298061a8f5120370174c2e100

data/Rakefile

@@ -15,7 +15,7 @@ end
 if defined?(RSpec)
   task spec: 'spec:all'
   namespace :spec do
-    task all: ['spec:type', 'spec:generator_spec', 'spec:generator_doc']
+    task all: ['spec:type', 'spec:core', 'spec:generator_spec', 'spec:generator_doc']
 
     task type: types
 
@@ -25,6 +25,10 @@ if defined?(RSpec)
       end
     end
 
+    RSpec::Core::RakeTask.new(:core) do |t|
+      t.pattern = 'spec/core/*_spec.rb'
+    end
+
     RSpec::Core::RakeTask.new(:generator_spec) do |t|
       t.pattern = 'spec/generator/spec/*_spec.rb'
     end

data/lib/awspec.rb

@@ -5,6 +5,7 @@ require 'time'
 require 'active_support/inflector'
 require 'awsecrets'
 require 'awspec/version'
+require 'awspec/error'
 require 'awspec/cli'
 require 'awspec/stub'
 require 'awspec/matcher'

data/lib/awspec/command/generate.rb

@@ -11,10 +11,9 @@ module Awspec
 
     types.each do |type|
       desc type + ' [vpc_id]', "Generate #{type} spec from VPC ID (or VPC \"Name\" tag)"
-      define_method type do |*args|
+      define_method type do |_vpc_id|
         Awsecrets.load(profile: options[:profile])
-        vpc_id = args.first
-        eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_by_vpc_id(vpc_id)"
+        eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_by_vpc_id(_vpc_id)"
       end
     end
 
@@ -35,7 +34,7 @@ module Awspec
     end
 
     types_for_generate_all = %w(
-      iam_policy cloudwatch_alarm directconnect ebs
+      iam_policy cloudwatch_alarm directconnect ebs lambda
     )
 
     types_for_generate_all.each do |type|

data/lib/awspec/error.rb

@@ -0,0 +1,4 @@
+module Awspec
+  class DuplicatedResourceTypeError < StandardError
+  end
+end

data/lib/awspec/ext.rb

@@ -1 +1,2 @@
 require 'awspec/ext/struct'
+require 'awspec/ext/array'

data/lib/awspec/ext/array.rb

@@ -0,0 +1,8 @@
+class Array
+  def single_resource(id = nil)
+    if self.count > 1
+      raise Awspec::DuplicatedResourceTypeError, "Duplicated resource type #{id}"
+    end
+    self.first if self.count == 1
+  end
+end

data/lib/awspec/generator.rb

@@ -14,6 +14,7 @@ require 'awspec/generator/spec/directconnect'
 require 'awspec/generator/spec/ebs'
 require 'awspec/generator/spec/s3_bucket'
 require 'awspec/generator/spec/nat_gateway'
+require 'awspec/generator/spec/lambda'
 
 # Doc
 require 'awspec/generator/doc/type'

data/lib/awspec/generator/spec/lambda.rb

@@ -0,0 +1,29 @@
+module Awspec::Generator
+  module Spec
+    class Lambda
+      include Awspec::Helper::Finder
+      def generate_all
+        lambda_functions = select_all_lambda_functions
+        raise 'Not Found lambda' if lambda_functions.empty?
+        ERB.new(lambda_spec_template, nil, '-').result(binding).chomp
+      end
+
+      def lambda_spec_template
+        template = <<-'EOF'
+<% lambda_functions.each do |function| %>
+describe lambda('<%= function.function_name %>') do
+  it { should exist }
+  its(:description) { should eq '<%= function.description %>' }
+  its(:runtime) { should eq '<%= function.runtime %>' }
+  its(:handler) { should eq '<%= function.handler %>' }
+  its(:code_size) { should eq <%= function.code_size %> }
+  its(:timeout) { should eq <%= function.timeout %> }
+  its(:memory_size) { should eq <%= function.memory_size %> }
+end
+<% end %>
+EOF
+        template
+      end
+    end
+  end
+end

data/lib/awspec/helper/finder.rb

@@ -1,5 +1,6 @@
 require 'aws-sdk'
 require 'awspec/helper/finder/vpc'
+require 'awspec/helper/finder/subnet'
 require 'awspec/helper/finder/ec2'
 require 'awspec/helper/finder/security_group'
 require 'awspec/helper/finder/rds'
@@ -19,6 +20,7 @@ require 'awspec/helper/finder/ami'
 module Awspec::Helper
   module Finder
     include Awspec::Helper::Finder::Vpc
+    include Awspec::Helper::Finder::Subnet
     include Awspec::Helper::Finder::Ec2
     include Awspec::Helper::Finder::SecurityGroup
     include Awspec::Helper::Finder::Rds

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

@@ -5,15 +5,17 @@ module Awspec::Helper
         res = ec2_client.describe_images({
                                            filters: [{ name: 'image-id', values: [image_id] }]
                                          })
-        return res[:images].first if res[:images].count == 1
+        resource = res.images.single_resource(image_id)
+        return resource if resource
         res = ec2_client.describe_images({
                                            filters: [{ name: 'name', values: [image_id] }]
                                          })
-        return res[:images].first if res[:images].count == 1
+        resource = res.images.single_resource(image_id)
+        return resource if resource
         res = ec2_client.describe_images({
                                            filters: [{ name: 'tag:Name', values: [image_id] }]
                                          })
-        return res[:images].first if res[:images].count == 1
+        res.images.single_resource(image_id)
       end
     end
   end

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

@@ -5,14 +5,14 @@ module Awspec::Helper
         res = autoscaling_client.describe_auto_scaling_groups({
                                                                 auto_scaling_group_names: [id]
                                                               })
-        res[:auto_scaling_groups].first if res[:auto_scaling_groups].count == 1
+        res.auto_scaling_groups.single_resource(id)
       end
 
       def find_launch_configuration(id)
         res = autoscaling_client.describe_launch_configurations({
                                                                   launch_configuration_names: [id]
                                                                 })
-        res[:launch_configurations].first if res[:launch_configurations].count == 1
+        res.launch_configurations.single_resource(id)
       end
     end
   end

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

@@ -5,12 +5,13 @@ module Awspec::Helper
         res = cloudwatch_client.describe_alarms({
                                                   alarm_names: [id]
                                                 })
-        return res[:metric_alarms].first if res[:metric_alarms].count == 1
+        return res.metric_alarms.first if res.metric_alarms.count == 1
 
         res = cloudwatch_client.describe_alarms
-        res[:metric_alarms].find do |alarm|
-          alarm[:alarm_arn] == id
+        alarms = res.metric_alarms.select do |alarm|
+          alarm.alarm_arn == id
         end
+        alarms.single_resource(id)
       end
 
       def select_all_cloudwatch_alarms

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

@@ -7,7 +7,7 @@ module Awspec::Helper
           next true if virtual_interface.virtual_interface_id == virtual_interface_id
           next true if virtual_interface.virtual_interface_name == virtual_interface_id
         end
-        return ret.first if ret.count == 1
+        ret.single_resource(virtual_interface_id)
       end
 
       def select_virtual_interfaces

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

@@ -5,18 +5,19 @@ module Awspec::Helper
         res = ec2_client.describe_volumes({
                                             filters: [{ name: 'volume-id', values: [volume_id] }]
                                           })
-        return res[:volumes].first if res[:volumes].count == 1
+        resource = res.volumes.single_resource(volume_id)
+        return resource if resource
         res = ec2_client.describe_volumes({
                                             filters: [{ name: 'tag:Name', values: [volume_id] }]
                                           })
-        return res[:volumes].first if res[:volumes].count == 1
+        res.volumes.single_resource(volume_id)
       end
 
       def select_ebs_by_instance_id(id)
         res = find_ec2(id)
         volumes = []
         return volumes unless res
-        res[:block_device_mappings].each do |block|
+        res.block_device_mappings.each do |block|
           volume = find_ebs(block.ebs.volume_id)
           volumes.push(volume) if volume
         end

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

@@ -2,39 +2,20 @@ module Awspec::Helper
   module Finder
     module Ec2
       def find_ec2(id)
-        if id.is_a?(Array)
-          # Aws::EC2::Client.describe_instances native filters format
+        # instance_id or tag:Name
+        begin
           res = ec2_client.describe_instances({
-                                                filters: id
+                                                instance_ids: [id]
                                               })
-        elsif id.is_a?(Hash)
-          # syntax sugar
-          filters = []
-          id.each do |k, v|
-            filters.push({ name: k, values: Array(v) })
-          end
+        rescue
+          # Aws::EC2::Errors::InvalidInstanceIDMalformed
+          # Aws::EC2::Errors::InvalidInstanceIDNotFound
           res = ec2_client.describe_instances({
-                                                filters: filters
+                                                filters: [{ name: 'tag:Name', values: [id] }]
                                               })
-        elsif id.is_a?(String)
-          # instance_id or tag:Name
-          begin
-            res = ec2_client.describe_instances({
-                                                  instance_ids: [id]
-                                                })
-          rescue
-            # Aws::EC2::Errors::InvalidInstanceIDMalformed
-            # Aws::EC2::Errors::InvalidInstanceIDNotFound
-            res = ec2_client.describe_instances({
-                                                  filters: [{ name: 'tag:Name', values: [id] }]
-                                                })
-          end
-        else
-          return nil
         end
         # rubocop:enable Style/GuardClause
-        return res[:reservations].first[:instances].first if res[:reservations].count == 1 && \
-                                                             res[:reservations].first[:instances].count == 1
+        res.reservations.first.instances.single_resource(id) if res.reservations.count == 1
       end
 
       def find_ec2_attribute(id, attribute)
@@ -52,12 +33,12 @@ module Awspec::Helper
           res = ec2_client.method(method_name).call({
                                                       filters: [{ name: type + '-gateway-id', values: [gateway_id] }]
                                                     })
-
-          return res[type + '_gateways'].first if res[type + '_gateways'].count == 1
+          resource = res[type + '_gateways'].single_resource(gateway_id)
+          return resource if resource
           res = ec2_client.method(method_name).call({
                                                       filters: [{ name: 'tag:Name', values: [gateway_id] }]
                                                     })
-          return res[type + '_gateways'].first if res[type + '_gateways'].count == 1
+          res[type + '_gateways'].single_resource(gateway_id)
         end
       end
 
@@ -65,22 +46,7 @@ module Awspec::Helper
         res = ec2_client.describe_nat_gateways({
                                                  filter: [{ name: 'nat-gateway-id', values: [gateway_id] }]
                                                })
-        return res['nat_gateways'].first if res['nat_gateways'].count == 1
-      end
-
-      def find_security_group(sg_id)
-        res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'group-id', values: [sg_id] }]
-                                                  })
-        return res[:security_groups].first if res[:security_groups].count == 1
-        res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'group-name', values: [sg_id] }]
-                                                  })
-        return res[:security_groups].first if res[:security_groups].count == 1
-        res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'tag:Name', values: [sg_id] }]
-                                                  })
-        return res[:security_groups].first if res[:security_groups].count == 1
+        res.nat_gateways.single_resource(gateway_id)
       end
 
       def select_ec2_by_vpc_id(vpc_id)
@@ -88,8 +54,7 @@ module Awspec::Helper
                                               filters: [{ name: 'vpc-id', values: [vpc_id] }]
                                             })
         instances = []
-        return instances unless res[:reservations].count > 0
-        res[:reservations].each do |reservation|
+        res.reservations.each do |reservation|
           reservation.instances.each do |instance|
             instances.push(instance)
           end
@@ -101,15 +66,14 @@ module Awspec::Helper
         res = ec2_client.describe_addresses({
                                               filters: [{ name: 'instance-id', values: [id] }]
                                             })
-        return [] unless res[:addresses].count > 0
-        res[:addresses]
+        res.addresses
       end
 
       def select_nat_gateway_by_vpc_id(vpc_id)
         res = ec2_client.describe_nat_gateways({
                                                  filter: [{ name: 'vpc-id', values: [vpc_id] }]
                                                })
-        res[:nat_gateways]
+        res.nat_gateways
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Awspec::Helper
         res = elasticache_client.describe_cache_clusters({
                                                            cache_cluster_id: id
                                                          })
-        res[:cache_clusters].first if res[:cache_clusters].count == 1
+        res.cache_clusters.single_resource(id)
       rescue
         nil
       end
@@ -14,7 +14,7 @@ module Awspec::Helper
         res = elasticache_client.describe_cache_subnet_groups({
                                                                 cache_subnet_group_name: group_name
                                                               })
-        res[:cache_subnet_groups].first if res[:cache_subnet_groups].count == 1
+        res.cache_subnet_groups.single_resource(group_name)
       end
     end
   end

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

@@ -5,14 +5,14 @@ module Awspec::Helper
         res = elb_client.describe_load_balancers({
                                                    load_balancer_names: [id]
                                                  })
-        return res[:load_balancer_descriptions].first if res[:load_balancer_descriptions].count == 1
+        res.load_balancer_descriptions.single_resource(id)
       rescue
         return nil
       end
 
       def select_elb_by_vpc_id(vpc_id)
         res = elb_client.describe_load_balancers
-        res[:load_balancer_descriptions].select do |lb|
+        res.load_balancer_descriptions.select do |lb|
           lb.vpc_id == vpc_id
         end
       end

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

@@ -15,7 +15,7 @@ module Awspec::Helper
             (res.next_page? && res = res.next_page) || break
           end
 
-          selected.first if selected.count == 1
+          selected.single_resource(id)
         end
       end
 

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

@@ -12,14 +12,20 @@ module Awspec::Helper
           (res.next_page? && res = res.next_page) || break
         end
 
-        selected.first if selected.count == 1
+        selected.single_resource(id)
       end
 
       def select_event_source_by_function_arn(function_arn)
         res = lambda_client.list_event_source_mappings({
                                                          function_name: function_arn
                                                        })
-        res[:event_source_mappings]
+        res.event_source_mappings
+      end
+
+      def select_all_lambda_functions
+        res = lambda_client.list_functions.map do |responce|
+          responce.functions
+        end.flatten
       end
     end
   end

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

@@ -6,12 +6,12 @@ module Awspec::Helper
         res = rds_client.describe_db_instances({
                                                  db_instance_identifier: id
                                                })
-        return res[:db_instances].first if res[:db_instances].count == 1
+        res.db_instances.single_resource(id)
       end
 
       def select_rds_by_vpc_id(vpc_id)
         res = rds_client.describe_db_instances
-        res[:db_instances].select do |db_instance|
+        res.db_instances.select do |db_instance|
           db_instance.db_subnet_group.vpc_id == vpc_id
         end
       end

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

@@ -3,14 +3,16 @@ module Awspec::Helper
     module Route53
       def find_hosted_zone(id)
         res = route53_client.list_hosted_zones
+        selected = []
         loop do
           res.hosted_zones.each do |hosted_zone|
             if hosted_zone[:name] == id || hosted_zone[:id] == '/hostedzone/' + id || hosted_zone[:id] == id
-              return hosted_zone
+              selected.push(hosted_zone)
             end
           end
           (res.next_page? && res = res.next_page) || break
         end
+        selected.single_resource(id)
       end
 
       def select_record_sets_by_hosted_zone_id(id)