awspec 0.82.1 → 0.82.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8248bcc51c59953143120a15cfa9ede3b8c50655
-  data.tar.gz: 70ce22f4b30d81fbb0b993fe18e540434a0c9af8
+  metadata.gz: d2401b916fc27b0f0cef2c86130013680dd90c87
+  data.tar.gz: 5f64f72143349aac7ff5d07e85e728b1462c630c
 SHA512:
-  metadata.gz: 31a14dd7941207ccc3aa27dc39d29807846e6889a242b1cc28c2690bebefa7c3e7ac6f60ea8dcb5a688562c5b14b04cf351152e67fb5d78b7922719842520149
-  data.tar.gz: 619e8cc58c5fcf36facac4ab468efe433619772b8294322184be5813faf7474e2d74cd060d82968b371b8442eff374216e9e4b9ff05e7df3aa89bf49bd84f3ba
+  metadata.gz: e9cd315d2935b521bd8b30fa884bcdbf2f8a734e29acb974d2ad6c4df220ec94f02a184325d90ff968368fa881a05c07f6daef6c62e92d788b296e39ffb98977
+  data.tar.gz: 27158fbebec7c13aebf72b6fc9cd8bda7774e036c5f08e2390ee7a4d663ffd482012fe483ec832293a01ea9b2b8a3eddae841b65ad95f2a35174370d704a42da

data/doc/_resource_types/s3_bucket.md

@@ -95,6 +95,14 @@ describe s3_bucket('my-bucket') do
 end
 ```
 
+### have_tag
+
+```ruby
+describe s3_bucket('my-bucket') do
+  it { should have_tag('env').value('dev') }
+end
+```
+
 ### have_versioning_enabled
 
 ```ruby

data/doc/_resource_types/sqs.md

@@ -3,7 +3,5 @@
 ```ruby
 describe sqs('my-queue') do
   it { should exist }
-  its(:queue_url) { should eq 'https://sqs.ap-northeast-1.amazonaws.com/123456789012/my-queue' }
-  its(:queue_arn) { should eq 'arn:aws:sqs:ap-northeast-1:123456789012:my-queue' }
 end
 ```

data/doc/resource_types.md

@@ -2115,6 +2115,15 @@ end
 ```
 
 
+### have_tag
+
+```ruby
+describe s3_bucket('my-bucket') do
+  it { should have_tag('env').value('dev') }
+end
+```
+
+
 ### have_versioning_enabled
 
 ```ruby
@@ -2236,12 +2245,10 @@ SQS resource type.
 ```ruby
 describe sqs('my-queue') do
   it { should exist }
-  its(:queue_url) { should eq 'https://sqs.ap-northeast-1.amazonaws.com/123456789012/my-queue' }
-  its(:queue_arn) { should eq 'arn:aws:sqs:ap-northeast-1:123456789012:my-queue' }
 end
 ```
 
-
+### its(:queue_arn), its(:approximate_number_of_messages), its(:approximate_number_of_messages_not_visible), its(:approximate_number_of_messages_delayed), its(:created_timestamp), its(:last_modified_timestamp), its(:visibility_timeout), its(:maximum_message_size), its(:message_retention_period), its(:delay_seconds), its(:receive_message_wait_time_seconds), its(:queue_url)
 ## <a name="subnet">subnet</a>
 
 Subnet resource type.

data/lib/awspec/generator/doc/type/sqs.rb

@@ -9,7 +9,7 @@ module Awspec::Generator
           @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
-          @describes = []
+          @describes = @type.resource_via_client.keys
         end
       end
     end

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

@@ -47,6 +47,9 @@ describe s3_bucket('<%= bucket.name %>') do
 <%- if bucket_policy -%>
   it { should have_policy('<%= bucket_policy %>') }
 <%- end -%>
+<%- if tag -%>
+  it { should have_tag('env').value('dev') }
+<%- end -%>
 end
 EOF
         template
@@ -57,6 +60,7 @@ EOF
       def content(bucket)
         acl = find_bucket_acl(bucket.name)
         grant_specs = generate_grant_specs(acl)
+        tag = find_bucket_tag(bucket.name, 'env')
         policy = find_bucket_policy(bucket.name)
         bucket_policy = policy.policy.read if policy
         ERB.new(bucket_spec_template, nil, '-').result(binding).gsub(/^\n/, '')

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

@@ -32,6 +32,18 @@ module Awspec::Helper
         nil
       end
 
+      def find_bucket_tag(id, tag_key)
+        tag = nil
+        begin
+          bucket_tagging = s3_client.get_bucket_tagging(bucket: id)
+          tag_set = bucket_tagging.tag_set
+          tag = tag_set.find { |tag_obj| tag_obj.key == tag_key }
+        rescue Aws::S3::Errors::ServiceError
+          nil
+        end
+        return tag if tag
+      end
+
       def find_bucket_versioning(id)
         s3_client.get_bucket_versioning(bucket: id)
       rescue Aws::S3::Errors::ServiceError

data/lib/awspec/stub/s3_bucket.rb

@@ -67,6 +67,14 @@ Aws.config[:s3] = {
     get_bucket_versioning: {
       status: 'Enabled',
       mfa_delete: 'Enabled'
+    },
+    get_bucket_tagging: {
+      tag_set: [
+        {
+          key: 'env',
+          value: 'dev'
+        }
+      ]
     }
   }
 }

data/lib/awspec/type/s3_bucket.rb

@@ -65,6 +65,12 @@ module Awspec::Type
       end
     end
 
+    def has_tag?(key, value)
+      tag = find_bucket_tag(id, key)
+      return nil if tag.value != value
+      tag
+    end
+
     def has_logging_enabled?(target_bucket: nil, target_prefix: nil)
       bl = find_bucket_logging(id)
       le = bl ? bl.logging_enabled : nil

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.82.1'
+  VERSION = '0.82.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.82.1
+  version: 0.82.2
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec