google_container_versions => google_container_engine_versions

As per feedback from @danawillow and @radeksimko.

builtin/providers/google/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)

builtin/providers/google/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"
 }
 `

builtin/providers/google/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{

builtin/providers/google/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 {

website/source/docs/providers/google/d/google_container_engine_versions.html.markdown

@@ -1,6 +1,6 @@
 ---
 layout: "google"
-page_title: "Google: google_container_versions"
+page_title: "Google: google_container_engine_versions"
 sidebar_current: "docs-google-datasource-container-versions"
 description: |-
   Provides lists of available Google Container versions for masters and nodes.
@@ -11,14 +11,14 @@ description: |-
 Provides access to available Google Container versions in a zone for a given project.
 
 ```hcl
-data "google_container_versions" "central1b" {
+data "google_container_engine_versions" "central1b" {
   zone = "us-central1-b"
 }
 
 resource "google_container_cluster" "foo" {
   name               = "terraform-test-cluster"
   zone               = "us-central1-b"
-  node_version       = "${data.google_container_versions.central1b.latest_node_version}"
+  node_version       = "${data.google_container_engine_versions.central1b.latest_node_version}"
   initial_node_count = 1
 
   master_auth {

website/source/layouts/google.erb

@@ -32,7 +32,7 @@
       <a href="/docs/providers/google/d/google_compute_zones.html">google_compute_zones</a>
       </li>
       <li<%= sidebar_current("docs-google-datasource-container-versions") %>>
-      <a href="/docs/providers/google/d/google_container_versions.html">google_container_versions</a>
+      <a href="/docs/providers/google/d/google_container_engine_versions.html">google_container_engine_versions</a>
       </li>
       <li<%= sidebar_current("docs-google-datasource-iam-policy") %>>
       <a href="/docs/providers/google/d/google_iam_policy.html">google_iam_policy</a>