awspec 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4a6211484564ebe1014a8a8e3716006c9fc88bf
-  data.tar.gz: 74e173c94216e05cd6c65a39320f480f60cea17b
+  metadata.gz: 6b179910887dad4c07a7dcb3a3964eddd1bd89a5
+  data.tar.gz: '09e960c5431fbf85ed39531e42dee075f46e9e67'
 SHA512:
-  metadata.gz: cd7819ffaa0cc4b1e26e70c3bd3e96d440e7e1bf596a4f3304d6f71e2dd58484cf50f743bd6dd3bcc27ddc39df86fe0cb94e1f905b58a598ace6258a1e37936d
-  data.tar.gz: ded38636c79963ef7879530fa7ad044305bc5676bee103654fb2d507e42ac4ba29198a0976d4042212aaf5f21b7f281b8f9d63ced94f1b1ca1e1d51337ebf95c
+  metadata.gz: 348f694481e7db4994744ffbc6ee94001f10d2132ae6762dc6f2f314e7dbb62d6e30c2e30609f833604c30bcc5d8472c0a972fd94f6d907ac3ed2815dbd6bccb
+  data.tar.gz: 1584f796a4420efa011fdd2f297096e8872f48d473becda49b8dbfce86d896613546c28d9347ebd5b90e7cd31ce1f2d716cbc5b3e5824202b19c274657dc6087

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 rvm:
-  - 2.4.2
+  - 2.4.3
   - 2.3.5
   - 2.2.8
   - 2.1.10
 
 before_install:
   - gem update --system
+  - gem pristine bundler
   
 script:
   - bundle exec rake spec

data/doc/_resource_types/vpc.md

@@ -14,6 +14,16 @@ describe vpc('vpc-ab123cde') do
 end
 ```
 
+### be_connected_to_vpc
+
+```ruby
+describe vpc('vpc-ab123cde') do
+  it { should be_connected_to_vpc('vpc-bcd1235e') }
+  it { should be_connected_to_vpc('vpc-bcd1235e').as_accepter }
+  it { should_not be_connected_to_vpc('vpc-bcd1235e').as_requester }
+end
+```
+
 ### have_network_acl
 
 ```ruby
@@ -40,6 +50,16 @@ describe vpc('vpc-ab123cde') do
 end
 ```
 
+### have_vpc_peering_connection
+
+```ruby
+describe vpc('vpc-ab123cde') do
+  it { should have_vpc_peering_connection('pcx-c56789de') }
+  it { should have_vpc_peering_connection('pcx-c56789de').as_accepter }
+  it { should_not have_vpc_peering_connection('pcx-c56789de').as_requester }
+end
+```
+
 ### advanced
 
 `vpc` can use `Aws::EC2::Vpc` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Vpc.html).

data/doc/resource_types.md

@@ -2454,6 +2454,17 @@ end
 ```
 
 
+### be_connected_to_vpc
+
+```ruby
+describe vpc('vpc-ab123cde') do
+  it { should be_connected_to_vpc('vpc-bcd1235e') }
+  it { should be_connected_to_vpc('vpc-bcd1235e').as_accepter }
+  it { should_not be_connected_to_vpc('vpc-bcd1235e').as_requester }
+end
+```
+
+
 ### have_network_acl
 
 ```ruby
@@ -2483,6 +2494,17 @@ end
 ```
 
 
+### have_vpc_peering_connection
+
+```ruby
+describe vpc('vpc-ab123cde') do
+  it { should have_vpc_peering_connection('pcx-c56789de') }
+  it { should have_vpc_peering_connection('pcx-c56789de').as_accepter }
+  it { should_not have_vpc_peering_connection('pcx-c56789de').as_requester }
+end
+```
+
+
 ### its(:cidr_block), its(:dhcp_options_id), its(:state), its(:vpc_id), its(:instance_tenancy), its(:ipv_6_cidr_block_association_set), its(:cidr_block_association_set), its(:is_default)
 ### :unlock: Advanced use
 

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

@@ -72,6 +72,17 @@ module Awspec::Helper
                                                           })
         res.vpc_peering_connections.single_resource(vpc_peering_connection_id)
       end
+
+      def select_vpc_peering_connection_by_vpc_id(vpc_id, status_code = nil)
+        params = {}
+        params = { filters: [{ name: 'status-code', values: [status_code] }] } if status_code
+        vpc_peering_connections = ec2_client.describe_vpc_peering_connections(params).map do |res|
+          res.vpc_peering_connections
+        end.flatten
+        vpc_peering_connections.select do |conn|
+          conn.accepter_vpc_info.vpc_id == vpc_id || conn.requester_vpc_info.vpc_id == vpc_id
+        end
+      end
     end
   end
 end

