awspec 1.28.0 → 1.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7d1b88af80d3b1bf908f34ad1f537505881bfb258f88ff56db14ab63d37afb8
-  data.tar.gz: 4da3943ff6e94748d3816823e91134d58a9a7ee522159534c1728ac0dbdc3afb
+  metadata.gz: b6f1ca2cbd7fc6f8da6c63b21580d6541b0537991e70b4fe6355206b4220d596
+  data.tar.gz: 6a63cd43a83035df50cde9861b13390807ed23e719e8823c1171b55f62c94491
 SHA512:
-  metadata.gz: 4dd50e4e4c5d3c3afb5a2c8c45de378fcc8b90bdf3cd0f2d8e47e951713d4022d084621a47fc0c32853cfa86ebec335a6e302acc8cb35513d240ecb2d56de1e4
-  data.tar.gz: ed8efb4183559c1ac70c8b801e2545a9fff732c2584f9fb34b2878e5275a0ba91a1fcafd9be469f33f78bbe2143a2f2555e433ea6be7b9d90ed9015bf103c7d1
+  metadata.gz: 241b78c9bd20ad9adba886717e3f95133c632e25b0dcedc2b86ec9c14f98a5a0c1a7f6a2cd1539ab63465e99490081b6e83c19847bb022280523f01231e5dfa0
+  data.tar.gz: 6b556cf9de7bc9c7ff171fe77ca28b7e21ee9d3ec3ee6428dc20205cea8fb85fde05f3307a8a8fc8a20cfdf47a980920b8fa0890a7736585070bc8fc2e1a6bd2

data/doc/_resource_types/cloudformation_stack.md

@@ -6,3 +6,11 @@ describe cloudformation_stack('my-cloudformation-stack') do
   its(:stack_status) { should eq 'UPDATE_COMPLETE' }
 end
 ```
+
+### have_tag
+
+```ruby
+describe cloudformation_stack('my-cloudformation-stack') do
+  it { should have_tag('env').value('dev') }
+end
+```

data/doc/_resource_types/s3_bucket.md

@@ -88,7 +88,7 @@ describe s3_bucket('my-bucket') do
   it do
     should have_lifecycle_rule(
       id: 'MyRuleName2',
-      prefix: '123/',
+      filter: { prefix: '123/' },
       noncurrent_version_expiration: { noncurrent_days: 2 },
       expiration: { days: 3 },
       transitions: [{ days: 5, storage_class: 'STANDARD_IA' }, { days: 10, storage_class: 'GLACIER' }],

data/doc/_resource_types/vpc_endpoints.md

@@ -1,11 +1,6 @@
-### exist
+### first
 
 ```ruby
-describe vpc_endpoints('my-vpc-endpoint') do
-  it { should exist }
-end
-```
-
 describe vpc_endpoints('vpce-05907f23265b25f20'), region: $tfvars["region"]["value"] do
   it { should exist }
   it { should be_available }
@@ -15,11 +10,20 @@ describe vpc_endpoints('vpce-05907f23265b25f20'), region: $tfvars["region"]["val
   its(:vpc_endpoint_type) { should eq 'Interface' }
   its(:service_name) { should eq 'com.amazonaws.eu-west-1.codebuild' }
 end
+```
+
+### exist
+
+```ruby
+describe vpc_endpoints('my-vpc-endpoint') do
+  it { should exist }
+end
+```
 
 ### be_pendingacceptance, be_pending, be_available, be_deleting, be_deleted, be_rejected, be_failed, be_expired
 
 ```ruby
-describe ami('my-ami') do
+describe vpc_endpoints('my-vpc-endpoint') do
   it { should be_available }
 end
 ```
@@ -45,6 +49,7 @@ end
 ```ruby
 describe vpc_endpoints('my-vpc-endpoint') do
   it { should have_subnet('subnet-abc123') }
+  it { should have_subnet('my-subnet') }
 end
 ```
 

data/doc/_resource_types/vpn_gateway.md

