awspec 0.25.3 → 0.26.0

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

@@ -5,7 +5,7 @@ module Awspec::Generator
         def initialize
           super
           @type = Awspec::Type::Subnet.new('my-route-table')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = [
             Awspec::Type::Subnet::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', ')
           ]

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

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

data/lib/awspec/generator/template.rb

@@ -60,7 +60,7 @@ module Awspec::Generator
           super
           @type_name = '#{@type.camelize}'
           @type = Awspec::Type::#{@type.camelize}.new('my-#{@type.underscore.tr('_', '-')}')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = []

data/lib/awspec/matcher/be_allowed.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_allowed do |port|
-  match do |resource|
-    resource.allowed?(port, @protocol, @cidr, @rule_number)
+  match do |type|
+    type.allowed?(port, @protocol, @cidr, @rule_number)
   end
 
   chain :protocol do |protocol|

data/lib/awspec/matcher/be_allowed_action.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_allowed_action do |action_name|
-  match do |resource|
-    results = resource.select_policy_evaluation_results(resource.resource[:arn], action_name, @resource_arn)
+  match do |type|
+    results = type.select_policy_evaluation_results(type.resource_via_client[:arn], action_name, @resource_arn)
     results.find do |result|
       result.eval_decision == 'allowed'
     end

data/lib/awspec/matcher/be_denied.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_denied do |port|
-  match do |resource|
-    resource.denied?(port, @protocol, @cidr, @rule_number)
+  match do |type|
+    type.denied?(port, @protocol, @cidr, @rule_number)
   end
 
   chain :protocol do |protocol|

data/lib/awspec/matcher/belong_to_cache_subnet_group.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define :belong_to_cache_subnet_group do |cache_subnet_group_name|
-  match do |resource|
-    return true if resource.resource[:cache_subnet_group_name] == cache_subnet_group_name
+  match do |type|
+    return true if type.resource_via_client[:cache_subnet_group_name] == cache_subnet_group_name
   end
 end

data/lib/awspec/matcher/belong_to_db_subnet_group.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define :belong_to_db_subnet_group do |db_subnet_group_name|
-  match do |resource|
-    return true if resource.resource[:db_subnet_group][:db_subnet_group_name] == db_subnet_group_name
+  match do |type|
+    return true if type.resource_via_client[:db_subnet_group][:db_subnet_group_name] == db_subnet_group_name
   end
 end

data/lib/awspec/matcher/belong_to_iam_group.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :belong_to_iam_group do |group_id|
-  match do |resource|
-    groups = resource.select_iam_group_by_user_name(resource.resource[:user_name])
+  match do |type|
+    groups = type.select_iam_group_by_user_name(type.resource_via_client[:user_name])
     groups.find do |group|
       group.group_id == group_id || group.group_name == group_id
     end

data/lib/awspec/matcher/belong_to_metric.rb

@@ -1,9 +1,9 @@
 RSpec::Matchers.define :belong_to_metric do |name|
-  match do |resource|
+  match do |type|
     if @namespace
-      resource.namespace == @namespace && resource.metric_name == name
+      type.namespace == @namespace && type.metric_name == name
     else
-      resource.metric_name == name
+      type.metric_name == name
     end
   end
 

data/lib/awspec/matcher/belong_to_replication_group.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :belong_to_replication_group do |group_id|
-  match do |resource|
+  match do |type|
     # ElastiCache
-    resource.resource[:replication_group_id] == group_id
+    type.resource_via_client[:replication_group_id] == group_id
   end
 end

data/lib/awspec/matcher/belong_to_subnet.rb

@@ -1,31 +1,31 @@
 RSpec::Matchers.define :belong_to_subnet do |subnet_id|
-  match do |resource|
+  match do |type|
     # EC2
-    if resource.instance_of?(Awspec::Type::Ec2)
-      return true if resource.subnet_id == subnet_id
-      subnet = resource.find_subnet(subnet_id)
+    if type.instance_of?(Awspec::Type::Ec2)
+      return true if type.subnet_id == subnet_id
+      subnet = type.find_subnet(subnet_id)
       return false unless subnet
