awspec 0.22.1 → 0.23.0

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

@@ -7,8 +7,12 @@ module Awspec::Generator
           @type_name = 'DirectconnectVirtualInterface'
           @type = Awspec::Type::DirectconnectVirtualInterface.new('my-directconnect-virtual-interface')
           @ret = @type.resource
-          @matchers = []
-          @ignore_matchers = []
+          @matchers = [
+            Awspec::Type::DirectconnectVirtualInterface::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::DirectconnectVirtualInterface::STATES.map do |state|
+            'be_' + state.tr('-', '_')
+          end
           @describes = []
         end
       end

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

@@ -7,8 +7,10 @@ module Awspec::Generator
           @type_name = 'EBS'
           @type = Awspec::Type::Ebs.new('my-ebs')
           @ret = @type.resource
-          @matchers = []
-          @ignore_matchers = []
+          @matchers = [
+            Awspec::Type::Ebs::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::Ebs::STATES.map { |state| 'be_' + state.tr('-', '_') }
           @describes = []
         end
       end

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

@@ -7,8 +7,12 @@ module Awspec::Generator
           @type_name = 'EC2'
           @type = Awspec::Type::Ec2.new('my-ec2')
           @ret = @type.resource
-          @matchers = %w(belong_to_vpc belong_to_subnet)
-          @ignore_matchers = []
+          @matchers = [
+            Awspec::Type::Ec2::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', '),
+            'belong_to_vpc',
+            'belong_to_subnet'
+          ]
+          @ignore_matchers = Awspec::Type::Ec2::STATES.map { |state| 'be_' + state.tr('-', '_') }
           @describes = []
         end
       end

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

@@ -7,8 +7,13 @@ module Awspec::Generator
           @type_name = 'Elasticache'
           @type = Awspec::Type::Elasticache.new('my-rep-group-001')
           @ret = @type.resource
-          @matchers = %w(belong_to_vpc belong_to_replication_group belong_to_cache_subnet_group)
-          @ignore_matchers = []
+          @matchers = [
+            Awspec::Type::Elasticache::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', '),
+            'belong_to_vpc',
+            'belong_to_replication_group',
+            'belong_to_cache_subnet_group'
+          ]
+          @ignore_matchers = Awspec::Type::Elasticache::STATES.map { |state| 'be_' + state.tr('-', '_') }
           @describes = []
         end
       end

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

@@ -7,7 +7,7 @@ module Awspec::Generator
           @type_name = 'ELB'
           @type = Awspec::Type::Elb.new('my-elb')
           @ret = @type.resource
-          @matchers = %w(belong_to_vpc belong_to_subnet)
+          @matchers = %w(belong_to_vpc)
           @ignore_matchers = []
           @describes = %w(
             health_check_target health_check_interval health_check_timeout

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

@@ -7,7 +7,10 @@ module Awspec::Generator
           @type_name = 'NetworkAcl'
           @type = Awspec::Type::NetworkAcl.new('my-network-acl')
           @ret = @type.resource
-          @matchers = ['its(:inbound), its(:outbound)']
+          @matchers = [
+            'belong_to_vpc',
+            'its(:inbound), its(:outbound), its(:inbound_entries_count), its(:outbound_entries_count)'
+          ]
           @ignore_matchers = %w(be_allowed be_denied)
           @describes = %w(inbound_entries_count outbound_entries_count)
         end

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

@@ -7,8 +7,13 @@ module Awspec::Generator
           @type_name = 'RDS'
           @type = Awspec::Type::Rds.new('my-rds')
           @ret = @type.resource
-          @matchers = %w(belong_to_vpc belong_to_subnet belong_to_db_subnet_group)
-          @ignore_matchers = []
+          @matchers = [
+            Awspec::Type::Rds::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', '),
+            'belong_to_vpc',
+            'belong_to_subnet',
+            'belong_to_db_subnet_group'
+          ]
+          @ignore_matchers = Awspec::Type::Rds::STATES.map { |state| 'be_' + state.tr('-', '_') }
           @describes = %w(vpc_id)
         end
       end

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

@@ -8,7 +8,7 @@ module Awspec::Generator
           @ret = @type.resource
           @matchers = []
           @ignore_matchers = []
-          @describes = []
+          @describes = %w(acl_grants_count acl_owner)
         end
       end
     end

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

@@ -6,8 +6,10 @@ module Awspec::Generator
           super
           @type = Awspec::Type::Subnet.new('my-route-table')
           @ret = @type.resource
-          @matchers = []
-          @ignore_matchers = []
+          @matchers = [
+            Awspec::Type::Subnet::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::Subnet::STATES.map { |state| 'be_' + state.tr('-', '_') }
           @describes = []
         end
       end

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

@@ -7,8 +7,10 @@ module Awspec::Generator
           @type_name = 'VPC'
           @type = Awspec::Type::Vpc.new('my-vpc')
           @ret = @type.resource
-          @matchers = []
-          @ignore_matchers = []
+          @matchers = [
+            Awspec::Type::Vpc::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::Vpc::STATES.map { |state| 'be_' + state.tr('-', '_') }
           @describes = []
         end
       end

data/lib/awspec/generator/template.rb

@@ -7,12 +7,12 @@ module Awspec::Generator
       generate_type
       generate_type_spec
       generate_generator_doc
+      generate_resource_type_doc
       put_message
     end
 
     def self.generate_type
       path = 'lib/awspec/type/' + @type.underscore + '.rb'
-      full_path = @root_path + path
       content = <<-"EOF"
 module Awspec::Type
   class #{@type.camelize} < Base
@@ -28,7 +28,6 @@ EOF
 
     def self.generate_stub
       path = 'lib/awspec/stub/' + @type.underscore + '.rb'
-      full_path = @root_path + path
       content = <<-"EOF"
 # Aws.config[:ec2] = {
 #   stub_responses: true
@@ -39,7 +38,6 @@ EOF
 
     def self.generate_type_spec
       path = 'spec/type/' + @type.underscore + '_spec.rb'
-      full_path = @root_path + path
       content = <<-"EOF"
 require 'spec_helper'
 Awspec::Stub.load '#{@type.underscore}'
@@ -53,7 +51,6 @@ EOF
 
     def self.generate_generator_doc
       path = 'lib/awspec/generator/doc/type/' + @type.underscore + '.rb'
-      full_path = @root_path + path
       content = <<-"EOF"
 module Awspec::Generator
   module Doc
@@ -76,6 +73,14 @@ EOF
       self.file_check_and_puts(path, content)
     end
 
+    def self.generate_resource_type_doc
+      path = 'doc/_resource_types/' + @type.underscore + '.md'
+      content = <<-"EOF"
+# exist
+EOF
+      self.file_check_and_puts(path, content)
+    end
+
     def self.put_message
       content = <<-"EOF"
 

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

@@ -7,6 +7,12 @@ module Awspec::Helper
           bucket.name == id
         end
       end
+
+      def find_bucket_acl(id)
+        @s3_client.get_bucket_acl(bucket: id)
+      rescue Aws::S3::Errors::NoSuchBucket
+        nil
+      end
     end
   end
 end

data/lib/awspec/stub/iam_group.rb

@@ -1,14 +1,5 @@
 Aws.config[:iam] = {
   stub_responses: {
-    list_groups: {
-      groups: [
-        path: '/',
-        group_name: 'my-iam-group',
-        group_id: 'GABCDEFGHI123455689',
-        arn: 'arn:aws:iam::123456789012:group/my-iam-group',
-        create_date: Time.local(2015)
-      ]
-    },
     list_users: {
       users: [
         path: '/',
@@ -18,6 +9,15 @@ Aws.config[:iam] = {
         create_date: Time.local(2015)
       ]
     },
+    list_groups: {
+      groups: [
+        path: '/',
+        group_name: 'my-iam-group',
+        group_id: 'GABCDEFGHI123455689',
+        arn: 'arn:aws:iam::123456789012:group/my-iam-group',
+        create_date: Time.local(2015)
+      ]
+    },
     list_groups_for_user: {
       groups: [
         {

data/lib/awspec/stub/iam_policy.rb

@@ -1,5 +1,32 @@
 Aws.config[:iam] = {
   stub_responses: {
+    list_users: {
+      users: [
+        path: '/',
+        user_name: 'my-iam-user',
+        user_id: 'ABCDEFGHI1234556890',
+        arn: 'arn:aws:iam::123456789012:user/my-iam-user',
+        create_date: Time.local(2015)
+      ]
+    },
+    list_groups: {
+      groups: [
+        path: '/',
+        group_name: 'my-iam-group',
+        group_id: 'GABCDEFGHI123455689',
+        arn: 'arn:aws:iam::123456789012:group/my-iam-group',
+        create_date: Time.local(2015)
+      ]
+    },
+    list_roles: {
+      roles: [
+        path: '/',
+        role_name: 'HelloIAmGodRole',
+        role_id: 'RABCDEFGHI123455689',
+        arn: 'arn:aws:iam::123456789012:role/HelloIAmGodRole',
+        create_date: Time.local(2015)
+      ]
+    },
     list_policies: {
       policies: [
         {

data/lib/awspec/stub/s3.rb

@@ -9,6 +9,34 @@ Aws.config[:s3] = {
     },
     head_object: {
       content_type: 'binary/octet-stream'
+    },
+    get_bucket_acl: {
+      owner: {
+        display_name: 'my-bucket-owner'
+      },
+      grants: [
+        {
+          grantee: {
+            display_name: 'my-bucket-owner',
+            type: 'CanonicalUser'
+          },
+          permission: 'FULL_CONTROL'
+        },
+        {
+          grantee: {
+            display_name: 'my-bucket-write-only',
+            type: 'CanonicalUser'
+          },
+          permission: 'WRITE'
+        },
+        {
+          grantee: {
+            display_name: 'my-bucket-read-only',
+            type: 'CanonicalUser'
+          },
+          permission: 'READ'
+        }
+      ]
     }
   }
 }

data/lib/awspec/type/directconnect_virtual_interface.rb

@@ -6,12 +6,12 @@ module Awspec::Type
       @id = @resource[:virtual_interface_id] if @resource
     end
 
-    states = %w(
+    STATES = %w(
       confirming verifying pending available
       deleting deleted rejected
     )
 
-    states.each do |state|
+    STATES.each do |state|
       define_method state + '?' do
         @resource[:virtual_interface_state] == state
       end

data/lib/awspec/type/ebs.rb

@@ -6,11 +6,11 @@ module Awspec::Type
       @id = @resource[:volume_id] if @resource
     end
 
-    states = %w(
+    STATES = %w(
       creating available in-use deleting deleted error
     )
 
-    states.each do |state|
+    STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
         @resource[:state] == state
       end

data/lib/awspec/type/ec2.rb

@@ -9,12 +9,12 @@ module Awspec::Type
       @id = @resource[:instance_id] if @resource
     end
 
-    states = %w(
+    STATES = %w(
       pending running shutting-down
       terminated stopping stopped
     )
 
-    states.each do |state|
+    STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
         @resource[:state][:name] == state
       end

data/lib/awspec/type/elasticache.rb

@@ -6,14 +6,14 @@ module Awspec::Type
       @id = @resource[:cache_cluster_id] if @resource
     end
 
-    states = %w(
+    STATES = %w(
       available creating deleted deleting
       incompatible-network modifying
       rebooting-cache-cluster-nodes restore-failed
       snapshotting
     )
 
-    states.each do |state|
+    STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
         @resource[:cache_cluster_status] == state
       end

data/lib/awspec/type/rds.rb

@@ -6,7 +6,7 @@ module Awspec::Type
       @id = @resource[:db_instance_identifier] if @resource
     end
 
-    states = %w(
+    STATES = %w(
       available backing-up creating deleting
       failed inaccessible-encryption-credentials
       incompatible-credentials incompatible-network
@@ -16,7 +16,7 @@ module Awspec::Type
       restore-error storage-full upgrading
     )
 
-    states.each do |state|
+    STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
         @resource[:db_instance_status] == state
       end

data/lib/awspec/type/s3.rb

@@ -15,5 +15,24 @@ module Awspec::Type
     rescue
       false
     end
+
+    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
+      end
+    end
+
+    def acl_owner
+      @acl = find_bucket_acl(@id)
+      @acl.owner.display_name
+    end
+
+    def acl_grants_count
+      @acl = find_bucket_acl(@id)
+      @acl.grants.count
+    end
   end
 end

data/lib/awspec/type/subnet.rb

@@ -6,11 +6,11 @@ module Awspec::Type
       @id = @resource[:subnet_id] if @resource
     end
 
-    states = %w(
+    STATES = %w(
       available pending
     )
 
-    states.each do |state|
+    STATES.each do |state|
       define_method state + '?' do
         @resource[:state] == state
       end

data/lib/awspec/type/vpc.rb

@@ -9,11 +9,11 @@ module Awspec::Type
       @id = @resource[:vpc_id] if @resource
     end
 
-    states = %w(
+    STATES = %w(
       available pending
     )
 
-    states.each do |state|
+    STATES.each do |state|
       define_method state + '?' do
         @resource[:state] == state
       end

data/lib/awspec/version.rb

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