public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-06-29 06:42:36 +00:00
Code Issues Projects Releases Wiki Activity

Avoid overwriting errors so that they can be detected by handleNotFoundError. (#2526)

Browse Source
This commit is contained in:
The Magician 2018-11-26 15:54:37 -08:00 committed by Nathan McKinley
parent 5bc96d3fa1
commit e74ccfde23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
google/logging_exclusion_billing_account.go
View File

@ -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

3
google/logging_exclusion_folder.go
View File

@ -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

3
google/logging_exclusion_organization.go
View File

@ -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

3
google/logging_exclusion_project.go
View File

@ -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