awspec 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29714cb2509f97ff68e7b273854fc1829a43161f
-  data.tar.gz: c6f75d467f1fbf92d96309a4e563aa356a6aee49
+  metadata.gz: 9d18888b14d8e1858e59126b09d82f75705cc744
+  data.tar.gz: 51e0923dc3afb735b6566a1beb4e8de83f79475f
 SHA512:
-  metadata.gz: 345ee0b436e56b86b65d784738a745a9addb2913fb0b63b981c04cb13e48ea3e483a190ce524c5aa2d96cd8ea630422b916c5fb4ae94b56852b60b11abf9683a
-  data.tar.gz: b0c9ad16b2b6aa41c83189f42ea8b6df451f6965eac01c665f77847d12787e8694d3291953e5524c02162ccea13c1dd6e807271c8e4a8cfcc79de7c5379c54f6
+  metadata.gz: a29ad76af244e9feac511c78779200d3c2a400e58dddcb7f6e967441c9d3758e7a29e9f6d472f6df7ddd512637f411c55910d5547509190ba4a641fffebe96b7
+  data.tar.gz: 75b430184399d5e2d46da464525b75b03b0a6c31ad3b34c6d54cc856f8d8459c7fed9c7bec453d2d2e5722f0ad893872a579278b5829f5619ef662e4096c5367

data/doc/resource_types.md

@@ -5,7 +5,7 @@
 | [rds_db_parameter_group](#rds_db_parameter_group)
 | [security_group](#security_group)
 | [vpc](#vpc)
-| [s3](#s3)
+| [s3_bucket](#s3_bucket)
 | [route53_hosted_zone](#route53_hosted_zone)
 | [autoscaling_group](#autoscaling_group)
 | [subnet](#subnet)
@@ -270,41 +270,21 @@ end
 ```
 
 #### its(:vpc_id), its(:state), its(:cidr_block), its(:dhcp_options_id), its(:instance_tenancy), its(:is_default)
-## <a name="s3">s3</a>
+## <a name="s3_bucket">s3_bucket</a>
 
-S3 resource type.
+S3Bucket resource type.
 
 ### exist
 
-```ruby
-describe s3('my-bucket') do
-  it { should exist }
-end
-```
-
-
 ### have_acl_grant
 
-```ruby
-describe s3('my-bucket') do
-  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' }
-end
-```
-
+### have_cors_rule
 
 ### have_object
 
-```ruby
-describe s3('my-bucket') do
-  it { should have_object('path/to/object') }
-end
-```
+### have_policy
 
-#### its(:acl_grants_count), its(:acl_owner), its(:name), its(:creation_date)
+#### its(:acl_grants_count), its(:acl_owner), its(:cors_rules_count), its(:name), its(:creation_date)
 ## <a name="route53_hosted_zone">route53_hosted_zone</a>
 
 Route53HostedZone resource type.

data/lib/awspec/command/generate.rb

@@ -26,12 +26,12 @@ module Awspec
     end
 
     types_for_generate_all = %w(
-      iam_policy cloudwatch_alarm directconnect
+      iam_policy cloudwatch_alarm directconnect ebs s3_bucket
     )
 
     types_for_generate_all.each do |type|
-      if type == 'iam_policy'
-        desc 'iam_policy', 'Generate attached iam_policy spec'
+      if %w(iam_policy ebs).include?(type)
+        desc type, "Generate attached #{type} spec"
       else
         desc type, "Generate #{type} spec"
       end

data/lib/awspec/generator.rb

@@ -13,6 +13,8 @@ require 'awspec/generator/spec/network_acl'
 require 'awspec/generator/spec/route_table'
 require 'awspec/generator/spec/subnet'
 require 'awspec/generator/spec/directconnect'
+require 'awspec/generator/spec/ebs'
+require 'awspec/generator/spec/s3_bucket'
 
 # Doc
 require 'awspec/generator/doc/type'

data/lib/awspec/generator/doc/type/{s3.rb → s3_bucket.rb}

@@ -1,14 +1,14 @@
 module Awspec::Generator
   module Doc
     module Type
-      class S3 < Base
+      class S3Bucket < Base
         def initialize
           super
-          @type = Awspec::Type::S3.new('my-bucket')
+          @type = Awspec::Type::S3Bucket.new('my-bucket')
           @ret = @type.resource
           @matchers = []
           @ignore_matchers = []
-          @describes = %w(acl_grants_count acl_owner)
+          @describes = %w(acl_grants_count acl_owner cors_rules_count)
         end
       end
     end

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

@@ -0,0 +1,55 @@
+module Awspec::Generator
+  module Spec
+    class Ebs
+      include Awspec::Helper::Finder
+      def generate_all
+        volumes = select_all_attached_ebs
+        volumes.empty? && fail('Not Found EBS')
+        specs = volumes.map do |volume|
+          attachment_specs = generate_attachment_specs(volume)
+          content = ERB.new(ebs_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      def generate_attachment_specs(volume)
+        linespecs = []
+        volume.attachments.each do |attachment|
+          instance = find_ec2(attachment.instance_id)
+          linespecs.push(ERB.new(attachment_linetemplate, nil, '-').result(binding)) if attachment.instance_id
+        end
+        linespecs
+      end
+
+      def attachment_linetemplate
+        template = <<-'EOF'
+<%- if instance.tag_name -%>
+it { should be_attached_to('<%= instance.tag_name %>') }
+<%- else -%>
+it { should be_attached_to('<%= instance.instance_id %>') }
+<%- end -%>
+EOF
+        template
+      end
+
+      def ebs_spec_template
+        template = <<-'EOF'
+<%- if volume.tag_name -%>
+describe ebs('<%= volume.tag_name %>') do
+<%- else -%>
+describe ebs('<%= volume.volume_id %>') do
+<%- end -%>
+  it { should exist }
+  it { should be_<%= volume.state.tr('-', '_') %> }
+  its(:size) { should eq <%= volume.size %> }
+  its(:volume_type) { should eq '<%= volume.volume_type %>' }
+<% attachment_specs.each do |line| %>
+  <%= line %>
+<% end %>
+end
+EOF
+        template
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module Awspec::Generator
+  module Spec
+    class S3Bucket
+      include Awspec::Helper::Finder
+      def generate_all
+        buckets = select_all_buckets
+        buckets.empty? && fail('Not Found Bucket')
+        specs = buckets.map do |bucket|
+          acl = find_bucket_acl(bucket.name)
+          grant_specs = generate_grant_specs(acl)
+          content = ERB.new(bucket_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      def generate_grant_specs(acl)
+        linespecs = []
+        acl.grants.each do |grant|
+          linespecs.push(ERB.new(grant_linetemplate, nil, '-').result(binding))
+        end
+        linespecs
+      end
+
+      def grant_linetemplate
+        template = <<-'EOF'
+it { should have_acl_grant(grantee: '<%= grant.grantee.display_name %>', permission: '<%= grant.permission %>') }
+EOF
+        template
+      end
+
+      def bucket_spec_template
+        template = <<-'EOF'
+describe s3_bucket('<%= bucket.name %>') do
+  it { should exist }
+  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
+      end
+    end
+  end
+end

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

@@ -22,6 +22,18 @@ module Awspec::Helper
         end
         volumes
       end
+
+      def select_all_attached_ebs
+        selected = []
+        res = @ec2_client.describe_volumes
+
+        loop do
+          selected += res.volumes.select { |v| v.attachments.count > 0 }
+          (res.next_page? && res = res.next_page) || break
+        end
+
+        selected
+      end
     end
   end
 end

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

@@ -13,6 +13,22 @@ module Awspec::Helper
       rescue Aws::S3::Errors::NoSuchBucket
         nil
       end
+
+      def find_bucket_cors(id)
+        @s3_client.get_bucket_cors(bucket: id)
+      rescue Aws::S3::Errors::NoSuchBucket
+        nil
+      end
+
+      def find_bucket_policy(id)
+        @s3_client.get_bucket_policy(bucket: id)
+      rescue Aws::S3::Errors::NoSuchBucket
+        nil
+      end
+
+      def select_all_buckets
+        @s3_client.list_buckets.buckets
+      end
     end
   end
 end

data/lib/awspec/helper/type.rb

@@ -3,7 +3,7 @@ module Awspec
     module Type
       TYPES = %w(
         base ec2 rds rds_db_parameter_group security_group
-        vpc s3 route53_hosted_zone autoscaling_group subnet
+        vpc s3_bucket route53_hosted_zone autoscaling_group subnet
         route_table ebs elb lambda iam_user iam_group iam_role
         iam_policy elasticache elasticache_cache_parameter_group
         cloudwatch_alarm ses_identity network_acl directconnect_virtual_interface
@@ -23,6 +23,12 @@ module Awspec
         puts Color.on_red(Color.white('!!! `auto_scaling_group` type is deprecated. use `autoscaling_group` !!!'))
         Awspec::Type::AutoscalingGroup.new(name)
       end
+
+      def s3(name)
+        puts ''
+        puts Color.on_red(Color.white('!!! `s3` type is deprecated. use `s3_bucket` !!!'))
+        Awspec::Type::S3Bucket.new(name)
+      end
     end
   end
 end

data/lib/awspec/stub/ebs.rb

@@ -46,6 +46,7 @@ Aws.config[:ec2] = {
           volume_id: 'vpc-ab123cde',
           state: 'in-use',
           size: 100,
+          volume_type: 'gp2',
           attachments: [
             {
               instance_id: 'i-ec12345a',

data/lib/awspec/stub/{s3.rb → s3_bucket.rb}

@@ -37,6 +37,37 @@ Aws.config[:s3] = {
           permission: 'READ'
         }
       ]
+    },
+    get_bucket_cors: {
+      cors_rules: [
+        {
+          allowed_methods: ['GET'],
+          allowed_origins: ['*']
+        },
+        {
+          allowed_headers: ['*'],
+          allowed_methods: ['GET'],
+          allowed_origins: ['https://example.com', 'https://example.org'],
+          expose_headers:  ['X-Custom-Header'],
+          max_age_seconds: 3600
+        }
+      ]
+    },
+    get_bucket_policy: {
+      policy: <<-POLICY
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Sid": "AllowPublicRead",
+      "Effect": "Allow",
+      "Principal": "*",
+      "Action": "s3:GetObject",
+      "Resource": "arn:aws:s3:::my-bucket/*"
+    }
+  ]
+}
+      POLICY
     }
   }
 }

data/lib/awspec/type/{s3.rb → s3_bucket.rb}

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class S3 < Base
+  class S3Bucket < Base
     def initialize(id)
       super
       @resource = find_bucket(id)
@@ -34,5 +34,35 @@ module Awspec::Type
       @acl = find_bucket_acl(@id)
       @acl.grants.count
     end
+
+    def has_cors_rule?(allowed_headers: [],
+                       allowed_methods:,
+                       allowed_origins:,
+                       expose_headers: [],
+                       max_age_seconds: nil)
+      cors_rules.any? do |rule|
+        (rule.allowed_headers - allowed_headers).empty? &&
+          (rule.allowed_methods - allowed_methods).empty? &&
+          (rule.allowed_origins - allowed_origins).empty? &&
+          (rule.expose_headers - expose_headers).empty? &&
+          rule.max_age_seconds == max_age_seconds
+      end
+    end
+
+    def cors_rules_count
+      cors_rules.count
+    end
+
+    def has_policy?(policy)
+      bp = find_bucket_policy(@id)
+      bp ? (bp.policy.read == policy) : false
+    end
+
+    private
+
+    def cors_rules
+      cors = find_bucket_cors(@id)
+      cors ? cors.cors_rules : []
+    end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.23.0'
+  VERSION = '0.24.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -235,13 +235,14 @@ files:
 - lib/awspec/generator/doc/type/rds_db_parameter_group.rb
 - lib/awspec/generator/doc/type/route53_hosted_zone.rb
 - lib/awspec/generator/doc/type/route_table.rb
-- lib/awspec/generator/doc/type/s3.rb
+- lib/awspec/generator/doc/type/s3_bucket.rb
 - lib/awspec/generator/doc/type/security_group.rb
 - lib/awspec/generator/doc/type/ses_identity.rb
 - lib/awspec/generator/doc/type/subnet.rb
 - lib/awspec/generator/doc/type/vpc.rb
 - lib/awspec/generator/spec/cloudwatch_alarm.rb
 - lib/awspec/generator/spec/directconnect.rb
+- lib/awspec/generator/spec/ebs.rb
 - lib/awspec/generator/spec/ec2.rb
 - lib/awspec/generator/spec/elb.rb
 - lib/awspec/generator/spec/iam_policy.rb
@@ -249,6 +250,7 @@ files:
 - lib/awspec/generator/spec/rds.rb
 - lib/awspec/generator/spec/route53_hosted_zone.rb
 - lib/awspec/generator/spec/route_table.rb
+- lib/awspec/generator/spec/s3_bucket.rb
 - lib/awspec/generator/spec/security_group.rb
 - lib/awspec/generator/spec/subnet.rb
 - lib/awspec/generator/spec/vpc.rb
@@ -307,7 +309,7 @@ files:
 - lib/awspec/stub/rds_db_parameter_group.rb
 - lib/awspec/stub/route53_hosted_zone.rb
 - lib/awspec/stub/route_table.rb
-- lib/awspec/stub/s3.rb
+- lib/awspec/stub/s3_bucket.rb
 - lib/awspec/stub/security_group.rb
 - lib/awspec/stub/ses_identity.rb
 - lib/awspec/stub/subnet.rb
@@ -332,7 +334,7 @@ files:
 - lib/awspec/type/rds_db_parameter_group.rb
 - lib/awspec/type/route53_hosted_zone.rb
 - lib/awspec/type/route_table.rb
-- lib/awspec/type/s3.rb
+- lib/awspec/type/s3_bucket.rb
 - lib/awspec/type/security_group.rb
 - lib/awspec/type/ses_identity.rb
 - lib/awspec/type/subnet.rb