awspec 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82db0940952c2d0456c6ab91ad8da93005e0342
-  data.tar.gz: c2ea3398cb1a479bc6037f2f42571ea8461b2b02
+  metadata.gz: 269db3afd477e7b97500b7fa382400c9619b565c
+  data.tar.gz: 3968c5248b90648e277fa1c104b097ee7a31e9bc
 SHA512:
-  metadata.gz: a46db329c15ddc92a25d437693f4ae60302998c772876b5fe23a1bdbf844248c8006d9b0758ae3d4a04bab84385cae0823671f46d106dc1207ae27116180f44a
-  data.tar.gz: 23d66c7d32f53236669021c14a5ea370bdd087674af69c43610c46f9fe07b1d556ac38560a21a83b5674bb68a2fb39cb38d7d9bb56189d034232700bc5eac53e
+  metadata.gz: 709a0207a1dfe54c95e75b7e5143207c6b1aca6eb97aa13edbed729940979617d6459974da673cf87973a231b15d34f420693a85743075b5faac2948995c788a
+  data.tar.gz: a914e74d80c93295e185770f22e978089819e4f051fb134ef7190fb3110ce957b835c08b966342b2e168214351283c71e34f982f8100c5a6d912edcb567b8f11

data/doc/_resource_types/s3_bucket.md

@@ -70,6 +70,14 @@ describe s3_bucket('my-bucket') do
 end
 ```
 
+### have_logging_enabled
+
+```ruby
+describe s3_bucket('my-bucket') do
+  it { should have_logging_enabled(target_bukcet: 'my-log-bucket', target_prefix: 'logs/') }
+end
+```
+
 ### advanced
 
 `s3_bucket` can use `Aws::S3::Bucket` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Bucket.html).

data/doc/resource_types.md

@@ -1293,6 +1293,15 @@ end
 ```
 
 
+### have_logging_enabled
+
+```ruby
+describe s3_bucket('my-bucket') do
+  it { should have_logging_enabled(target_bukcet: 'my-log-bucket', target_prefix: 'logs/') }
+end
+```
+
+
 ### have_object
 
 ```ruby

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

@@ -26,6 +26,12 @@ module Awspec::Helper
         nil
       end
 
+      def find_bucket_logging(id)
+        s3_client.get_bucket_logging(bucket: id)
+      rescue Aws::S3::Errors::NoSuchBucket
+        nil
+      end
+
       def select_all_buckets
         s3_client.list_buckets.buckets
       end

data/lib/awspec/stub/s3_bucket.rb

@@ -54,10 +54,15 @@ Aws.config[:s3] = {
       ]
     },
     get_bucket_policy: {
-      policy: '{"Version":"2012-10-17","Statement":' \
-              '[{"Sid":"AllowPublicRead","Effect":"Allow",' \
-              '"Principal":"*","Action":"s3:GetObject",' \
-              '"Resource":"arn:aws:s3:::my-bucket/*"}]}'
+      policy: '{"Version":"2012-10-17","Statement":[{"Sid":"","Effect":"Allow","Principal":' \
+              '{"AWS":"arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity XXXXX"},' \
+              '"Action":"s3:GetObject","Resource":"arn:aws:s3:::my-bucket/*"}]}'
+    },
+    get_bucket_logging: {
+      logging_enabled: {
+        target_bucket: 'my-log-bucket',
+        target_prefix: 'logs/'
+      }
     }
   }
 }

data/lib/awspec/type/s3_bucket.rb

@@ -56,8 +56,17 @@ module Awspec::Type
 
     def has_policy?(policy)
       bp = find_bucket_policy(@id)
-      # newlines, spaces, etc.. are removed from policy which is returned from API
-      bp ? (bp.policy.read == policy.gsub(/(\n|\r|\r\n|\s|\t)/, '')) : false
+      bp ? (JSON.parse(bp.policy.read) == JSON.parse(policy)) : false
+    end
+
+    def has_logging_enabled?(target_bucket: nil, target_prefix: nil)
+      bl = find_bucket_logging(@id)
+      le = bl ? bl.logging_enabled : nil
+
+      return false if le.nil?
+      return false if target_bucket && target_bucket != le.target_bucket
+      return false if target_prefix && target_prefix != le.target_prefix
+      true
     end
 
     private

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.41.0'
+  VERSION = '0.42.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.42.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec