awspec 1.24.3 → 1.25.2

data/lib/awspec/type/nlb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Nlb < ResourceBase
     def resource_via_client
@@ -8,12 +10,12 @@ module Awspec::Type
       @id ||= resource_via_client.load_balancer_name if resource_via_client
     end
 
-    STATES = %w(
+    STATES = %w[
       active provisioning failed
-    )
+    ]
 
     STATES.each do |state|
-      define_method state + '?' do
+      define_method "#{state}?" do
         resource_via_client.state.code == state
       end
     end
@@ -28,6 +30,7 @@ module Awspec::Type
         az.subnet_id == subnet_id
       end
       return true if ret
+
       subnet2 = find_subnet(subnet_id)
       subnet2.subnet_id = subnet_id
     end

data/lib/awspec/type/nlb_listener.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class NlbListener < ResourceBase
     def resource_via_client
@@ -15,11 +17,13 @@ module Awspec::Type
         actions = [actions] if actions.is_a?(Hash)
         next false if !rule_id.nil? && rule.rule_arn != rule_id
         next false if !priority.nil? && rule.priority != priority
+
         unless conditions.nil?
           next false unless conditions.map do |condition|
             rule_conds = rule.conditions.select { |rule_cond| rule_cond[:field] == condition[:field] }
             next if rule_conds.empty?
             next unless rule_conds.reject { |rule_cond| condition[:values] == rule_cond[:values] }.empty?
+
             condition
           end.compact.size == conditions.size
         end

data/lib/awspec/type/nlb_target_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class NlbTargetGroup < ResourceBase
     def resource_via_client
@@ -11,6 +13,7 @@ module Awspec::Type
     def has_ec2?(id)
       ec2 = find_ec2(id)
       return nil unless ec2
+
       descriptions = elbv2_client.describe_target_health(
         target_group_arn: resource_via_client.target_group_arn
       ).target_health_descriptions

data/lib/awspec/type/rds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Rds < ResourceBase
     aws_resource Aws::RDS::DBInstance
@@ -10,7 +12,7 @@ module Awspec::Type
       @id ||= resource_via_client.db_instance_identifier if resource_via_client
     end
 
-    STATES = %w(
+    STATES = %w[
       available backing-up creating deleting
       failed inaccessible-encryption-credentials
       incompatible-credentials incompatible-network
@@ -18,10 +20,10 @@ module Awspec::Type
       incompatible-restore maintenance
       modifying rebooting renaming resetting-master-credentials
       restore-error storage-full upgrading
-    )
+    ]
 
     STATES.each do |state|
-      define_method state.tr('-', '_') + '?' do
+      define_method "#{state.tr('-', '_')}?" do
         resource_via_client.db_instance_status == state
       end
     end
@@ -83,6 +85,7 @@ module Awspec::Type
                                                   filters: [{ name: 'group-name', values: [sg_id] }]
                                                 })
       return false unless res.security_groups.count == 1
+
       sgs.find do |sg|
         sg.vpc_security_group_id == res.security_groups.first.group_id
       end
@@ -94,6 +97,7 @@ module Awspec::Type
                                                   filters: [{ name: 'tag:Name', values: [sg_id] }]
                                                 })
       return false unless res.security_groups.count == 1
+
       sgs.find do |sg|
         sg.vpc_security_group_id == res.security_groups.first.group_id
       end

data/lib/awspec/type/rds_account_attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class RdsAccountAttributes < AccountAttributeBase
     def resource_via_client

data/lib/awspec/type/rds_db_cluster_parameter_group.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class RdsDbClusterParameterGroup < ResourceBase
     def resource_via_client
       return @resource_via_client if @resource_via_client
+
       @resource_via_client ||= select_all_rds_db_cluster_parameters(@display_name)
     end
 

data/lib/awspec/type/rds_db_parameter_group.rb

@@ -1,7 +1,46 @@
+# frozen_string_literal: true
+
 module Awspec::Type
