Merge 04a41e5 into b35d8fc

api/type.rb

@@ -522,7 +522,12 @@ def validate
         check_property :key_type, ::String
         check_property :key_name, ::String
         raise "Missing 'value_type' on #{object_display_name}" if @value_type.nil?
-        @value_type.validate if @value_type.is_a?(NestedObject)
+        if @value_type.is_a?(NestedObject)
+          @value_type.set_variable(@name, :__name)
+          @value_type.set_variable(@__resource, :__resource)
+          @value_type.set_variable(self, :__parent)
+          @value_type.validate
+        end
         raise "Invalid type #{@key_type}" unless type?(@key_type)
         raise "Invalid type #{@value_type}" unless type?(@value_type)
       end

templates/terraform/property_documentation.erb

@@ -9,3 +9,7 @@
 <% if property.is_a?(Api::Type::NestedObject) || string_to_object_map?(property) || (property.is_a?(Api::Type::Array) && property.item_type.is_a?(Api::Type::NestedObject)) -%>
   Structure is documented below.
 <% end -%>
+<% if property.min_version.name == 'beta' && property.__resource.min_version.name != 'beta' -%>
+  This property is in beta, and should be used with the terraform-provider-google-beta provider.
+  See [Provider Versions](http://terraform.io/docs/provider/google/provider_versions.html) for more details on beta fields.
+<% end -%>

templates/terraform/resource.erb

@@ -49,7 +49,11 @@ func resource<%= resource_name -%>() *schema.Resource {
         Importer: &schema.ResourceImporter{
             State: resource<%= resource_name -%>Import,
         },
-
+<%      if object.min_version.name == 'beta' -%>
+  DeprecationMessage: `This resource is in beta and will be removed from this provider.
+Use the <%= resource_name -%> resource in terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`,
+<%      end -%>
 <%      unless object.async.nil? -%>
         Timeouts: &schema.ResourceTimeout {
             Create: schema.DefaultTimeout(<%= object.async.operation.timeouts.insert_sec -%> * time.Second),

templates/terraform/resource.html.markdown.erb

@@ -52,6 +52,11 @@ description: |-
 
 <%= lines(object.description) -%>
 
+<% if object.min_version.name == 'beta' -%>
+~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
+See [Provider Versions](http://terraform.io/docs/provider/google/provider_versions.html) for more details on beta resources.
+<% end -%>
+
 <% if !object.references.nil? -%>
 To get more information about <%= object.name -%>, see:
 

templates/terraform/schema_property.erb

@@ -32,6 +32,11 @@
 <% if force_new?(property, object) -%>
   ForceNew: true,
 <% end -%>
+<% if property.min_version.name == 'beta' && property.__resource.min_version.name != 'beta' -%>
+  Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
+<% end -%>
 <% unless property.validation.nil? || property.output -%>
 	<% if !property.validation.regex.nil? -%>
   ValidateFunc: validateRegexp(`<%= property.validation.regex -%>`),