@@ -22,4 +22,11 @@ describe vpn_gateway('my-vpn-gateway') do
 end
 ```
 
-### its(:vpn_gateway_id), its(:state), its(:type), its(:availability_zone)
+### belong_to_vpc
+
+```ruby
+describe vpn_gateway('my-vpn-gateway') do
+  it { should belong_to_vpc('vpc-ab123cde') }
+  it { should belong_to_vpc('my-vpc') }
+end
+```

data/doc/resource_types.md

@@ -278,7 +278,7 @@ end
 
 ### have_tag
 
-### its(:architecture), its(:creation_date), its(:image_id), its(:image_location), its(:image_type), its(:public), its(:kernel_id), its(:owner_id), its(:platform), its(:platform_details), its(:usage_operation), its(:ramdisk_id), its(:state), its(:description), its(:ena_support), its(:hypervisor), its(:image_owner_alias), its(:name), its(:root_device_name), its(:root_device_type), its(:sriov_net_support), its(:state_reason), its(:virtualization_type), its(:boot_mode), its(:tpm_support), its(:deprecation_time)
+### its(:architecture), its(:creation_date), its(:image_id), its(:image_location), its(:image_type), its(:public), its(:kernel_id), its(:owner_id), its(:platform), its(:platform_details), its(:usage_operation), its(:ramdisk_id), its(:state), its(:description), its(:ena_support), its(:hypervisor), its(:image_owner_alias), its(:name), its(:root_device_name), its(:root_device_type), its(:sriov_net_support), its(:state_reason), its(:virtualization_type), its(:boot_mode), its(:tpm_support), its(:deprecation_time), its(:imds_support)
 ### :unlock: Advanced use
 
 `ami` can use `Aws::EC2::Image` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Image.html).
@@ -457,6 +457,15 @@ describe cloudformation_stack('my-cloudformation-stack') do
 end
 ```
 
+
+### have_tag
+
+```ruby
+describe cloudformation_stack('my-cloudformation-stack') do
+  it { should have_tag('env').value('dev') }
+end
+```
+
 ### its(:stack_id), its(:stack_name), its(:change_set_id), its(:description), its(:parameters), its(:creation_time), its(:deletion_time), its(:last_updated_time), its(:rollback_configuration), its(:stack_status), its(:stack_status_reason), its(:disable_rollback), its(:notification_arns), its(:timeout_in_minutes), its(:capabilities), its(:role_arn), its(:enable_termination_protection), its(:parent_id), its(:root_id), its(:drift_information)
 ## <a name="cloudfront_distribution">cloudfront_distribution</a>
 
@@ -1350,7 +1359,7 @@ describe eip('123.0.456.789') do
 end
 ```
 
-
+### its(:instance_id), its(:public_ip), its(:allocation_id), its(:association_id), its(:domain), its(:network_interface_id), its(:network_interface_owner_id), its(:private_ip_address), its(:public_ipv_4_pool), its(:network_border_group), its(:customer_owned_ip), its(:customer_owned_ipv_4_pool), its(:carrier_ip)
 ## <a name="eks">eks</a>
 
 Eks resource type.
@@ -1371,7 +1380,7 @@ describe eks('my-eks') do
 end
 ```
 
-### its(:name), its(:arn), its(:created_at), its(:version), its(:endpoint), its(:role_arn), its(:kubernetes_network_config), its(:logging), its(:identity), its(:status), its(:client_request_token), its(:platform_version), its(:tags), its(:encryption_config), its(:connector_config)
+### its(:name), its(:arn), its(:created_at), its(:version), its(:endpoint), its(:role_arn), its(:kubernetes_network_config), its(:logging), its(:identity), its(:status), its(:client_request_token), its(:platform_version), its(:tags), its(:encryption_config), its(:connector_config), its(:id), its(:health), its(:outpost_config)
 ## <a name="eks_nodegroup">eks_nodegroup</a>
 
 EksNodegroup resource type.
@@ -2932,7 +2941,7 @@ describe rds_db_cluster('my-rds-db-cluster') do
 end
 ```
 
-### its(:allocated_storage), its(:availability_zones), its(:backup_retention_period), its(:character_set_name), its(:database_name), its(:db_cluster_identifier), its(:db_cluster_parameter_group), its(:db_subnet_group), its(:status), its(:automatic_restart_time), its(:percent_progress), its(:earliest_restorable_time), its(:endpoint), its(:reader_endpoint), its(:custom_endpoints), its(:multi_az), its(:engine), its(:engine_version), its(:latest_restorable_time), its(:port), its(:master_username), its(:db_cluster_option_group_memberships), its(:preferred_backup_window), its(:preferred_maintenance_window), its(:replication_source_identifier), its(:read_replica_identifiers), its(:hosted_zone_id), its(:storage_encrypted), its(:kms_key_id), its(:db_cluster_resource_id), its(:db_cluster_arn), its(:associated_roles), its(:iam_database_authentication_enabled), its(:clone_group_id), its(:cluster_create_time), its(:earliest_backtrack_time), its(:backtrack_window), its(:backtrack_consumed_change_records), its(:enabled_cloudwatch_logs_exports), its(:capacity), its(:engine_mode), its(:scaling_configuration_info), its(:deletion_protection), its(:http_endpoint_enabled), its(:activity_stream_mode), its(:activity_stream_status), its(:activity_stream_kms_key_id), its(:activity_stream_kinesis_stream_name), its(:copy_tags_to_snapshot), its(:cross_account_clone), its(:domain_memberships), its(:tag_list), its(:global_write_forwarding_status), its(:global_write_forwarding_requested), its(:pending_modified_values), its(:db_cluster_instance_class), its(:storage_type), its(:iops), its(:publicly_accessible), its(:auto_minor_version_upgrade), its(:monitoring_interval), its(:monitoring_role_arn), its(:performance_insights_enabled), its(:performance_insights_kms_key_id), its(:performance_insights_retention_period), its(:serverless_v2_scaling_configuration)
+### its(:allocated_storage), its(:availability_zones), its(:backup_retention_period), its(:character_set_name), its(:database_name), its(:db_cluster_identifier), its(:db_cluster_parameter_group), its(:db_subnet_group), its(:status), its(:automatic_restart_time), its(:percent_progress), its(:earliest_restorable_time), its(:endpoint), its(:reader_endpoint), its(:custom_endpoints), its(:multi_az), its(:engine), its(:engine_version), its(:latest_restorable_time), its(:port), its(:master_username), its(:db_cluster_option_group_memberships), its(:preferred_backup_window), its(:preferred_maintenance_window), its(:replication_source_identifier), its(:read_replica_identifiers), its(:hosted_zone_id), its(:storage_encrypted), its(:kms_key_id), its(:db_cluster_resource_id), its(:db_cluster_arn), its(:associated_roles), its(:iam_database_authentication_enabled), its(:clone_group_id), its(:cluster_create_time), its(:earliest_backtrack_time), its(:backtrack_window), its(:backtrack_consumed_change_records), its(:enabled_cloudwatch_logs_exports), its(:capacity), its(:engine_mode), its(:scaling_configuration_info), its(:deletion_protection), its(:http_endpoint_enabled), its(:activity_stream_mode), its(:activity_stream_status), its(:activity_stream_kms_key_id), its(:activity_stream_kinesis_stream_name), its(:copy_tags_to_snapshot), its(:cross_account_clone), its(:domain_memberships), its(:tag_list), its(:global_write_forwarding_status), its(:global_write_forwarding_requested), its(:pending_modified_values), its(:db_cluster_instance_class), its(:storage_type), its(:iops), its(:publicly_accessible), its(:auto_minor_version_upgrade), its(:monitoring_interval), its(:monitoring_role_arn), its(:performance_insights_enabled), its(:performance_insights_kms_key_id), its(:performance_insights_retention_period), its(:serverless_v2_scaling_configuration), its(:network_type)
 ## <a name="rds_db_cluster_parameter_group">rds_db_cluster_parameter_group</a>
 
 RdsDbClusterParameterGroup resource type.
@@ -3361,7 +3370,7 @@ describe s3_bucket('my-bucket') do
   it do
     should have_lifecycle_rule(
       id: 'MyRuleName2',
-      prefix: '123/',
+      filter: { prefix: '123/' },
       noncurrent_version_expiration: { noncurrent_days: 2 },
       expiration: { days: 3 },
       transitions: [{ days: 5, storage_class: 'STANDARD_IA' }, { days: 10, storage_class: 'GLACIER' }],
@@ -3947,14 +3956,7 @@ end
 
 VpcEndpoints resource type.
 
-### exist
-
 ```ruby
