Remove some unnecessary overrides, add google.erb.

GoogleCloudPlatform · Feb 10, 2020 · 03ee74d · 03ee74d
1 parent 6ad0a84
commit 03ee74d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/api/resource.rb b/api/resource.rb
@@ -314,6 +314,8 @@ def self_link_uri
       if @self_link.nil?
         [@base_url, '{{name}}'].join('/')
       else
+        # If the terms in this are not snake-cased, this will require
+        # an override in Terraform.
         @self_link
       end
     end

diff --git a/products/datastore/api.yaml b/products/datastore/api.yaml
@@ -40,7 +40,7 @@ async: !ruby/object:Api::OpAsync
       - false
   error: !ruby/object:Api::OpAsync::Error
     path: 'error'
-    message: 'message' 
+    message: 'message'
 objects:
   - !ruby/object:Api::Resource
     name: 'Index'

diff --git a/products/datastore/terraform.yaml b/products/datastore/terraform.yaml
@@ -16,7 +16,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
   Index: !ruby/object:Overrides::Terraform::ResourceOverride
     id_format: "projects/{{project}}/indexes/{{index_id}}"
     self_link: "projects/{{project}}/indexes/{{index_id}}"
-    import_format: ["projects/{{project}}/indexes/{{index_id}}"]
     autogen_async: true
     # TODO(ndmckinley): This resource doesn't have a name, so the current
     # sweeper won't ever sweep it - might as well not have one for now,

diff --git a/third_party/terraform/website-compiled/google.erb b/third_party/terraform/website-compiled/google.erb
@@ -894,6 +894,15 @@
     </ul>
     </li>
 
+    <li<%%= sidebar_current("docs-google-datastore") %>>
+    <a href="#">Google Datastore Resources</a>
+    <ul class="nav nav-visible">
+      <li<%%= sidebar_current("docs-google-datastore-index") %>>
+          <a href="/docs/providers/google/r/datastore_index.html">google_datastore_index</a>
+      </li>
+    </ul>
+    </li>
+
     <li<%%= sidebar_current("docs-google-dataproc") %>>
         <a href="#">Google Dataproc Resources</a>
         <ul class="nav nav-visible">