update origin field to use self link or name (#5243) (#3673)

* update origin field to use self link or name

* suppress diff on failover origin for self link vs resource name

* just compare the resource names

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/5243.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/resource_dataproc_cluster_test.go

@@ -13,9 +13,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"google.golang.org/api/googleapi"
-
 	dataproc "google.golang.org/api/dataproc/v1beta2"
+	"google.golang.org/api/googleapi"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {

google-beta/resource_gke_hub_feature_membership_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
+	"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
 	gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

google-beta/resource_network_services_edge_cache_origin.go

@@ -68,8 +68,9 @@ If a Cloud Storage bucket is provided, it must be in the canonical "gs://bucketn
 				Description: `A human-readable description of the resource.`,
 			},
 			"failover_origin": {
-				Type:     schema.TypeString,
-				Optional: true,
+				Type:             schema.TypeString,
+				Optional:         true,
+				DiffSuppressFunc: compareResourceNames,
 				Description: `The Origin resource to try when the current origin cannot be reached.
 After maxAttempts is reached, the configured failoverOrigin will be used to fulfil the request.
 

google-beta/resource_network_services_edge_cache_service.go

@@ -341,8 +341,9 @@ Response headers are only sent to the client, and do not have an effect on the c
 													},
 												},
 												"origin": {
-													Type:     schema.TypeString,
-													Optional: true,
+													Type:             schema.TypeString,
+													Optional:         true,
+													DiffSuppressFunc: compareSelfLinkOrResourceName,
 													Description: `The Origin resource that requests to this route should fetch from when a matching response is not in cache. Origins can be defined as short names ("my-origin") or fully-qualified resource URLs - e.g. "networkservices.googleapis.com/projects/my-project/global/edgecacheorigins/my-origin"
 
 Only one of origin or urlRedirect can be set.`,