awspec 1.34.0 → 1.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65a2f5aea6df138e2c8ddef3a36092fc2760f40086c4129ca4f639281b83e52
-  data.tar.gz: d9c213638e77e674dd5fd8b08648ec52956855285253330db732877cd40350ff
+  metadata.gz: db3c043ecfd88d5ba4d3172eacd752be77fced5cfc8437e8eff6309f08d2cf1d
+  data.tar.gz: f2681be63ef0ebe27769fa955c44a8fea5bc40b46ac68fc5d2d84c5dc56b2454
 SHA512:
-  metadata.gz: e7972b92325855e58d1c950192b49d477c2d913251c4577371b9f0a2ff593c56a839472cd42c44295562aaef5d9b74445392de9c8fe06ddd4c676962b425ca0f
-  data.tar.gz: 99d9f6df0b85b122550f4c07dfcfd2544a1ddb2a8bf17fc09588f53653a086d6caf851ca78663149a130da766e11afdf2ae6e3210987b0443608f09003122457
+  metadata.gz: 97c866e601968425dc87fc154a3a24894bb0361a8a1a0af891a4e06a86d799f8a2778059c234cd09de7d4c6f44de405c6dc481f85de30c916624533b586662a4
+  data.tar.gz: ea9f60784223a778a2bc4a2fbda77b6fac713a27863eed4deb716211e81693e122623279641089bfedda0058bd70caa00a25f15f787123f00afc92929999be45

data/.tagpr

@@ -33,3 +33,5 @@
 	vPrefix = true
 	releaseBranch = main
 	versionFile = lib/awspec/version.rb
+	majorLabels = "tagpr:major"
+	minorLabels = "tagpr:minor"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v1.35.0](https://github.com/k1LoW/awspec/compare/v1.34.0...v1.35.0) - 2025-11-10
+- Improve backup plan rules output by @endemics in https://github.com/k1LoW/awspec/pull/611
+- Add missing details for IAM roles and policies by @endemics in https://github.com/k1LoW/awspec/pull/609
+- chore: remove ERB trim fix warnings by @endemics in https://github.com/k1LoW/awspec/pull/610
+- chore: setup tagpr labels by @k1LoW in https://github.com/k1LoW/awspec/pull/608
+
 ## [v1.34.0](https://github.com/k1LoW/awspec/compare/v1.33.0...v1.34.0) - 2025-10-18
 - Add support for aws backup rules (under backup plan) by @endemics in https://github.com/k1LoW/awspec/pull/605
 - feat: setup tagpr by @k1LoW in https://github.com/k1LoW/awspec/pull/606

data/doc/resource_types.md

@@ -414,7 +414,7 @@ end
 ```
 
 
-### its(:backup_vault_name), its(:backup_vault_arn), its(:vault_type), its(:vault_state), its(:creation_date), its(:encryption_key_arn), its(:creator_request_id), its(:number_of_recovery_points), its(:locked), its(:min_retention_days), its(:max_retention_days), its(:lock_date)
+### its(:backup_vault_name), its(:backup_vault_arn), its(:vault_type), its(:vault_state), its(:creation_date), its(:encryption_key_arn), its(:creator_request_id), its(:number_of_recovery_points), its(:locked), its(:min_retention_days), its(:max_retention_days), its(:lock_date), its(:encryption_key_type)
 ## <a name="batch_compute_environment">batch_compute_environment</a>
 
 BatchComputeEnvironment resource type.
@@ -2284,7 +2284,7 @@ describe kinesis('my-kinesis') do
 end
 ```
 
-### its(:stream_name), its(:stream_arn), its(:stream_status), its(:stream_mode_details), its(:retention_period_hours), its(:stream_creation_timestamp), its(:encryption_type), its(:key_id), its(:open_shard_count), its(:consumer_count)
+### its(:stream_name), its(:stream_arn), its(:stream_status), its(:stream_mode_details), its(:retention_period_hours), its(:stream_creation_timestamp), its(:encryption_type), its(:key_id), its(:open_shard_count), its(:consumer_count), its(:warm_throughput), its(:max_record_size_in_ki_b)
 ## <a name="kms">kms</a>
 
 Kms resource type.
@@ -2532,7 +2532,7 @@ end
 ```
 
 
-### its(:prefix_list_id), its(:address_family), its(:state), its(:state_message), its(:prefix_list_arn), its(:prefix_list_name), its(:max_entries), its(:version), its(:owner_id)
+### its(:prefix_list_id), its(:address_family), its(:state), its(:state_message), its(:prefix_list_arn), its(:prefix_list_name), its(:max_entries), its(:version), its(:owner_id), its(:ipam_prefix_list_resolver_target_id), its(:ipam_prefix_list_resolver_sync_enabled)
 ## <a name="mq">mq</a>
 
 MQ resource type.
@@ -2795,7 +2795,7 @@ describe network_interface('eni-12ab3cde') do
 end
 ```
 
-### its(:association), its(:availability_zone), its(:connection_tracking_configuration), its(:description), its(:interface_type), its(:ipv_6_addresses), its(:mac_address), its(:network_interface_id), its(:outpost_arn), its(:owner_id), its(:private_dns_name), its(:public_dns_name), its(:public_ip_dns_name_options), its(:private_ip_address), its(:ipv_4_prefixes), its(:ipv_6_prefixes), its(:requester_id), its(:requester_managed), its(:source_dest_check), its(:status), its(:subnet_id), its(:vpc_id), its(:deny_all_igw_traffic), its(:ipv_6_native), its(:ipv_6_address), its(:operator), its(:associated_subnets)
+### its(:association), its(:availability_zone), its(:connection_tracking_configuration), its(:description), its(:interface_type), its(:ipv_6_addresses), its(:mac_address), its(:network_interface_id), its(:outpost_arn), its(:owner_id), its(:private_dns_name), its(:public_dns_name), its(:public_ip_dns_name_options), its(:private_ip_address), its(:ipv_4_prefixes), its(:ipv_6_prefixes), its(:requester_id), its(:requester_managed), its(:source_dest_check), its(:status), its(:subnet_id), its(:vpc_id), its(:deny_all_igw_traffic), its(:ipv_6_native), its(:ipv_6_address), its(:operator), its(:associated_subnets), its(:availability_zone_id)
 ## <a name="nlb">nlb</a>
 
 NLB resource type.

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

@@ -15,7 +15,7 @@ module Awspec::Generator
         end
 
         def generate_doc
-          @account_spec = ERB.new(account_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          @account_spec = ERB.new(account_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
           super
         end
 

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

@@ -14,8 +14,9 @@ module Awspec::Generator
           @describes = []
         end
 
+        # rubocop:disable Layout/LineLength
         def generate_doc
-          @account_attribute_spec = ERB.new(account_attribute_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          @account_attribute_spec = ERB.new(account_attribute_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
           super
         end
 

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

@@ -48,7 +48,7 @@ module Awspec::Generator
               @descriptions[matcher] += line
             end
           end
-          ERB.new(doc_template, nil, '-').result(binding)
+          ERB.new(doc_template, trim_mode: '-').result(binding)
         end
 
         def collect_matchers

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

@@ -18,7 +18,7 @@ module Awspec::Generator
 <%= links.join("\n| ") %>
 
 EOF
-        doc = ERB.new(header, nil, '-').result(binding)
+        doc = ERB.new(header, trim_mode: '-').result(binding)
 
         types.sort.map do |type|
           doc += eval "Awspec::Generator::Doc::Type::#{type.camelize}.new.generate_doc"

data/lib/awspec/generator/spec/acm.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         certificates = select_all_certificates
         raise 'Not Found Certificates' if certificates.empty?
 
-        ERB.new(acm_spec_template, nil, '-').result(binding).chomp
+        ERB.new(acm_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def acm_spec_template

data/lib/awspec/generator/spec/alb.rb

@@ -16,7 +16,7 @@ module Awspec::Generator
         albs = select_alb_by_vpc_id(@vpc_id)
 
         specs = albs.map do |alb|
-          content = ERB.new(alb_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(alb_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/alb_listener.rb

@@ -20,7 +20,7 @@ module Awspec::Generator
           alb_listeners.map do |listener|
             rules = select_rule_by_alb_listener_id(listener.listener_arn).map(&:to_h)
             rules.map do |rule|
-              content = ERB.new(alb_listener_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+              content = ERB.new(alb_listener_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
             end
           end
         end

data/lib/awspec/generator/spec/autoscaling_group.rb

@@ -17,7 +17,7 @@ module Awspec::Generator
         @vpc_tag_name = vpc.tag_name
         autoscaling_groups = select_autoscaling_group_by_vpc_id(@vpc_id)
         specs = autoscaling_groups.map do |autoscaling_group|
-          content = ERB.new(autoscaling_group_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(autoscaling_group_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/cloudwatch_alarm.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         alarms = select_all_cloudwatch_alarms
         raise 'Not Found alarm' if alarms.empty?
 
-        ERB.new(alarm_spec_template, nil, '-').result(binding).chomp
+        ERB.new(alarm_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def alarm_spec_template

data/lib/awspec/generator/spec/cloudwatch_event.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         events = select_all_cloudwatch_events
         raise 'Not Found event' if events.empty?
 
-        ERB.new(event_spec_template, nil, '-').result(binding).chomp
+        ERB.new(event_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def event_spec_template

data/lib/awspec/generator/spec/cloudwatch_logs.rb

@@ -12,7 +12,7 @@ module Awspec::Generator
           log_stream_line = generate_log_stream_spec(log_group.log_group_name)
           metric_filter_lines = generate_log_metric_filters_specs(log_group.log_group_name)
           subscription_filter_lines = generate_log_subscription_filters_specs(log_group.log_group_name)
-          content = ERB.new(cloudwatch_logs_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(cloudwatch_logs_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/codebuild.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         projects = select_all_codebuild_projects
         raise 'Not Found CodeBuild Project' if projects.empty?
 
-        ERB.new(codebuild_spec_template, nil, '-').result(binding).chomp
+        ERB.new(codebuild_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def codebuild_spec_template

data/lib/awspec/generator/spec/codepipeline.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         pipelines = select_all_codepipelines
         raise 'Not Found CodePipeline' if pipelines.empty?
 
-        ERB.new(codepipeline_spec_template, nil, '-').result(binding).chomp
+        ERB.new(codepipeline_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def codepipeline_spec_template

data/lib/awspec/generator/spec/directconnect.rb

@@ -12,7 +12,7 @@ module Awspec::Generator
         virtual_interfaces = select_virtual_interfaces
         raise 'Not Found virtual_interfaces' if virtual_interfaces.empty?
 
-        ERB.new(virtual_interface_spec_template, nil, '-').result(binding).chomp
+        ERB.new(virtual_interface_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def virtual_interface_spec_template

data/lib/awspec/generator/spec/ebs.rb

@@ -10,7 +10,7 @@ module Awspec::Generator
 
         specs = volumes.map do |volume|
           attachment_specs = generate_attachment_specs(volume)
-          content = ERB.new(ebs_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(ebs_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end
@@ -19,7 +19,7 @@ module Awspec::Generator
         linespecs = []
         volume.attachments.each do |attachment|
           instance = find_ec2(attachment.instance_id)
-          linespecs.push(ERB.new(attachment_linetemplate, nil, '-').result(binding)) if attachment.instance_id
+          linespecs.push(ERB.new(attachment_linetemplate, trim_mode: '-').result(binding)) if attachment.instance_id
         end
         linespecs
       end

data/lib/awspec/generator/spec/ec2.rb

@@ -23,7 +23,7 @@ module Awspec::Generator
           volumes = select_ebs_by_instance_id(instance_id)
           network_interfaces = select_network_interface_by_instance_id(instance_id)
           credit_specification = find_ec2_credit_specifications(instance_id)
-          content = ERB.new(ec2_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(ec2_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/efs.rb

@@ -10,7 +10,7 @@ module Awspec::Generator
 
         specs = file_systems.map do |file_system|
           file_system.name = get_name_by_id(file_system.file_system_id)
-          content = ERB.new(file_system_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(file_system_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/eip.rb

@@ -13,7 +13,7 @@ module Awspec::Generator
         eips = select_all_addresses
         raise 'Not Found Elastic IP addresses.' if eips.empty?
 
-        ERB.new(eip_spec_template, nil, '-').result(binding).chomp
+        ERB.new(eip_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def eip_spec_template

data/lib/awspec/generator/spec/elasticache.rb

@@ -16,7 +16,7 @@ module Awspec::Generator
         end
         raise 'Not Found Cache Clusters' if clusters.empty?
 
-        ERB.new(cache_clusters_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        ERB.new(cache_clusters_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
 
       def cache_clusters_spec_template

data/lib/awspec/generator/spec/elasticsearch.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         domains = select_all_elasticsearch_domains
         raise 'Not Found Domain' if domains.empty?
 
-        ERB.new(domain_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        ERB.new(domain_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
 
       def domain_spec_template

data/lib/awspec/generator/spec/elb.rb

@@ -20,7 +20,7 @@ module Awspec::Generator
         lbs = select_elb_by_vpc_id(@vpc_id)
 
         specs = lbs.map do |lb|
-          content = ERB.new(elb_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(elb_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/iam_group.rb

@@ -17,7 +17,7 @@ module Awspec::Generator
             document = JSON.generate(JSON.parse(URI.decode_www_form_component(res.policy_document)))
             "it { should have_inline_policy('#{policy_name}').policy_document('#{document}') }"
           end
-          content = ERB.new(iam_group_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(iam_group_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/iam_policy.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         policies = select_all_attached_policies
         raise 'Not Found policy' if policies.empty?
 
-        ERB.new(policy_spec_template, nil, '-').result(binding).chomp
+        ERB.new(policy_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       # rubocop:disable all

data/lib/awspec/generator/spec/iam_role.rb

@@ -17,7 +17,7 @@ module Awspec::Generator
             document = JSON.generate(JSON.parse(URI.decode_www_form_component(res.policy_document)))
             "it { should have_inline_policy('#{policy_name}').policy_document('#{document}') }"
           end
-          content = ERB.new(iam_role_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(iam_role_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/iam_user.rb

@@ -17,7 +17,7 @@ module Awspec::Generator
             document = JSON.generate(JSON.parse(URI.decode_www_form_component(res.policy_document)))
             "it { should have_inline_policy('#{policy_name}').policy_document('#{document}') }"
           end
-          content = ERB.new(iam_user_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(iam_user_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/internet_gateway.rb

@@ -15,7 +15,7 @@ module Awspec::Generator
         internet_gateways = select_internet_gateway_by_vpc_id(@vpc_id)
         specs = internet_gateways.map do |internet_gateway|
           internet_gateway_id = internet_gateway[:internet_gateway_id]
-          content = ERB.new(internet_gateway_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(internet_gateway_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/kms.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         aliases = select_all_kms_aliases.select { |kms_alias| customer_managed_key?(kms_alias) }
         raise 'Not Found alias' if aliases.empty?
 
-        ERB.new(keys_spec_template, nil, '-').result(binding).chomp
+        ERB.new(keys_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def keys_spec_template

data/lib/awspec/generator/spec/lambda.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
         lambda_functions = select_all_lambda_functions
         raise 'Not Found lambda' if lambda_functions.empty?
 
-        ERB.new(lambda_spec_template, nil, '-').result(binding).chomp
+        ERB.new(lambda_spec_template, trim_mode: '-').result(binding).chomp
       end
 
       def lambda_spec_template

data/lib/awspec/generator/spec/managed_prefix_list.rb

@@ -15,7 +15,7 @@ module Awspec::Generator
 
         specs = prefix_lists.map do |prefix_list|
           entries = select_managed_prefix_list_entries(prefix_list.prefix_list_id)
-          content = ERB.new(managed_prefix_list_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(managed_prefix_list_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/nat_gateway.rb

@@ -15,7 +15,7 @@ module Awspec::Generator
         nat_gateways = select_nat_gateway_by_vpc_id(@vpc_id)
         specs = nat_gateways.map do |nat_gateway|
           nat_gateway_id = nat_gateway[:nat_gateway_id]
-          content = ERB.new(nat_gateway_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(nat_gateway_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/network_acl.rb

@@ -24,7 +24,7 @@ module Awspec::Generator
           outbound_entries_count = acl.entries.count do |entry|
             entry.egress == true
           end
-          content = ERB.new(network_acl_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(network_acl_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/network_interface.rb

@@ -19,7 +19,7 @@ module Awspec::Generator
           network_interface_id = interface[:network_interface_id]
           linespecs = generate_linespecs(interface)
           private_ip_addresses_count = interface.private_ip_addresses.count
-          content = ERB.new(network_interface_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(network_interface_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/nlb.rb

@@ -16,7 +16,7 @@ module Awspec::Generator
         nlbs = select_nlb_by_vpc_id(@vpc_id)
 
         specs = nlbs.map do |nlb|
-          content = ERB.new(nlb_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(nlb_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/nlb_listener.rb

@@ -20,7 +20,7 @@ module Awspec::Generator
           nlb_listeners.map do |listener|
             rules = select_rule_by_nlb_listener_id(listener.listener_arn).map(&:to_h)
             rules.map do |rule|
-              content = ERB.new(nlb_listener_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+              content = ERB.new(nlb_listener_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
             end
           end
         end

data/lib/awspec/generator/spec/rds.rb

@@ -21,7 +21,7 @@ module Awspec::Generator
             ret = find_security_group(sg_id)
             ret[:group_name]
           end
-          content = ERB.new(rds_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(rds_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/rds_db_cluster.rb

@@ -39,7 +39,7 @@ EOF
       private
 
       def content(cluster)
-        ERB.new(rds_db_cluster_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        ERB.new(rds_db_cluster_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
     end
   end

data/lib/awspec/generator/spec/rds_db_cluster_parameter_group.rb

@@ -7,7 +7,7 @@ module Awspec::Generator
       def generate_by_parameter_group(parameter_group)
         @parameter_group = parameter_group
         res = select_all_rds_db_cluster_parameters(@parameter_group)
-        ERB.new(db_cluster_parameter_group_template, nil, '-').result(binding).gsub(/^\n/, '')
+        ERB.new(db_cluster_parameter_group_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
 
       def db_cluster_parameter_group_template

data/lib/awspec/generator/spec/rds_db_parameter_group.rb

@@ -7,7 +7,7 @@ module Awspec::Generator
       def generate_by_parameter_group(parameter_group)
         @parameter_group = parameter_group
         res = select_all_rds_db_parameters(@parameter_group)
-        ERB.new(db_parameter_group_template, nil, '-').result(binding).gsub(/^\n/, '')
+        ERB.new(db_parameter_group_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
 
       def db_parameter_group_template

data/lib/awspec/generator/spec/rds_global_cluster.rb

@@ -33,7 +33,7 @@ EOF
       private
 
       def content(cluster)
-        ERB.new(rds_global_cluster_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        ERB.new(rds_global_cluster_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
     end
   end

data/lib/awspec/generator/spec/rds_proxy.rb

@@ -11,7 +11,7 @@ module Awspec::Generator
         @vpc_id = vpc[:vpc_id]
         db_proxies = select_rds_proxy_by_vpc_id(@vpc_id)
         specs = db_proxies.map do |db_proxy|
-          content = ERB.new(rds_proxy_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(rds_proxy_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/redshift.rb

@@ -24,7 +24,7 @@ module Awspec::Generator
             ret = find_security_group(sg_id)
             ret[:group_name]
           end
-          content = ERB.new(redshift_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(redshift_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/redshift_cluster_parameter_group.rb

@@ -7,7 +7,7 @@ module Awspec::Generator
       def generate_by_parameter_group(parameter_group)
         @parameter_group = parameter_group
         res = select_all_redshift_cluster_parameters(@parameter_group)
-        ERB.new(redshift_cluster_parameters_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        ERB.new(redshift_cluster_parameters_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
 
       def redshift_cluster_parameters_spec_template

data/lib/awspec/generator/spec/route53_hosted_zone.rb

@@ -28,7 +28,7 @@ module Awspec::Generator
           generate_linespec(record_set)
         end
 
-        content = ERB.new(route53_hosted_zone_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        content = ERB.new(route53_hosted_zone_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
 
       def generate_linespec(record_set)
@@ -55,7 +55,7 @@ it { should have_record_set('<%= name %>').alias('<%= dns_name %>', '<%= hosted_
 <% end -%>
 EOF
         end
-        ERB.new(template, nil, '-').result(binding)
+        ERB.new(template, trim_mode: '-').result(binding)
       end
 
       def route53_hosted_zone_spec_template

data/lib/awspec/generator/spec/route_table.rb

@@ -18,7 +18,7 @@ module Awspec::Generator
           subnet_linespecs = generate_subnet_linespecs(route_table)
           route_table_id = route_table[:route_table_id]
           route_table_tag_name = route_table.tag_name
-          content = ERB.new(route_table_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(route_table_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end
@@ -29,18 +29,22 @@ module Awspec::Generator
           if route.gateway_id
             destination = route.destination_cidr_block
             destination ||= route.destination_prefix_list_id
-            linespecs.push(ERB.new(route_table_spec_gateway_linetemplate, nil, '-').result(binding))
+            linespecs.push(ERB.new(route_table_spec_gateway_linetemplate, trim_mode: '-').result(binding))
           end
           if route.instance_id
             instance = find_ec2(route.instance_id)
-            linespecs.push(ERB.new(route_table_spec_instance_linetemplate, nil, '-').result(binding)) if instance
+            if instance
+              linespecs.push(ERB.new(route_table_spec_instance_linetemplate, trim_mode: '-').result(binding))
+            end
           end
           if route.vpc_peering_connection_id
             connection = find_vpc_peering_connection(route.vpc_peering_connection_id)
-            linespecs.push(ERB.new(route_table_spec_connection_linetemplate, nil, '-').result(binding)) if connection
+            if connection
+              linespecs.push(ERB.new(route_table_spec_connection_linetemplate, trim_mode: '-').result(binding))
+            end
           end
           if route.nat_gateway_id
-            linespecs.push(ERB.new(route_table_spec_nat_linetemplate, nil, '-').result(binding))
+            linespecs.push(ERB.new(route_table_spec_nat_linetemplate, trim_mode: '-').result(binding))
           end
         end
         linespecs
@@ -52,7 +56,7 @@ module Awspec::Generator
           next if a.subnet_id.nil?
 
           subnet = find_subnet(a.subnet_id)
-          linespecs.push(ERB.new(route_table_spec_subnet_linetemplate, nil, '-').result(binding)) if subnet
+          linespecs.push(ERB.new(route_table_spec_subnet_linetemplate, trim_mode: '-').result(binding)) if subnet
         end
         linespecs
       end

data/lib/awspec/generator/spec/s3_bucket.rb

@@ -24,7 +24,7 @@ module Awspec::Generator
 
         linespecs = []
         acl.grants.each do |grant|
-          linespecs.push(ERB.new(grant_linetemplate, nil, '-').result(binding))
+          linespecs.push(ERB.new(grant_linetemplate, trim_mode: '-').result(binding))
         end
         linespecs
       end
@@ -79,7 +79,7 @@ it do
     )
   end
           EOF
-          linespecs.push(ERB.new(template, nil, '-').result(binding))
+          linespecs.push(ERB.new(template, trim_mode: '-').result(binding))
         end
         linespecs
       end
@@ -124,7 +124,7 @@ EOF
         lifecycle_rule = find_bucket_lifecycle_configuration(bucket.name)
         lifecycle_specs = generate_lifecycle_rule_specs(lifecycle_rule) if lifecycle_rule
         location = find_bucket_location(bucket.name)
-        ERB.new(bucket_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        ERB.new(bucket_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
     end
   end

data/lib/awspec/generator/spec/security_group.rb

@@ -23,7 +23,7 @@ module Awspec::Generator
           outbound_rule_count = sg[:ip_permissions_egress].reduce(0) do |sum, permission|
             sum += permission.ip_ranges.count + permission.user_id_group_pairs.count
           end
-          content = ERB.new(security_group_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(security_group_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end
@@ -49,12 +49,12 @@ module Awspec::Generator
 
             permission.ip_ranges.each do |ip_range|
               target = ip_range.cidr_ip
-              linespecs.push(ERB.new(security_group_spec_linetemplate, nil, '-').result(binding))
+              linespecs.push(ERB.new(security_group_spec_linetemplate, trim_mode: '-').result(binding))
             end
             permission.user_id_group_pairs.each do |group|
               target = group.group_name
               target = group.group_id unless group.group_name
-              linespecs.push(ERB.new(security_group_spec_linetemplate, nil, '-').result(binding))
+              linespecs.push(ERB.new(security_group_spec_linetemplate, trim_mode: '-').result(binding))
             end
           end
         end

data/lib/awspec/generator/spec/subnet.rb

@@ -17,7 +17,7 @@ module Awspec::Generator
         specs = subnets.map do |subnet|
           subnet_id = subnet[:subnet_id]
           subnet_tag_name = subnet.tag_name
-          content = ERB.new(subnet_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          content = ERB.new(subnet_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/vpc.rb

@@ -16,7 +16,7 @@ module Awspec::Generator
         route_tables = select_route_table_by_vpc_id(@vpc_id)
         network_acls = select_network_acl_by_vpc_id(@vpc_id)
         vpc_attributes = select_vpc_attribute(@vpc_id)
-        spec = ERB.new(vpc_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        spec = ERB.new(vpc_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
       end
 
       # rubocop:disable all

data/lib/awspec/generator/spec/wafv2_ip_set.rb

@@ -10,7 +10,7 @@ module Awspec::Generator
 
         specs = ip_sets.map do |i|
           ip_set = get_ip_set(scope, i.name, i.id)
-          ERB.new(wafv2_ip_set_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          ERB.new(wafv2_ip_set_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

data/lib/awspec/generator/spec/wafv2_web_acl.rb

@@ -10,7 +10,7 @@ module Awspec::Generator
 
         specs = web_acls.map do |acl|
           web_acl = get_web_acl(scope, acl.name, acl.id)
-          ERB.new(wafv2_web_acl_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+          ERB.new(wafv2_web_acl_spec_template, trim_mode: '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
       end

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

@@ -23,7 +23,23 @@ module Awspec::Helper
             )
           end
 
-          selected.single_resource(id)
+          res = selected.single_resource(id)
+
+          unless res.nil?
+            # Enrich the resource with all the fields returned by get_user, get_group, get_role, get_policy
+            params = type == 'policy' ? { :policy_arn => res['arn'] } : { "#{type}_name".to_sym => res["#{type}_name"] }
+            r = iam_client.send(
+              "get_#{type}",
+              params
+            )
+            object = r[type.to_sym]
+            unless object.nil?
+              object.to_h.each_key do |k|
+                res[k] = object[k] if res[k].nil?
+              end
+            end
+          end
+          res
         end
       end
 

data/lib/awspec/matcher/have_plan_rule.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 RSpec::Matchers.define :have_plan_rule do |rule_id|
+  attr_list = %w[
+    rule_name target_backup_vault_name schedule_expression
+    start_window_minutes completion_window_minutes lifecycle
+    enable_continuous_backup schedule_expression_timezone
+  ]
+
   match do |plan|
     plan.has_plan_rule?(rule_id,
                         rule_name: @rule_name,
@@ -13,35 +19,20 @@ RSpec::Matchers.define :have_plan_rule do |rule_id|
                         schedule_expression_timezone: @schedule_expression_timezone)
   end
 
-  chain :rule_name do |rule_name|
-    @rule_name = rule_name
-  end
-
-  chain :target_backup_vault_name do |target_backup_vault_name|
-    @target_backup_vault_name = target_backup_vault_name
-  end
-
-  chain :schedule_expression do |schedule_expression|
-    @schedule_expression = schedule_expression
-  end
-
-  chain :start_window_minutes do |start_window_minutes|
-    @start_window_minutes = start_window_minutes
-  end
-
-  chain :completion_window_minutes do |completion_window_minutes|
-    @completion_window_minutes = completion_window_minutes
+  attr_list.each do |a|
+    define_method a.to_sym do |*args|
+      instance_variable_set("@#{a}", args[0])
+      self
+    end
   end
 
-  chain :lifecycle do |lifecycle|
-    @lifecycle = lifecycle
-  end
-
-  chain :enable_continuous_backup do |enable_continuous_backup|
-    @enable_continuous_backup = enable_continuous_backup
-  end
+  description do
+    attr = ''
+    attr_list.each do |a|
+      attr += "#{a} #{instance_variable_get("@#{a}")}" unless instance_variable_get("@#{a}").nil?
+    end
 
-  chain :schedule_expression_timezone do |schedule_expression_timezone|
-    @schedule_expression_timezone = schedule_expression_timezone
+    attr = " with #{attr}" if attr != ''
+    "have plan rule #{rule_id}#{attr}"
   end
 end

data/lib/awspec/stub/iam_policy.rb

@@ -33,7 +33,7 @@ Aws.config[:iam] = {
       policies: [
         {
           attachment_count: 1,
-          arn: 'arn:aws:iam::aws:policy/my-iam-policy',
+          arn: 'arn:aws:iam::123456789012:policy/my-iam-policy',
           default_version_id: 'v1',
           is_attachable: true,
           policy_id: 'PABCDEFGHI123455689',
@@ -81,6 +81,20 @@ Aws.config[:iam] = {
         is_default_version: true,
         create_date: Time.new(2022, 11, 12, 01, 23, 45, '+00:00')
       }
+    },
+    get_policy: {
+      policy: {
+        policy_name: 'my-iam-policy',
+        create_date: Time.new(2014, 1, 2, 10, 00, 00, '+00:00'),
+        description: 'my-description',
+        attachment_count: 1,
+        is_attachable: true,
+        policy_id: 'PABCDEFGHI123455689',
+        default_version_id: 'v1',
+        path: '/',
+        arn: 'arn:aws:iam::123456789012:policy/my-iam-policy',
+        update_date: Time.new(2015, 1, 2, 10, 00, 00, '+00:00')
+      }
     }
   }
 }

data/lib/awspec/stub/iam_role.rb

@@ -8,6 +8,7 @@ Aws.config[:iam] = {
         role_name: 'my-iam-role',
         role_id: 'RABCDEFGHI123455689',
         arn: 'arn:aws:iam::123456789012:role/my-iam-role',
+        description: 'my-description',
         create_date: Time.new(2015, 1, 2, 9, 00, 00, '+00:00')
       ]
     },
@@ -34,7 +35,16 @@ Aws.config[:iam] = {
         role_name: 'my-iam-role',
         role_id: 'RABCDEFGHI123455689',
         arn: 'arn:aws:iam::123456789012:role/my-iam-role',
-        create_date: Time.new(2015, 1, 2, 9, 00, 00, '+00:00')
+        description: 'my-description',
+        create_date: Time.new(2015, 1, 2, 9, 00, 00, '+00:00'),
+        permissions_boundary: {
+          permissions_boundary_type: 'Policy',
+          permissions_boundary_arn: 'arn:aws:iam::123456789012:policy/my-permission-boundary'
+        },
+        role_last_used: {
+          region: 'us-east-1',
+          last_used_date: Time.new(2019, 11, 13, 17, 14, 00, '+00:00')
+        }
       }
     },
     get_role_policy: {

data/lib/awspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.34.0
+  version: 1.35.0
 platform: ruby
 authors:
 - k1LoW