awspec 0.62.0 → 0.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b28100b1878c194fcd42a0efac49424c7d08539
-  data.tar.gz: a8057019286ff6106a243f10b48fe60805bbfc5d
+  metadata.gz: e39a73e41965600fce45012b4d6e7488162a9989
+  data.tar.gz: 8b1f51e39b8f834bf1bc76589288fbd135dc1f6a
 SHA512:
-  metadata.gz: cc55cbd2da9bfc4d78e57049490cf97775dbd7760b8d653fda00406b6864861ffa2ae3c91b0c99ca3657fcf9d5f15ea37ad574c2809971b59b1b3ea341a00d65
-  data.tar.gz: e586a79328767f2107f6020600b6e788ed0bd96318c92cdaca28b1fe771a3b77f4569fd39aac081b4b057badb7bb09fe34f487738f97a2e0ef3c37ae02b88395
+  metadata.gz: 1ea9915dbc828828e0c8854243062dae403d811b85e22ec53f2f88baaeed01d8a95b314bb08c20fca206ec39e7b6df06cf057fd4380e174360cd6e9091b0c9d0
+  data.tar.gz: 902e0ad0f05da4ab1ec57412d580689d0cbdcbe5e82dfb1452462787a97e2a5e8b6464ae1d6ef41dfe53a1aa60dfbee2102e82a32d3f63fe7747ae33c99f84f9

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

@@ -17,6 +17,7 @@ module Awspec::Generator
       end
 
       def generate_grant_specs(acl)
+        return [] unless acl
         linespecs = []
         acl.grants.each do |grant|
           linespecs.push(ERB.new(grant_linetemplate, nil, '-').result(binding))
@@ -36,8 +37,10 @@ it { should have_acl_grant(grantee: '<%= #{grantee} %>', permission: '<%= grant.
         template = <<-'EOF'
 describe s3_bucket('<%= bucket.name %>') do
   it { should exist }
+<%- if acl -%>
   its(:acl_owner) { should eq '<%= acl.owner.display_name %>' }
   its(:acl_grants_count) { should eq <%= acl.grants.count %> }
+<%- end -%>
 <% grant_specs.each do |line| %>
   <%= line %>
 <% end %>
@@ -54,7 +57,8 @@ EOF
       def content(bucket)
         acl = find_bucket_acl(bucket.name)
         grant_specs = generate_grant_specs(acl)
-        bucket_policy = find_bucket_policy(bucket.name).policy.read
+        policy = find_bucket_policy(bucket.name)
+        bucket_policy = policy.policy.read if policy
         ERB.new(bucket_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
       end
     end

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

@@ -10,31 +10,31 @@ module Awspec::Helper
 
       def find_bucket_acl(id)
         s3_client.get_bucket_acl(bucket: id)
-      rescue Aws::S3::Errors::NoSuchBucket
+      rescue Aws::S3::Errors::ServiceError
         nil
       end
 
       def find_bucket_cors(id)
         s3_client.get_bucket_cors(bucket: id)
-      rescue Aws::S3::Errors::NoSuchBucket
+      rescue Aws::S3::Errors::ServiceError
         nil
       end
 
       def find_bucket_policy(id)
         s3_client.get_bucket_policy(bucket: id)
-      rescue Aws::S3::Errors::NoSuchBucket
+      rescue Aws::S3::Errors::ServiceError
         nil
       end
 
       def find_bucket_logging(id)
         s3_client.get_bucket_logging(bucket: id)
-      rescue Aws::S3::Errors::NoSuchBucket
+      rescue Aws::S3::Errors::ServiceError
         nil
       end
 
       def find_bucket_versioning(id)
         s3_client.get_bucket_versioning(bucket: id)
-      rescue Aws::S3::Errors::NoSuchBucket
+      rescue Aws::S3::Errors::ServiceError
         nil
       end
 

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.62.0'
+  VERSION = '0.62.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.62.1
 platform: ruby
 authors:
 - k1LoW