Remove remaining docs (and one test I missed).

GoogleCloudPlatform · Oct 2, 2019 · 0503a47 · 0503a47
1 parent 17ae664
commit 0503a47
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 19 deletions.
diff --git a/third_party/terraform/tests/resource_storage_bucket_test.go b/third_party/terraform/tests/resource_storage_bucket_test.go
@@ -1421,17 +1421,14 @@ resource "google_project" "acceptance" {
 	billing_account = "%{billing_account}"
 }
 
-resource "google_project_services" "acceptance" {
+resource "google_project_service" "acceptance" {
 	project = "${google_project.acceptance.project_id}"
-
-	services = [
-	  "cloudkms.googleapis.com",
-	]
+	service = "cloudkms.googleapis.com"
 }
 
 resource "google_kms_key_ring" "key_ring" {
 	name     = "tf-test-%{random_suffix}"
-	project  = "${google_project_services.acceptance.project}"
+	project  = "${google_project_service.acceptance.project}"
 	location = "us"
 }
 

diff --git a/third_party/terraform/utils/batcher.go b/third_party/terraform/utils/batcher.go
@@ -123,7 +123,7 @@ func (b *RequestBatcher) stop() {
 // may choose to use a key with method if needed to diff GET/read and
 // POST/create)
 //
-// As an example, for google_project_service and google_project_services, the
+// As an example, for google_project_service, the
 // batcher is called to batch services.batchEnable() calls for a project
 // $PROJECT. The calling code uses the template
 // "serviceusage:projects/$PROJECT/services:batchEnable", which mirrors the HTTP request:

diff --git a/third_party/terraform/utils/provider.go.erb b/third_party/terraform/utils/provider.go.erb
@@ -186,7 +186,6 @@ func Provider() terraform.ResourceProvider {
 			"google_project":                                   dataSourceGoogleProject(),
 			"google_projects":                                  dataSourceGoogleProjects(),
 			"google_project_organization_policy":               dataSourceGoogleProjectOrganizationPolicy(),
-			"google_project_services":                          dataSourceGoogleProjectServices(),
 			"google_service_account":                           dataSourceGoogleServiceAccount(),
 			"google_service_account_access_token":              dataSourceGoogleServiceAccountAccessToken(),
 			"google_service_account_key":                       dataSourceGoogleServiceAccountKey(),

diff --git a/third_party/terraform/website-compiled/google.erb b/third_party/terraform/website-compiled/google.erb
@@ -170,9 +170,6 @@
       <li<%%= sidebar_current("docs-google-datasource-project-organization-policy") %>>
         <a href="/docs/providers/google/d/datasource_google_project_organization_policy.html">google_project_organization_policy</a>
       </li>
-      <li<%%= sidebar_current("docs-google-datasource-project-services") %>>
-        <a href="/docs/providers/google/d/google_project_services.html">google_project_services</a>
-      </li>
       <li<%%= sidebar_current("docs-google-datasource-service-account") %>>
       <a href="/docs/providers/google/d/datasource_google_service_account.html">google_service_account</a>
       </li>
@@ -417,9 +414,6 @@
       <li<%%= sidebar_current("docs-google-project-service-x") %>>
         <a href="/docs/providers/google/r/google_project_service.html">google_project_service</a>
       </li>
-      <li<%%= sidebar_current("docs-google-project-services") %>>
-        <a href="/docs/providers/google/r/google_project_services.html">google_project_services</a>
-      </li>
       <li<%%= sidebar_current("docs-google-project-usage-export-bucket") %>>
         <a href="/docs/providers/google/r/usage_export_bucket.html">google_project_usage_export_bucket</a>
       </li>

diff --git a/third_party/terraform/website/docs/provider_reference.html.markdown b/third_party/terraform/website/docs/provider_reference.html.markdown
@@ -318,8 +318,7 @@ as their versioned counterpart but that won't necessarily always be the case.
 
 **So far, batching is implemented for**:
 
-* enabling project services using `google_project_service` or
-  `google_project_services`
+* enabling project services using `google_project_service`.
 
 The `batching` block supports the following fields.
 

diff --git a/third_party/terraform/website/docs/r/google_project_service.html.markdown b/third_party/terraform/website/docs/r/google_project_service.html.markdown
@@ -13,9 +13,6 @@ Allows management of a single API service for an existing Google Cloud Platform
 For a list of services available, visit the
 [API library page](https://console.cloud.google.com/apis/library) or run `gcloud services list`.
 
-~> **Note:** This resource _must not_ be used in conjunction with
-   `google_project_services` or they will fight over which services should be enabled.
-
 ## Example Usage
 
 ```hcl