awspec 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fedd240ae678f2b6088358bc661639c63ab38051
-  data.tar.gz: 8f4ce460a85b9f162db910f7d12274628c592f52
+  metadata.gz: a25dc9ad7bb00c00fe9f75c60fb65a3bb7d2b657
+  data.tar.gz: 1250c5a36bc0f938e7cd66d7c24edaa9c514942f
 SHA512:
-  metadata.gz: 8b53ab8f8501203bdcd2c91700ddd97df50d233344bca211023c4af431c02824285ebc51cc98fc117db5c94aab76f4ea952f74d77651c25708e3ab781d438fd5
-  data.tar.gz: 10b95c79186e03d84f6bf9067ae028a737100a80cec52ca815855d0158d840421f76fa8d123d7ac7df760249a025666f1f103a02de9b438e220a4cf12cc9d5a5
+  metadata.gz: f13db27a3fadd0865336cb3b3a8c1e53bb8edc1128c57a503b3042a5b44ac30e832ba9c9589fe58e93d1c55a2728a866089ccd4b888438475f7e3a37c2619efd
+  data.tar.gz: 012cc4516ecafde2171abdef407ec9172be2f350c82ef477af2223eaaabbcbc1f60669e25473bf78a1dec9642e85686523d77c38c9c9e033c83a6a5db299cd71

data/README.md

@@ -28,7 +28,16 @@ Or install it yourself as:
 
 ### STEP 1. Generate awspec init files
 
+If you're starting on a fresh RSpec project, you can use awspec to generate your init files:
+
     $ awspec init
+    
+If you're working on an exisitng RSpec project, you will need to add the following lines to your `spec_helper.rb` file:
+
+```ruby
+require 'awspec'
+Awsecrets.load(secrets_path: File.expand_path('./secrets.yml', File.dirname(__FILE__)))
+```
 
 ### STEP 2. Set AWS config
 

data/doc/_resource_types/s3_bucket.md

@@ -80,7 +80,18 @@ describe s3_bucket('my-bucket') do
       id: 'MyRuleName',
       noncurrent_version_expiration: { noncurrent_days: 1 },
       expiration: { days: 2 },
-      transitions: { days: 3, storage_class: 'GLACIER' },
+      transitions: [{ days: 3, storage_class: 'GLACIER' }],
+      status: 'Enabled'
+    )
+  end
+
+  it do
+    should have_lifecycle_rule(
+      id: 'MyRuleName2',
+      prefix: '123/',
+      noncurrent_version_expiration: { noncurrent_days: 2 },
+      expiration: { days: 3 },
+      transitions: [{ days: 5, storage_class: 'STANDARD_IA' }, { days: 10, storage_class: 'GLACIER' }],
       status: 'Enabled'
     )
   end

data/doc/resource_types.md

@@ -294,7 +294,7 @@ describe autoscaling_group('my-auto-scaling-group') do
 end
 ```
 
-### its(:auto_scaling_group_name), its(:auto_scaling_group_arn), its(:launch_configuration_name), its(:launch_template), its(:min_size), its(:max_size), its(:desired_capacity), its(:default_cooldown), its(:availability_zones), its(:load_balancer_names), its(:target_group_arns), its(:health_check_type), its(:health_check_grace_period), its(:created_time), its(:placement_group), its(:vpc_zone_identifier), its(:enabled_metrics), its(:status), its(:termination_policies), its(:new_instances_protected_from_scale_in)
+### its(:auto_scaling_group_name), its(:auto_scaling_group_arn), its(:launch_configuration_name), its(:launch_template), its(:min_size), its(:max_size), its(:desired_capacity), its(:default_cooldown), its(:availability_zones), its(:load_balancer_names), its(:target_group_arns), its(:health_check_type), its(:health_check_grace_period), its(:created_time), its(:placement_group), its(:vpc_zone_identifier), its(:enabled_metrics), its(:status), its(:termination_policies), its(:new_instances_protected_from_scale_in), its(:service_linked_role_arn)
 ## <a name="cloudformation_stack">cloudformation_stack</a>
 
 CloudformationStack resource type.
@@ -648,7 +648,7 @@ end
 ```
 
 
