From e74ccfde23127d611f4e7aa62c3d1cf9c5304002 Mon Sep 17 00:00:00 2001
From: The Magician <magic-modules@google.com>
Date: Mon, 26 Nov 2018 15:54:37 -0800
Subject: [PATCH] Avoid overwriting errors so that they can be detected by
 handleNotFoundError. (#2526)

---
 google/logging_exclusion_billing_account.go | 3 ++-
 google/logging_exclusion_folder.go          | 3 ++-
 google/logging_exclusion_organization.go    | 3 ++-
 google/logging_exclusion_project.go         | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/google/logging_exclusion_billing_account.go b/google/logging_exclusion_billing_account.go
index 0c70e7e7..d45f86df 100644
--- a/google/logging_exclusion_billing_account.go
+++ b/google/logging_exclusion_billing_account.go
@@ -2,6 +2,7 @@ package google
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/helper/schema"
 	"google.golang.org/api/logging/v2"
@@ -58,7 +59,7 @@ func (u *BillingAccountLoggingExclusionUpdater) ReadLoggingExclusion(id string)
 	exclusion, err := u.Config.clientLogging.BillingAccounts.Exclusions.Get(id).Do()
 
 	if err != nil {
-		return nil, fmt.Errorf("Error retrieving logging exclusion for %s: %s", u.DescribeResource(), err)
+		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving logging exclusion for %s: {{err}}", u.DescribeResource()), err)
 	}
 
 	return exclusion, nil
diff --git a/google/logging_exclusion_folder.go b/google/logging_exclusion_folder.go
index 1b7b51c1..33dc4711 100644
--- a/google/logging_exclusion_folder.go
+++ b/google/logging_exclusion_folder.go
@@ -2,6 +2,7 @@ package google
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/helper/schema"
 	"google.golang.org/api/logging/v2"
@@ -59,7 +60,7 @@ func (u *FolderLoggingExclusionUpdater) ReadLoggingExclusion(id string) (*loggin
 	exclusion, err := u.Config.clientLogging.Folders.Exclusions.Get(id).Do()
 
 	if err != nil {
-		return nil, fmt.Errorf("Error retrieving logging exclusion for %s: %s", u.DescribeResource(), err)
+		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving logging exclusion for %s: {{err}}", u.DescribeResource()), err)
 	}
 
 	return exclusion, nil
diff --git a/google/logging_exclusion_organization.go b/google/logging_exclusion_organization.go
index 18a61499..93b1aac1 100644
--- a/google/logging_exclusion_organization.go
+++ b/google/logging_exclusion_organization.go
@@ -2,6 +2,7 @@ package google
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/helper/schema"
 	"google.golang.org/api/logging/v2"
@@ -58,7 +59,7 @@ func (u *OrganizationLoggingExclusionUpdater) ReadLoggingExclusion(id string) (*
 	exclusion, err := u.Config.clientLogging.Organizations.Exclusions.Get(id).Do()
 
 	if err != nil {
-		return nil, fmt.Errorf("Error retrieving logging exclusion for %s: %s", u.DescribeResource(), err)
+		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving logging exclusion for %s: {{err}}", u.DescribeResource()), err)
 	}
 
 	return exclusion, nil
diff --git a/google/logging_exclusion_project.go b/google/logging_exclusion_project.go
index eb59972b..e2e78ed6 100644
--- a/google/logging_exclusion_project.go
+++ b/google/logging_exclusion_project.go
@@ -2,6 +2,7 @@ package google
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/helper/schema"
 	"google.golang.org/api/logging/v2"
@@ -65,7 +66,7 @@ func (u *ProjectLoggingExclusionUpdater) ReadLoggingExclusion(id string) (*loggi
 	exclusion, err := u.Config.clientLogging.Projects.Exclusions.Get(id).Do()
 
 	if err != nil {
-		return nil, fmt.Errorf("Error retrieving logging exclusion for %s: %s", u.DescribeResource(), err)
+		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving logging exclusion for %s: {{err}}", u.DescribeResource()), err)
 	}
 
 	return exclusion, nil