awspec 0.55.0 → 0.56.0

data/lib/awspec/type/network_interface.rb

@@ -1,9 +1,11 @@
 module Awspec::Type
   class NetworkInterface < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_network_interface(id)
-      @id = @resource_via_client.network_interface_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_network_interface(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.network_interface_id if resource_via_client
     end
 
     STATES = %w(
@@ -12,28 +14,28 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource_via_client.status == state
+        resource_via_client.status == state
       end
     end
 
     def attached_to?(instance_id, device_index = 0)
       instance = find_ec2(instance_id)
       return false unless instance
-      return false unless @resource_via_client.attachment
-      @resource_via_client.attachment.instance_id == instance.instance_id && \
-        @resource_via_client.attachment.status == 'attached' && \
-        @resource_via_client.attachment.device_index == device_index
+      return false unless resource_via_client.attachment
+      resource_via_client.attachment.instance_id == instance.instance_id && \
+        resource_via_client.attachment.status == 'attached' && \
+        resource_via_client.attachment.device_index == device_index
     end
 
     def has_private_ip_address?(ip_address, primary = nil)
-      @resource_via_client.private_ip_addresses.find do |i|
+      resource_via_client.private_ip_addresses.find do |i|
         next false if !primary.nil? && i.primary != primary
         i.private_ip_address == ip_address
       end
     end
 
     def has_security_group?(sg_id)
-      sgs = @resource_via_client.groups
+      sgs = resource_via_client.groups
       ret = sgs.find do |sg|
         sg.group_id == sg_id || sg.group_name == sg_id
       end
@@ -46,7 +48,7 @@ module Awspec::Type
     end
 
     def private_ip_addresses_count
-      @resource_via_client.private_ip_addresses.count
+      resource_via_client.private_ip_addresses.count
     end
   end
 end

data/lib/awspec/type/rds.rb

@@ -2,10 +2,12 @@ module Awspec::Type
   class Rds < Base
     aws_resource Aws::RDS::DBInstance
 
-    def initialize(id)
-      super
-      @resource_via_client = find_rds(id)
-      @id = @resource_via_client.db_instance_identifier if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_rds(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.db_instance_identifier if resource_via_client
     end
 
     STATES = %w(
@@ -20,12 +22,12 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource_via_client.db_instance_status == state
+        resource_via_client.db_instance_status == state
       end
     end
 
     def vpc_id
-      @resource_via_client.db_subnet_group.vpc_id
+      resource_via_client.db_subnet_group.vpc_id
     end
 
     def has_security_group?(sg_id)
@@ -36,14 +38,14 @@ module Awspec::Type
     end
 
     def has_db_parameter_group?(name)
-      pgs = @resource_via_client.db_parameter_groups
+      pgs = resource_via_client.db_parameter_groups
       pgs.find do |pg|
         pg.db_parameter_group_name == name
       end
     end
 
     def has_option_group?(name)
-      ogs = @resource_via_client.option_group_memberships
+      ogs = resource_via_client.option_group_memberships
       ogs.find do |og|
         og.option_group_name == name
       end
@@ -52,14 +54,14 @@ module Awspec::Type
     private
 
     def has_vpc_security_group_id?(sg_id)
-      sgs = @resource_via_client.vpc_security_groups
+      sgs = resource_via_client.vpc_security_groups
       sgs.find do |sg|
         sg.vpc_security_group_id == sg_id
       end
     end
 
     def has_vpc_security_group_name?(sg_id)
-      sgs = @resource_via_client.vpc_security_groups
+      sgs = resource_via_client.vpc_security_groups
       res = ec2_client.describe_security_groups({
                                                   filters: [{ name: 'group-name', values: [sg_id] }]
                                                 })
@@ -70,7 +72,7 @@ module Awspec::Type
     end
 
     def has_vpc_security_group_tag_name?(sg_id)
-      sgs = @resource_via_client.vpc_security_groups
+      sgs = resource_via_client.vpc_security_groups
       res = ec2_client.describe_security_groups({
                                                   filters: [{ name: 'tag:Name', values: [sg_id] }]
                                                 })
@@ -81,7 +83,7 @@ module Awspec::Type
     end
 
     def has_db_security_group_name?(sg_id)
-      sgs = @resource_via_client.db_security_groups
+      sgs = resource_via_client.db_security_groups
       sgs.find do |sg|
         sg.db_security_group_name == sg_id
       end

data/lib/awspec/type/rds_db_cluster_parameter_group.rb

@@ -1,27 +1,31 @@
 module Awspec::Type
   class RdsDbClusterParameterGroup < Base
-    def initialize(name)
-      super
-      @parameters = {}
+    def resource_via_client
+      return @resource_via_client if @resource_via_client
+
+      parameters = {}
       res = rds_client.describe_db_cluster_parameters({
-                                                        db_cluster_parameter_group_name: name
+                                                        db_cluster_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.respond_to?(:next_page?) && res.next_page? && res = res.next_page) || break
       end
 
-      @id = name unless @parameters.empty?
-      @resource_via_client = @parameters
+      @resource_via_client ||= parameters
+    end
+
+    def id
+      @id ||= @display_name unless resource_via_client.empty?
     end
 
     def method_missing(name)
       param_name = name.to_s
-      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/rds_db_parameter_group.rb

@@ -1,27 +1,31 @@
 module Awspec::Type
   class RdsDbParameterGroup < Base
-    def initialize(name)
-      super
-      @parameters = {}
+    def resource_via_client
+      return @resource_via_client if @resource_via_client
+
+      parameters = {}
       res = rds_client.describe_db_parameters({
-                                                db_parameter_group_name: name
+                                                db_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
 
-      @id = name unless @parameters.empty?
-      @resource_via_client = @parameters
+      @resource_via_client ||= parameters
+    end
+
+    def id
+      @id ||= @display_name unless resource_via_client.empty?
     end
 
     def method_missing(name)
       param_name = name.to_s
-      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/route53_hosted_zone.rb

@@ -1,16 +1,20 @@
 module Awspec::Type
   class Route53HostedZone < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_hosted_zone(id)
-      @id = @resource_via_client.id if @resource_via_client
-      return unless @id
-      @resource_via_client_record_sets = select_record_sets_by_hosted_zone_id(@id)
+    def resource_via_client
+      @resource_via_client ||= find_hosted_zone(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.id if resource_via_client
+    end
+
+    def resource_via_client_record_sets
+      @resource_via_client_record_sets ||= select_record_sets_by_hosted_zone_id(id)
     end
 
     def has_record_set?(name, type, value, options = {})
       name.gsub!(/\*/, '\\\052') # wildcard support
-      ret = @resource_via_client_record_sets.find do |record_set|
+      ret = resource_via_client_record_sets.find do |record_set|
         # next if record_set.type != type.upcase
         next unless record_set.type.casecmp(type) == 0
         options[:ttl] = record_set[:ttl] unless options[:ttl]

data/lib/awspec/type/route_table.rb

@@ -3,10 +3,12 @@ module Awspec::Type
     aws_resource Aws::EC2::RouteTable
     tags_allowed
 
-    def initialize(id)
-      super
-      @resource_via_client = find_route_table(id)
-      @id = @resource_via_client.route_table_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_route_table(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.route_table_id if resource_via_client
     end
 
     def has_route?(destination,
@@ -14,7 +16,7 @@ module Awspec::Type
                    instance_id = nil,
                    vpc_peering_connection_id = nil,
                    nat_gateway_id = nil)
-      @resource_via_client.routes.find do |route|
+      resource_via_client.routes.find do |route|
         if destination
           next false unless route.destination_cidr_block == destination
         end
@@ -28,7 +30,7 @@ module Awspec::Type
     def has_subnet?(subnet_id)
       subnet = find_subnet(subnet_id)
       return false unless subnet
-      @resource_via_client.associations.find do |a|
+      resource_via_client.associations.find do |a|
         a.subnet_id == subnet.subnet_id
       end
     end

data/lib/awspec/type/s3_bucket.rb

@@ -2,15 +2,17 @@ module Awspec::Type
   class S3Bucket < Base
     aws_resource Aws::S3::Bucket
 
-    def initialize(id)
-      super
-      @resource_via_client = find_bucket(id)
-      @id = id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_bucket(@display_name)
+    end
+
+    def id
+      @id ||= @display_name if resource_via_client
     end
 
     def has_object?(key)
       res = s3_client.head_object({
-                                    bucket: @id,
+                                    bucket: id,
                                     key: key.sub(%r(\A/), '')
                                   })
       res
@@ -19,7 +21,7 @@ module Awspec::Type
     end
 
     def has_acl_grant?(grantee:, permission:)
-      @acl = find_bucket_acl(@id)
+      @acl = find_bucket_acl(id)
       @acl.grants.find do |grant|
         grant.permission == permission &&
           (grant.grantee.display_name == grantee || grant.grantee.uri == grantee || grant.grantee.id == grantee)
@@ -27,12 +29,12 @@ module Awspec::Type
     end
 
     def acl_owner
-      @acl = find_bucket_acl(@id)
+      @acl = find_bucket_acl(id)
       @acl.owner.display_name
     end
 
     def acl_grants_count
-      @acl = find_bucket_acl(@id)
+      @acl = find_bucket_acl(id)
       @acl.grants.count
     end
 
@@ -55,7 +57,7 @@ module Awspec::Type
     end
 
     def has_policy?(policy)
-      bp = find_bucket_policy(@id)
+      bp = find_bucket_policy(id)
       if bp
         JSON.parse(bp.policy.read, array_class: Set) == JSON.parse(policy, array_class: Set)
       else
@@ -64,7 +66,7 @@ module Awspec::Type
     end
 
     def has_logging_enabled?(target_bucket: nil, target_prefix: nil)
-      bl = find_bucket_logging(@id)
+      bl = find_bucket_logging(id)
       le = bl ? bl.logging_enabled : nil
 
       return false if le.nil?
@@ -74,19 +76,19 @@ module Awspec::Type
     end
 
     def has_versioning_enabled?
-      bv = find_bucket_versioning(@id)
+      bv = find_bucket_versioning(id)
       bv ? (bv.status == 'Enabled') : false
     end
 
     def has_mfa_delete_enabled?
-      bv = find_bucket_versioning(@id)
+      bv = find_bucket_versioning(id)
       bv ? (bv.mfa_delete == 'Enabled') : false
     end
 
     private
 
     def cors_rules
-      cors = find_bucket_cors(@id)
+      cors = find_bucket_cors(id)
       cors ? cors.cors_rules : []
     end
   end

data/lib/awspec/type/security_group.rb

@@ -3,11 +3,12 @@ module Awspec::Type
     aws_resource Aws::EC2::SecurityGroup
     tags_allowed
 
-    def initialize(id)
-      super
-      @inbound = true
-      @resource_via_client = find_security_group(id)
-      @id = @resource_via_client.group_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_security_group(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.group_id if resource_via_client
     end
 
     def opened?(port = nil, protocol = nil, cidr = nil)
@@ -21,13 +22,13 @@ module Awspec::Type
     end
 
     def inbound_opened?(port = nil, protocol = nil, cidr = nil)
-      @resource_via_client.ip_permissions.find do |permission|
+      resource_via_client.ip_permissions.find do |permission|
         cidr_opened?(permission, cidr) && protocol_opened?(permission, protocol) && port_opened?(permission, port)
       end
     end
 
     def inbound_opened_only?(port = nil, protocol = nil, cidr = nil)
-      permissions = @resource_via_client.ip_permissions.select do |permission|
+      permissions = resource_via_client.ip_permissions.select do |permission|
         protocol_opened?(permission, protocol) && port_opened?(permission, port)
       end
       cidrs = []
@@ -38,13 +39,13 @@ module Awspec::Type
     end
 
     def outbound_opened?(port = nil, protocol = nil, cidr = nil)
-      @resource_via_client.ip_permissions_egress.find do |permission|
+      resource_via_client.ip_permissions_egress.find do |permission|
         cidr_opened?(permission, cidr) && protocol_opened?(permission, protocol) && port_opened?(permission, port)
       end
     end
 
     def outbound_opened_only?(port = nil, protocol = nil, cidr = nil)
-      permissions = @resource_via_client.ip_permissions_egress.select do |permission|
+      permissions = resource_via_client.ip_permissions_egress.select do |permission|
         protocol_opened?(permission, protocol) && port_opened?(permission, port)
       end
       cidrs = []
@@ -65,23 +66,23 @@ module Awspec::Type
     end
 
     def ip_permissions_count
-      @resource_via_client.ip_permissions.count
+      resource_via_client.ip_permissions.count
     end
     alias_method :inbound_permissions_count, :ip_permissions_count
 
     def ip_permissions_egress_count
-      @resource_via_client.ip_permissions_egress.count
+      resource_via_client.ip_permissions_egress.count
     end
     alias_method :outbound_permissions_count, :ip_permissions_egress_count
 
     def inbound_rule_count
-      @resource_via_client.ip_permissions.reduce(0) do |sum, permission|
+      resource_via_client.ip_permissions.reduce(0) do |sum, permission|
         sum += permission.ip_ranges.count + permission.user_id_group_pairs.count
       end
     end
 
     def outbound_rule_count
-      @resource_via_client.ip_permissions_egress.reduce(0) do |sum, permission|
+      resource_via_client.ip_permissions_egress.reduce(0) do |sum, permission|
         sum += permission.ip_ranges.count + permission.user_id_group_pairs.count
       end
     end