awspec 1.24.3 → 1.25.2

data/lib/awspec/type/autoscaling_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class AutoscalingGroup < ResourceBase
     aws_resource Aws::AutoScaling::AutoScalingGroup
@@ -20,6 +22,7 @@ module Awspec::Type
     def has_ec2?(id)
       ec2 = find_ec2(id)
       return nil unless ec2
+
       resource_via_client.instances.one? do |instance|
         instance.instance_id == ec2.instance_id
       end

data/lib/awspec/type/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk'
 require 'awspec/resource_reader'
 require 'awspec/helper/finder'
@@ -34,12 +36,13 @@ module Awspec::Type
           tags = resource_via_client.tag_set
         end
         return false unless tags
+
         tags.any? { |t| t['key'] == key && t['value'] == value }
       end
     end
 
     def method_missing(name)
-      name_str = name.to_s if name.class == Symbol
+      name_str = name.to_s if name.instance_of?(Symbol)
       describe = name_str.tr('-', '_').to_sym
 
       if !resource_via_client.nil? && resource_via_client.members.include?(describe)
@@ -47,12 +50,12 @@ module Awspec::Type
       elsif resource_via_client.nil?
         raise Awspec::NoExistingResource.new(self.class, @display_name)
       else
-        super unless self.respond_to?(:resource)
+        super unless respond_to?(:resource)
         method_missing_via_black_list(name, delegate_to: resource)
       end
     end
 
-    undef :timeout
+    undef :timeout if Gem::Version.create(RUBY_VERSION) < Gem::Version.create('3.1.0')
 
     private
 

data/lib/awspec/type/batch_compute_environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class BatchComputeEnvironment < ResourceBase
     def initialize(compenv)
@@ -13,18 +15,18 @@ module Awspec::Type
       @id ||= resource_via_client.compute_environment_name if resource_via_client
     end
 
-    STATES = %w(ENABLED DISABLED)
+    STATES = %w[ENABLED DISABLED]
 
     STATES.each do |state|
-      define_method state.downcase + '?' do
+      define_method "#{state.downcase}?" do
         resource_via_client.state == state
       end
     end
 
-    TYPES = %w(MANAGED UNMANAGED)
+    TYPES = %w[MANAGED UNMANAGED]
 
     TYPES.each do |type|
-      define_method type.downcase + '?' do
+      define_method "#{type.downcase}?" do
         resource_via_client.type == type
       end
     end

data/lib/awspec/type/batch_job_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class BatchJobDefinition < ResourceBase
     def initialize(jobdef)

data/lib/awspec/type/batch_job_queue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class BatchJobQueue < ResourceBase
     def initialize(jobqueue)
@@ -13,10 +15,10 @@ module Awspec::Type
       @id ||= resource_via_client.job_queue_name if resource_via_client
     end
 
-    STATES = %w(ENABLED DISABLED)
+    STATES = %w[ENABLED DISABLED]
 
     STATES.each do |state|
-      define_method state.downcase + '?' do
+      define_method "#{state.downcase}?" do
         resource_via_client.state == state
       end
     end

data/lib/awspec/type/cloudformation_stack.rb

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

data/lib/awspec/type/cloudfront_distribution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class CloudfrontDistribution < ResourceBase
     def resource_via_client
@@ -8,12 +10,12 @@ module Awspec::Type
       @id ||= resource_via_client.id if resource_via_client
     end
 
-    STATUSES = %w(
+    STATUSES = %w[
       InProgress Deployed
-    )
+    ]
 
     STATUSES.each do |status|
-      define_method status.underscore + '?' do
+      define_method "#{status.underscore}?" do
         resource_via_client.status == status
       end
     end
@@ -23,12 +25,14 @@ 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|
         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
         next false if !origin_access_identity.nil? && \
                       origin.s3_origin_config.origin_access_identity != origin_access_identity
+
         true
       end
     end
@@ -38,8 +42,8 @@ module Awspec::Type
     end
 
     def has_origin_domain_name_and_path?(domain_name_and_path)
-      domain_name = domain_name_and_path.gsub(%r(/.*\z), '')
-      origin_path = domain_name_and_path.gsub(%r(\A[^/]*), '')
+      domain_name = domain_name_and_path.gsub(%r{/.*\z}, '')
+      origin_path = domain_name_and_path.gsub(%r{\A[^/]*}, '')
       has_origin?(nil, domain_name: domain_name, origin_path: origin_path)
     end
 
@@ -48,11 +52,13 @@ module Awspec::Type
                                         response_code: nil,
                                         error_caching_min_ttl: nil)
       return false unless [error_code, domain_name].any?
+
       resource_via_client.custom_error_responses.items.find do |error|
         next false if !error_code.nil? && error.error_code != error_code
         next false if !response_page_path.nil? && error.response_page_path != response_page_path
         next false if !response_code.nil? && error.response_code != response_code.to_s
         next false if !error_caching_min_ttl.nil? && error.error_caching_min_ttl != error_caching_min_ttl
