awspec 0.55.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2786648f3e7a7e6b273f3d154686f6d247113f0
-  data.tar.gz: a65ca8501700768f0b39ec7a24c6de49b03749b2
+  metadata.gz: 29b03262bb9f7a144d1baa26418051af1898f0a2
+  data.tar.gz: 4ad6c4180e0837b971d4ae7dcb5dfaf92d444245
 SHA512:
-  metadata.gz: 12665c4e7ae28e5e2bf4e1168ffdcd29d4f10c08e5b7c2de597f3f72eaa8ec71e44ed923b517998666ee330d93ad29366eecce818ac88ebad7fe824fe7b665bf
-  data.tar.gz: 5910721661c227d6ae285e738efafa734f5822701afdd8f385e917fa9c86d2d1fb69a44c5e31cb9673b06b33f17927eaa7a26d33b702e16656c35189cbedabd9
+  metadata.gz: d17e5911fc2e6927a0cc2db573e02f2dc77731fb2b24f192995427f1ba7c63e6a2f1cc4a8a3c3bb4a0be226d30728429576489a8eb15861827a1d817fa2e4e2f
+  data.tar.gz: 174d4e576def401d02993ffe598723ecb8b76cf3783120796b7ea70b869cd27ca9bb3929ae7997689a0355fc3021bd01a896eaf9ab73733ef647ab4011ade3ac

data/lib/awspec.rb

@@ -14,6 +14,7 @@ require 'awspec/ext'
 require 'awspec/generator'
 require 'awspec/toolbox'
 require 'awspec/resource_reader'
+require 'awspec/shared_context'
 
 module Awspec
 end

data/lib/awspec/generator/template.rb

@@ -16,9 +16,12 @@ module Awspec::Generator
       content = <<-"EOF"
 module Awspec::Type
   class #{@type.camelize} < Base
-    def initialize(id)
-      super
-      # @id = # @FIXME
+    def resource_via_client
+      @resource_via_client ||= # FIXME
+    end
+
+    def id
+     @id ||= # FIXME
     end
   end
 end

data/lib/awspec/shared_context.rb

@@ -0,0 +1,11 @@
+shared_context 'region', :region do
+  before do |example|
+    region = example.metadata[:region]
+    @_region = Aws.config[:region]
+    Aws.config[:region] = region
+  end
+
+  after do
+    Aws.config[:region] = @_region
+  end
+end

data/lib/awspec/type/ami.rb

@@ -2,10 +2,12 @@ module Awspec::Type
   class Ami < Base
     aws_resource Aws::EC2::Image
 
