awspec 0.70.0 → 0.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbc433c70382704905947b4081e9840c9bf2183d
-  data.tar.gz: 4e42d218ba02d6e44682fa77eb26f1d287222684
+  metadata.gz: dc669dded96eca85392499ed934f5e74a3792255
+  data.tar.gz: 200f595fd7e078ee438168ad458abef078b9e5bc
 SHA512:
-  metadata.gz: 4fa1b9088672ee9f3684c7198f0de7a2481d6607dae9e44274dd4fbf4b16f90d5cb7961c6687584db8bf9452d09ef27fa0a4467cab7d7d6fdb5f3a16a99de44d
-  data.tar.gz: 7eb06937cf09a4528594844a18b57c12ec42e3d0c365d68ed84c09f6474ef6f3503000b541293b5a049de7918da948e748a592de482fca27748fdcbf117184f7
+  metadata.gz: 5d4485290d46b5255eccbde9b3155a072f9242466b2ccd574d6760b5d942ee7200dcb6b49ae363be92f5f4a76b9f2da2a3233f63896f16189f3bb4f09dd75f47
+  data.tar.gz: 6452260c37fe0de431d89d1bfa788fab472d30b87ee5ae25815affd4ba41c57e9f37672bc75262dd48491df15db2aec706a738f1835086401fd654fbf6b9ee6d

data/doc/_resource_types/ec2.md

@@ -91,6 +91,15 @@ describe ec2('my-ec2') do
 end
 ```
 
+### have_security_groups
+
+```ruby
+describe ec2('my-ec2') do
+  it { should have_security_groups(['my-security-group-name-1', 'my-security-group-name-2']) }
+  it { should have_security_groups(['sg-1a2b3cd4', 'sg-5e6f7gh8']) }
+end
+```
+
 ### have_tag
 
 ```ruby

data/doc/resource_types.md

@@ -445,6 +445,16 @@ end
 ```
 
 
+### have_security_groups
+
+```ruby
+describe ec2('my-ec2') do
+  it { should have_security_groups(['my-security-group-name-1', 'my-security-group-name-2']) }
+  it { should have_security_groups(['sg-1a2b3cd4', 'sg-5e6f7gh8']) }
+end
+```
+
+
 ### have_tag
 
 ```ruby

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

@@ -2,27 +2,33 @@ module Awspec::Helper
   module Finder
     module SecurityGroup
       def find_security_group(sg_id)
-        res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'group-id', values: [sg_id] }]
-                                                  })
-        resource = res.security_groups.single_resource(sg_id)
+        resource = select_security_group_by_group_id([sg_id]).single_resource(sg_id)
         return resource if resource
-        res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'group-name', values: [sg_id] }]
-                                                  })
-        resource = res.security_groups.single_resource(sg_id)
+
+        resource = select_security_group_by_group_name([sg_id]).single_resource(sg_id)
         return resource if resource
-        res = ec2_client.describe_security_groups({
-                                                    filters: [{ name: 'tag:Name', values: [sg_id] }]
-                                                  })
-        res.security_groups.single_resource(sg_id)
+
+        select_security_group_by_tag_name([sg_id]).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
+        describe_security_groups({ filters: [{ name: 'vpc-id', values: [vpc_id] }] })
+      end
+
+      def select_security_group_by_group_id(ids)
+        describe_security_groups({ filters: [{ name: 'group-id', values: ids }] })
+      end
+
+      def select_security_group_by_group_name(names)
+        describe_security_groups({ filters: [{ name: 'group-name', values: names }] })
+      end
+
+      def select_security_group_by_tag_name(names)
+        describe_security_groups({ filters: [{ name: 'tag:Name', values: names }] })
+      end
+
+      def describe_security_groups(param)
+        ec2_client.describe_security_groups(param).security_groups
       end
     end
   end

data/lib/awspec/stub/ec2_has_multi_security_groups.rb

@@ -0,0 +1,21 @@
+require_relative '../stub/ec2'
+
+stub_responses = Aws.config[:ec2][:stub_responses]
+
+stub_responses[:describe_instances][:reservations][0][:instances][0][:security_groups] <<
+  {
+    group_id: 'sg-5e6f7gh8',
+    group_name: 'my-security-group-name-2'
+  }
+
+stub_responses[:describe_security_groups][:security_groups] <<
+  {
+    group_id: 'sg-5e6f7gh8',
+    group_name: 'my-security-group-name-2',
+    tags: [
+      {
+        key: 'Name',
+        value: 'my-security-group-tag-name-2'
+      }
+    ]
+  }

data/lib/awspec/type/ec2.rb

@@ -42,6 +42,15 @@ module Awspec::Type
       return ret.addresses.count > 0 unless ip_address
     end
 
+    def has_security_groups?(sg_ids)
+      return true if match_group_ids?(sg_ids) || match_group_names?(sg_ids)
+
+      group_ids = resource_security_groups.map { |sg| sg.group_id }
+      tags = select_security_group_by_group_id(group_ids).map { |sg| sg.tags }.flatten
+      group_names = tags.select { |tag| tag.key == 'Name' }.map { |tag| tag.value }
+      group_names == sg_ids
+    end
+
     def has_security_group?(sg_id)
       sgs = resource_via_client.security_groups
       ret = sgs.find do |sg|
@@ -118,5 +127,19 @@ module Awspec::Type
       end
       return true if ret
     end
+
+    private
+
+    def match_group_ids?(sg_ids)
+      sg_ids.sort == resource_security_groups.map { |sg| sg.group_id }.sort
+    end
+
+    def match_group_names?(sg_names)
+      sg_names.sort == resource_security_groups.map { |sg| sg.group_name }.sort
+    end
+
+    def resource_security_groups
+      resource_via_client.security_groups
+    end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.70.0'
+  VERSION = '0.71.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 0.71.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -428,6 +428,7 @@ files:
 - lib/awspec/stub/duplicated_resource_type.rb
 - lib/awspec/stub/ebs.rb
 - lib/awspec/stub/ec2.rb
+- lib/awspec/stub/ec2_has_multi_security_groups.rb
 - lib/awspec/stub/ecr_repository.rb
 - lib/awspec/stub/ecs.rb
 - lib/awspec/stub/ecs_cluster.rb