+  class InvalidRdsDbParameter < StandardError
+    ##
+    # Overrides the superclass initialize method to include more information
+    # and default error message.
+    # Expected parameters:
+    # - parameter_name: the name of the parameter.
+
+    def initialize(parameter_name)
+      @param_name = parameter_name
+      message = "There is no such parameter \"rds.#{parameter_name}\""
+      super message
+    end
+  end
+
+  class RdsDBParameters
+    ##
+    # Thanks to AWS for creating parameters names like
+    # 'rds.accepted_password_auth_method', which would be caught as method 'rds'
+    # by method_missing in RdsDbParameterGroup class, this class was created
+    # See https://github.com/k1LoW/awspec/issues/527 for more details
+    def initialize(params)
+      @params = params
+    end
+
+    def to_s
+      "RdsDBParameters = #{@params}"
+    end
+
+    def method_missing(name)
+      param_name = name.to_sym
+      return @params[param_name] if @params.include?(param_name)
+
+      raise InvalidRdsDbParameter, name
+    end
+  end
+
   class RdsDbParameterGroup < ResourceBase
     def resource_via_client
       return @resource_via_client if @resource_via_client
+
       @resource_via_client ||= select_all_rds_db_parameters(@display_name)
     end
 
@@ -11,11 +50,30 @@ module Awspec::Type
 
     def method_missing(name)
       param_name = name.to_s
+      return create_rds_params if param_name == 'rds'
+
       if resource_via_client.include?(param_name)
         resource_via_client[param_name].to_s
       else
         super
       end
     end
+
+    private
+
+    def create_rds_params
+      return @rds_params if @rds_params
+
+      rds_params_keys = resource_via_client.keys.select { |key| key.to_s.start_with?('rds.') }
+      rds_params = {}
+
+      rds_params_keys.each do |key|
+        new_key = key.split('.')[-1]
+        rds_params[new_key.to_sym] = resource_via_client[key]
+      end
+
+      @rds_params = RdsDBParameters.new(rds_params)
+      @rds_params
+    end
   end
 end

data/lib/awspec/type/redshift.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Redshift < ResourceBase
     def resource_via_client
@@ -8,16 +10,16 @@ module Awspec::Type
       @id ||= resource_via_client.cluster_identifier if resource_via_client
     end
 
-    STATES = %w(
+    STATES = %w[
       available cancelling-resize creating deleting
       final-snapshot hardware-failure incompatible-hsm
       incompatible-network incompatible-parameters incompatible-restore
       modifying rebooting renaming resizing rotating-keys
       storage-full updating-hsm
-    )
+    ]
 
     STATES.each do |state|
-      define_method state.tr('-', '_') + '?' do
+      define_method "#{state.tr('-', '_')}?" do
         resource_via_client.cluster_status == state
       end
     end
@@ -62,6 +64,7 @@ module Awspec::Type
                                                   filters: [{ name: 'group-name', values: [sg_id] }]
                                                 })
       return false unless res.security_groups.count == 1
+
       sgs.find do |sg|
         sg.vpc_security_group_id == res.security_groups.first.group_id
       end
@@ -73,6 +76,7 @@ module Awspec::Type
                                                   filters: [{ name: 'tag:Name', values: [sg_id] }]
                                                 })
       return false unless res.security_groups.count == 1
+
       sgs.find do |sg|
         sg.vpc_security_group_id == res.security_groups.first.group_id
       end

data/lib/awspec/type/redshift_cluster_parameter_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class RedshiftClusterParameterGroup < ResourceBase
     def resource_via_client

data/lib/awspec/type/resource_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class ResourceBase < Base
     attr_reader :id, :resource_via_client

data/lib/awspec/type/route53_hosted_zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Route53HostedZone < ResourceBase
     def resource_via_client
@@ -28,6 +30,7 @@ module Awspec::Type
 
       record_sets.each do |record_set|
         return match_record(record_set, name, value, options) unless record_set.resource_records.empty?
