awspec 0.24.1 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a10eaa86514c0ae91094657961105fcb5f9ac41a
-  data.tar.gz: 57bcad942d927c04524a515b12c08c046a43c0dc
+  metadata.gz: 39292abd8aa1e62f4e4b5fa387790bb195ecbbcd
+  data.tar.gz: 93aaf5af8a1db102d1bd4de00a4223f16e4fef52
 SHA512:
-  metadata.gz: e8e94a86368a27e40ae57255d2a30f097fea631e0c2779ac6ca887d2efdca42db992a409516353d72a1c20138fe47ee900639b14a09baa955115266204a2da82
-  data.tar.gz: b349d5f781dc8272957504f1941351268bf8cbd4a13ad3ce44b71d9803d914279731876dc13c58d5c74cbf69026b7ebfe21fa006ed81e9e7c1676d2ea1abb224
+  metadata.gz: 695b9f482584822502cc969f791f6d406394778458f968900382883015791196ddd8db20b73811e68e534aff8d5403aaa88e8e0a608f44b668561f1548ee29a5
+  data.tar.gz: 3df34ad6f03d73a862fa3f2cf8e142d6df1a17f799b8ab076d42a186dc02dab690a788be761fdfca2cd9c524a4e4e539366ef2662eda9674355bdb63737479b2

data/doc/_resource_types/{s3.md → s3_bucket.md}

@@ -1,7 +1,7 @@
 ### exist
 
 ```ruby
-describe s3('my-bucket') do
+describe s3_bucket('my-bucket') do
   it { should exist }
 end
 ```
@@ -9,19 +9,19 @@ end
 ### have_acl_grant
 
 ```ruby
-describe s3('my-bucket') do
+describe s3_bucket('my-bucket') do
+  its(:acl_owner) { should eq 'my-bucket-owner' }
   its(:acl_grants_count) { should eq 3 }
   it { should have_acl_grant(grantee: 'my-bucket-owner', permission: 'FULL_CONTROL') }
-  it { should have_acl_grant(grantee: 'my-bucket-write-only', permission: 'WRITE') }
-  it { should have_acl_grant(grantee: 'my-bucket-read-only', permission: 'READ') }
-  its(:acl_owner) { should eq 'my-bucket-owner' }
+  it { should have_acl_grant(grantee: 'http://acs.amazonaws.com/groups/s3/LogDelivery', permission: 'WRITE') }
+  it { should have_acl_grant(grantee: '68f4bb06b094152df53893bfba57760e', permission: 'READ') }
 end
 ```
 
 ### have_object
 
 ```ruby
-describe s3('my-bucket') do
+describe s3_bucket('my-bucket') do
   it { should have_object('path/to/object') }
 end
 ```

data/doc/resource_types.md

@@ -276,12 +276,36 @@ S3Bucket resource type.
 
 ### exist
 
+```ruby
+describe s3_bucket('my-bucket') do
+  it { should exist }
+end
+```
+
+
 ### have_acl_grant
 
+```ruby
+describe s3_bucket('my-bucket') do
+  its(:acl_owner) { should eq 'my-bucket-owner' }
+  its(:acl_grants_count) { should eq 3 }
+  it { should have_acl_grant(grantee: 'my-bucket-owner', permission: 'FULL_CONTROL') }
+  it { should have_acl_grant(grantee: 'http://acs.amazonaws.com/groups/s3/LogDelivery', permission: 'WRITE') }
+  it { should have_acl_grant(grantee: '68f4bb06b094152df53893bfba57760e', permission: 'READ') }
+end
+```
+
+
 ### have_cors_rule
 
 ### have_object
 
+```ruby
+describe s3_bucket('my-bucket') do
+  it { should have_object('path/to/object') }
+end
+```
+
 ### have_policy
 
 #### its(:acl_grants_count), its(:acl_owner), its(:cors_rules_count), its(:name), its(:creation_date)

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

@@ -22,9 +22,10 @@ module Awspec::Generator
       end
 
       def grant_linetemplate
-        template = <<-'EOF'
-it { should have_acl_grant(grantee: '<%= grant.grantee.display_name %>', permission: '<%= grant.permission %>') }
-EOF
+        grantee = 'grant.grantee.display_name || grant.grantee.uri || grant.grantee.id'
+        template = <<-EOF
+it { should have_acl_grant(grantee: '<%= #{grantee} %>', permission: '<%= grant.permission %>') }
+        EOF
         template
       end
 
@@ -32,11 +33,11 @@ EOF
         template = <<-'EOF'
 describe s3_bucket('<%= bucket.name %>') do
   it { should exist }
+  its(:acl_owner) { should eq '<%= acl.owner.display_name %>' }
   its(:acl_grants_count) { should eq <%= acl.grants.count %> }
 <% grant_specs.each do |line| %>
   <%= line %>
 <% end %>
-  its(:acl_owner) { should eq '<%= acl.owner.display_name %>' }
 end
 EOF
         template

data/lib/awspec/stub/s3_bucket.rb

@@ -24,14 +24,14 @@ Aws.config[:s3] = {
         },
         {
           grantee: {
-            display_name: 'my-bucket-write-only',
+            uri: 'http://acs.amazonaws.com/groups/s3/LogDelivery',
             type: 'CanonicalUser'
           },
           permission: 'WRITE'
         },
         {
           grantee: {
-            display_name: 'my-bucket-read-only',
+            id: '68f4bb06b094152df53893bfba57760e',
             type: 'CanonicalUser'
           },
           permission: 'READ'

data/lib/awspec/type/s3_bucket.rb

@@ -19,9 +19,8 @@ module Awspec::Type
     def has_acl_grant?(grantee:, permission:)
       @acl = find_bucket_acl(@id)
       @acl.grants.find do |grant|
-        next false if !grantee.nil? && grant.grantee.display_name != grantee && grant.grantee.id != grantee
-        next false if !permission.nil? && grant.permission != permission
-        true
+        grant.permission == permission &&
+          (grant.grantee.display_name == grantee || grant.grantee.uri == grantee || grant.grantee.id == grantee)
       end
     end
 

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.24.1'
+  VERSION = '0.24.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.2
 platform: ruby
 authors:
 - k1LoW
@@ -201,7 +201,7 @@ files:
 - doc/_resource_types/rds_db_parameter_group.md
 - doc/_resource_types/route53_hosted_zone.md
 - doc/_resource_types/route_table.md
-- doc/_resource_types/s3.md
+- doc/_resource_types/s3_bucket.md
 - doc/_resource_types/security_group.md
 - doc/_resource_types/ses_identity.md
 - doc/_resource_types/subnet.md