Add override for docs sections - apply to compute and monitoring. (#5257

) (#3686) * Add override for docs sections - apply to compute and monitoring. * These compute resources are actually handwritten, and the monitoring has no GA. Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Sep 30, 2021 · d7ddbe2 · d7ddbe2
1 parent 633897c
commit d7ddbe2
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 45 deletions.
diff --git a/.changelog/5257.txt b/.changelog/5257.txt
@@ -0,0 +1,3 @@
+```release-note:note
+Minor docs reorganization to group all Compute Engine and Monitoring (Stackdriver) resources together.
+```
diff --git a/google-beta/resource_gke_hub_feature_membership_test.go b/google-beta/resource_gke_hub_feature_membership_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
+	dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
 	gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

diff --git a/website/docs/r/compute_firewall_policy.html.markdown b/website/docs/r/compute_firewall_policy.html.markdown
@@ -13,7 +13,7 @@
 #     are required, please file an issue at https:#github.com/hashicorp/terraform-provider-google/issues/new/choose
 #
 # ----------------------------------------------------------------------------
-subcategory: "Compute"
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_firewall_policy"
 sidebar_current: "docs-google-compute-firewall-policy"

diff --git a/website/docs/r/compute_firewall_policy_association.html.markdown b/website/docs/r/compute_firewall_policy_association.html.markdown
@@ -13,7 +13,7 @@
 #     are required, please file an issue at https:#github.com/hashicorp/terraform-provider-google/issues/new/choose
 #
 # ----------------------------------------------------------------------------
-subcategory: "Compute"
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_firewall_policy_association"
 sidebar_current: "docs-google-compute-firewall-policy-association"

diff --git a/website/docs/r/compute_firewall_policy_rule.html.markdown b/website/docs/r/compute_firewall_policy_rule.html.markdown
@@ -13,7 +13,7 @@
 #     are required, please file an issue at https:#github.com/hashicorp/terraform-provider-google/issues/new/choose
 #
 # ----------------------------------------------------------------------------
-subcategory: "Compute"
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_firewall_policy_rule"
 sidebar_current: "docs-google-compute-firewall-policy-rule"

diff --git a/website/docs/r/monitoring_monitored_project.html.markdown b/website/docs/r/monitoring_monitored_project.html.markdown
@@ -13,7 +13,7 @@
 #     are required, please file an issue at https:#github.com/hashicorp/terraform-provider-google/issues/new/choose
 #
 # ----------------------------------------------------------------------------
-subcategory: "Monitoring"
+subcategory: "Cloud (Stackdriver) Monitoring"
 layout: "google"
 page_title: "Google: google_monitoring_monitored_project"
 sidebar_current: "docs-google-monitoring-monitored-project"

diff --git a/website/google.erb b/website/google.erb
@@ -547,6 +547,10 @@
           <a href="/docs/providers/google/r/monitoring_metric_descriptor.html">google_monitoring_metric_descriptor</a>
           </li>
 
+          <li>
+          <a href="/docs/providers/google/r/monitoring_monitored_project.html">google_monitoring_monitored_project</a>
+          </li>
+
           <li>
           <a href="/docs/providers/google/r/monitoring_notification_channel.html">google_monitoring_notification_channel</a>
           </li>
@@ -1574,30 +1578,6 @@
     </ul>
     </li>
 
-    <li>
-    <a href="#">Compute</a>
-    <ul class="nav">
-      <li>
-        <a href="#">Resources</a>
-        <ul class="nav nav-auto-expand">
-
-          <li>
-          <a href="/docs/providers/google/r/compute_firewall_policy.html">google_compute_firewall_policy</a>
-          </li>
-
-          <li>
-          <a href="/docs/providers/google/r/compute_firewall_policy_association.html">google_compute_firewall_policy_association</a>
-          </li>
-
-          <li>
-          <a href="/docs/providers/google/r/compute_firewall_policy_rule.html">google_compute_firewall_policy_rule</a>
-          </li>
-
-        </ul>
-      </li>
-    </ul>
-    </li>
-
     <li>
     <a href="#">Compute Engine</a>
     <ul class="nav">
@@ -1771,6 +1751,18 @@
           <a href="/docs/providers/google/r/compute_firewall.html">google_compute_firewall</a>
           </li>
 
+          <li>
+          <a href="/docs/providers/google/r/compute_firewall_policy.html">google_compute_firewall_policy</a>
+          </li>
+
+          <li>
+          <a href="/docs/providers/google/r/compute_firewall_policy_association.html">google_compute_firewall_policy_association</a>
+          </li>
+
+          <li>
+          <a href="/docs/providers/google/r/compute_firewall_policy_rule.html">google_compute_firewall_policy_rule</a>
+          </li>
+
           <li>
           <a href="/docs/providers/google/r/compute_forwarding_rule.html">google_compute_forwarding_rule</a>
           </li>
@@ -2748,22 +2740,6 @@
     </ul>
     </li>
 
-    <li>
-    <a href="#">Monitoring</a>
-    <ul class="nav">
-      <li>
-        <a href="#">Resources</a>
-        <ul class="nav nav-auto-expand">
-
-          <li>
-          <a href="/docs/providers/google/r/monitoring_monitored_project.html">google_monitoring_monitored_project</a>
-          </li>
-
-        </ul>
-      </li>
-    </ul>
-    </li>
-
     <li>
     <a href="#">Network services</a>
     <ul class="nav">