awspec 1.27.0 → 1.28.1

data/lib/awspec/helper/finder/eip.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Awspec::Helper
+  module Finder
+    module Eip
+      def select_eip_by_instance_id(id)
+        res = ec2_client.describe_addresses({
+                                              filters: [{ name: 'instance-id', values: [id] }]
+                                            })
+        res.addresses
+      end
+
+      def select_eip(id)
+        res = ec2_client.describe_addresses({
+                                              filters: [{ name: 'public-ip', values: [id] }]
+                                            })
+        return res.addresses unless res.addresses.empty?
+
+        res = ec2_client.describe_addresses({
+                                              filters: [{ name: 'tag:Name', values: [id] }]
+                                            })
+        res.addresses
+      end
+    end
+  end
+end

data/lib/awspec/helper/finder/rds.rb

@@ -71,6 +71,27 @@ module Awspec::Helper
           db_proxy.vpc_id == vpc_id
         end
       end
+
+      def find_db_cluster(db_cluster_identifier)
+        res = rds_client.describe_db_clusters({
+                                                db_cluster_identifier: db_cluster_identifier
+                                              })
+        res.db_clusters.single_resource(db_cluster_identifier)
+      end
+
+      def find_global_cluster(global_cluster_identifier)
+        res = rds_client.describe_global_clusters({
+                                                    global_cluster_identifier: global_cluster_identifier
+                                                  })
+        res.global_clusters.single_resource(global_cluster_identifier)
+      end
+
+      def find_db_subnet_group(db_subnet_group_name)
+        res = rds_client.describe_db_subnet_groups({
+                                                     db_subnet_group_name: db_subnet_group_name
+                                                   })
+        res.db_subnet_groups.single_resource(db_subnet_group_name)
+      end
     end
   end
 end

data/lib/awspec/helper/finder.rb

@@ -10,6 +10,7 @@ require 'awspec/helper/finder/ec2'
 require 'awspec/helper/finder/ecr'
 require 'awspec/helper/finder/ecs'
 require 'awspec/helper/finder/efs'
+require 'awspec/helper/finder/eip'
 require 'awspec/helper/finder/security_group'
 require 'awspec/helper/finder/rds'
 require 'awspec/helper/finder/route53'
@@ -70,6 +71,7 @@ module Awspec::Helper
     include Awspec::Helper::Finder::Ecr
     include Awspec::Helper::Finder::Ecs
     include Awspec::Helper::Finder::Efs
+    include Awspec::Helper::Finder::Eip
     include Awspec::Helper::Finder::Firehose
     include Awspec::Helper::Finder::SecurityGroup
     include Awspec::Helper::Finder::Rds

data/lib/awspec/helper/type.rb

@@ -17,8 +17,9 @@ module Awspec
         efs eks eks_nodegroup elasticache elasticache_cache_parameter_group elasticsearch elb emr firehose iam_group
         iam_policy iam_role iam_user kinesis kms lambda launch_configuration launch_template mq nat_gateway
         network_acl network_interface nlb nlb_listener nlb_target_group
-        rds rds_proxy rds_db_cluster_parameter_group rds_db_parameter_group route53_hosted_zone
-        route_table s3_bucket security_group ses_identity subnet vpc cloudfront_distribution
+        rds rds_proxy rds_db_cluster_parameter_group rds_db_parameter_group rds_db_subnet_group
+        rds_db_cluster rds_global_cluster
+        route53_hosted_zone route_table s3_bucket security_group ses_identity subnet vpc cloudfront_distribution
         elastictranscoder_pipeline waf_web_acl wafregional_web_acl customer_gateway vpn_gateway vpn_connection
         internet_gateway acm cloudwatch_logs dynamodb_table eip sqs ssm_parameter cloudformation_stack
         codebuild sns_topic redshift redshift_cluster_parameter_group codedeploy codedeploy_deployment_group

data/lib/awspec/matcher/belong_to_subnet.rb

@@ -33,6 +33,27 @@ RSpec::Matchers.define :belong_to_subnet do |subnet_id|
       return ret[:subnet_availability_zone][:name] == type.availability_zone if ret
     end
 
