From 03fa5325a667fbc8dd937e8b0b399309bcbad026 Mon Sep 17 00:00:00 2001 From: NSSPKrishna Date: Thu, 22 Dec 2022 17:13:01 +0530 Subject: [PATCH 1/2] fix(private_locations): returning the err --- ...resource_newrelic_synthetics_private_location.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/newrelic/resource_newrelic_synthetics_private_location.go b/newrelic/resource_newrelic_synthetics_private_location.go index 4565c20a9..c94c047b6 100644 --- a/newrelic/resource_newrelic_synthetics_private_location.go +++ b/newrelic/resource_newrelic_synthetics_private_location.go @@ -2,13 +2,14 @@ package newrelic import ( "context" + "fmt" + "github.com/newrelic/newrelic-client-go/v2/pkg/errors" "log" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/newrelic/newrelic-client-go/v2/pkg/common" "github.com/newrelic/newrelic-client-go/v2/pkg/entities" - "github.com/newrelic/newrelic-client-go/v2/pkg/errors" "github.com/newrelic/newrelic-client-go/v2/pkg/synthetics" ) @@ -114,13 +115,15 @@ func resourceNewRelicSyntheticsPrivateLocationRead(ctx context.Context, d *schem resp, err := client.Entities.GetEntityWithContext(ctx, guid) if err != nil { - if _, ok := err.(*errors.NotFound); ok { - d.SetId("") - return nil + if err.Error() == "Argument \"guid\" has invalid value $guid." { + return diag.FromErr(fmt.Errorf("invalid GUID")) } - return diag.FromErr(err) } + if _, ok := err.(*errors.NotFound); ok { + d.SetId("") + return nil + } if resp == nil { d.SetId("") From bfc84b60c52058ba202c62649661486668315c06 Mon Sep 17 00:00:00 2001 From: NSSPKrishna Date: Tue, 10 Jan 2023 14:58:51 +0530 Subject: [PATCH 2/2] chore(private_locations): print guid --- .../resource_newrelic_synthetics_private_location.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/newrelic/resource_newrelic_synthetics_private_location.go b/newrelic/resource_newrelic_synthetics_private_location.go index c94c047b6..b7bf36259 100644 --- a/newrelic/resource_newrelic_synthetics_private_location.go +++ b/newrelic/resource_newrelic_synthetics_private_location.go @@ -115,15 +115,15 @@ func resourceNewRelicSyntheticsPrivateLocationRead(ctx context.Context, d *schem resp, err := client.Entities.GetEntityWithContext(ctx, guid) if err != nil { + if _, ok := err.(*errors.NotFound); ok { + d.SetId("") + return nil + } if err.Error() == "Argument \"guid\" has invalid value $guid." { - return diag.FromErr(fmt.Errorf("invalid GUID")) + return diag.FromErr(fmt.Errorf("%v is invalid GUID", guid)) } return diag.FromErr(err) } - if _, ok := err.(*errors.NotFound); ok { - d.SetId("") - return nil - } if resp == nil { d.SetId("")