data/lib/awspec/matcher.rb

@@ -60,3 +60,7 @@ require 'awspec/matcher/belong_to_domain'
 
 # Alb Target Group
 require 'awspec/matcher/belong_to_alb'
+
+# VPC
+require 'awspec/matcher/be_connected_to_vpc'
+require 'awspec/matcher/have_vpc_peering_connection'

data/lib/awspec/matcher/be_connected_to_vpc.rb

@@ -0,0 +1,13 @@
+RSpec::Matchers.define :be_connected_to_vpc do |vpc_id|
+  match do |vpc|
+    vpc.connected_to_vpc?(vpc_id, @accepter_or_requester)
+  end
+
+  chain :as_accepter do
+    @accepter_or_requester = 'accepter'
+  end
+
+  chain :as_requester do
+    @accepter_or_requester = 'requester'
+  end
+end

data/lib/awspec/matcher/have_vpc_peering_connection.rb

@@ -0,0 +1,13 @@
+RSpec::Matchers.define :have_vpc_peering_connection do |vpc_peering_connection_id|
+  match do |vpc|
+    vpc.has_vpc_peering_connection?(vpc_peering_connection_id, @accepter_or_requester)
+  end
+
+  chain :as_accepter do
+    @accepter_or_requester = 'accepter'
+  end
+
+  chain :as_requester do
+    @accepter_or_requester = 'requester'
+  end
+end

data/lib/awspec/stub/vpc.rb

@@ -64,6 +64,42 @@ Aws.config[:ec2] = {
           ]
         }
       ]
+    },
+    describe_vpc_peering_connections: {
+      vpc_peering_connections: [
+        {
+          vpc_peering_connection_id: 'pcx-c56789de',
+          accepter_vpc_info: {
+            cidr_block: nil,
+            ipv_6_cidr_block_set: [],
+            cidr_block_set: [],
+            owner_id: '123453345554',
+            peering_options: nil,
+            vpc_id: 'vpc-ab123cde',
+            region: 'ap-northeast-1'
+          },
+          expiration_time: nil,
+          requester_vpc_info: {
+            cidr_block: nil,
+            ipv_6_cidr_block_set: [],
+            cidr_block_set: [],
+            owner_id: '192912349399',
+            peering_options: nil,
+            vpc_id: 'vpc-bcd1235e',
+            region: 'ap-northeast-1'
+          },
+          status: {
+            code: 'active',
+            message: 'Active'
+          },
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-pcx'
+            }
+          ]
+        }
+      ]
     }
   }
 }

data/lib/awspec/type/vpc.rb

@@ -32,5 +32,31 @@ module Awspec::Type
       return false unless n
       n.vpc_id == id
     end
+
+    def connected_to_vpc?(vpc_id, accepter_or_requester = nil)
+      connections = select_vpc_peering_connection_by_vpc_id(vpc_id, 'active')
+      return connections.single_resource(vpc_id) unless accepter_or_requester
+
+      if accepter_or_requester == 'accepter'
+        connections.select do |conn|
+          conn.accepter_vpc_info.vpc_id == @id
+        end.single_resource(vpc_id)
+      elsif accepter_or_requester == 'requester'
+        connections.select do |conn|
+          conn.requester_vpc_info.vpc_id == @id
+        end.single_resource(vpc_id)
+      end
+    end
+
+    def has_vpc_peering_connection?(vpc_peering_connection_id, accepter_or_requester = nil)
+      connection = find_vpc_peering_connection(vpc_peering_connection_id)
+      res = if accepter_or_requester == 'accepter'
+              connection.accepter_vpc_info.vpc_id == @id
+            elsif accepter_or_requester == 'requester'
+              connection.requester_vpc_info.vpc_id == @id
+            else
+              connection
+            end
+    end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -419,6 +419,7 @@ files:
 - lib/awspec/matcher/be_allowed.rb
 - lib/awspec/matcher/be_allowed_action.rb
 - lib/awspec/matcher/be_attached_to.rb
+- lib/awspec/matcher/be_connected_to_vpc.rb
 - lib/awspec/matcher/be_denied.rb
 - lib/awspec/matcher/be_opened.rb
 - lib/awspec/matcher/be_opened_only.rb
@@ -443,6 +444,7 @@ files:
 - lib/awspec/matcher/have_rule.rb
 - lib/awspec/matcher/have_subscription_filter.rb
 - lib/awspec/matcher/have_tag.rb
+- lib/awspec/matcher/have_vpc_peering_connection.rb
 - lib/awspec/resource_reader.rb
 - lib/awspec/setup.rb
 - lib/awspec/shared_context.rb