+
         return match_alias_record(record_set, name, options)
       end
     end
@@ -37,8 +40,10 @@ module Awspec::Type
     def match_failover_record(record_sets, name, value, options)
       record_sets.select! { |record_set| record_set.failover == options[:record_type] }
       return false if record_sets.empty?
+
       record_sets.each do |record_set|
         return match_alias_record(record_set, name, options) if value.nil?
+
         return match_record(record_set, name, value, options)
       end
     end
@@ -58,8 +63,8 @@ module Awspec::Type
 
     def match_alias_record(record_set, name, options)
       record_set.name == name && \
-      record_set.alias_target.dns_name == options[:alias_dns_name] && \
-      record_set.alias_target.hosted_zone_id == options[:alias_hosted_zone_id]
+        record_set.alias_target.dns_name == options[:alias_dns_name] && \
+        record_set.alias_target.hosted_zone_id == options[:alias_hosted_zone_id]
     end
   end
 end

data/lib/awspec/type/route_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class RouteTable < ResourceBase
     aws_resource Aws::EC2::RouteTable
@@ -30,6 +32,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|
         a.subnet_id == subnet.subnet_id
       end
@@ -44,26 +47,33 @@ module Awspec::Type
     def target_gateway?(route, gateway_id)
       # * gateway
       return true if route.gateway_id == gateway_id
+
       # internet gateway
       igw = find_internet_gateway(gateway_id)
       return true if igw && igw.internet_gateway_id == route.gateway_id
+
       # vpn gateway
       vgw = find_vpn_gateway(gateway_id)
       return true if vgw && vgw.vpn_gateway_id == route.gateway_id
+
       # customer gateway
       cgw = find_customer_gateway(gateway_id)
       return true if cgw && cgw.customer_gateway_id == route.gateway_id
+
       # nat gateway
       nat = find_nat_gateway(gateway_id)
       return true if nat.nat_gateway_id == route.nat_gateway_id
+
       false
     end
 
     def target_instance?(route, instance_id)
       # instance
       return true if route.instance_id == instance_id
+
       instance = find_ec2(instance_id)
       return true if instance && instance.instance_id == route.instance_id
+
       false
     end
 
@@ -76,8 +86,10 @@ module Awspec::Type
     def target_vpc_peering_connection?(route, vpc_peering_connection_id)
       # vpc_peering_connection_id
       return true if route.vpc_peering_connection_id == vpc_peering_connection_id
+
       connection = find_vpc_peering_connection(vpc_peering_connection_id)
       return true if connection && connection.vpc_peering_connection_id == route.vpc_peering_connection_id
+
       false
     end
   end

data/lib/awspec/type/s3_bucket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class S3Bucket < ResourceBase
     aws_resource Aws::S3::Bucket
@@ -41,9 +43,7 @@ module Awspec::Type
       @acl.grants.count
     end
 
