From ca5f25669f44fa3730dda11d32ef56237f3c8b18 Mon Sep 17 00:00:00 2001 From: Emily Ye Date: Mon, 5 Aug 2019 12:25:09 -0700 Subject: [PATCH] text --- third_party/terraform/data_sources/data_source_google_folder.go | 2 +- third_party/terraform/resources/resource_google_folder.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/terraform/data_sources/data_source_google_folder.go b/third_party/terraform/data_sources/data_source_google_folder.go index 544df3c3ab5c..c782eb249021 100644 --- a/third_party/terraform/data_sources/data_source_google_folder.go +++ b/third_party/terraform/data_sources/data_source_google_folder.go @@ -55,7 +55,7 @@ func dataSourceFolderRead(d *schema.ResourceData, meta interface{}) error { if err := resourceGoogleFolderRead(d, meta); err != nil { return err } - // If resource doesn't exist, 404 was handled in read(). + // If resource doesn't exist, read will not set ID and we should return error. if d.Id() == "" { return nil } diff --git a/third_party/terraform/resources/resource_google_folder.go b/third_party/terraform/resources/resource_google_folder.go index 4ac53e29ccc9..398b285c151a 100644 --- a/third_party/terraform/resources/resource_google_folder.go +++ b/third_party/terraform/resources/resource_google_folder.go @@ -109,7 +109,7 @@ func resourceGoogleFolderRead(d *schema.ResourceData, meta interface{}) error { folder, err := getGoogleFolder(d.Id(), d, config) if err != nil { - return handleNotFoundError(err, d, d.Id()) + return handleNotFoundError(err, d, fmt.Sprintf("Folder Not Found : %s", d.Id())) } d.Set("name", folder.Name)