awspec 0.33.0 → 0.34.0

data/lib/awspec/type/elb.rb

@@ -3,7 +3,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_elb(id)
-      @id = @resource_via_client[:load_balancer_name] if @resource_via_client
+      @id = @resource_via_client.load_balancer_name if @resource_via_client
     end
 
     health_check_options = %w(
@@ -13,7 +13,7 @@ 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
 
@@ -25,32 +25,32 @@ 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 == sg_id
       end
       return true if ret
       sg2 = find_security_group(sg_id)
-      return false unless sg2.tag_name == sg_id || sg2[:group_name] == sg_id
+      return false unless sg2.tag_name == sg_id || sg2.group_name == sg_id
       sgs.find do |sg|
-        sg == sg2[:group_name]
+        sg == sg2.group_name
       end
     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
       return true if ret
       res = find_subnet(subnet_id)
       ret = subnets.find do |s|
-        s == res[:subnet_id]
+        s == res.subnet_id
       end
     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

@@ -3,13 +3,13 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_iam_group(id)
-      @id = @resource_via_client[:group_id] if @resource_via_client
+      @id = @resource_via_client.group_id if @resource_via_client
     end
 
     def has_iam_user?(user_id)
       user = find_iam_user(user_id)
       return false unless user
-      user_name = user[:user_name]
+      user_name = user.user_name
       groups = select_iam_group_by_user_name(user_name)
       groups.find do |group|
         group.group_id == @id
@@ -17,7 +17,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

data/lib/awspec/type/iam_policy.rb

@@ -3,7 +3,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_iam_policy(id)
-      @id = @resource_via_client[:policy_id] if @resource_via_client
+      @id = @resource_via_client.policy_id if @resource_via_client
     end
 
     def attachable?
@@ -16,7 +16,7 @@ module Awspec::Type
         user = find_iam_user(user_id)
         return false unless user
         users.any? do |u|
-          u.user_name == user[:user_name]
+          u.user_name == user.user_name
         end
       else
         !users.empty?
@@ -29,7 +29,7 @@ module Awspec::Type
         group = find_iam_group(group_id)
         return false unless group
         groups.any? do |g|
-          g.group_name == group[:group_name]
+          g.group_name == group.group_name
         end
       else
         !groups.empty?
@@ -42,7 +42,7 @@ module Awspec::Type
         role = find_iam_role(role_id)
         return false unless role
         roles.any? do |r|
-          r.role_name == role[:role_name]
+          r.role_name == role.role_name
         end
       else
         !roles.empty?

data/lib/awspec/type/iam_role.rb

@@ -3,11 +3,11 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_iam_role(id)
-      @id = @resource_via_client[:role_id] if @resource_via_client
+      @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

data/lib/awspec/type/iam_user.rb

@@ -3,11 +3,11 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_iam_user(id)
-      @id = @resource_via_client[:user_id] if @resource_via_client
+      @id = @resource_via_client.user_id 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

data/lib/awspec/type/lambda.rb

@@ -3,11 +3,11 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_lambda(id)
-      @id = @resource_via_client[:function_arn] if @resource_via_client
+      @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)

data/lib/awspec/type/launch_configuration.rb

@@ -3,18 +3,18 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_launch_configuration(id)
-      @id = @resource_via_client[:launch_configuration_arn] if @resource_via_client
+      @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
       return true if ret
       sg2 = find_security_group(sg_id)
       sgs.find do |sg|
-        sg == sg2[:group_id]
+        sg == sg2.group_id
       end
     end
   end

data/lib/awspec/type/nat_gateway.rb

