awspec 0.25.3 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a80cb2ea5870a490bfe2b7cb7fe5ac24accef75
-  data.tar.gz: f7062e9d487af2edc7ef896b8d863c3792309099
+  metadata.gz: 91d1046d787b8957220ed223913e1e700a315b15
+  data.tar.gz: 8ee3e74a2cf0acc44d334d21a04d5d9cd2f7fcb4
 SHA512:
-  metadata.gz: e433e38e4dd7909f5565a8b7945cb450516bc955a54fc9fb15c69a5e081d0c77b0155157430e85327dc6777f8d877584309dd6fd0f0985b10c503616e29a0c39
-  data.tar.gz: 456d6bf601db101ebe9e2cd51eedbcf13543779f4479051c239209f6555330e6587e263c54e763de05587ce2dd3bcd7b0887a24a58df75b9fbbda0ff476d5a3d
+  metadata.gz: 65e9b4bd2a5d147a2d969c934557de0858232806e124fbe5924cbf05015cd39c1e0931c96ef404cc864c2671247a8736b8125f20325a516c7a946df5795abf0b
+  data.tar.gz: 28545f2508caf4cbdcdb3d8c51d21a16ccf46552ba7442511bbd6de79fd2ee3c6aa1870a1c2b27bf492575a867d803e1613c53f88b193acc9c6b702f6f43d9d2

data/awspec.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'octorelease'
+  spec.add_development_dependency 'pry'
 end

data/doc/_resource_types/s3_bucket.md

@@ -69,3 +69,13 @@ describe s3_bucket('my-bucket') do
   it { should have_object('path/to/object') }
 end
 ```
+
+### advanced
+
+`s3_bucket` can use `Aws::S3::Bucket` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Bucket.html).
+
+```ruby
+describe s3_bucket('my-bucket') do
+  its('acl.owner.display_name') { should eq 'my-bucket-owner' }
+end
+```

data/doc/resource_types.md

@@ -103,7 +103,7 @@ describe ec2('my-ec2') do
 end
 ```
 
-#### its(:instance_id), its(:image_id), its(:private_dns_name), its(:public_dns_name), its(:state_transition_reason), its(:key_name), its(:ami_launch_index), its(:instance_type), its(:launch_time), its(:placement), its(:kernel_id), its(:ramdisk_id), its(:platform), its(:monitoring), its(:subnet_id), its(:vpc_id), its(:private_ip_address), its(:public_ip_address), its(:state_reason), its(:architecture), its(:root_device_type), its(:root_device_name), its(:virtualization_type), its(:instance_lifecycle), its(:spot_instance_request_id), its(:client_token), its(:source_dest_check), its(:hypervisor), its(:iam_instance_profile), its(:ebs_optimized), its(:sriov_net_support)
+### its(:instance_id), its(:image_id), its(:private_dns_name), its(:public_dns_name), its(:state_transition_reason), its(:key_name), its(:ami_launch_index), its(:instance_type), its(:launch_time), its(:placement), its(:kernel_id), its(:ramdisk_id), its(:platform), its(:monitoring), its(:subnet_id), its(:vpc_id), its(:private_ip_address), its(:public_ip_address), its(:state_reason), its(:architecture), its(:root_device_type), its(:root_device_name), its(:virtualization_type), its(:instance_lifecycle), its(:spot_instance_request_id), its(:client_token), its(:source_dest_check), its(:hypervisor), its(:iam_instance_profile), its(:ebs_optimized), its(:sriov_net_support)
 ## <a name="rds">rds</a>
 
 RDS resource type.
@@ -182,7 +182,7 @@ describe rds('my-rds') do
 end
 ```
 
-#### its(:vpc_id), its(:db_instance_identifier), its(:db_instance_class), its(:engine), its(:db_instance_status), its(:master_username), its(:db_name), its(:endpoint), its(:allocated_storage), its(:instance_create_time), its(:preferred_backup_window), its(:backup_retention_period), its(:availability_zone), its(:preferred_maintenance_window), its(:pending_modified_values), its(:latest_restorable_time), its(:multi_az), its(:engine_version), its(:auto_minor_version_upgrade), its(:read_replica_source_db_instance_identifier), its(:license_model), its(:iops), its(:character_set_name), its(:secondary_availability_zone), its(:publicly_accessible), its(:storage_type), its(:tde_credential_arn), its(:db_instance_port), its(:db_cluster_identifier), its(:storage_encrypted), its(:kms_key_id), its(:dbi_resource_id), its(:ca_certificate_identifier), its(:copy_tags_to_snapshot)
+### its(:vpc_id), its(:db_instance_identifier), its(:db_instance_class), its(:engine), its(:db_instance_status), its(:master_username), its(:db_name), its(:endpoint), its(:allocated_storage), its(:instance_create_time), its(:preferred_backup_window), its(:backup_retention_period), its(:availability_zone), its(:preferred_maintenance_window), its(:pending_modified_values), its(:latest_restorable_time), its(:multi_az), its(:engine_version), its(:auto_minor_version_upgrade), its(:read_replica_source_db_instance_identifier), its(:license_model), its(:iops), its(:character_set_name), its(:secondary_availability_zone), its(:publicly_accessible), its(:storage_type), its(:tde_credential_arn), its(:db_instance_port), its(:db_cluster_identifier), its(:storage_encrypted), its(:kms_key_id), its(:dbi_resource_id), its(:ca_certificate_identifier), its(:copy_tags_to_snapshot)
 ## <a name="rds_db_parameter_group">rds_db_parameter_group</a>
 
 RdsDbParameterGroup resource type.
@@ -227,7 +227,7 @@ describe security_group('my-security-group-name') do
 end
 ```
 
-#### its(:inbound_rule_count), its(:outbound_rule_count), its(:inbound_permissions_count), its(:outbound_permissions_count), its(:owner_id), its(:group_name), its(:group_id), its(:description), its(:vpc_id)
+### its(:inbound_rule_count), its(:outbound_rule_count), its(:inbound_permissions_count), its(:outbound_permissions_count), its(:owner_id), its(:group_name), its(:group_id), its(:description), its(:vpc_id)
 ## <a name="vpc">vpc</a>
 
 VPC resource type.
@@ -269,7 +269,7 @@ describe vpc('vpc-ab123cde') do
 end
 ```
 
-#### its(:vpc_id), its(:state), its(:cidr_block), its(:dhcp_options_id), its(:instance_tenancy), its(:is_default)
+### its(:vpc_id), its(:state), its(:cidr_block), its(:dhcp_options_id), its(:instance_tenancy), its(:is_default)
 ## <a name="s3_bucket">s3_bucket</a>
 
 S3Bucket resource type.
@@ -327,6 +327,7 @@ describe s3_bucket('my-bucket') do
 end
 ```
 
+
 ### have_policy
 
 ```ruby
@@ -350,7 +351,17 @@ end
 ```
 
 
-#### its(:acl_grants_count), its(:acl_owner), its(:cors_rules_count), its(:name), its(:creation_date)
+### its(:acl_grants_count), its(:acl_owner), its(:cors_rules_count), its(:name), its(:creation_date)
+### :unlock: Advanced use
+
+`s3_bucket` can use `Aws::S3::Bucket` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Bucket.html).
+
+```ruby
+describe s3_bucket('my-bucket') do
+  its('acl.owner.display_name') { should eq 'my-bucket-owner' }
+end
+```
+
 ## <a name="route53_hosted_zone">route53_hosted_zone</a>
 
 Route53HostedZone resource type.
@@ -382,7 +393,7 @@ ns-890.awsdns-12.com.'
 end
 ```
 
-#### its(:id), its(:name), its(:caller_reference), its(:config), its(:resource_record_set_count)
+### its(:id), its(:name), its(:caller_reference), its(:config), its(:resource_record_set_count)
 ## <a name="autoscaling_group">autoscaling_group</a>
 
 AutoscalingGroup resource type.
@@ -413,7 +424,7 @@ describe autoscaling_group('my-auto-scaling-group') do
 end
 ```
 
-#### its(:auto_scaling_group_name), its(:auto_scaling_group_arn), its(:launch_configuration_name), its(:min_size), its(:max_size), its(:desired_capacity), its(:default_cooldown), its(:health_check_type), its(:health_check_grace_period), its(:created_time), its(:placement_group), its(:vpc_zone_identifier), its(:status), its(:new_instances_protected_from_scale_in)
+### its(:auto_scaling_group_name), its(:auto_scaling_group_arn), its(:launch_configuration_name), its(:min_size), its(:max_size), its(:desired_capacity), its(:default_cooldown), its(:health_check_type), its(:health_check_grace_period), its(:created_time), its(:placement_group), its(:vpc_zone_identifier), its(:status), its(:new_instances_protected_from_scale_in)
 ## <a name="subnet">subnet</a>
 
 Subnet resource type.
@@ -435,7 +446,7 @@ describe subnet('my-subnet') do
 end
 ```
 
-#### its(:subnet_id), its(:state), its(:vpc_id), its(:cidr_block), its(:available_ip_address_count), its(:availability_zone), its(:default_for_az), its(:map_public_ip_on_launch)
+### its(:subnet_id), its(:state), its(:vpc_id), its(:cidr_block), its(:available_ip_address_count), its(:availability_zone), its(:default_for_az), its(:map_public_ip_on_launch)
 ## <a name="route_table">route_table</a>
 
 RouteTable resource type.
@@ -469,7 +480,7 @@ describe route_table('my-route-table') do
 end
 ```
 
-#### its(:route_table_id), its(:vpc_id)
+### its(:route_table_id), its(:vpc_id)
 ## <a name="ebs">ebs</a>
 
 EBS resource type.
@@ -500,7 +511,7 @@ describe ebs('my-volume') do
 end
 ```
 
-#### its(:volume_id), its(:size), its(:snapshot_id), its(:availability_zone), its(:state), its(:create_time), its(:volume_type), its(:iops), its(:encrypted), its(:kms_key_id)
+### its(:volume_id), its(:size), its(:snapshot_id), its(:availability_zone), its(:state), its(:create_time), its(:volume_type), its(:iops), its(:encrypted), its(:kms_key_id)
 ## <a name="elb">elb</a>
 
 ELB resource type.
@@ -560,7 +571,7 @@ describe elb('my-elb') do
 end
 ```
 
-#### its(:health_check_target), its(:health_check_interval), its(:health_check_timeout), its(:health_check_unhealthy_threshold), its(:health_check_healthy_threshold), its(:load_balancer_name), its(:dns_name), its(:canonical_hosted_zone_name), its(:canonical_hosted_zone_name_id), its(:vpc_id), its(:created_time), its(:scheme)
+### its(:health_check_target), its(:health_check_interval), its(:health_check_timeout), its(:health_check_unhealthy_threshold), its(:health_check_healthy_threshold), its(:load_balancer_name), its(:dns_name), its(:canonical_hosted_zone_name), its(:canonical_hosted_zone_name_id), its(:vpc_id), its(:created_time), its(:scheme)
 ## <a name="lambda">lambda</a>
 
 Lambda resource type.
@@ -578,7 +589,7 @@ end
 
 This matcher does not support Amazon S3 event sources. ( [See SDK doc](http://docs.aws.amazon.com/sdkforruby/api/Aws/Lambda/Client.html#list_event_source_mappings-instance_method) )
 
-#### its(:function_name), its(:function_arn), its(:runtime), its(:role), its(:handler), its(:code_size), its(:description), its(:timeout), its(:memory_size), its(:last_modified), its(:code_sha_256), its(:version)
+### its(:function_name), its(:function_arn), its(:runtime), its(:role), its(:handler), its(:code_size), its(:description), its(:timeout), its(:memory_size), its(:last_modified), its(:code_sha_256), its(:version)
 ## <a name="iam_user">iam_user</a>
 
 IamUser resource type.
@@ -619,7 +630,7 @@ describe iam_user('my-iam-user') do
 end
 ```
 
-#### its(:path), its(:user_name), its(:user_id), its(:arn), its(:create_date), its(:password_last_used)
+### its(:path), its(:user_name), its(:user_id), its(:arn), its(:create_date), its(:password_last_used)
 ## <a name="iam_group">iam_group</a>
 
 IamGroup resource type.
@@ -660,7 +671,7 @@ describe iam_group('my-iam-group') do
 end
 ```
 
-#### its(:path), its(:group_name), its(:group_id), its(:arn), its(:create_date)
+### its(:path), its(:group_name), its(:group_id), its(:arn), its(:create_date)
 ## <a name="iam_role">iam_role</a>
 
 IamRole resource type.
@@ -692,7 +703,7 @@ describe iam_role('my-iam-role') do
 end
 ```
 
-#### its(:path), its(:role_name), its(:role_id), its(:arn), its(:create_date), its(:assume_role_policy_document)
+### its(:path), its(:role_name), its(:role_id), its(:arn), its(:create_date), its(:assume_role_policy_document)
 ## <a name="iam_policy">iam_policy</a>
 
 IamPolicy resource type.
@@ -741,7 +752,7 @@ describe iam_policy('my-iam-policy') do
 end
 ```
 
-#### its(:policy_name), its(:policy_id), its(:arn), its(:path), its(:default_version_id), its(:attachment_count), its(:is_attachable), its(:description), its(:create_date), its(:update_date)
+### its(:policy_name), its(:policy_id), its(:arn), its(:path), its(:default_version_id), its(:attachment_count), its(:is_attachable), its(:description), its(:create_date), its(:update_date)
 ## <a name="elasticache">elasticache</a>
 
 Elasticache resource type.
@@ -799,7 +810,7 @@ describe elasticache('my-rep-group-001') do
 end
 ```
 
-#### its(:cache_cluster_id), its(:configuration_endpoint), its(:client_download_landing_page), its(:cache_node_type), its(:engine), its(:engine_version), its(:cache_cluster_status), its(:num_cache_nodes), its(:preferred_availability_zone), its(:cache_cluster_create_time), its(:preferred_maintenance_window), its(:notification_configuration), its(:cache_subnet_group_name), its(:auto_minor_version_upgrade), its(:replication_group_id), its(:snapshot_retention_limit), its(:snapshot_window)
+### its(:cache_cluster_id), its(:configuration_endpoint), its(:client_download_landing_page), its(:cache_node_type), its(:engine), its(:engine_version), its(:cache_cluster_status), its(:num_cache_nodes), its(:preferred_availability_zone), its(:cache_cluster_create_time), its(:preferred_maintenance_window), its(:notification_configuration), its(:cache_subnet_group_name), its(:auto_minor_version_upgrade), its(:replication_group_id), its(:snapshot_retention_limit), its(:snapshot_window)
 ## <a name="elasticache_cache_parameter_group">elasticache_cache_parameter_group</a>
 
 ElasticacheCacheParameterGroup resource type.
@@ -870,7 +881,7 @@ describe cloudwatch_alarm('my-cloudwatch-alarm') do
 end
 ```
 
-#### its(:alarm_name), its(:alarm_arn), its(:alarm_description), its(:alarm_configuration_updated_timestamp), its(:actions_enabled), its(:state_value), its(:state_reason), its(:state_reason_data), its(:state_updated_timestamp), its(:metric_name), its(:namespace), its(:statistic), its(:period), its(:unit), its(:evaluation_periods), its(:threshold), its(:comparison_operator)
+### its(:alarm_name), its(:alarm_arn), its(:alarm_description), its(:alarm_configuration_updated_timestamp), its(:actions_enabled), its(:state_value), its(:state_reason), its(:state_reason_data), its(:state_updated_timestamp), its(:metric_name), its(:namespace), its(:statistic), its(:period), its(:unit), its(:evaluation_periods), its(:threshold), its(:comparison_operator)
 ## <a name="ses_identity">ses_identity</a>
 
 SesIdentity resource type.
@@ -895,7 +906,7 @@ describe ses_identity('example.com') do
 end
 ```
 
-#### its(:dkim_enabled), its(:dkim_verification_status), its(:bounce_topic), its(:complaint_topic), its(:delivery_topic), its(:forwarding_enabled), its(:verification_status), its(:verification_token)
+### its(:dkim_enabled), its(:dkim_verification_status), its(:bounce_topic), its(:complaint_topic), its(:delivery_topic), its(:forwarding_enabled), its(:verification_status), its(:verification_token)
 ## <a name="network_acl">network_acl</a>
 
 NetworkAcl resource type.
@@ -939,7 +950,7 @@ describe network_acl('my-network-acl') do
 end
 ```
 
-#### its(:inbound_entries_count), its(:outbound_entries_count), its(:network_acl_id), its(:vpc_id), its(:is_default)
+### its(:inbound_entries_count), its(:outbound_entries_count), its(:network_acl_id), its(:vpc_id), its(:is_default)
 ## <a name="directconnect_virtual_interface">directconnect_virtual_interface</a>
 
 DirectconnectVirtualInterface resource type.
@@ -975,4 +986,4 @@ describe directconnect_virtual_interface('my-directconnect-virtual-interface') d
 end
 ```
 
-#### its(:owner_account), its(:virtual_interface_id), its(:location), its(:connection_id), its(:virtual_interface_type), its(:virtual_interface_name), its(:vlan), its(:asn), its(:auth_key), its(:amazon_address), its(:customer_address), its(:virtual_interface_state), its(:customer_router_config), its(:virtual_gateway_id)
+### its(:owner_account), its(:virtual_interface_id), its(:location), its(:connection_id), its(:virtual_interface_type), its(:virtual_interface_name), its(:vlan), its(:asn), its(:auth_key), its(:amazon_address), its(:customer_address), its(:virtual_interface_state), its(:customer_router_config), its(:virtual_gateway_id)

data/lib/awspec.rb

@@ -11,6 +11,7 @@ require 'awspec/helper'
 require 'awspec/ext'
 require 'awspec/generator'
 require 'awspec/toolbox'
+require 'awspec/resource_reader'
 
 module Awspec
 end

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

@@ -5,7 +5,7 @@ module Awspec::Generator
         def initialize
           super
           @type = Awspec::Type::AutoscalingGroup.new('my-auto-scaling-group')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = []

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

@@ -64,8 +64,11 @@ module Awspec::Generator
 ### <%= matcher %>
 <%- if @descriptions.include?(matcher) -%><%= @descriptions[matcher] %><%- end -%>
 <% end %>
-<%- unless its.empty? -%>#### <%= its.join(', ') %><%- end -%>
-<%- if @descriptions.include?('last') -%><%= @descriptions['last'] %><%- end -%>
+<%- unless its.empty? -%>### <%= its.join(', ') %><%- end -%>
+<%- if @descriptions.include?('advanced') -%>
+
+### :unlock: Advanced use
+<%= @descriptions['advanced'] %><%- end -%>
 
 EOF
           template

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'CloudwatchAlarm'
           @type = Awspec::Type::CloudwatchAlarm.new('my-cloudwatch-alarm')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = %w(belong_to_metric)
           @ignore_matchers = []
           @describes = []

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'DirectconnectVirtualInterface'
           @type = Awspec::Type::DirectconnectVirtualInterface.new('my-directconnect-virtual-interface')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = [
             Awspec::Type::DirectconnectVirtualInterface::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', ')
           ]

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'EBS'
           @type = Awspec::Type::Ebs.new('my-ebs')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = [
             Awspec::Type::Ebs::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', ')
           ]

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'EC2'
           @type = Awspec::Type::Ec2.new('my-ec2')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = [
             Awspec::Type::Ec2::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', '),
             'belong_to_vpc',

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'Elasticache'
           @type = Awspec::Type::Elasticache.new('my-rep-group-001')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = [
             Awspec::Type::Elasticache::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', '),
             'belong_to_vpc',

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'ElasticacheCacheParameterGroup'
           @type = Awspec::Type::ElasticacheCacheParameterGroup.new('my-cache-parameter-group')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = []

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'ELB'
           @type = Awspec::Type::Elb.new('my-elb')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = %w(belong_to_vpc)
           @ignore_matchers = []
           @describes = %w(

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'IamGroup'
           @type = Awspec::Type::IamGroup.new('my-iam-group')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = %w(be_allowed_action)
           @ignore_matchers = []
           @describes = []

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'IamPolicy'
           @type = Awspec::Type::IamPolicy.new('my-iam-policy')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = []

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'IamRole'
           @type = Awspec::Type::IamRole.new('my-iam-role')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = %w(be_allowed_action)
           @ignore_matchers = []
           @describes = []

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'IamUser'
           @type = Awspec::Type::IamUser.new('my-iam-user')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = %w(belong_to_iam_group be_allowed_action)
           @ignore_matchers = []
           @describes = []

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'Lambda'
           @type = Awspec::Type::Lambda.new('my-lambda-function-name')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = []

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'NetworkAcl'
           @type = Awspec::Type::NetworkAcl.new('my-network-acl')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = [
             'belong_to_vpc',
             'its(:inbound), its(:outbound), its(:inbound_entries_count), its(:outbound_entries_count)'

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'RDS'
           @type = Awspec::Type::Rds.new('my-rds')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = [
             Awspec::Type::Rds::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', '),
             'belong_to_vpc',

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

@@ -5,7 +5,7 @@ module Awspec::Generator
         def initialize
           super
           @type = Awspec::Type::Route53HostedZone.new('example.com.')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = []

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

@@ -5,7 +5,7 @@ module Awspec::Generator
         def initialize
           super
           @type = Awspec::Type::RouteTable.new('my-route-table')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = []

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

@@ -5,7 +5,7 @@ module Awspec::Generator
         def initialize
           super
           @type = Awspec::Type::S3Bucket.new('my-bucket')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = %w(acl_grants_count acl_owner cors_rules_count)

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

@@ -5,7 +5,7 @@ module Awspec::Generator
         def initialize
           super
           @type = Awspec::Type::SecurityGroup.new('my-security-group-name')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = ['its(:inbound), its(:outbound)']
           @ignore_matchers = %w(be_opened be_inbound_opened be_outbound_opened)
           @describes = %w(inbound_rule_count outbound_rule_count inbound_permissions_count outbound_permissions_count)

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

@@ -6,7 +6,7 @@ module Awspec::Generator
           super
           @type_name = 'SesIdentity'
           @type = Awspec::Type::SesIdentity.new('example.com')
-          @ret = @type.resource
+          @ret = @type.resource_via_client
           @matchers = []
           @ignore_matchers = []
           @describes = %w(