text

GoogleCloudPlatform · Aug 5, 2019 · ca5f256 · ca5f256
1 parent 7dc7a3d
commit ca5f256
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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)