From 51bf0817223d63555a309fbd9f5ff049b7d5493d Mon Sep 17 00:00:00 2001 From: Yong Wen Chua Date: Wed, 16 Jan 2019 03:27:57 +0800 Subject: [PATCH] Fix incorrect arguments for `google_compute_instance` data source (#2874) Fixes #2535 --- google/data_source_google_compute_instance.go | 6 ++---- google/data_source_google_compute_instance_test.go | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/google/data_source_google_compute_instance.go b/google/data_source_google_compute_instance.go index b3a54525..0caf5bcf 100644 --- a/google/data_source_google_compute_instance.go +++ b/google/data_source_google_compute_instance.go @@ -2,6 +2,7 @@ package google import ( "fmt" + "github.com/hashicorp/terraform/helper/schema" ) @@ -9,11 +10,8 @@ func dataSourceGoogleComputeInstance() *schema.Resource { // Generate datasource schema from resource dsSchema := datasourceSchemaFromResourceSchema(resourceComputeInstance().Schema) - // Set 'Required' schema elements - addRequiredFieldsToSchema(dsSchema, "name") - // Set 'Optional' schema elements - addOptionalFieldsToSchema(dsSchema, "project", "zone") + addOptionalFieldsToSchema(dsSchema, "name", "self_link", "project", "zone") return &schema.Resource{ Read: dataSourceGoogleComputeInstanceRead, diff --git a/google/data_source_google_compute_instance_test.go b/google/data_source_google_compute_instance_test.go index e4b9ee94..476ecd48 100644 --- a/google/data_source_google_compute_instance_test.go +++ b/google/data_source_google_compute_instance_test.go @@ -129,5 +129,9 @@ data "google_compute_instance" "bar" { name = "${google_compute_instance.foo.name}" zone = "us-central1-a" } + +data "google_compute_instance" "baz" { + self_link = "${google_compute_instance.foo.self_link}" +} `, instanceName) }