-    def has_cors_rule?(allowed_headers: [],
-                       allowed_methods:,
-                       allowed_origins:,
+    def has_cors_rule?(allowed_methods:, allowed_origins:, allowed_headers: [],
                        expose_headers: [],
                        max_age_seconds: nil)
       cors_rules.any? do |rule|
@@ -74,6 +74,7 @@ module Awspec::Type
       check_existence
       tag = find_bucket_tag(id, key)
       return nil if tag.value != value
+
       tag
     end
 
@@ -85,6 +86,7 @@ module Awspec::Type
       return false if le.nil?
       return false if target_bucket && target_bucket != le.target_bucket
       return false if target_prefix && target_prefix != le.target_prefix
+
       true
     end
 
@@ -102,14 +104,15 @@ module Awspec::Type
       rule.all? do |key, value|
         lc_rule.each do |r|
           return false if value.is_a?(String) && r[key] != value
+
           if value.is_a?(Hash)
             return false if r[key].to_h != value
           end
           if value.is_a?(Array)
             return false if r[key].map(&:to_h) != value
           end
-          true
         end
+        true
       end
     end
 

data/lib/awspec/type/secretsmanager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Secretsmanager < ResourceBase
     aws_resource Aws::SecretsManager

data/lib/awspec/type/security_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   # rubocop:disable Metrics/ClassLength
   class SecurityGroup < ResourceBase
@@ -14,11 +16,13 @@ module Awspec::Type
 
     def opened?(port = nil, protocol = nil, cidr = nil)
       return inbound_opened?(port, protocol, cidr) if @inbound
+
       outbound_opened?(port, protocol, cidr)
     end
 
     def opened_only?(port = nil, protocol = nil, cidr = nil)
       return inbound_opened_only?(port, protocol, cidr) if @inbound
+
       outbound_opened_only?(port, protocol, cidr)
     end
 
@@ -69,12 +73,12 @@ module Awspec::Type
     def ip_permissions_count
       resource_via_client.ip_permissions.count
     end
-    alias_method :inbound_permissions_count, :ip_permissions_count
+    alias inbound_permissions_count ip_permissions_count
 
     def ip_permissions_egress_count
       resource_via_client.ip_permissions_egress.count
     end
-    alias_method :outbound_permissions_count, :ip_permissions_egress_count
+    alias outbound_permissions_count ip_permissions_egress_count
 
     def has_inbound_rule?(rule)
       resource_via_client.ip_permissions.find do |permission|
@@ -104,10 +108,12 @@ module Awspec::Type
 
     def cidr_opened?(permission, cidr)
       return true unless cidr
+
       ret = permission.prefix_list_ids.select do |prefix_list_id|
         prefix_list_id.prefix_list_id == cidr
       end
       return true if ret.count > 0
+
       ret = permission.ip_ranges.select do |ip_range|
         # if the cidr is an IP address then do a true CIDR match
         if cidr =~ /^\d+\.\d+\.\d+\.\d+/
@@ -118,6 +124,7 @@ module Awspec::Type
         end
       end
       return true if ret.count > 0
+
       ret = permission.user_id_group_pairs.select do |sg|
         # Compare the sg group_name if the remote group is in another account.
         # find_security_group call doesn't return info on a remote security group.
@@ -125,9 +132,11 @@ module Awspec::Type
           next (sg.group_name == cidr) || (sg.group_id == cidr)
         end
         next true if sg.group_id == cidr
+
         sg2 = find_security_group(sg.group_id)
         next false if sg2.nil?
         next true if sg2.group_name == cidr
+
         sg2.tags.find do |tag|
           tag.key == 'Name' && tag.value == cidr
         end
@@ -139,6 +148,7 @@ module Awspec::Type
       return true unless protocol
       return false if protocol == 'all' && permission.ip_protocol != '-1'
       return true if permission.ip_protocol == '-1'
+
       permission.ip_protocol == protocol
     end
 
@@ -146,6 +156,7 @@ module Awspec::Type
       return true unless port
       return true unless permission.from_port
       return true unless permission.to_port
+
       port_between?(port, permission.from_port, permission.to_port)
     end
 
@@ -185,6 +196,7 @@ module Awspec::Type
         actual_pair.vpc_peering_connection_id == rule_pair[:vpc_peering_connection_id] ||
         rule_pair[:vpc_peering_connection_id].nil?
       return false unless actual_pair.peering_status == rule_pair[:peering_status] || rule_pair[:peering_status].nil?
+
       true
     end
   end

data/lib/awspec/type/ses_identity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class SesIdentity < ResourceBase
     def resource_via_client
@@ -18,9 +20,9 @@ module Awspec::Type
     end
 
     # dkim_attributes
-    dkim_attributes = %w(
+    dkim_attributes = %w[
       dkim_enabled dkim_verification_status
-    )
+    ]
 
     dkim_attributes.each do |attribute|
       define_method attribute do
@@ -39,10 +41,10 @@ module Awspec::Type
     end
 
     # notification_attributes
-    notification_attributes = %w(
+    notification_attributes = %w[
       bounce_topic complaint_topic delivery_topic
       forwarding_enabled
-    )
+    ]
 
     notification_attributes.each do |attribute|
       define_method attribute do
@@ -54,9 +56,9 @@ module Awspec::Type
     end
 
     # verification_attributes
-    verification_attributes = %w(
+    verification_attributes = %w[
       verification_status verification_token
-    )
+    ]
 
     verification_attributes.each do |attribute|
       define_method attribute do

data/lib/awspec/type/ses_send_quota.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class SesSendQuota < AccountAttributeBase
     def resource_via_client

data/lib/awspec/type/sns_topic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class SnsTopic < ResourceBase
     def initialize(topic_arn)
@@ -30,6 +32,7 @@ module Awspec::Type
       subs_key = subscribed_arn.to_sym
       fetch_subscriptions
       raise "'#{subscribed_arn}' is not a valid subscription ARN" unless @subscriptions.key?(subs_key)
+
       @subscriptions[subs_key]
     end
 
@@ -44,6 +47,7 @@ module Awspec::Type
     def fetch_subscriptions
       @subscriptions = find_sns_topic_subs(@topic_arn) if @subscriptions.nil?
       raise Awspec::NoExistingResource.new(self.class, @display_name) if @subscriptions.nil?
+
       @subscriptions
     end
   end

data/lib/awspec/type/sqs.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Sqs < ResourceBase
     def resource_via_client
       return @resource_via_client if @resource_via_client
+
       queue_url = id
       attributes = {}
       res = sqs_client.get_queue_attributes({
@@ -31,6 +34,7 @@ module Awspec::Type
     def has_tag?(tag_key, tag_value)
       @tag_set ||= find_tags_for_queue(@id)
       return nil if @tag_set[tag_key] != tag_value
+
       true
     end
   end

data/lib/awspec/type/ssm_parameter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class SsmParameter < ResourceBase
     def initialize(name)
@@ -20,6 +22,7 @@ module Awspec::Type
     def has_tag?(key, value)
       tag = find_parameter_tag(id, key)
       return nil if tag.value != value
+
       tag
     end
   end

data/lib/awspec/type/subnet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Subnet < ResourceBase
     aws_resource Aws::EC2::Subnet
@@ -22,16 +24,17 @@ module Awspec::Type
                                                ]
                                              })
       return false if res[:route_tables].empty?