@@ -3,7 +3,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_nat_gateway(id)
-      @id = @resource_via_client[:nat_gateway_id] if @resource_via_client
+      @id = @resource_via_client.nat_gateway_id if @resource_via_client
     end
 
     STATES = %w(
@@ -12,7 +12,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state.tr('-', '_') + '?' do
-        @resource_via_client[:state] == state
+        @resource_via_client.state == state
       end
     end
 

data/lib/awspec/type/network_acl.rb

@@ -6,7 +6,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_network_acl(id)
-      @id = @resource_via_client[:network_acl_id] if @resource_via_client
+      @id = @resource_via_client.network_acl_id if @resource_via_client
     end
 
     def has_subnet?(subnet_id)
@@ -14,7 +14,7 @@ module Awspec::Type
         next true if a.subnet_id == subnet_id
         subnet = find_subnet(subnet_id)
         next false unless subnet
-        next a.subnet_id == subnet[:subnet_id]
+        next a.subnet_id == subnet.subnet_id
       end
     end
 
@@ -39,13 +39,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 +71,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

data/lib/awspec/type/rds.rb

@@ -5,7 +5,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_rds(id)
-      @id = @resource_via_client[:db_instance_identifier] if @resource_via_client
+      @id = @resource_via_client.db_instance_identifier if @resource_via_client
     end
 
     STATES = %w(
@@ -20,12 +20,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,54 +36,54 @@ 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
+        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
+        og.option_group_name == name
       end
     end
 
     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
+        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] }]
                                                 })
-      return false unless res[:security_groups].count == 1
+      return false unless res.security_groups.count == 1
       sgs.find do |sg|
-        sg[:vpc_security_group_id] == res[:security_groups][0][:group_id]
+        sg.vpc_security_group_id == res.security_groups.first.group_id
       end
     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] }]
                                                 })
-      return false unless res[:security_groups].count == 1
+      return false unless res.security_groups.count == 1
       sgs.find do |sg|
-        sg[:vpc_security_group_id] == res[:security_groups][0][:group_id]
+        sg.vpc_security_group_id == res.security_groups.first.group_id
       end
     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
+        sg.db_security_group_name == sg_id
       end
     end
   end

data/lib/awspec/type/route53_hosted_zone.rb

@@ -3,7 +3,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_hosted_zone(id)
-      @id = @resource_via_client[:id] if @resource_via_client
+      @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)
     end
@@ -13,7 +13,7 @@ module Awspec::Type
       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]
+        options[:ttl] = record_set[:ttl] unless options[:ttl]
         if !record_set.resource_records.empty?
           v = record_set.resource_records.map { |r| r.value }.join("\n")
           record_set.name == name && \

data/lib/awspec/type/route_table.rb

@@ -6,7 +6,7 @@ module Awspec::Type
     def initialize(id)
       super
       @resource_via_client = find_route_table(id)