-      return subnet[:subnet_id] == resource.subnet_id
+      return subnet[:subnet_id] == type.subnet_id
     end
 
     # RDS
-    if resource.instance_of?(Awspec::Type::Rds)
-      subnets = resource.resource[:db_subnet_group][:subnets]
+    if type.instance_of?(Awspec::Type::Rds)
+      subnets = type.resource_via_client[:db_subnet_group][:subnets]
       ret = subnets.find do |s|
         s[:subnet_identifier] == subnet_id
       end
 
-      return ret[:subnet_availability_zone][:name] == resource.availability_zone if ret
+      return ret[:subnet_availability_zone][:name] == type.availability_zone if ret
 
-      res = resource.ec2_client.describe_subnets({
-                                                   filters: [{ name: 'tag:Name', values: [subnet_id] }]
-                                                 })
+      res = type.ec2_client.describe_subnets({
+                                               filters: [{ name: 'tag:Name', values: [subnet_id] }]
+                                             })
       return false unless res
       ret = subnets.find do |s|
         s[:subnet_identifier] == res[:subnets][0][:subnet_id]
       end
 
-      return ret[:subnet_availability_zone][:name] == resource.availability_zone if ret
+      return ret[:subnet_availability_zone][:name] == type.availability_zone if ret
     end
   end
 end

data/lib/awspec/matcher/belong_to_vpc.rb

@@ -1,8 +1,8 @@
 RSpec::Matchers.define :belong_to_vpc do |vpc_id|
-  match do |resource|
-    return true if resource.vpc_id == vpc_id
-    ret = resource.find_vpc(vpc_id)
+  match do |type|
+    return true if type.vpc_id == vpc_id
+    ret = type.find_vpc(vpc_id)
     return false unless ret
-    ret[:vpc_id] == resource.vpc_id
+    ret[:vpc_id] == type.vpc_id
   end
 end

data/lib/awspec/resource_reader.rb

@@ -0,0 +1,48 @@
+module Awspec
+  module BlackListForwardable
+    class CalledMethodInBlackList < StandardError
+    end
+
+    def method_missing_via_black_list(name, delegate_to: nil)
+      fail(ArguementError, 'delegate_to: must be specified') unless delegate_to
+      if match_black_list?(name)
+        fail CalledMethodInBlackList, "Method call #{name.inspect} is black-listed"
+      else
+        attr = delegate_to.send(name)
+        case attr
+        when Aws::Resources::Resource
+          ResourceReader.new(attr)
+        else
+          attr
+        end
+      end
+    end
+
+    private
+
+    BLACK_LIST_RE = /
+      create|
+      delete|
+      clear|
+      put|
+      update|
+      add
+    /ix
+
+    def match_black_list?(name)
+      BLACK_LIST_RE =~ name
+    end
+  end
+
+  class ResourceReader
+    include BlackListForwardable
+
+    def initialize(resource)
+      @resource_via_client = resource
+    end
+
+    def method_missing(name)
+      method_missing_via_black_list(name, delegate_to: @resource_via_client)
+    end
+  end
+end

data/lib/awspec/type/autoscaling_group.rb

@@ -2,19 +2,19 @@ module Awspec::Type
   class AutoscalingGroup < Base
     def initialize(id)
       super
-      @resource = find_autoscaling_group(id)
-      @id = @resource[:auto_scaling_group_arn] if @resource
+      @resource_via_client = find_autoscaling_group(id)
+      @id = @resource_via_client[:auto_scaling_group_arn] if @resource_via_client
     end
 
     def has_elb?(name)
-      @resource.load_balancer_names.find do |lb_name|
+      @resource_via_client.load_balancer_names.find do |lb_name|
         lb_name == name
       end
     end
 
     def has_ec2?(id)
       ec2 = find_ec2(id)
