From 1709ea441416540530dbbd512b496a968def2d7f Mon Sep 17 00:00:00 2001 From: Paddy 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 +++--- ...ta_source_google_container_engine_versions_test.go} | 4 ++-- builtin/providers/google/provider.go | 10 +++++----- .../google/resource_container_cluster_test.go | 4 ++-- ... => google_container_engine_versions.html.markdown} | 6 +++--- website/source/layouts/google.erb | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) rename builtin/providers/google/{data_source_google_container_versions.go => data_source_google_container_engine_versions.go} (86%) rename builtin/providers/google/{data_source_google_container_versions_test.go => data_source_google_container_engine_versions_test.go} (96%) rename website/source/docs/providers/google/d/{google_container_versions.html.markdown => google_container_engine_versions.html.markdown} (87%) diff --git a/builtin/providers/google/data_source_google_container_versions.go b/builtin/providers/google/data_source_google_container_engine_versions.go similarity index 86% rename from builtin/providers/google/data_source_google_container_versions.go rename to builtin/providers/google/data_source_google_container_engine_versions.go index 9ae0f2a7b0..3eaf8043ae 100644 --- a/builtin/providers/google/data_source_google_container_versions.go +++ b/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) diff --git a/builtin/providers/google/data_source_google_container_versions_test.go b/builtin/providers/google/data_source_google_container_engine_versions_test.go similarity index 96% rename from builtin/providers/google/data_source_google_container_versions_test.go rename to builtin/providers/google/data_source_google_container_engine_versions_test.go index d4399a6b6b..208dff034d 100644 --- a/builtin/providers/google/data_source_google_container_versions_test.go +++ b/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" } ` diff --git a/builtin/providers/google/provider.go b/builtin/providers/google/provider.go index bb1bbedc79..8f61f8bc23 100644 --- a/builtin/providers/google/provider.go +++ 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{ diff --git a/builtin/providers/google/resource_container_cluster_test.go b/builtin/providers/google/resource_container_cluster_test.go index e7f2a3968d..549803f559 100644 --- a/builtin/providers/google/resource_container_cluster_test.go +++ b/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 { diff --git a/website/source/docs/providers/google/d/google_container_versions.html.markdown b/website/source/docs/providers/google/d/google_container_engine_versions.html.markdown similarity index 87% rename from website/source/docs/providers/google/d/google_container_versions.html.markdown rename to website/source/docs/providers/google/d/google_container_engine_versions.html.markdown index b7b8afd30f..ad48595f70 100644 --- a/website/source/docs/providers/google/d/google_container_versions.html.markdown +++ b/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 { diff --git a/website/source/layouts/google.erb b/website/source/layouts/google.erb index 368829edf8..00b971dc9d 100644 --- a/website/source/layouts/google.erb +++ b/website/source/layouts/google.erb @@ -32,7 +32,7 @@ google_compute_zones > - google_container_versions + google_container_engine_versions > google_iam_policy