awspec 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aaeb6e4dc658f764f20bec8fdac89d45a084797
-  data.tar.gz: e02bd3450a6008edef4b22b79a66cd798a8a0f1d
+  metadata.gz: 6fe998760f93b86dc7701a60a93fd32aac29c022
+  data.tar.gz: 6b2dc3d9ebaf9dbc759ae5cde264d0e415505ed5
 SHA512:
-  metadata.gz: a9778ec751b40035b38ed973b86aad9efeedb766da6e002bf1bcafbd7b5afb43e4094ce361c79acf25c0a231c00d7de440f7463adb26a277362ca5d51ae8901d
-  data.tar.gz: c4b2e854c8bf2f6e954496030332bbb8a19c8ba671c5702f42054b1cea85041692d56ce757410f7f975fb8f3defdd8a8e829c994f0a36e770a96677e92439472
+  metadata.gz: 7fdd812ac8a0f340376f246f1051f91e14f0924d7c17496eaf207160a332023e5249945b1589c958a537b3582412f6d84a5e714c9452d798105db0f82d9c633c
+  data.tar.gz: 2ed5eaf23ece386af5b1293aaf5243698f6677f669b2eaef5fa9088d7b984259c1c6e7927b077c21aec938bb1320223f031c5cc610a819ef6009d7034469d5a9

data/doc/contributing.md

@@ -17,7 +17,7 @@
 3. Fill files with code.
 4. Generate [doc/resource_types.md](doc/resource_types.md) (`bundle exec bin/toolbox docgen > doc/resource_types.md`)
 5. Run test (`bundle exec rake spec`)
-6. Push to the branch (`git push origin add-type-redshift`)
+6. Push to the branch (`git push origin add-type-cf-limit`)
 7. Create a new Pull Request
 
 ## Append resource type document (ex. VPC resource `be_available`)

data/doc/resource_types.md

@@ -74,7 +74,7 @@ end
 
 ### be_pending_validation, be_issued, be_inactive, be_expired, be_validation_timed_out, be_revoked, be_failed
 
-### its(:certificate_arn), its(:domain_name), its(:subject_alternative_names), its(:domain_validation_options), its(:serial), its(:subject), its(:issuer), its(:created_at), its(:issued_at), its(:imported_at), its(:status), its(:revoked_at), its(:revocation_reason), its(:not_before), its(:not_after), its(:key_algorithm), its(:signature_algorithm), its(:in_use_by), its(:failure_reason), its(:type), its(:renewal_summary), its(:key_usages), its(:extended_key_usages)
+### its(:certificate_arn), its(:domain_name), its(:subject_alternative_names), its(:domain_validation_options), its(:serial), its(:subject), its(:issuer), its(:created_at), its(:issued_at), its(:imported_at), its(:status), its(:revoked_at), its(:revocation_reason), its(:not_before), its(:not_after), its(:key_algorithm), its(:signature_algorithm), its(:in_use_by), its(:failure_reason), its(:type), its(:renewal_summary), its(:key_usages), its(:extended_key_usages), its(:certificate_authority_arn), its(:renewal_eligibility), its(:options)
 ## <a name="alb">alb</a>
 
 ALB resource type.
@@ -1209,7 +1209,7 @@ end
 ```
 
 
-### its(:domain_id), its(:domain_name), its(:arn), its(:created), its(:deleted), its(:endpoint), its(:endpoints), its(:processing), its(:elasticsearch_version), its(:access_policies), its(:snapshot_options), its(:vpc_options), its(:encryption_at_rest_options), its(:advanced_options), its(:log_publishing_options)
+### its(:domain_id), its(:domain_name), its(:arn), its(:created), its(:deleted), its(:endpoint), its(:endpoints), its(:processing), its(:elasticsearch_version), its(:access_policies), its(:snapshot_options), its(:vpc_options), its(:cognito_options), its(:encryption_at_rest_options), its(:advanced_options), its(:log_publishing_options)
 ## <a name="elastictranscoder_pipeline">elastictranscoder_pipeline</a>
 
 ElastictranscoderPipeline resource type.
@@ -1467,7 +1467,7 @@ end
 ```
 
 