-      @resource.instances.find do |instance|
+      @resource_via_client.instances.find do |instance|
         instance.instance_id = ec2.instance_id
       end if ec2
     end

data/lib/awspec/type/base.rb

@@ -1,10 +1,13 @@
 require 'aws-sdk'
+require 'awspec/resource_reader'
 require 'awspec/helper/finder'
 
 module Awspec::Type
   class Base
     include Awspec::Helper::Finder
-    attr_reader :id, :resource
+    include Awspec::BlackListForwardable
+
+    attr_reader :id, :resource_via_client
 
     def initialize(id = nil)
       @display_name = id
@@ -27,10 +30,11 @@ module Awspec::Type
 
     def method_missing(name)
       describe = name.to_sym
-      if @resource.members.include?(describe)
-        @resource[describe]
+      if @resource_via_client.members.include?(describe)
+        @resource_via_client[describe]
       else
-        super
+        super unless self.respond_to?(:hogehoge)
+        method_missing_via_black_list(name, delegate_to: hogehoge)
       end
     end
   end

data/lib/awspec/type/cloudwatch_alarm.rb

@@ -2,20 +2,20 @@ module Awspec::Type
   class CloudwatchAlarm < Base
     def initialize(id)
       super
-      @resource = find_cloudwatch_alarm(id)
-      @id = @resource[:alarm_arn] if @resource
+      @resource_via_client = find_cloudwatch_alarm(id)
+      @id = @resource_via_client[:alarm_arn] if @resource_via_client
     end
 
     def has_ok_action?(name)
-      @resource[:ok_actions].include?(name)
+      @resource_via_client[:ok_actions].include?(name)
     end
 
     def has_alarm_action?(name)
-      @resource[:alarm_actions].include?(name)
+      @resource_via_client[:alarm_actions].include?(name)
     end
 
     def has_insufficient_data_action?(name)
-      @resource[:insufficient_data_actions].include?(name)
+      @resource_via_client[:insufficient_data_actions].include?(name)
     end
   end
 end

data/lib/awspec/type/directconnect_virtual_interface.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class DirectconnectVirtualInterface < Base
     def initialize(id)
       super