-### its(:table_name), its(:table_status), its(:creation_date_time), its(:table_size_bytes), its(:item_count), its(:table_arn), its(:table_id), its(:local_secondary_indexes), its(:global_secondary_indexes), its(:stream_specification), its(:latest_stream_label), its(:latest_stream_arn), its(:restore_summary)
+### its(:table_name), its(:table_status), its(:creation_date_time), its(:table_size_bytes), its(:item_count), its(:table_arn), its(:table_id), its(:local_secondary_indexes), its(:global_secondary_indexes), its(:stream_specification), its(:latest_stream_label), its(:latest_stream_arn), its(:restore_summary), its(:sse_description)
 ### :unlock: Advanced use
 
 `dynamodb_table` can use `Aws::DynamoDB::Table` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Table.html).
@@ -986,7 +986,7 @@ describe ecs_service('my-ecs-service') do
 end
 ```
 
-### its(:service_arn), its(:service_name), its(:cluster_arn), its(:load_balancers), its(:status), its(:desired_count), its(:running_count), its(:pending_count), its(:launch_type), its(:platform_version), its(:task_definition), its(:role_arn), its(:created_at), its(:placement_constraints), its(:placement_strategy), its(:network_configuration), its(:health_check_grace_period_seconds)
+### its(:service_arn), its(:service_name), its(:cluster_arn), its(:load_balancers), its(:service_registries), its(:status), its(:desired_count), its(:running_count), its(:pending_count), its(:launch_type), its(:platform_version), its(:task_definition), its(:role_arn), its(:created_at), its(:placement_constraints), its(:placement_strategy), its(:network_configuration), its(:health_check_grace_period_seconds)
 ## <a name="ecs_task_definition">ecs_task_definition</a>
 
 ECS Task Definition resource type.
@@ -2357,7 +2357,18 @@ describe s3_bucket('my-bucket') do
       id: 'MyRuleName',
       noncurrent_version_expiration: { noncurrent_days: 1 },
       expiration: { days: 2 },
-      transitions: { days: 3, storage_class: 'GLACIER' },
+      transitions: [{ days: 3, storage_class: 'GLACIER' }],
+      status: 'Enabled'
+    )
+  end
+
+  it do
+    should have_lifecycle_rule(
+      id: 'MyRuleName2',
+      prefix: '123/',
+      noncurrent_version_expiration: { noncurrent_days: 2 },
+      expiration: { days: 3 },
+      transitions: [{ days: 5, storage_class: 'STANDARD_IA' }, { days: 10, storage_class: 'GLACIER' }],
       status: 'Enabled'
     )
   end

data/lib/awspec/stub/s3_bucket.rb

@@ -75,6 +75,47 @@ Aws.config[:s3] = {
           value: 'dev'
         }
       ]
+    },
+    get_bucket_lifecycle_configuration: {
+      rules: [
+        {
+          id: 'MyRuleName',
+          status: 'Enabled',
+          transitions: [
+            {
+              days: 3,
+              storage_class: 'GLACIER'
+            }
+          ],
+          expiration: {
+            days: 2
+          },
+          noncurrent_version_expiration: {
+            noncurrent_days: 1
+          }
+        },
+        {
+          id: 'MyRuleName2',
+          prefix: '123/',
+          status: 'Enabled',
+          transitions: [
+            {
+              days: 5,
+              storage_class: 'STANDARD_IA'
+            },
+            {
+              days: 10,
+              storage_class: 'GLACIER'
+            }
+          ],
+          expiration: {
+            days: 3
+          },
+          noncurrent_version_expiration: {
+            noncurrent_days: 2
+          }
+        }
+      ]
     }
   }
 }

data/lib/awspec/type/s3_bucket.rb

@@ -87,8 +87,20 @@ module Awspec::Type
     end
 
     def has_lifecycle_rule?(rule)
-      lifecycle_configuration_rules.any? do |lc_rule|
-        rule.each { |key, value| lc_rule[key] == value }
+      lc_rule = lifecycle_configuration_rules.select { |r| r[:id] == rule[:id] }
+      return false if lc_rule == []
+
+      rule.all? do |key, value|
+        lc_rule.each do |r|
+          return false if value.is_a?(String) && r[key] != value
+          if value.is_a?(Hash)
+            return false if r[key].to_h != value
+          end
+          if value.is_a?(Array)
+            return false if r[key].map(&:to_h) != value
+          end
+          true
+        end
       end
     end
 

data/lib/awspec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk