Merge pull request #494 from chef/v2_route_table

Fixing some errors I ran across with not using the V2 Route Table object
chef-boneyard · Aug 3, 2016 · e4d35db · e4d35db
2 parents e55953f + f54ddbf
commit e4d35db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/docs/examples/ref_destroy.rb b/docs/examples/ref_destroy.rb
@@ -99,7 +99,8 @@
 # and finally delete the VPC (which deletes the main route table)
 aws_vpc 'ref-vpc' do
   main_route_table lazy {
-    self.aws_object.route_tables.select {|r| !r.main?}.first
+    rt = self.aws_object.route_tables.select {|r| !r.main?}.first
+    rt.id if rt
   }
   only_if { !self.aws_object.nil? }
 end

diff --git a/lib/chef/resource/aws_subnet.rb b/lib/chef/resource/aws_subnet.rb
@@ -76,7 +76,7 @@ class Chef::Resource::AwsSubnet < Chef::Provisioning::AWSDriver::AWSResourceWith
   #
   # By default, an implicit association with the main route table is made (`:default_to_main`)
   #
-  attribute :route_table#, kind_of: [ String, AwsRouteTable, AWS::EC2::RouteTable ], equal_to: [ :default_to_main ]
+  attribute :route_table#, kind_of: [ String, AwsRouteTable, ::Aws::EC2::RouteTable ], equal_to: [ :default_to_main ]
 
   #
   # The Network ACL to associate with this subnet. Subnets may only

diff --git a/lib/chef/resource/aws_vpc.rb b/lib/chef/resource/aws_vpc.rb
@@ -79,7 +79,7 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   # - An actual `aws_route_table` resource.
   # - An AWS `route_table` object.
   #
-  attribute :main_route_table, kind_of: [ String, AwsRouteTable, AWS::EC2::RouteTable ]
+  attribute :main_route_table, kind_of: [ String, AwsRouteTable, ::Aws::EC2::RouteTable ]
 
   #
   # The routes for the main route table.