-describe vpc_endpoints('my-vpc-endpoint') do
-  it { should exist }
-end
-```
-
 describe vpc_endpoints('vpce-05907f23265b25f20'), region: $tfvars["region"]["value"] do
   it { should exist }
   it { should be_available }
@@ -3964,23 +3966,26 @@ describe vpc_endpoints('vpce-05907f23265b25f20'), region: $tfvars["region"]["val
   its(:vpc_endpoint_type) { should eq 'Interface' }
   its(:service_name) { should eq 'com.amazonaws.eu-west-1.codebuild' }
 end
+```
 
 
-### be_available
-
-### be_deleted
-
-### be_deleting
+### exist
 
-### be_expired
+```ruby
+describe vpc_endpoints('my-vpc-endpoint') do
+  it { should exist }
+end
+```
 
-### be_failed
 
-### be_pending
+### be_pendingacceptance, be_pending, be_available, be_deleting, be_deleted, be_rejected, be_failed, be_expired
 
-### be_pendingacceptance
+```ruby
+describe vpc_endpoints('my-vpc-endpoint') do
+  it { should be_available }
+end
+```
 
-### be_rejected
 
 ### have_route_table
 
@@ -3996,6 +4001,7 @@ end
 ```ruby
 describe vpc_endpoints('my-vpc-endpoint') do
   it { should have_subnet('subnet-abc123') }
+  it { should have_subnet('my-subnet') }
 end
 ```
 
@@ -4009,7 +4015,16 @@ end
 ```
 
 
+### belong_to_vpc
+
+```ruby
+describe vpc_endpoints('my-vpc-endpoint') do
+  it { should belong_to_vpc('my-vpc') }
+end
+```
+
 
+### its(:vpc_endpoint_id), its(:vpc_endpoint_type), its(:vpc_id), its(:service_name), its(:state), its(:policy_document), its(:route_table_ids), its(:subnet_ids), its(:groups), its(:ip_address_type), its(:dns_options), its(:private_dns_enabled), its(:requester_managed), its(:network_interface_ids), its(:dns_entries), its(:creation_timestamp), its(:owner_id), its(:last_error)
 ### :unlock: Advanced use
 
 `vpc_endpoints` can use `Aws::EC2::Types::VpcEndpoint` resource (see https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Types/VpcEndpoint.html).
@@ -4086,7 +4101,16 @@ end
 ```
 
 
-### its(:availability_zone), its(:state), its(:type), its(:vpc_attachments), its(:vpn_gateway_id), its(:amazon_side_asn), its(:tags)
+### belong_to_vpc
+
+```ruby
+describe vpn_gateway('my-vpn-gateway') do
+  it { should belong_to_vpc('vpc-ab123cde') }
+  it { should belong_to_vpc('my-vpc') }
+end
+```
+
+### its(:availability_zone), its(:state), its(:type), its(:vpn_gateway_id), its(:amazon_side_asn)
 ## <a name="waf_web_acl">waf_web_acl</a>
 
 WafWebAcl resource type.

data/lib/awspec/generator/doc/type/vpc_endpoints.rb

@@ -7,10 +7,13 @@ module Awspec::Generator
         def initialize
           super
           @type_name = 'VpcEndpoints'
-          @type = Awspec::Type::VpcEndpoints.new('my-vpc-endpoint')
+          @type = Awspec::Type::VpcEndpoints.new('vpce-abc123')
           @ret = @type.resource_via_client
-          @matchers = []
-          @ignore_matchers = []
+          @matchers = [
+            Awspec::Type::VpcEndpoints::STATES.map { |state| "be_#{state.tr('-', '_')}" }.join(', '),
+            'belong_to_vpc'
+          ]
+          @ignore_matchers = Awspec::Type::VpcEndpoints::STATES.map { |state| "be_#{state.tr('-', '_')}" }
           @describes = []
         end
       end

data/lib/awspec/generator/doc/type/vpn_gateway.rb