-      @id = @resource_via_client[:route_table_id] if @resource_via_client
+      @id = @resource_via_client.route_table_id if @resource_via_client
     end
 
     def has_route?(destination,
@@ -29,7 +29,7 @@ module Awspec::Type
       subnet = find_subnet(subnet_id)
       return false unless subnet
       @resource_via_client.associations.find do |a|
-        a[:subnet_id] == subnet[:subnet_id]
+        a.subnet_id == subnet.subnet_id
       end
     end
 

data/lib/awspec/type/security_group.rb

@@ -6,7 +6,7 @@ module Awspec::Type
       super
       @inbound = true
       @resource_via_client = find_security_group(id)
-      @id = @resource_via_client[:group_id] if @resource_via_client
+      @id = @resource_via_client.group_id if @resource_via_client
     end
 
     def opened?(port = nil, protocol = nil, cidr = nil)
@@ -20,23 +20,23 @@ 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|
         next true unless port
-        next true unless permission[:from_port]
-        next true unless permission[:to_port]
-        next false unless port_between?(port, permission[:from_port], permission[:to_port])
-        next false if protocol && permission[:ip_protocol] != protocol
+        next true unless permission.from_port
+        next true unless permission.to_port
+        next false unless port_between?(port, permission.from_port, permission.to_port)
+        next false if protocol && permission.ip_protocol != protocol
         next true unless cidr
-        ret = permission[:ip_ranges].select do |ip_range|
-          ip_range[:cidr_ip] == cidr
+        ret = permission.ip_ranges.select do |ip_range|
+          ip_range.cidr_ip == cidr
         end
         next true if ret.count > 0
-        ret = permission[:user_id_group_pairs].select do |sg|
-          next true if sg[:group_id] == cidr
-          sg2 = find_security_group(sg[:group_id])
-          next true if sg2[:group_name] == cidr
-          sg2[:tags].find do |tag|
-            tag[:key] == 'Name' && tag[:value] == cidr
+        ret = permission.user_id_group_pairs.select do |sg|
+          next true if sg.group_id == cidr
+          sg2 = find_security_group(sg.group_id)
+          next true if sg2.group_name == cidr
+          sg2.tags.find do |tag|
+            tag.key == 'Name' && tag.value == cidr
           end
         end
         next true if ret.count > 0
@@ -44,35 +44,35 @@ module Awspec::Type
     end
 
     def inbound_opened_only?(port = nil, protocol = nil, cidr = nil)
-      permissions = @resource_via_client[:ip_permissions].select do |permission|
-        port_between?(port, permission[:from_port], permission[:to_port])
+      permissions = @resource_via_client.ip_permissions.select do |permission|
+        port_between?(port, permission.from_port, permission.to_port)
       end
-      permissions = permissions.select { |permission| permission[:ip_protocol] == protocol }
+      permissions = permissions.select { |permission| permission.ip_protocol == protocol }
       cidrs = []
       permissions.each do |permission|
-        permission[:ip_ranges].select { |ip_range| cidrs.push(ip_range[:cidr_ip]) }
+        permission.ip_ranges.select { |ip_range| cidrs.push(ip_range.cidr_ip) }
       end
       cidrs == Array(cidr)
     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|
         next true unless port
-        next true unless permission[:from_port]
-        next true unless permission[:to_port]
-        next false unless port_between?(port, permission[:from_port], permission[:to_port])
-        next false if protocol && permission[:ip_protocol] != protocol
+        next true unless permission.from_port
+        next true unless permission.to_port
+        next false unless port_between?(port, permission.from_port, permission.to_port)
+        next false if protocol && permission.ip_protocol != protocol
         next true unless cidr
-        ret = permission[:ip_ranges].select do |ip_range|
-          ip_range[:cidr_ip] == cidr
+        ret = permission.ip_ranges.select do |ip_range|
+          ip_range.cidr_ip == cidr
         end
         next true if ret.count > 0
-        ret = permission[:user_id_group_pairs].select do |sg|
-          next true if sg[:group_id] == cidr
-          sg2 = find_security_group(sg[:group_id])
-          next true if sg2[:group_name] == cidr
-          sg2[:tags].find do |tag|
-            tag[:key] == 'Name' && tag[:value] == cidr
+        ret = permission.user_id_group_pairs.select do |sg|
+          next true if sg.group_id == cidr
+          sg2 = find_security_group(sg.group_id)
+          next true if sg2.group_name == cidr
+          sg2.tags.find do |tag|
+            tag.key == 'Name' && tag.value == cidr
           end
         end
         next true if ret.count > 0
@@ -80,13 +80,13 @@ module Awspec::Type
     end
 
     def outbound_opened_only?(port = nil, protocol = nil, cidr = nil)
-      permissions = @resource_via_client[:ip_permissions_egress].select do |permission|
-        port_between?(port, permission[:from_port], permission[:to_port])
+      permissions = @resource_via_client.ip_permissions_egress.select do |permission|
+        port_between?(port, permission.from_port, permission.to_port)
       end
-      permissions = permissions.select { |permission| permission[:ip_protocol] == protocol }
+      permissions = permissions.select { |permission| permission.ip_protocol == protocol }
       cidrs = []
       permissions.each do |permission|
-        permission[:ip_ranges].select { |ip_range| cidrs.push(ip_range[:cidr_ip]) }
+        permission.ip_ranges.select { |ip_range| cidrs.push(ip_range.cidr_ip) }
       end
       cidrs == Array(cidr)
     end
@@ -102,23 +102,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