+
         true
       end
     end

data/lib/awspec/type/cloudtrail.rb

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

data/lib/awspec/type/cloudwatch_alarm.rb

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

data/lib/awspec/type/cloudwatch_event.rb

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

data/lib/awspec/type/cloudwatch_logs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class CloudwatchLogs < ResourceBase
     def resource_via_client
@@ -13,9 +15,14 @@ module Awspec::Type
       return true if ret == stream_name
     end
 
-    def has_metric_filter?(filter_name)
-      ret = find_cloudwatch_logs_metric_fileter_by_log_group_name(@id, filter_name).filter_name
-      return true if ret == filter_name
+    def has_metric_filter?(filter_name, pattern = nil)
+      ret = find_cloudwatch_logs_metric_fileter_by_log_group_name(@id, filter_name)
+      if pattern.nil?
+        return true if ret.filter_name == filter_name
+      else
+        return false unless ret.filter_pattern == pattern
+      end
+      return true if ret.filter_name == filter_name
     end
 
     def has_subscription_filter?(filter_name, pattern = nil)

data/lib/awspec/type/codebuild.rb

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

data/lib/awspec/type/codedeploy.rb

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

data/lib/awspec/type/codedeploy_deployment_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class CodedeployDeploymentGroup < ResourceBase
     attr_accessor :application_name
@@ -25,8 +27,10 @@ module Awspec::Type
         asg.name == asg_name
       end
       return true if res
+
       asg2 = find_autoscaling_group(asg_name)
       return true if asgs.include? asg2.auto_scaling_group_name
+
       false
     end
   end

data/lib/awspec/type/cognito_identity_pool.rb

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

data/lib/awspec/type/cognito_user_pool.rb

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

data/lib/awspec/type/customer_gateway.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class CustomerGateway < ResourceBase
     tags_allowed
@@ -15,12 +17,12 @@ module Awspec::Type
       @id ||= resource_via_client.customer_gateway_id if resource_via_client
     end
 
-    STATES = %w(
+    STATES = %w[
       pending available deleting deleted
-    )
+    ]
 
     STATES.each do |state|
-      define_method state.tr('-', '_') + '?' do
+      define_method "#{state.tr('-', '_')}?" do
         resource_via_client.state == state
       end
     end

data/lib/awspec/type/directconnect_virtual_interface.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class DirectconnectVirtualInterface < ResourceBase
     def initialize(name)
@@ -13,13 +15,13 @@ module Awspec::Type
       @id ||= resource_via_client.virtual_interface_id if resource_via_client
     end
 
-    STATES = %w(
+    STATES = %w[
       confirming verifying pending available
       deleting deleted rejected
-    )
+    ]
 
     STATES.each do |state|
-      define_method state + '?' do
+      define_method "#{state}?" do
         resource_via_client.virtual_interface_state == state
       end
     end

data/lib/awspec/type/dynamodb_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class DynamodbTable < ResourceBase
     aws_resource Aws::DynamoDB::Table
@@ -10,15 +12,15 @@ module Awspec::Type
       @id ||= resource_via_client.table_name if resource_via_client
     end
 
-    STATUSES = %w(
+    STATUSES = %w[
       CREATING
       UPDATING
       DELETING
       ACTIVE
-    )
+    ]
 
     STATUSES.each do |status|
-      define_method status.downcase + '?' do
+      define_method "#{status.downcase}?" do
         resource_via_client.table_status == status
       end
     end

data/lib/awspec/type/ebs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Ebs < ResourceBase
     aws_resource Aws::EC2::Volume
@@ -16,12 +18,12 @@ module Awspec::Type
       @id ||= resource_via_client.volume_id if resource_via_client
     end
 
-    STATES = %w(
+    STATES = %w[
       creating available in-use deleting deleted error
-    )
+    ]
 
     STATES.each do |state|
-      define_method state.tr('-', '_') + '?' do
+      define_method "#{state.tr('-', '_')}?" do
         resource_via_client.state == state
       end
     end
@@ -30,6 +32,7 @@ module Awspec::Type
       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'
     end

data/lib/awspec/type/ec2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'awspec/helper/states'
 
 module Awspec::Type
@@ -50,6 +52,7 @@ module Awspec::Type
 
     def has_security_groups?(sg_ids)
       return true if match_group_ids?(sg_ids) || match_group_names?(sg_ids)
+
       group_ids = resource_security_groups.map { |sg| sg.group_id }
       tags = select_security_group_by_group_id(group_ids).map { |sg| sg.tags }.flatten
       group_names = tags.select { |tag| tag.key == 'Name' }.map { |tag| tag.value }
@@ -63,8 +66,10 @@ module Awspec::Type
         sg.group_id == sg_id || sg.group_name == sg_id
       end
       return true if ret
+
       sg2 = find_security_group(sg_id)
       return false unless sg2.tag_name == sg_id
+
       sgs.find do |sg|
         sg.group_id == sg2.group_id
       end
@@ -82,9 +87,11 @@ module Awspec::Type
       blocks = resource_via_client.block_device_mappings
       ret = blocks.find do |block|
         next false unless block.ebs
+
         block.ebs.volume_id == volume_id
       end
       return true if ret
+
       blocks2 = find_ebs(volume_id)
       blocks2.attachments.find do |attachment|
         attachment.instance_id == id
@@ -97,6 +104,7 @@ module Awspec::Type
       interfaces = resource_via_client.network_interfaces
       ret = interfaces.find do |interface|
         next false if device_index && interface.attachment.device_index != device_index
+
         interface.network_interface_id == res.network_interface_id
       end
     end
@@ -111,6 +119,7 @@ module Awspec::Type
     def has_events?
       status = find_ec2_status(id)
       return false if status.nil?
+
       status.events.count > 0
     end
 
@@ -129,6 +138,7 @@ module Awspec::Type
       }
       classic_link_instances = ec2_client.describe_classic_link_instances(option)
       return false if classic_link_instances.instances.count == 0
+
       instances = classic_link_instances[0]
       sgs = instances[0].groups
       ret = sgs.find do |sg|

data/lib/awspec/type/ec2_account_attributes.rb

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

data/lib/awspec/type/ecr_repository.rb

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

data/lib/awspec/type/ecs_cluster.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class EcsCluster < ResourceBase
     def initialize(name)
@@ -13,10 +15,10 @@ module Awspec::Type
       @id ||= resource_via_client.cluster_name if resource_via_client
     end
 
-    STATES = %w(ACTIVE INACTIVE)
+    STATES = %w[ACTIVE INACTIVE]
 
     STATES.each do |state|
-      define_method state.downcase + '?' do
+      define_method "#{state.downcase}?" do
         resource_via_client.status == state
       end
     end
@@ -38,6 +40,7 @@ module Awspec::Type
       puts ''
       warn Color.on_red(Color.white("!!! `#{__method__}` is deprecated. awspec don't provide complex result !!!"))
       return @container_instances if @container_instances
+
       arns = container_instance_arns
       @container_instances ||=
         arns.empty? ? [] : find_ecs_container_instances(id, arns).map! { |ci| EcsContainerInstance.new(id, ci) }

data/lib/awspec/type/ecs_container_instance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class EcsContainerInstance < ResourceBase
     attr_accessor :cluster
@@ -19,10 +21,10 @@ module Awspec::Type
       @cluster || 'default'
     end
 
-    STATES = %w(ACTIVE INACTIVE)
+    STATES = %w[ACTIVE INACTIVE]
 
     STATES.each do |state|
-      define_method state.downcase + '?' do
+      define_method "#{state.downcase}?" do
         resource_via_client.status == state
       end
     end

data/lib/awspec/type/ecs_service.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class EcsService < ResourceBase
     attr_accessor :cluster
+
     def initialize(service)
       super
       @display_name = service
@@ -18,10 +21,10 @@ module Awspec::Type
       @cluster || 'default'
     end
 
-    STATES = %w(ACTIVE DRAINING INACTIVE)
+    STATES = %w[ACTIVE DRAINING INACTIVE]
 
     STATES.each do |state|
-      define_method state.downcase + '?' do
+      define_method "#{state.downcase}?" do
         resource_via_client.status == state
       end
     end

data/lib/awspec/type/ecs_task_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class EcsTaskDefinition < ResourceBase
     def initialize(taskdef)
@@ -13,10 +15,10 @@ module Awspec::Type
       @id ||= "#{resource_via_client.family}:#{resource_via_client.revision}" if resource_via_client
     end
 
-    STATES = %w(ACTIVE INACTIVE)
+    STATES = %w[ACTIVE INACTIVE]
 
     STATES.each do |state|
-      define_method state.downcase + '?' do
+      define_method "#{state.downcase}?" do
         resource_via_client.status == state
       end
     end

data/lib/awspec/type/efs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Efs < ResourceBase
     def initialize(file_system_id)
@@ -16,6 +18,7 @@ module Awspec::Type
     def has_tag?(tag_key, tag_value)
       tag = find_efs_tags(@display_name, tag_key)
       return nil if tag.value != tag_value
+
       tag
     end
   end

data/lib/awspec/type/eip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Eip < ResourceBase
     def resource_via_client
@@ -10,6 +12,7 @@ module Awspec::Type
 
     def associated_to?(instance_id)
       return false unless resource_via_client.last.instance_id == instance_id
+
       resource_via_client.last.instance_id == instance_id
     end
   end

data/lib/awspec/type/eks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awspec::Type
   class Eks < ResourceBase
     def initialize(name)
@@ -13,10 +15,10 @@ module Awspec::Type
       @id ||= resource_via_client.name if resource_via_client
     end
 
-    STATES = %w(ACTIVE CREATING)
+    STATES = %w[ACTIVE CREATING]
 
     STATES.each do |state|
-      define_method state.downcase + '?' do
+      define_method "#{state.downcase}?" do
         resource_via_client.status == state
       end
     end