awspec 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a25dc9ad7bb00c00fe9f75c60fb65a3bb7d2b657
-  data.tar.gz: 1250c5a36bc0f938e7cd66d7c24edaa9c514942f
+  metadata.gz: 2aaeb6e4dc658f764f20bec8fdac89d45a084797
+  data.tar.gz: e02bd3450a6008edef4b22b79a66cd798a8a0f1d
 SHA512:
-  metadata.gz: f13db27a3fadd0865336cb3b3a8c1e53bb8edc1128c57a503b3042a5b44ac30e832ba9c9589fe58e93d1c55a2728a866089ccd4b888438475f7e3a37c2619efd
-  data.tar.gz: 012cc4516ecafde2171abdef407ec9172be2f350c82ef477af2223eaaabbcbc1f60669e25473bf78a1dec9642e85686523d77c38c9c9e033c83a6a5db299cd71
+  metadata.gz: a9778ec751b40035b38ed973b86aad9efeedb766da6e002bf1bcafbd7b5afb43e4094ce361c79acf25c0a231c00d7de440f7463adb26a277362ca5d51ae8901d
+  data.tar.gz: c4b2e854c8bf2f6e954496030332bbb8a19c8ba671c5702f42054b1cea85041692d56ce757410f7f975fb8f3defdd8a8e829c994f0a36e770a96677e92439472

data/doc/_resource_types/rds.md

@@ -19,6 +19,10 @@ end
 ```ruby
 describe rds('my-rds') do
   it { should have_db_parameter_group('my-db-parameter-group') }
+  it do
+    should have_db_parameter_group('custom.mysql5.6')\
+      .parameter_apply_status('in-sync')
+  end
 end
 ```
 
@@ -27,6 +31,10 @@ end
 ```ruby
 describe rds('my-rds') do
   it { should have_option_group('default:mysql-5-6') }
+  it do
+    should have_option_group('default:mysql-5-6')\
+      .status('in-sync')
+  end
 end
 ```
 

data/doc/resource_types.md

@@ -2083,6 +2083,10 @@ end
 ```ruby
 describe rds('my-rds') do
   it { should have_db_parameter_group('my-db-parameter-group') }
+  it do
+    should have_db_parameter_group('custom.mysql5.6')\
+      .parameter_apply_status('in-sync')
+  end
 end
 ```
 
@@ -2092,6 +2096,10 @@ end
 ```ruby
 describe rds('my-rds') do
   it { should have_option_group('default:mysql-5-6') }
+  it do
+    should have_option_group('default:mysql-5-6')\
+      .status('in-sync')
+  end
 end
 ```
 

data/lib/awspec/matcher.rb

@@ -6,6 +6,8 @@ require 'awspec/matcher/have_network_interface'
 
 # RDS
 require 'awspec/matcher/belong_to_db_subnet_group'
+require 'awspec/matcher/have_db_parameter_group'
+require 'awspec/matcher/have_option_group'
 
 # SecurityGroup
 require 'awspec/matcher/be_opened'

data/lib/awspec/matcher/have_db_parameter_group.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_db_parameter_group do |name|
+  match do |db_instance_identifier|
+    db_instance_identifier.has_db_parameter_group?(name, @parameter_apply_status)
+  end
+
+  chain :parameter_apply_status do |parameter_apply_status|
+    @parameter_apply_status = parameter_apply_status
+  end
+end

data/lib/awspec/matcher/have_option_group.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_option_group do |name|
+  match do |db_instance_identifier|
+    db_instance_identifier.has_option_group?(name, @status)
+  end
+
+  chain :status do |status|
+    @status = status
+  end
+end

data/lib/awspec/stub/rds.rb

@@ -34,18 +34,22 @@ Aws.config[:rds] = {
           },
           db_parameter_groups: [
             {
-              db_parameter_group_name: 'default.mysql5.6'
+              db_parameter_group_name: 'default.mysql5.6',
+              parameter_apply_status: 'pending-reboot'
             },
             {
-              db_parameter_group_name: 'custom.mysql5.6'
+              db_parameter_group_name: 'custom.mysql5.6',
+              parameter_apply_status: 'in-sync'
             }
           ],
           option_group_memberships: [
             {
-              option_group_name: 'default:mysql-5-6'
+              option_group_name: 'default:mysql-5-6',
+              status: 'in-sync'
             },
             {
-              option_group_name: 'custom:mysql-5-6'
+              option_group_name: 'custom:mysql-5-6',
+              status: 'in-sync'
             }
           ],
           availability_zone: 'ap-northeast-1a',

data/lib/awspec/type/rds.rb

@@ -37,17 +37,26 @@ module Awspec::Type
       return true if has_db_security_group_name?(sg_id)
     end
 
-    def has_db_parameter_group?(name)
+    def has_db_parameter_group?(name, parameter_apply_status = nil)
       pgs = resource_via_client.db_parameter_groups
       pgs.find do |pg|
-        pg.db_parameter_group_name == name
+        if parameter_apply_status.nil?
+          pg.db_parameter_group_name == name
+        else
+          pg.db_parameter_group_name == name && \
+            pg.parameter_apply_status == parameter_apply_status
+        end
       end
     end
 
-    def has_option_group?(name)
+    def has_option_group?(name, status = nil)
       ogs = resource_via_client.option_group_memberships
       ogs.find do |og|
-        og.option_group_name == name
+        if status.nil?
+          og.option_group_name == name
+        else
+          og.option_group_name == name && og.status == status
+        end
       end
     end
 

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '1.4.3'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -445,10 +445,12 @@ files:
 - lib/awspec/matcher/belong_to_vpc.rb
 - lib/awspec/matcher/have_attribute_definition.rb
 - lib/awspec/matcher/have_custom_response_error_code.rb
+- lib/awspec/matcher/have_db_parameter_group.rb
 - lib/awspec/matcher/have_inline_policy.rb
 - lib/awspec/matcher/have_key_policy.rb
 - lib/awspec/matcher/have_key_schema.rb
 - lib/awspec/matcher/have_network_interface.rb
+- lib/awspec/matcher/have_option_group.rb
 - lib/awspec/matcher/have_origin.rb
 - lib/awspec/matcher/have_private_ip_address.rb
 - lib/awspec/matcher/have_record_set.rb