@@ -10,7 +10,8 @@ module Awspec::Generator
           @type = Awspec::Type::VpnGateway.new('my-vpn-gateway')
           @ret = @type.resource_via_client
           @matchers = [
-            Awspec::Type::VpnGateway::STATES.map { |state| "be_#{state.tr('-', '_')}" }.join(', ')
+            Awspec::Type::VpnGateway::STATES.map { |state| "be_#{state.tr('-', '_')}" }.join(', '),
+            'belong_to_vpc'
           ]
           @ignore_matchers = Awspec::Type::VpnGateway::STATES.map { |state| "be_#{state.tr('-', '_')}" }
           @describes = []

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

@@ -76,12 +76,16 @@ module Awspec::Helper
         define_method "find_#{type}_gateway" do |*args|
           gateway_id = args.first
           method_name = "describe_#{type}_gateways"
-          res = ec2_client.send(
-            method_name,
-            { filters: [{ name: "#{type}-gateway-id", values: [gateway_id] }] }
-          )
-          resource = res["#{type}_gateways"].single_resource(gateway_id)
-          return resource if resource
+          begin
+            res = ec2_client.send(
+              method_name,
+              { filters: [{ name: "#{type}-gateway-id", values: [gateway_id] }] }
+            )
+            resource = res["#{type}_gateways"].single_resource(gateway_id)
+            return resource if resource
+          rescue StandardError
+            resource = nil
+          end
 
           res = ec2_client.send(
             method_name,

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

@@ -14,12 +14,12 @@ module Awspec::Helper
         res = ec2_client.describe_addresses({
                                               filters: [{ name: 'public-ip', values: [id] }]
                                             })
-        return res.addresses unless res.addresses.empty?
+        return res.addresses.single_resource(id) unless res.addresses.empty?
 
         res = ec2_client.describe_addresses({
                                               filters: [{ name: 'tag:Name', values: [id] }]
                                             })
-        res.addresses
+        res.addresses.single_resource(id)
       end
     end
   end

data/lib/awspec/matcher/belong_to_domain.rb

@@ -2,6 +2,6 @@
 
 RSpec::Matchers.define :belong_to_domain do |domain|
   match do |type|
-    return true if type.resource_via_client.last[:domain] == domain
+    return true if type.resource_via_client[:domain] == domain
   end
 end

data/lib/awspec/stub/vpn_gateway.rb

@@ -7,7 +7,20 @@ Aws.config[:ec2] = {
           vpn_gateway_id: 'vgw-cg5692g4',
           availability_zone: 'us-east-1a',
           state: 'available',
-          type: "ipsec.1"
+          type: "ipsec.1",
+          vpc_attachments: [
+            {
+              state: 'attached',
+              vpc_id: 'vpc-ab123cde'
+            }
+          ],
+          amazon_side_asn: 64512,
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-vpn-gateway'
+            }
+          ]
         }
       ]
     }

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

@@ -2,18 +2,20 @@
 
 module Awspec::Type
   class Eip < ResourceBase
+    aws_resource Aws::EC2::Types::Address
+
     def resource_via_client
       @resource_via_client ||= select_eip(@display_name)
     end
 
     def id
-      @id ||= resource_via_client.last.public_ip if resource_via_client
+      @id ||= resource_via_client.public_ip if resource_via_client
     end
 
     def associated_to?(instance_id)
-      return false unless resource_via_client.last.instance_id == instance_id
+      return false unless resource_via_client.instance_id == instance_id
 
-      resource_via_client.last.instance_id == instance_id
+      resource_via_client.instance_id == instance_id
     end
   end
 end

data/lib/awspec/type/vpc_endpoints.rb

@@ -45,6 +45,12 @@ module Awspec::Type
         subnet == subnet_id
       end
       return true if ret
+
+      res = find_subnet(subnet_id)
+      ret = subnets.find do |subnet|
+        subnet == res.subnet_id
+      end
+      return true if ret
     end
   end
 end

data/lib/awspec/type/vpn_gateway.rb

@@ -27,16 +27,8 @@ module Awspec::Type
       end
     end
 
-    def availability_zone
-      resource_via_client.availability_zone
-    end
-
-    def vpc_attachments
-      resource_via_client.vpc_attachments
-    end
-
-    def type
-      resource_via_client.type
+    def vpc_id
+      resource_via_client.vpc_attachments.first.vpc_id
     end
   end
 end

data/lib/awspec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.28.2
 platform: ruby
 authors:
 - k1LoW
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable