GoogleCloudPlatform · modular-magician · Nov 6, 2019 · Oct 31, 2019 · Nov 5, 2019 · Nov 5, 2019
diff --git a/.ci/magic-modules/generate-terraform.sh b/.ci/magic-modules/generate-terraform.sh
@@ -32,7 +32,7 @@ if [ "$GITHUB_ORG" = "terraform-providers" ]; then
     # "-wholename": entire relative path - including directory names - matches following wildcard.
     # "-name": filename alone matches following string.  e.g. -name README.md matches ./README.md *and* ./foo/bar/README.md
     # "-exec": for each file found, execute the command following until the literal ';'
-    find . -type f -not -wholename "./.git*" -not -wholename "./vendor*" -not -name ".travis.yml" -not -name ".golangci.yml" -not -name "CHANGELOG.md" -not -name "GNUmakefile" -not -name "LICENSE" -not -name "README.md" -not -wholename "./examples*" -not -name "go.mod" -not -name "go.sum" -not -name "staticcheck.conf" -not -name ".go-version" -not -name ".hashibot.hcl" -not -name "tools.go"  -exec git rm {} \;
+    find . -type f -not -wholename "./.git*" -not -wholename "./vendor*" -not -name ".travis.yml" -not -name ".golangci.yml" -not -name "CHANGELOG.md" -not -name "GNUmakefile" -not -name "docscheck.sh" -not -name "LICENSE" -not -name "README.md" -not -wholename "./examples*" -not -name "go.mod" -not -name "go.sum" -not -name "staticcheck.conf" -not -name ".go-version" -not -name ".hashibot.hcl" -not -name "tools.go"  -exec git rm {} \;
 fi
 
 popd

diff --git a/build/inspec b/build/inspec
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/templates/terraform/resource.html.markdown.erb b/templates/terraform/resource.html.markdown.erb
@@ -35,8 +35,9 @@
     is generated from a ruby function, but skip it on anything that is
     directly inserted from YAML.
 -%>
-<% 
+<%
   tf_product = (@config.legacy_name || product_ns).underscore
+  tf_subcategory = (object.__product.display_name)
   terraform_name = object.legacy_name || "google_#{tf_product}_#{object.name.underscore}"
   properties = object.all_user_properties
   # In order of preference, use TF override,
@@ -47,6 +48,7 @@
 -%>
 ---
 <%= lines(autogen_notice :yaml) -%>
+subcategory: "<%= tf_subcategory -%>"
 layout: "google"
 page_title: "Google: <%= terraform_name -%>"
 sidebar_current: "docs-<%= terraform_name.gsub("_", "-") -%>"

diff --git a/templates/terraform/resource_iam.html.markdown.erb b/templates/terraform/resource_iam.html.markdown.erb
@@ -37,6 +37,7 @@
 -%>
 <%
   tf_product = (@config.legacy_name || product_ns).underscore
+  tf_subcategory = (object.__product.display_name)
   resource_ns = object.legacy_name || "google_#{tf_product}_#{object.name.underscore}"
   resource_ns_iam = "#{resource_ns}_iam"
   properties = object.all_user_properties
@@ -49,6 +50,7 @@
 -%>
 ---
 <%= lines(autogen_notice :yaml) -%>
+subcategory: "<%= tf_subcategory -%>"
 layout: "google"
 page_title: "Google: <%= resource_ns_iam -%>"
 sidebar_current: "docs-<%= resource_ns_iam.gsub("_", "-") -%>"

diff --git a/third_party/terraform/website/docs/d/datasource_client_config.html.markdown b/third_party/terraform/website/docs/d/datasource_client_config.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_client_config"
 sidebar_current: "docs-google-datasource-client-config"

diff --git a/...party/terraform/website/docs/d/datasource_cloudfunctions_function.html.markdown b/...party/terraform/website/docs/d/datasource_cloudfunctions_function.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Functions"
 layout: "google"
 page_title: "Google: google_cloudfunctions_function"
 sidebar_current: "docs-google-datasource-cloudfunctions-function"

diff --git a/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_address"
 sidebar_current: "docs-google-datasource-compute-address"
@@ -55,4 +56,4 @@ exported:
 
 * `self_link` - The URI of the created resource.
 * `address` - The IP of the created resource.
-* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
+* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
diff --git a/...party/terraform/website/docs/d/datasource_compute_forwarding_rule.html.markdown b/...party/terraform/website/docs/d/datasource_compute_forwarding_rule.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_forwarding_rule"
 sidebar_current: "docs-google-datasource-compute-forwarding-rule"

diff --git a/..._party/terraform/website/docs/d/datasource_compute_global_address.html.markdown b/..._party/terraform/website/docs/d/datasource_compute_global_address.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_global_address"
 sidebar_current: "docs-google-datasource-compute-global-address"
@@ -52,4 +53,4 @@ exported:
 
 * `self_link` - The URI of the created resource.
 * `address` - The IP of the created resource.
-* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
+* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
diff --git a/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_image"
 sidebar_current: "docs-google-datasource-compute-image"

diff --git a/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance"
 sidebar_current: "docs-google-datasource-compute-instance-x"
@@ -203,4 +204,4 @@ The `shielded_instance_config` block supports:
 
 * `enable_vtpm` -- Whether the instance uses vTPM.
 
-* `enable_integrity_monitoring` -- Whether integrity monitoring is enabled for the instance.
+* `enable_integrity_monitoring` -- Whether integrity monitoring is enabled for the instance.
diff --git a/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_compute_lb_ip_ranges"
 sidebar_current: "docs-google-datasource-compute-lb-ip-ranges"

diff --git a/third_party/terraform/website/docs/d/datasource_compute_network.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_network.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network"
 sidebar_current: "docs-google-datasource-compute-network"

diff --git a/...terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown b/...terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_region_instance_group"
 sidebar_current: "docs-google-datasource-compute-region-instance-group"

diff --git a/third_party/terraform/website/docs/d/datasource_compute_router.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_router.html.markdown
@@ -1,5 +1,6 @@
 ---
 layout: "google"
+subcategory: "Compute Engine"
 page_title: "Google: google_compute_router"
 sidebar_current: "docs-google-datasource-compute-router"
 description: |-
@@ -27,7 +28,7 @@ The following arguments are supported:
 
 * `network` - (Required) The VPC network on which this router lives.
 
-* `project` - (Optional) The ID of the project in which the resource 
+* `project` - (Optional) The ID of the project in which the resource
     belongs. If it is not provided, the provider project is used.
 
 * `region` - (Optional) The region this router has been created in. If
@@ -36,4 +37,4 @@ The following arguments are supported:
 
 ## Attributes Reference
 
-See [google_compute_router](https://www.terraform.io/docs/providers/google/r/compute_router.html) resource for details of the available attributes.
+See [google_compute_router](https://www.terraform.io/docs/providers/google/r/compute_router.html) resource for details of the available attributes.
diff --git a/...party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown b/...party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_ssl_certificate"
 sidebar_current: "docs-google-datasource-compute-ssl-certificate"

diff --git a/third_party/terraform/website/docs/d/datasource_compute_ssl_policy.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_ssl_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_ssl_policy"
 sidebar_current: "docs-google-datasource-compute-ssl-policy"
@@ -48,4 +49,4 @@ In addition to the arguments listed above, the following attributes are exported
 
 * `fingerprint` - Fingerprint of this resource.
 
-* `self_link` - The URI of the created resource.
+* `self_link` - The URI of the created resource.
diff --git a/third_party/terraform/website/docs/d/datasource_compute_subnetwork.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_subnetwork.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_subnetwork"
 sidebar_current: "docs-google-datasource-compute-subnetwork"

diff --git a/third_party/terraform/website/docs/d/datasource_compute_vpn_gateway.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_vpn_gateway.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_vpn_gateway"
 sidebar_current: "docs-google-datasource-compute-vpn-gateway"

diff --git a/...terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown b/...terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_client_openid_userinfo"
 sidebar_current: "docs-google-datasource-client-openid-userinfo"

diff --git a/...erraform/website/docs/d/datasource_google_composer_image_versions.html.markdown b/...erraform/website/docs/d/datasource_google_composer_image_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Composer"
 layout: "google"
 page_title: "Google: google_composer_image_versions"
 sidebar_current: "docs-google-datasource-composer-image-versions"
@@ -43,4 +44,4 @@ The following attributes are exported:
 
 * `image_versions` - A list of composer image versions available in the given project and location. Each `image_version` contains:
   * `image_version_id` - The string identifier of the image version, in the form: "composer-x.y.z-airflow-a.b(.c)"
-  * `supported_python_versions` - Supported python versions for this image version
+  * `supported_python_versions` - Supported python versions for this image version
diff --git a/...erraform/website/docs/d/datasource_google_compute_backend_service.html.markdown b/...erraform/website/docs/d/datasource_google_compute_backend_service.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_backend_service"
 sidebar_current: "docs-google-datasource-compute-backend-service"

diff --git a/...m/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown b/...m/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network_endpoint_group"
 sidebar_current: "docs-google-datasource-compute-network-endpoint-group"

diff --git a/...aform/website/docs/d/datasource_google_folder_organization_policy.html.markdown b/...aform/website/docs/d/datasource_google_folder_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_organization_policy"
 sidebar_current: "docs-google-datasource-folder-organization-policy"

diff --git a/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown b/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_iam_role"
 sidebar_current: "docs-google-datasource-iam-role"

diff --git a/...rty/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown b/...rty/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_netblock_ip_ranges"
 sidebar_current: "docs-google-datasource-netblock-ip-ranges"

diff --git a/...form/website/docs/d/datasource_google_project_organization_policy.html.markdown b/...form/website/docs/d/datasource_google_project_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_organization_policy"
 sidebar_current: "docs-google-datasource-project-organization-policy"

diff --git a/..._party/terraform/website/docs/d/datasource_google_service_account.html.markdown b/..._party/terraform/website/docs/d/datasource_google_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account"
 sidebar_current: "docs-google-datasource-service-account"

diff --git a/...orm/website/docs/d/datasource_google_service_account_access_token.html.markdown b/...orm/website/docs/d/datasource_google_service_account_access_token.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_access_token"
 sidebar_current: "docs-google-service-account-access-token"

diff --git a/...ty/terraform/website/docs/d/datasource_google_service_account_key.html.markdown b/...ty/terraform/website/docs/d/datasource_google_service_account_key.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_key"
 sidebar_current: "docs-google-datasource-service-account-key"

diff --git a/...party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown b/...party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_tpu_tensorflow_versions"
 sidebar_current: "docs-google-datasource-tpu-tensorflow-versions"

diff --git a/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown b/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud DNS"
 layout: "google"
 page_title: "Google: google_dns_managed_zone"
 sidebar_current: "docs-google-datasource-dns-managed-zone"

diff --git a/third_party/terraform/website/docs/d/google_active_folder.html.markdown b/third_party/terraform/website/docs/d/google_active_folder.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_active_folder"
 sidebar_current: "docs-google-datasource-active-folder"

diff --git a/third_party/terraform/website/docs/d/google_billing_account.html.markdown b/third_party/terraform/website/docs/d/google_billing_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account"
 sidebar_current: "docs-google-datasource-billing-account"

diff --git a/...y/terraform/website/docs/d/google_compute_default_service_account.html.markdown b/...y/terraform/website/docs/d/google_compute_default_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_compute_default_service_account"
 sidebar_current: "docs-google-datasource-compute-default-service-account"

diff --git a/third_party/terraform/website/docs/d/google_compute_instance_group.html.markdown b/third_party/terraform/website/docs/d/google_compute_instance_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_group"
 sidebar_current: "docs-google-datasource-compute-instance-group"

diff --git a/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown b/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_node_types"
 sidebar_current: "docs-google-datasource-compute-node-types"

diff --git a/third_party/terraform/website/docs/d/google_compute_regions.html.markdown b/third_party/terraform/website/docs/d/google_compute_regions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_regions"
 sidebar_current: "docs-google-datasource-compute-regions"

diff --git a/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown b/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown
@@ -1,5 +1,6 @@
 ---
 layout: "google"
+subcategory: "Cloud Platform"
 page_title: "Google: google_compute_resource_policy"
 sidebar_current: "docs-google-datasource-compute-resource-policy"
 description: |-

diff --git a/third_party/terraform/website/docs/d/google_compute_zones.html.markdown b/third_party/terraform/website/docs/d/google_compute_zones.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_zones"
 sidebar_current: "docs-google-datasource-compute-zones"

diff --git a/third_party/terraform/website/docs/d/google_container_cluster.html.markdown b/third_party/terraform/website/docs/d/google_container_cluster.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_cluster"
 sidebar_current: "docs-google-datasource-container-cluster"

diff --git a/...d_party/terraform/website/docs/d/google_container_engine_versions.html.markdown b/...d_party/terraform/website/docs/d/google_container_engine_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_engine_versions"
 sidebar_current: "docs-google-datasource-container-versions"

diff --git a/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown b/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Container Registry"
 layout: "google"
 page_title: "Google: google_container_registry_image"
 sidebar_current: "docs-google-datasource-container-image"

diff --git a/...rty/terraform/website/docs/d/google_container_registry_repository.html.markdown b/...rty/terraform/website/docs/d/google_container_registry_repository.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Container Registry"
 layout: "google"
 page_title: "Google: google_container_registry_repository"
 sidebar_current: "docs-google-datasource-container-repo"

diff --git a/third_party/terraform/website/docs/d/google_folder.html.markdown b/third_party/terraform/website/docs/d/google_folder.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder"
 sidebar_current: "docs-google-datasource-folder"

diff --git a/third_party/terraform/website/docs/d/google_iam_policy.html.markdown b/third_party/terraform/website/docs/d/google_iam_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_iam_policy"
 sidebar_current: "docs-google-datasource-iam-policy"

diff --git a/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown b/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_crypto_key"
 sidebar_current: "docs-google-datasource-kms-crypto-key"

diff --git a/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown b/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_crypto_key_version"
 sidebar_current: "docs-google-datasource-kms-crypto-key-version"

diff --git a/third_party/terraform/website/docs/d/google_kms_key_ring.html.markdown b/third_party/terraform/website/docs/d/google_kms_key_ring.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_key_ring"
 sidebar_current: "docs-google-datasource-kms-key-ring"

diff --git a/third_party/terraform/website/docs/d/google_kms_secret.html.markdown b/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_secret"
 sidebar_current: "docs-google-kms-secret"

diff --git a/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown b/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_secret_ciphertext"
 sidebar_current: "docs-google-kms-secret-ciphertext"
@@ -61,7 +62,7 @@ resource "google_compute_instance" "instance" {
     access_config {
     }
   }
-  
+
   metadata = {
     password = "${data.google_kms_secret_ciphertext.my_password.ciphertext}"
   }
+12 −2		CHANGELOG.md
+1 −1		VERSION
+6 −0		docs/resources/google_service_account.md
+1 −1		inspec.yml