remove debugInfo

gemmahou · Mar 21, 2024 · f84c99e · f84c99e
1 parent aaaa501
commit f84c99e
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 354 deletions.
diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go
@@ -24,14 +24,13 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/dnaeon/go-vcr.v3/recorder"
-
 	"github.com/go-logr/logr"
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	cloudresourcemanagerv1 "google.golang.org/api/cloudresourcemanager/v1"
 	"google.golang.org/api/option"
+	"gopkg.in/dnaeon/go-vcr.v3/recorder"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -326,17 +325,10 @@ func NewHarness(ctx context.Context, t *testing.T) *Harness {
 			}
 			r, err := recorder.NewWithOptions(opts)
 			if err != nil {
-<<<<<<< HEAD
 				t.Fatalf("[VCR] Failed create vcr recorder: %v", err)
 			}
 			h.VCRRecorder = r
 			ret = &http.Client{Transport: h.VCRRecorder}
-=======
-				t.Fatalf("creat vcr recorder failed: %v", err)
-			}
-			h.Rec = r
-			ret = &http.Client{Transport: h.Rec}
->>>>>>> e848f5336 (add hook)
 			return ret
 		}
 	} else {