+    # RDS DB Subnet Group
+    if type.instance_of?(Awspec::Type::RdsDbSubnetGroup)
+      subnets = type.resource_via_client[:subnets]
+      ret = subnets.find do |s|
+        s[:subnet_identifier] == subnet_id
+      end
+
+      return true if ret
+
+      res = type.ec2_client.describe_subnets({
+                                               filters: [{ name: 'tag:Name', values: [subnet_id] }]
+                                             })
+      return false unless res
+
+      ret = subnets.find do |s|
+        s[:subnet_identifier] == res[:subnets][0][:subnet_id]
+      end
+
+      return ret ? true : false
+    end
+
     # RDS Proxy
     if type.instance_of?(Awspec::Type::RdsProxy)
       subnet_ids = type.resource_via_client[:vpc_subnet_ids]

data/lib/awspec/matcher/have_cluster_member.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :have_cluster_member do |name|
+  match do |cluster_identifier|
+    cluster_identifier.has_cluster_member?(name, @is_writer)
+  end
+
+  chain :is_writer do |is_writer|
+    @is_writer = is_writer
+  end
+end

data/lib/awspec/matcher.rb

@@ -13,6 +13,7 @@ require 'awspec/matcher/belong_to_subnets'
 require 'awspec/matcher/belong_to_db_subnet_group'
 require 'awspec/matcher/have_db_parameter_group'
 require 'awspec/matcher/have_option_group'
+require 'awspec/matcher/have_cluster_member'
 
 # SecurityGroup
 require 'awspec/matcher/be_opened'

data/lib/awspec/stub/eip.rb

@@ -7,7 +7,13 @@ Aws.config[:ec2] = {
         {
           domain: 'vpc',
           public_ip: '123.0.456.789',
-          instance_id: 'i-ec12345a'
+          instance_id: 'i-ec12345a',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-eip'
+            }
+          ]
         }
       ]
     }

data/lib/awspec/stub/rds_db_cluster.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+Aws.config[:rds] = {
+  stub_responses: {
+    describe_db_clusters: {
+      db_clusters: [
+        {
+          allocated_storage: 1,
+          availability_zones: %w[ap-northeast-1a ap-northeast-1c ap-northeast-1d],
+          backup_retention_period: 1,
+          character_set_name: nil,
+          database_name: 'example_db',
+          db_cluster_identifier: 'my-rds-db-cluster',
+          db_cluster_parameter_group: 'default.aurora-mysql5.7',
+          db_subnet_group: 'default',
+          status: 'available',
+          automatic_restart_time: nil,
+          percent_progress: nil,
+          earliest_restorable_time: Time.local(2022),
+          endpoint: 'my-rds-db-cluster.cluster-abcdefghij12.ap-northeast-1.rds.amazonaws.com',
+          reader_endpoint: 'my-rds-db-cluster.cluster-ro-abcdefghij12.ap-northeast-1.rds.amazonaws.com',
+          custom_endpoints: [],
+          multi_az: false,
+          engine: 'aurora-mysql',
+          engine_version: '5.7.mysql_aurora.2.10.2',
+          latest_restorable_time: Time.local(2022),
+          port: 3306,
+          master_username: 'username',
+          db_cluster_option_group_memberships: [],
+          preferred_backup_window: '14:09-14:39',
+          preferred_maintenance_window: 'sun:17:01-sun:17:31',
+          replication_source_identifier: nil,
+          read_replica_identifiers: [
+            'arn:aws:rds:ap-northeast-3:123456789012:cluster:my-rds-secondary-cluster'
+          ],
+          db_cluster_members: [
+            {
+              db_instance_identifier: 'my-rds-db-cluster-instance-1',
+              is_cluster_writer: true,
+              db_cluster_parameter_group_status: 'in-sync',
+              promotion_tier: 0
+            },
+            {
+              db_instance_identifier: 'my-rds-db-cluster-instance-2',
+              is_cluster_writer: false,
+              db_cluster_parameter_group_status: 'in-sync',
+              promotion_tier: 0
+            }
+          ],
+          vpc_security_groups: [
+            {
+              vpc_security_group_id: 'sg-5a6b7cd8',
+              status: 'active'
+            }
+          ],
+          hosted_zone_id: 'Z24O6O9L7SGTNB',
+          storage_encrypted: false,
+          kms_key_id: nil,
+          db_cluster_resource_id: 'cluster-ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+          db_cluster_arn: 'arn:aws:rds:ap-northeast-1:123456789012:cluster:my-rds-db-cluster',
+          associated_roles: [],
+          iam_database_authentication_enabled: false,
+          clone_group_id: nil,
+          cluster_create_time: Time.local(2022),
+          earliest_backtrack_time: nil,
+          backtrack_window: nil,
+          backtrack_consumed_change_records: nil,
+          enabled_cloudwatch_logs_exports: [],
+          capacity: nil,
+          engine_mode: 'provisioned',
+          scaling_configuration_info: nil,
+          deletion_protection: false,
+          http_endpoint_enabled: false,
+          activity_stream_mode: nil,
+          activity_stream_status: 'stopped',
+          activity_stream_kms_key_id: nil,
+          activity_stream_kinesis_stream_name: nil,
+          copy_tags_to_snapshot: false,
+          cross_account_clone: false,
+          domain_memberships: [],
+          tag_list: [],
+          global_write_forwarding_status: nil,
+          global_write_forwarding_requested: false,
+          pending_modified_values: nil,
+          db_cluster_instance_class: nil,
+          storage_type: nil,
+          iops: nil,
+          publicly_accessible: nil,
+          monitoring_interval: nil,
+          monitoring_role_arn: nil,
+          performance_insights_enabled: nil,
+          performance_insights_kms_key_id: nil,
+          performance_insights_retention_period: nil,
+          serverless_v2_scaling_configuration: nil
+        }
+      ],
+      marker: nil
+    }
+  }
+}
+
+Aws.config[:ec2] = {
+  stub_responses: {
+    describe_security_groups: {
+      security_groups: [
+        {
+          group_id: 'sg-5a6b7cd8',
+          group_name: 'group-name-sg',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-db-sg'
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

data/lib/awspec/stub/rds_db_subnet_group.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+Aws.config[:rds] = {
+  stub_responses: {
+    describe_db_subnet_groups: {
+      db_subnet_groups: [
+        {
+          db_subnet_group_name: 'my-rds-db-subnet-group',
+          db_subnet_group_description: 'Created from the RDS Management Console',
+          vpc_id: 'vpc-ab123cde',
+          subnet_group_status: 'Complete',
+          subnets: [
+            {
+              subnet_identifier: 'subnet-1234a567',
+              subnet_availability_zone: {
+                name: 'ap-northeast-1a'
+              },
+              subnet_outpost: {
+                arn: nil
+              },
+              subnet_status: 'Active'
+            },
+            {
+              subnet_identifier: 'subnet-1234b567',
+              subnet_availability_zone: {
+                name: 'ap-northeast-1c'
+              },
+              subnet_outpost: {
+                arn: nil
+              },
+              subnet_status: 'Active'
+            },
+            {
+              subnet_identifier: 'subnet-1234c567',
+              subnet_availability_zone: {
+                name: 'ap-northeast-1d'
+              },
+              subnet_outpost: {
+                arn: nil
+              },
+              subnet_status: 'Active'
+            }
+          ],
+          db_subnet_group_arn: 'arn:aws:rds:ap-northeast-1:123456789012:subgrp:my-rds-db-subnet-group'
+        }
+      ],
+      marker: nil
+    }
+  }
+}
+
+Aws.config[:ec2] = {
+  stub_responses: {
+    describe_vpcs: {
+      vpcs: [
+        {
+          vpc_id: 'vpc-ab123cde',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-vpc'
+            }
+          ]
+        }
+      ]
+    },
+    describe_subnets: {
+      subnets: [
+        {
+          subnet_id: 'subnet-1234a567',
+          tags: [
+            {
+              key: 'Name',
+              value: 'db-subnet-a'
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

data/lib/awspec/stub/rds_global_cluster.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+Aws.config[:rds] = {
+  stub_responses: {
+    describe_global_clusters: {
+      global_clusters: [
+        {
+          global_cluster_identifier: 'my-rds-global-cluster',
+          global_cluster_resource_id: 'cluster-1234567890abcdef',
+          global_cluster_arn: 'arn:aws:rds::123456789012:global-cluster:my-rds-global-cluster',
+          status: 'available',
+          engine: 'aurora-mysql',
+          engine_version: '5.7.mysql_aurora.2.10.2',
+          database_name: 'example_db',
+          storage_encrypted: false,
+          deletion_protection: false,
+          global_cluster_members: [
+            {
+              db_cluster_arn: 'arn:aws:rds:ap-northeast-1:123456789012:cluster:my-primary-cluster',
+              readers: [
+                'arn:aws:rds:ap-northeast-3:123456789012:cluster:my-secondary-cluster'
+              ],
+              is_writer: true,
+              global_write_forwarding_status: nil
+            },
+            {
+              db_cluster_arn: 'arn:aws:rds:ap-northeast-3:123456789012:cluster:my-secondary-cluster',
+              readers: [],
+              is_writer: false,
+              global_write_forwarding_status: 'disabled'
+            }
+          ],
+          failover_state: nil
+        }
+      ],
+      marker: nil
+    }
+  }
+}

data/lib/awspec/type/cloudformation_stack.rb

@@ -2,6 +2,9 @@
 
 module Awspec::Type
   class CloudformationStack < ResourceBase
+    aws_resource Aws::CloudFormation::Stack
+    tags_allowed
+
     def resource_via_client
       @resource_via_client ||= find_cloudformation_stack(@display_name)
     end

data/lib/awspec/type/eip.rb

@@ -3,7 +3,7 @@
 module Awspec::Type
   class Eip < ResourceBase
     def resource_via_client
-      @resource_via_client ||= select_eip_by_public_ip(@display_name)
+      @resource_via_client ||= select_eip(@display_name)
     end
 
     def id

data/lib/awspec/type/rds_db_cluster.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Awspec::Type
+  class RdsDbCluster < ResourceBase
+    aws_resource Aws::RDS::Types::DBCluster
+
+    def resource_via_client
+      @resource_via_client ||= find_db_cluster(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.db_cluster_identifier if resource_via_client
+    end
+
+    STATES = %w[
+      available creating deleting
+    ]
+
+    STATES.each do |state|
+      define_method "#{state.tr('-', '_')}?" do
+        resource_via_client.status == state
+      end
+    end
+
+    def has_security_group?(sg_id)
+      return true if has_vpc_security_group_id?(sg_id)
+      return true if has_vpc_security_group_name?(sg_id)
+      return true if has_vpc_security_group_tag_name?(sg_id)
+    end
+
+    def has_cluster_member?(db_instance_identifier, is_writer = nil)
+      members = resource_via_client.db_cluster_members
+      members.find do |member|
+        if is_writer.nil?
+          member.db_instance_identifier == db_instance_identifier
+        else
+          member.db_instance_identifier == db_instance_identifier && member.is_cluster_writer == is_writer
+        end
+      end
+    end
+
+    private
+
+    def has_vpc_security_group_id?(sg_id)
+      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
+      res = ec2_client.describe_security_groups({
+                                                  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
+    end
+
+    def has_vpc_security_group_tag_name?(sg_id)
+      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
+
+      sgs.find do |sg|
+        sg.vpc_security_group_id == res.security_groups.first.group_id
+      end
+    end
+  end
+end

data/lib/awspec/type/rds_db_subnet_group.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Awspec::Type
+  class RdsDbSubnetGroup < ResourceBase
+    aws_resource Aws::RDS::Types::DBSubnetGroup
+
+    def resource_via_client
+      @resource_via_client ||= find_db_subnet_group(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.db_subnet_group_name if resource_via_client
+    end
+
+    def vpc_id
+      resource_via_client.vpc_id
+    end
+  end
+end

data/lib/awspec/type/rds_global_cluster.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Awspec::Type
+  class RdsGlobalCluster < ResourceBase
+    aws_resource Aws::RDS::Types::GlobalCluster
+
+    def resource_via_client
+      @resource_via_client ||= find_global_cluster(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.global_cluster_identifier if resource_via_client
+    end
+
+    STATES = %w[
+      available creating deleting
+    ]
+
+    STATES.each do |state|
+      define_method "#{state.tr('-', '_')}?" do
+        resource_via_client.status == state
+      end
+    end
+
+    def has_cluster_member?(db_cluster_arn, is_writer = nil)
+      members = resource_via_client.global_cluster_members
+      members.find do |member|
+        if is_writer.nil?
+          member.db_cluster_arn == db_cluster_arn
+        else
+          member.db_cluster_arn == db_cluster_arn && member.is_writer == is_writer
+        end
+      end
+    end
+  end
+end

data/lib/awspec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Awspec
-  VERSION = '1.27.0'
+  VERSION = '1.28.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.28.1
 platform: ruby
 authors:
 - k1LoW
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -309,8 +309,11 @@ files:
 - doc/_resource_types/nlb_target_group.md
 - doc/_resource_types/rds.md
 - doc/_resource_types/rds_account_attributes.md
+- doc/_resource_types/rds_db_cluster.md
 - doc/_resource_types/rds_db_cluster_parameter_group.md
 - doc/_resource_types/rds_db_parameter_group.md
+- doc/_resource_types/rds_db_subnet_group.md
+- doc/_resource_types/rds_global_cluster.md
 - doc/_resource_types/rds_proxy.md
 - doc/_resource_types/redshift.md
 - doc/_resource_types/redshift_cluster_parameter_group.md
@@ -416,8 +419,11 @@ files:
 - lib/awspec/generator/doc/type/nlb_target_group.rb
 - lib/awspec/generator/doc/type/rds.rb
 - lib/awspec/generator/doc/type/rds_account_attributes.rb
+- lib/awspec/generator/doc/type/rds_db_cluster.rb
 - lib/awspec/generator/doc/type/rds_db_cluster_parameter_group.rb
 - lib/awspec/generator/doc/type/rds_db_parameter_group.rb
+- lib/awspec/generator/doc/type/rds_db_subnet_group.rb
+- lib/awspec/generator/doc/type/rds_global_cluster.rb
 - lib/awspec/generator/doc/type/rds_proxy.rb
 - lib/awspec/generator/doc/type/redshift.rb
 - lib/awspec/generator/doc/type/redshift_cluster_parameter_group.rb
@@ -469,8 +475,10 @@ files:
 - lib/awspec/generator/spec/nlb.rb
 - lib/awspec/generator/spec/nlb_listener.rb
 - lib/awspec/generator/spec/rds.rb
+- lib/awspec/generator/spec/rds_db_cluster.rb
 - lib/awspec/generator/spec/rds_db_cluster_parameter_group.rb
 - lib/awspec/generator/spec/rds_db_parameter_group.rb
+- lib/awspec/generator/spec/rds_global_cluster.rb
 - lib/awspec/generator/spec/rds_proxy.rb
 - lib/awspec/generator/spec/redshift.rb
 - lib/awspec/generator/spec/redshift_cluster_parameter_group.rb
@@ -509,6 +517,7 @@ files:
 - lib/awspec/helper/finder/ecr.rb
 - lib/awspec/helper/finder/ecs.rb
 - lib/awspec/helper/finder/efs.rb
+- lib/awspec/helper/finder/eip.rb
 - lib/awspec/helper/finder/eks.rb
 - lib/awspec/helper/finder/elasticache.rb
 - lib/awspec/helper/finder/elasticsearch.rb
@@ -562,6 +571,7 @@ files:
 - lib/awspec/matcher/belong_to_subnets.rb
 - lib/awspec/matcher/belong_to_vpc.rb
 - lib/awspec/matcher/have_attribute_definition.rb
+- lib/awspec/matcher/have_cluster_member.rb
 - lib/awspec/matcher/have_cluster_parameter_group.rb
 - lib/awspec/matcher/have_custom_response_error_code.rb
 - lib/awspec/matcher/have_db_parameter_group.rb
@@ -654,8 +664,11 @@ files:
 - lib/awspec/stub/nlb_listener.rb
 - lib/awspec/stub/nlb_target_group.rb
 - lib/awspec/stub/rds.rb
+- lib/awspec/stub/rds_db_cluster.rb
 - lib/awspec/stub/rds_db_cluster_parameter_group.rb
 - lib/awspec/stub/rds_db_parameter_group.rb
+- lib/awspec/stub/rds_db_subnet_group.rb
+- lib/awspec/stub/rds_global_cluster.rb
 - lib/awspec/stub/rds_proxy.rb
 - lib/awspec/stub/redshift.rb
 - lib/awspec/stub/redshift_cluster_parameter_group.rb
@@ -747,8 +760,11 @@ files:
 - lib/awspec/type/nlb_target_group.rb
 - lib/awspec/type/rds.rb
 - lib/awspec/type/rds_account_attributes.rb
+- lib/awspec/type/rds_db_cluster.rb
 - lib/awspec/type/rds_db_cluster_parameter_group.rb
 - lib/awspec/type/rds_db_parameter_group.rb
+- lib/awspec/type/rds_db_subnet_group.rb
+- lib/awspec/type/rds_global_cluster.rb
 - lib/awspec/type/rds_proxy.rb
 - lib/awspec/type/redshift.rb
 - lib/awspec/type/redshift_cluster_parameter_group.rb