awspec 0.55.0 → 0.56.0

data/lib/awspec/type/elasticache.rb

@@ -1,9 +1,16 @@
 module Awspec::Type
   class Elasticache < Base
-    def initialize(id)
+    def initialize(name)
       super
-      @resource_via_client = find_cache_cluster(id)
-      @id = @resource_via_client.cache_cluster_id if @resource_via_client
+      @display_name = name
+    end
+
+    def resource_via_client
+      @resource_via_client ||= find_cache_cluster(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.cache_cluster_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.cache_cluster_status == state
+        resource_via_client.cache_cluster_status == state
       end
     end
 
     def has_cache_parameter_group?(group_name)
-      @resource_via_client.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_via_client.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

@@ -2,27 +2,34 @@ module Awspec::Type
   class ElasticacheCacheParameterGroup < Base
     def initialize(name)
       super
-      @parameters = {}
+      @display_name = name
+    end
+
+    def resource_via_client
+      return @resource_via_client if @resource_via_client
+
+      parameters = {}
       res = elasticache_client.describe_cache_parameters({
-                                                           cache_parameter_group_name: name
+                                                           cache_parameter_group_name: @display_name
                                                          })
 
       loop do
         res.parameters.each do |param|
-          @parameters[param.parameter_name] = param.parameter_value
+          parameters[param.parameter_name] = param.parameter_value
         end
         (res.next_page? && res = res.next_page) || break
       end
+      @resource_via_client ||= parameters
+    end
 
-      @id = name unless @parameters.empty?
-      @resource_via_client = @parameters
-      @id
+    def id
+      @id ||= @display_name unless resource_via_client.empty?
     end
 
     def method_missing(name)
       param_name = name.to_s.tr('_', '-')
-      if @parameters.include?(param_name)
-        @parameters[param_name].to_s
+      if resource_via_client.include?(param_name)
+        resource_via_client[param_name].to_s
       else
         super
       end

data/lib/awspec/type/elasticsearch.rb

@@ -1,21 +1,23 @@
 module Awspec::Type
   class Elasticsearch < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_elasticsearch_domain(id)
-      @id = @resource_via_client.arn if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_elasticsearch_domain(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.arn if resource_via_client
     end
 
     def has_access_policies?(policy)
-      @resource_via_client.access_policies == policy.gsub(/\n/, '').gsub(/ /, '')
+      resource_via_client.access_policies == policy.gsub(/\n/, '').gsub(/ /, '')
     end
 
     def created?
-      @resource_via_client.created
+      resource_via_client.created
     end
 
     def deleted?
-      @resource_via_client.deleted
+      resource_via_client.deleted
     end
   end
 end

data/lib/awspec/type/elastictranscoder_pipeline.rb

@@ -1,9 +1,11 @@
 module Awspec::Type
   class ElastictranscoderPipeline < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_pipeline(id)
-      @id = @resource_via_client.id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_pipeline(@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
   end

data/lib/awspec/type/elb.rb

@@ -1,9 +1,11 @@
 module Awspec::Type
   class Elb < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_elb(id)
-      @id = @resource_via_client.load_balancer_name if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_elb(@display_name)
+    end
+
+    def id
+      @id = resource_via_client.load_balancer_name if resource_via_client
     end
 
     health_check_options = %w(
@@ -13,19 +15,19 @@ module Awspec::Type
 
     health_check_options.each do |option|
       define_method 'health_check_' + option do
-        @resource_via_client.health_check[option]
+        resource_via_client.health_check[option]
       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
 
     def has_security_group?(sg_id)
-      sgs = @resource_via_client.security_groups
+      sgs = resource_via_client.security_groups
       ret = sgs.find do |sg|
         sg == sg_id
       end
@@ -38,7 +40,7 @@ module Awspec::Type
     end
 
     def has_subnet?(subnet_id)
-      subnets = @resource_via_client.subnets
+      subnets = resource_via_client.subnets
       ret = subnets.find do |s|
         s == subnet_id
       end
@@ -50,7 +52,7 @@ module Awspec::Type
     end
 
     def has_listener?(protocol:, port:, instance_protocol:, instance_port:)
-      @resource_via_client.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

data/lib/awspec/type/iam_group.rb

@@ -2,10 +2,12 @@ module Awspec::Type
   class IamGroup < Base
     aws_resource Aws::IAM::Group
 
-    def initialize(id)
-      super
-      @resource_via_client = find_iam_group(id)
-      @id = @resource_via_client.group_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_iam_group(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.group_id if resource_via_client
     end
 
     def has_iam_user?(user_id)
@@ -19,7 +21,7 @@ module Awspec::Type
     end
 
     def has_iam_policy?(policy_id)
-      policies = select_iam_policy_by_group_name(@resource_via_client.group_name)
+      policies = select_iam_policy_by_group_name(resource_via_client.group_name)
       policies.find do |policy|
         policy.policy_arn == policy_id || policy.policy_name == policy_id
       end
@@ -27,7 +29,7 @@ module Awspec::Type
 
     def has_inline_policy?(policy_name, document = nil)
       res = iam_client.get_group_policy({
-                                          group_name: @resource_via_client.group_name,
+                                          group_name: resource_via_client.group_name,
                                           policy_name: policy_name
                                         })
       return JSON.parse(URI.decode(res.policy_document)) == JSON.parse(document) if document

data/lib/awspec/type/iam_policy.rb

@@ -1,17 +1,19 @@
 module Awspec::Type
   class IamPolicy < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_iam_policy(id)
-      @id = @resource_via_client.policy_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_iam_policy(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.policy_id if resource_via_client
     end
 
     def attachable?
-      @resource_via_client.is_attachable
+      resource_via_client.is_attachable
     end
 
     def attached_to_user?(user_id = nil)
-      users = select_attached_users(@id)
+      users = select_attached_users(id)
       if user_id
         user = find_iam_user(user_id)
         return false unless user

data/lib/awspec/type/iam_role.rb

@@ -2,14 +2,16 @@ module Awspec::Type
   class IamRole < Base
     aws_resource Aws::IAM::Role
 
-    def initialize(id)
-      super
-      @resource_via_client = find_iam_role(id)
-      @id = @resource_via_client.role_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_iam_role(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.role_id if resource_via_client
     end
 
     def has_iam_policy?(policy_id)
-      policies = select_iam_policy_by_role_name(@resource_via_client.role_name)
+      policies = select_iam_policy_by_role_name(resource_via_client.role_name)
       policies.find do |policy|
         policy.policy_arn == policy_id || policy.policy_name == policy_id
       end
@@ -17,7 +19,7 @@ module Awspec::Type
 
     def has_inline_policy?(policy_name, document = nil)
       res = iam_client.get_role_policy({
-                                         role_name: @resource_via_client.role_name,
+                                         role_name: resource_via_client.role_name,
                                          policy_name: policy_name
                                        })
       return JSON.parse(URI.decode(res.policy_document)) == JSON.parse(document) if document

data/lib/awspec/type/iam_user.rb

@@ -2,14 +2,16 @@ module Awspec::Type
   class IamUser < Base
     aws_resource Aws::IAM::User
 
-    def initialize(id)
-      super
-      @resource_via_client = find_iam_user(id)
-      @id = @resource_via_client.user_name if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_iam_user(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.user_name if resource_via_client
     end
 
     def has_iam_policy?(policy_id)
-      policies = select_iam_policy_by_user_name(@resource_via_client.user_name)
+      policies = select_iam_policy_by_user_name(resource_via_client.user_name)
       policies.find do |policy|
         policy.policy_arn == policy_id || policy.policy_name == policy_id
       end
@@ -17,7 +19,7 @@ module Awspec::Type
 
     def has_inline_policy?(policy_name, document = nil)
       res = iam_client.get_user_policy({
-                                         user_name: @resource_via_client.user_name,
+                                         user_name: resource_via_client.user_name,
                                          policy_name: policy_name
                                        })
       return JSON.parse(URI.decode(res.policy_document)) == JSON.parse(document) if document

data/lib/awspec/type/kms.rb

@@ -1,17 +1,19 @@
 module Awspec::Type
   class Kms < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_kms_key_by_alias(id)
-      @id = @resource_via_client.arn if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_kms_key_by_alias(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.arn if resource_via_client
     end
 
     def enabled?
-      @resource_via_client.enabled
+      resource_via_client.enabled
     end
 
     def has_key_policy?(policy_name, document = nil)
-      res = kms_client.get_key_policy(key_id: @id, policy_name: policy_name)
+      res = kms_client.get_key_policy(key_id: id, policy_name: policy_name)
       return JSON.parse(URI.decode(res.policy)) == JSON.parse(document) if document
       res
     end

data/lib/awspec/type/lambda.rb

@@ -1,17 +1,19 @@
 module Awspec::Type
   class Lambda < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_lambda(id)
-      @id = @resource_via_client.function_arn if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_lambda(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.function_arn if resource_via_client
     end
 
     def timeout
-      @resource_via_client.timeout
+      resource_via_client.timeout
     end
 
     def has_event_source?(event_source_arn)
-      sources = select_event_source_by_function_arn(@id)
+      sources = select_event_source_by_function_arn(id)
       sources.find do |source|
         source.event_source_arn == event_source_arn
       end

data/lib/awspec/type/launch_configuration.rb

@@ -1,13 +1,15 @@
 module Awspec::Type
   class LaunchConfiguration < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_launch_configuration(id)
-      @id = @resource_via_client.launch_configuration_arn if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_launch_configuration(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.launch_configuration_arn if resource_via_client
     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 == sg_id
       end

data/lib/awspec/type/nat_gateway.rb

@@ -1,9 +1,11 @@
 module Awspec::Type
   class NatGateway < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_nat_gateway(id)
-      @id = @resource_via_client.nat_gateway_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_nat_gateway(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.nat_gateway_id if resource_via_client
     end
 
     STATES = %w(
@@ -12,12 +14,12 @@ 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 has_eip?(ip_address = nil)
-      @resource_via_client.nat_gateway_addresses.find do |address|
+      resource_via_client.nat_gateway_addresses.find do |address|
         return address.public_ip == ip_address
       end
     end

data/lib/awspec/type/network_acl.rb

@@ -3,14 +3,16 @@ module Awspec::Type
     aws_resource Aws::EC2::NetworkAcl
     tags_allowed
 
-    def initialize(id)
-      super
-      @resource_via_client = find_network_acl(id)
-      @id = @resource_via_client.network_acl_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_network_acl(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.network_acl_id if resource_via_client
     end
 
     def has_subnet?(subnet_id)
-      @resource_via_client.associations.find do |a|
+      resource_via_client.associations.find do |a|
         next true if a.subnet_id == subnet_id
         subnet = find_subnet(subnet_id)
         next false unless subnet
@@ -39,13 +41,13 @@ module Awspec::Type
     end
 
     def inbound_entries_count
-      @resource_via_client.entries.count do |entry|
+      resource_via_client.entries.count do |entry|
         entry.egress == false
       end
     end
 
     def outbound_entries_count
-      @resource_via_client.entries.count do |entry|
+      resource_via_client.entries.count do |entry|
         entry.egress == true
       end
     end
@@ -71,7 +73,7 @@ module Awspec::Type
     private
 
     def entry?(rule_action, port = nil, protocol = nil, cidr = nil, rule_number = nil)
-      @resource_via_client.entries.find do |entry|
+      resource_via_client.entries.find do |entry|
         # egress rule_action
         next false if entry.egress != @egress
         next false if entry.rule_action != rule_action