+
       associated_route_table = res[:route_tables].first
       associated_route_table.route_table_id == route_table_id || associated_route_table.tag_name == route_table_id
     end
 
-    STATES = %w(
+    STATES = %w[
       available pending
-    )
+    ]
 
     STATES.each do |state|
-      define_method state + '?' do
+      define_method "#{state}?" do
         resource_via_client.state == state
       end
     end

data/lib/awspec/type/transit_gateway.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class TransitGateway < ResourceBase
     aws_resource Aws::EC2::Types::TransitGateway

data/lib/awspec/type/vpc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Vpc < ResourceBase
     aws_resource Aws::EC2::Vpc
@@ -11,12 +13,12 @@ module Awspec::Type
       @id ||= resource_via_client.vpc_id if resource_via_client
     end
 
-    STATES = %w(
+    STATES = %w[
       available pending
-    )
+    ]
 
     STATES.each do |state|
-      define_method state + '?' do
+      define_method "#{state}?" do
         resource_via_client.state == state
       end
     end
@@ -24,12 +26,14 @@ module Awspec::Type
     def has_route_table?(table_id)
       route_table = find_route_table(table_id)
       return false unless route_table
+
       route_table.vpc_id == id
     end
 
     def has_network_acl?(table_id)
       n = find_network_acl(table_id)
       return false unless n
+
       n.vpc_id == id
     end