-    def initialize(id)
-      super
-      @resource_via_client = find_ami(id)
-      @id = @resource_via_client.image_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_ami(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.image_id if resource_via_client
     end
 
     STATES = %w(
@@ -15,7 +17,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource_via_client.state == state
+        resource_via_client.state == state
       end
     end
   end

data/lib/awspec/type/autoscaling_group.rb

@@ -1,20 +1,22 @@
 module Awspec::Type
   class AutoscalingGroup < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_autoscaling_group(id)
-      @id = @resource_via_client.auto_scaling_group_arn if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_autoscaling_group(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.auto_scaling_group_arn if resource_via_client
     end
 
     def has_elb?(name)
-      @resource_via_client.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_via_client.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

@@ -9,8 +9,8 @@ module Awspec::Type
 
     attr_reader :id, :resource_via_client
 
-    def initialize(id = nil)
-      @display_name = id
+    def initialize(display_name = nil)
+      @display_name = display_name
       @id = nil
     end
 
@@ -24,18 +24,26 @@ module Awspec::Type
     end
 
     def exists?
-      @id
+      id
+    end
+
+    def id
+      raise 'this method must be override!'
+    end
+
+    def resource_via_client
+      raise 'this method must be override!'
     end
 
     def self.aws_resource(resource)
       define_method :resource do
-        @resource ||= Awspec::ResourceReader.new(resource.new(@id))
+        @resource ||= Awspec::ResourceReader.new(resource.new(id))
       end
     end
 
     def self.tags_allowed
       define_method :has_tag? do |key, value|
-        tags = @resource_via_client.tags
+        tags = resource_via_client.tags
         return false unless tags
         tags.any? { |t| t['key'] == key && t['value'] == value }
       end
@@ -43,8 +51,8 @@ module Awspec::Type
 
     def method_missing(name)
       describe = name.to_sym
-      if @resource_via_client.members.include?(describe)
-        @resource_via_client[describe]
+      if resource_via_client.members.include?(describe)
+        resource_via_client[describe]
       else
         super unless self.respond_to?(:resource)
         method_missing_via_black_list(name, delegate_to: resource)

data/lib/awspec/type/cloudfront_distribution.rb

@@ -1,9 +1,11 @@
 module Awspec::Type
   class CloudfrontDistribution < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_cloudfront_distribution(id)
-      @id = @resource_via_client.id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_cloudfront_distribution(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.id if resource_via_client
     end
 
     STATUSES = %w(
@@ -12,7 +14,7 @@ module Awspec::Type
 
     STATUSES.each do |status|
       define_method status.underscore + '?' do
-        @resource_via_client.status == status
+        resource_via_client.status == status
       end
     end
 
@@ -21,7 +23,7 @@ module Awspec::Type
                     origin_path: nil,
                     origin_access_identity: nil)
       return false unless [origin_id, domain_name].any?
-      @resource_via_client.origins.items.find do |origin|
+      resource_via_client.origins.items.find do |origin|
         next false if !origin_id.nil? && origin.id != origin_id
         next false if !domain_name.nil? && origin.domain_name != domain_name
         next false if !origin_path.nil? && origin.origin_path != origin_path

data/lib/awspec/type/cloudtrail.rb

@@ -2,26 +2,28 @@ module Awspec::Type
   class Cloudtrail < Base
     aws_resource Aws::CloudTrail
 
-    def initialize(id)
-      super
-      @resource_via_client = find_trail(id)
-      @id = @resource_via_client.name if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_trail(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.name if resource_via_client
     end
 
     def has_global_service_events_included?
-      @resource_via_client.include_global_service_events
+      resource_via_client.include_global_service_events
     end
 
     def multi_region_trail?
-      @resource_via_client.is_multi_region_trail
+      resource_via_client.is_multi_region_trail
     end
 
     def has_log_file_validation_enabled?
-      @resource_via_client.log_file_validation_enabled
+      resource_via_client.log_file_validation_enabled
     end
 
     def logging?
-      is_logging?(@id)
+      is_logging?(id)
     end
   end
 end

data/lib/awspec/type/cloudwatch_alarm.rb

@@ -1,21 +1,23 @@
 module Awspec::Type
   class CloudwatchAlarm < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_cloudwatch_alarm(id)
-      @id = @resource_via_client.alarm_arn if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_cloudwatch_alarm(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.alarm_arn if resource_via_client
     end
 
     def has_ok_action?(name)
-      @resource_via_client.ok_actions.include?(name)
+      resource_via_client.ok_actions.include?(name)
     end
 
     def has_alarm_action?(name)
-      @resource_via_client.alarm_actions.include?(name)
+      resource_via_client.alarm_actions.include?(name)
     end
 
     def has_insufficient_data_action?(name)
-      @resource_via_client.insufficient_data_actions.include?(name)
+      resource_via_client.insufficient_data_actions.include?(name)
     end
   end
 end

data/lib/awspec/type/cloudwatch_event.rb

@@ -1,17 +1,19 @@
 module Awspec::Type
   class CloudwatchEvent < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_cloudwatch_event(id)
-      @id = @resource_via_client.arn if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_cloudwatch_event(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.arn if resource_via_client
     end
 
     def enable?
-      @resource_via_client.state == 'ENABLED'
+      resource_via_client.state == 'ENABLED'
     end
 
     def scheduled?(schedule)
-      @resource_via_client.schedule_expression == schedule
+      resource_via_client.schedule_expression == schedule
     end
   end
 end

data/lib/awspec/type/directconnect_virtual_interface.rb

@@ -1,9 +1,16 @@
 module Awspec::Type
   class DirectconnectVirtualInterface < Base
-    def initialize(id)
+    def initialize(name)
       super
-      @resource_via_client = find_virtual_interface(id)
-      @id = @resource_via_client.virtual_interface_id if @resource_via_client
+      @display_name = name
+    end
+
+    def resource_via_client
+      @resource_via_client ||= find_virtual_interface(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.virtual_interface_id if resource_via_client
     end
 
     STATES = %w(
@@ -13,7 +20,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource_via_client.virtual_interface_state == state
+        resource_via_client.virtual_interface_state == state
       end
     end
   end

data/lib/awspec/type/ebs.rb

@@ -3,10 +3,17 @@ module Awspec::Type
     aws_resource Aws::EC2::Volume
     tags_allowed
 
-    def initialize(id)
+    def initialize(name)
       super
-      @resource_via_client = find_ebs(id)
-      @id = @resource_via_client.volume_id if @resource_via_client
+      @display_name = name
+    end
+
+    def resource_via_client
+      @resource_via_client ||= find_ebs(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.volume_id if resource_via_client
     end
 
     STATES = %w(
@@ -15,16 +22,16 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource_via_client.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_via_client.attachments
-      @resource_via_client.attachments.first.instance_id == instance.instance_id && \
-        @resource_via_client.attachments.first.state == 'attached'
+      return false unless resource_via_client.attachments
+      resource_via_client.attachments.first.instance_id == instance.instance_id && \
+        resource_via_client.attachments.first.state == 'attached'
     end
   end
 end

data/lib/awspec/type/ec2.rb

@@ -3,10 +3,17 @@ module Awspec::Type
     aws_resource Aws::EC2::Instance
     tags_allowed
 
-    def initialize(id)
+    def initialize(name)
       super
-      @resource_via_client = find_ec2(id)
-      @id = @resource_via_client.instance_id if @resource_via_client
+      @display_name = name
+    end
+
+    def resource_via_client
+      @resource_via_client ||= find_ec2(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.instance_id if resource_via_client
     end
 
     STATES = %w(
@@ -16,18 +23,18 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource_via_client.state.name == state
+        resource_via_client.state.name == state
       end
     end
 
     def disabled_api_termination?
-      ret = find_ec2_attribute(@id, 'disableApiTermination')
+      ret = find_ec2_attribute(id, 'disableApiTermination')
       ret.disable_api_termination.value
     end
 
     def has_eip?(ip_address = nil)
       option = {
-        filters: [{ name: 'instance-id', values: [@id] }]
+        filters: [{ name: 'instance-id', values: [id] }]
       }
       option[:public_ips] = [ip_address] if ip_address
       ret = ec2_client.describe_addresses(option)
@@ -36,7 +43,7 @@ module Awspec::Type
     end
 
     def has_security_group?(sg_id)
-      sgs = @resource_via_client.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 +56,7 @@ module Awspec::Type
     end
 
     def has_ebs?(volume_id)
-      blocks = @resource_via_client.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
@@ -57,26 +64,26 @@ module Awspec::Type
       return true if ret
       blocks2 = find_ebs(volume_id)
       blocks2.attachments.find do |attachment|
-        attachment.instance_id == @id
+        attachment.instance_id == id
       end
     end
 
     def has_event?(event_code)
-      status = find_ec2_status(@id)
+      status = find_ec2_status(id)
       ret = status.events.find do |event|
         event.code == event_code
       end
     end
 
     def has_events?
-      status = find_ec2_status(@id)
+      status = find_ec2_status(id)
       return false if status.nil?
       status.events.count > 0
     end
 
     def has_classiclink?(vpc_id = nil)
       option = {
-        instance_ids: [@id]
+        instance_ids: [id]
       }
       option[:filters] = [{ name: 'vpc-id', values: [vpc_id] }] if vpc_id
       ret = ec2_client.describe_classic_link_instances(option)
@@ -85,7 +92,7 @@ module Awspec::Type
 
     def has_classiclink_security_group?(sg_id)
       option = {
-        instance_ids: [@id]
+        instance_ids: [id]
       }
       classic_link_instances = ec2_client.describe_classic_link_instances(option)
       return false if classic_link_instances.instances.count == 0