From 23b525375ec60ca2a0f4f54e734a7c6e59485078 Mon Sep 17 00:00:00 2001
From: Paddy <paddy@hashicorp.com>
Date: Wed, 10 May 2017 15:01:15 -0700
Subject: [PATCH] google_container_versions => google_container_engine_versions

As per feedback from @danawillow and @radeksimko.
---
 ... => data_source_google_container_engine_versions.go |  6 +++---
 ...ata_source_google_container_engine_versions_test.go |  4 ++--
 provider.go                                            | 10 +++++-----
 resource_container_cluster_test.go                     |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename data_source_google_container_versions.go => data_source_google_container_engine_versions.go (86%)
 rename data_source_google_container_versions_test.go => data_source_google_container_engine_versions_test.go (96%)

diff --git a/data_source_google_container_versions.go b/data_source_google_container_engine_versions.go
similarity index 86%
rename from data_source_google_container_versions.go
rename to data_source_google_container_engine_versions.go
index 9ae0f2a7..3eaf8043 100644
--- a/data_source_google_container_versions.go
+++ b/data_source_google_container_engine_versions.go
@@ -7,9 +7,9 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
-func dataSourceGoogleContainerVersions() *schema.Resource {
+func dataSourceGoogleContainerEngineVersions() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceGoogleContainerVersionsRead,
+		Read: dataSourceGoogleContainerEngineVersionsRead,
 		Schema: map[string]*schema.Schema{
 			"project": {
 				Type:     schema.TypeString,
@@ -41,7 +41,7 @@ func dataSourceGoogleContainerVersions() *schema.Resource {
 	}
 }
 
-func dataSourceGoogleContainerVersionsRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceGoogleContainerEngineVersionsRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
 	project, err := getProject(d, config)
diff --git a/data_source_google_container_versions_test.go b/data_source_google_container_engine_versions_test.go
similarity index 96%
rename from data_source_google_container_versions_test.go
rename to data_source_google_container_engine_versions_test.go
index d4399a6b..208dff03 100644
--- a/data_source_google_container_versions_test.go
+++ b/data_source_google_container_engine_versions_test.go
@@ -18,7 +18,7 @@ func TestAccGoogleContainerVersions_basic(t *testing.T) {
 			{
 				Config: testAccCheckGoogleContainerVersionsConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGoogleContainerVersionsMeta("data.google_container_versions.versions"),
+					testAccCheckGoogleContainerVersionsMeta("data.google_container_engine_versions.versions"),
 				),
 			},
 		},
@@ -91,7 +91,7 @@ func testAccCheckGoogleContainerVersionsMeta(n string) resource.TestCheckFunc {
 }
 
 var testAccCheckGoogleContainerVersionsConfig = `
-data "google_container_versions" "versions" {
+data "google_container_engine_versions" "versions" {
   zone = "us-central1-b"
 }
 `
diff --git a/provider.go b/provider.go
index bb1bbedc..8f61f8bc 100644
--- a/provider.go
+++ b/provider.go
@@ -49,11 +49,11 @@ func Provider() terraform.ResourceProvider {
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{
-			"google_compute_network":    dataSourceGoogleComputeNetwork(),
-			"google_compute_subnetwork": dataSourceGoogleComputeSubnetwork(),
-			"google_compute_zones":      dataSourceGoogleComputeZones(),
-			"google_container_versions": dataSourceGoogleContainerVersions(),
-			"google_iam_policy":         dataSourceGoogleIamPolicy(),
+			"google_compute_network":           dataSourceGoogleComputeNetwork(),
+			"google_compute_subnetwork":        dataSourceGoogleComputeSubnetwork(),
+			"google_compute_zones":             dataSourceGoogleComputeZones(),
+			"google_container_engine_versions": dataSourceGoogleContainerEngineVersions(),
+			"google_iam_policy":                dataSourceGoogleIamPolicy(),
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
diff --git a/resource_container_cluster_test.go b/resource_container_cluster_test.go
index e7f2a396..549803f5 100644
--- a/resource_container_cluster_test.go
+++ b/resource_container_cluster_test.go
@@ -400,14 +400,14 @@ resource "google_container_cluster" "with_additional_zones" {
 }`, acctest.RandString(10))
 
 var testAccContainerCluster_withVersion = fmt.Sprintf(`
-data "google_container_versions" "central1a" {
+data "google_container_engine_versions" "central1a" {
 	zone = "us-central1-a"
 }
 
 resource "google_container_cluster" "with_version" {
 	name = "cluster-test-%s"
 	zone = "us-central1-a"
-	node_version = "${data.google_container_versions.central1a.latest_node_version}"
+	node_version = "${data.google_container_engine_versions.central1a.latest_node_version}"
 	initial_node_count = 1
 
 	master_auth {