-      @resource = find_virtual_interface(id)
-      @id = @resource[:virtual_interface_id] if @resource
+      @resource_via_client = find_virtual_interface(id)
+      @id = @resource_via_client[:virtual_interface_id] if @resource_via_client
     end
 
     STATES = %w(
@@ -13,7 +13,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource[:virtual_interface_state] == state
+        @resource_via_client[:virtual_interface_state] == state
       end
     end
   end

data/lib/awspec/type/ebs.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class Ebs < Base
     def initialize(id)
       super
-      @resource = find_ebs(id)
-      @id = @resource[:volume_id] if @resource
+      @resource_via_client = find_ebs(id)
+      @id = @resource_via_client[:volume_id] if @resource_via_client
     end
 
     STATES = %w(
@@ -12,16 +12,16 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource[:state] == state
+        @resource_via_client[:state] == state
       end
     end
 
     def attached_to?(instance_id)
       instance = find_ec2(instance_id)
       return false unless instance
-      return false unless @resource[:attachments]
-      @resource[:attachments][0][:instance_id] == instance[:instance_id] && \
-        @resource[:attachments][0][:state] == 'attached'
+      return false unless @resource_via_client[:attachments]
+      @resource_via_client[:attachments][0][:instance_id] == instance[:instance_id] && \
+        @resource_via_client[:attachments][0][:state] == 'attached'
     end
   end
 end

data/lib/awspec/type/ec2.rb

@@ -5,8 +5,8 @@ module Awspec::Type
     def initialize(id)
       super
       @client = @ec2_client
-      @resource = find_ec2(id)
-      @id = @resource[:instance_id] if @resource
+      @resource_via_client = find_ec2(id)
+      @id = @resource_via_client[:instance_id] if @resource_via_client
     end
 
     STATES = %w(
@@ -16,7 +16,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource[:state][:name] == state
+        @resource_via_client[:state][:name] == state
       end
     end
 
@@ -36,7 +36,7 @@ module Awspec::Type
     end
 
     def has_security_group?(sg_id)
-      sgs = @resource[:security_groups]
+      sgs = @resource_via_client[:security_groups]
       ret = sgs.find do |sg|
         sg[:group_id] == sg_id || sg[:group_name] == sg_id
       end
@@ -49,7 +49,7 @@ module Awspec::Type
     end
 
     def has_ebs?(volume_id)
-      blocks = @resource[:block_device_mappings]
+      blocks = @resource_via_client[:block_device_mappings]
       ret = blocks.find do |block|
         next false unless block[:ebs]
         block[:ebs][:volume_id] == volume_id

data/lib/awspec/type/elasticache.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class Elasticache < Base
     def initialize(id)
       super
-      @resource = find_cache_cluster(id)
-      @id = @resource[:cache_cluster_id] if @resource
+      @resource_via_client = find_cache_cluster(id)
+      @id = @resource_via_client[:cache_cluster_id] if @resource_via_client
     end
 
     STATES = %w(
@@ -15,16 +15,16 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource[:cache_cluster_status] == state
+        @resource_via_client[:cache_cluster_status] == state
       end
     end
 
     def has_cache_parameter_group?(group_name)
-      @resource[:cache_parameter_group][:cache_parameter_group_name] == group_name
+      @resource_via_client[:cache_parameter_group][:cache_parameter_group_name] == group_name
     end
 
     def vpc_id
-      cache_subnet_group = find_cache_subnet_group(@resource[:cache_subnet_group_name])
+      cache_subnet_group = find_cache_subnet_group(@resource_via_client[:cache_subnet_group_name])
       cache_subnet_group[:vpc_id] if cache_subnet_group
     end
   end

data/lib/awspec/type/elasticache_cache_parameter_group.rb

@@ -17,7 +17,7 @@ module Awspec::Type
       end
 
       @id = name unless @parameters.empty?
-      @resource = @parameters
+      @resource_via_client = @parameters
       @id
     end
 

data/lib/awspec/type/elb.rb

@@ -2,8 +2,8 @@ module Awspec::Type
   class Elb < Base
     def initialize(id)
       super
-      @resource = find_elb(id)
-      @id = @resource[:load_balancer_name] if @resource
+      @resource_via_client = find_elb(id)
+      @id = @resource_via_client[:load_balancer_name] if @resource_via_client
     end
 
     health_check_options = %w(
@@ -13,19 +13,19 @@ module Awspec::Type
 
     health_check_options.each do |option|
       define_method 'health_check_' + option do
-        @resource[:health_check][option]
+        @resource_via_client[:health_check][option]
       end
     end
 
     def has_ec2?(id)
       ec2 = find_ec2(id)
-      @resource.instances.find do |instance|
+      @resource_via_client.instances.find do |instance|
         instance.instance_id = ec2.instance_id
       end if ec2
     end
 
     def has_security_group?(sg_id)
-      sgs = @resource[:security_groups]
+      sgs = @resource_via_client[:security_groups]
       ret = sgs.find do |sg|
         sg == sg_id
       end
@@ -38,7 +38,7 @@ module Awspec::Type
     end
 
     def has_subnet?(subnet_id)
-      subnets = @resource[:subnets]
+      subnets = @resource_via_client[:subnets]
       ret = subnets.find do |s|
         s == subnet_id
       end
@@ -50,7 +50,7 @@ module Awspec::Type
     end
 
     def has_listener?(protocol:, port:, instance_protocol:, instance_port:)
-      @resource[:listener_descriptions].find do |desc|
+      @resource_via_client[:listener_descriptions].find do |desc|
         listener = desc.listener
         listener.protocol == protocol && listener.load_balancer_port == port && \
           listener.instance_protocol == instance_protocol && listener.instance_port == instance_port