-### its(:path), its(:role_name), its(:role_id), its(:arn), its(:create_date), its(:assume_role_policy_document), its(:description)
+### its(:path), its(:role_name), its(:role_id), its(:arn), its(:create_date), its(:assume_role_policy_document), its(:description), its(:max_session_duration)
 ### :unlock: Advanced use
 
 `iam_role` can use `Aws::IAM::Role` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/IAM/Role.html).

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

@@ -48,10 +48,10 @@ describe rds('<%= instance_id %>') do
 <%- end -%>
   it { should belong_to_db_subnet_group('<%= db_instance.db_subnet_group.db_subnet_group_name %>') }
 <% db_instance.db_parameter_groups.each do |pg| %>
-  it { should have_db_parameter_group('<%= pg.db_parameter_group_name %>') }
+  it { should have_db_parameter_group('<%= pg.db_parameter_group_name %>').parameter_apply_status('<%= pg.parameter_apply_status %>') }
 <% end %>
 <% db_instance.option_group_memberships.each do |og| %>
-  it { should have_option_group('<%= og.option_group_name %>') }
+  it { should have_option_group('<%= og.option_group_name %>').status('<%= og.status %>') }
 <% end %>
 end
 EOF

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

@@ -33,6 +33,53 @@ it { should have_acl_grant(grantee: '<%= #{grantee} %>', permission: '<%= grant.
         template
       end
 
+      def generate_lifecycle_rule_transitions_spec(transitions_rule)
+        rules = []
+        transitions_rule.each do |line|
+          elements = []
+          line.each do |k, v|
+            elements << case v
+                        when Numeric
+                          "#{k}: #{v}"
+                        when String
+                          "#{k}: '#{v}'"
+                        else
+                          "#{k}: '#{v.inspect}'"
+                        end
+          end
+          rules << '{ ' + elements.join(', ') + ' }'
+        end
+        '[' + rules.join(', ') + ']'
+      end
+
+      def generate_lifecycle_rule_specs(lifecycle_rule)
+        return [] unless lifecycle_rule
+        linespecs = []
+        lifecycle_rule.rules.each do |rule|
+          transitions = generate_lifecycle_rule_transitions_spec(rule.transitions.map(&:to_h))
+          template = <<-EOF
+it do
+    should have_lifecycle_rule(
+      id: '<%= rule.id %>',
+      <%- if rule.prefix -%>
+      prefix: '<%= rule.prefix %>',
+      <%- end -%>
+      <%- rule.noncurrent_version_expiration.to_h.each do |k, v| -%>
+      noncurrent_version_expiration: { <%= k %>: <%= v %> },
+      <%- end -%>
+      <%- rule.expiration.to_h.each do |k, v| -%>
+      expiration: { <%= k %>: <%= v %> },
+      <%- end -%>
+      transitions: <%= transitions %>,
+      status: '<%= rule.status %>'
+    )
+  end
+          EOF
+          linespecs.push(ERB.new(template, nil, '-').result(binding))
+        end
+        linespecs
+      end
+
       def bucket_spec_template
         template = <<-'EOF'
 describe s3_bucket('<%= bucket.name %>') do
@@ -50,6 +97,11 @@ describe s3_bucket('<%= bucket.name %>') do
 <%- if tag -%>
   it { should have_tag('env').value('dev') }
 <%- end -%>
+<%- if lifecycle_rule -%>
+<% lifecycle_specs.each do |line| %>
+  <%= line %>
+<% end %>
+<%- end -%>
 end
 EOF
         template
@@ -63,6 +115,8 @@ EOF
         tag = find_bucket_tag(bucket.name, 'env')
         policy = find_bucket_policy(bucket.name)
         bucket_policy = policy.policy.read if policy
+        lifecycle_rule = find_bucket_lifecycle_configuration(bucket.name)
+        lifecycle_specs = generate_lifecycle_rule_specs(lifecycle_rule) if lifecycle_rule
         ERB.new(bucket_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
       end
     end

data/lib/awspec/type/route53_hosted_zone.rb

@@ -13,7 +13,7 @@ module Awspec::Type
     end
 
     def has_record_set?(name, type, value, options = {})
-      name.gsub!(/\*/, '\\\052') # wildcard support
+      name = name.gsub(/\*/, '\\\052') # wildcard support
       ret = resource_via_client_record_sets.find do |record_set|
         # next if record_set.type != type.upcase
         next unless record_set.type.casecmp(type) == 0

data/lib/awspec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk