diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go index 20f343a90d..4982882120 100644 --- a/config/tests/samples/create/harness.go +++ b/config/tests/samples/create/harness.go @@ -326,10 +326,17 @@ 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 { diff --git a/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml b/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml index 5fa515ee08..1c24d4c979 100644 --- a/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +++ b/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml @@ -31,9 +31,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml User-Agent: - Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +======= + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}?alt=json +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml method: GET response: proto: HTTP/2.0 @@ -47,10 +51,17 @@ interactions: { "error": { "code": 404, +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "message": "The resource 'projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q' was not found", "errors": [ { "message": "The resource 'projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q' was not found", +======= + "message": "The resource 'projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}' was not found", + "errors": [ + { + "message": "The resource 'projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}' was not found", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "domain": "global", "reason": "notFound", "debugInfo": "java.lang.Exception\n\tat com.google.cloud.control.common.publicerrors.PublicErrorProtoUtils.newErrorBuilder(PublicErrorProtoUtils.java:2158)\n\tat com.google.cloud.control.common.publicerrors.PublicErrorProtoUtils.newErrorBuilder(PublicErrorProtoUtils.java:2150)\n\tat com.google.cloud.control.common.publicerrors.PublicErrorProtoUtils.createResourceNotFoundError(PublicErrorProtoUtils.java:194)\n\tat com.google.cloud.control.entities.clhbridge.ClhBridgeEntityLoader.lambda$getEntityByReference$0(ClhBridgeEntityLoader.java:164)\n\tat java.base/java.util.Optional.orElseThrow(Unknown Source)\n\tat com.google.cloud.control.entities.clhbridge.ClhBridgeEntityLoader.getEntityByReference(ClhBridgeEntityLoader.java:161)\n\tat com.google.cloud.control.services.clhbridge.ClhBridgeGetResourceAction$Handler.runAttempt(ClhBridgeGetResourceAction.java:390)\n\tat com.google.cloud.control.services.clhbridge.ClhBridgeGetResourceAction$Handler.runAttempt(ClhBridgeGetResourceAction.java:267)\n\tat com.google.cloud.cluster.metastore.RetryingMetastoreTransactionExecutor$1.runAttempt(RetryingMetastoreTransactionExecutor.java:94)\n\tat com.google.cloud.cluster.metastore.MetastoreRetryLoop.runHandler(MetastoreRetryLoop.java:523)\n\t...Stack trace is shortened.\n" @@ -59,10 +70,9 @@ interactions: } } headers: - Cache-Control: - - private Content-Type: - application/json; charset=UTF-8 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml Date: - Thu, 14 Mar 2024 17:40:31 GMT Server: @@ -80,6 +90,11 @@ interactions: status: 404 Not Found code: 404 duration: 400.888332ms +======= + status: 404 Not Found + code: 404 + duration: 193.994653ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml - id: 1 request: proto: HTTP/1.1 @@ -92,14 +107,16 @@ interactions: remote_addr: "" request_uri: "" body: | +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml {"cpuOvercommitType":"NONE","description":"Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.","name":"computenodetemplate-ecutmuuaqyhab6sxwf7q","nodeAffinityLabels":{"cnrm-test":"true","managed-by-cnrm":"true","memory_guarantee":"false"},"nodeTypeFlexibility":{"cpus":"96","memory":"any"},"region":"projects/cnrm-yuhou/global/regions/us-central1"} +======= + {"cpuOvercommitType":"NONE","description":"Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.","name":"computenodetemplate-{uniqueID}","nodeAffinityLabels":{"cnrm-test":"true","managed-by-cnrm":"true","memory_guarantee":"false"},"nodeTypeFlexibility":{"cpus":"96","memory":"any"},"region":"projects/{projectID}/global/regions/us-central1"} +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml form: {} headers: Content-Type: - application/json - User-Agent: - - Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev - url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates?alt=json + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates?alt=json method: POST response: proto: HTTP/2.0 @@ -112,24 +129,38 @@ interactions: body: | { "kind": "compute#operation", +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "id": "5139217832128448639", "name": "operation-1710438031884-613a2634d0282-3478b363-e0af1d97", "operationType": "compute.nodeTemplates.insert", "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q", "targetId": "6493056936179566719", +======= + "id": "6426718546362724406", + "name": "operation-1710280409165-6137db041301e-c8b805d3-fe2f3939", + "operationType": "compute.nodeTemplates.insert", + "targetLink": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}", + "targetId": "3271522381153005622", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "status": "RUNNING", - "user": "yuhou@google.com", + "user": "{user}", "progress": 0, +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "insertTime": "2024-03-14T10:40:32.186-07:00", "startTime": "2024-03-14T10:40:32.237-07:00", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/operations/operation-1710438031884-613a2634d0282-3478b363-e0af1d97", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1" +======= + "insertTime": "2024-03-12T14:53:29.437-07:00", + "startTime": "2024-03-12T14:53:29.473-07:00", + "selfLink": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/operations/operation-1710280409165-6137db041301e-c8b805d3-fe2f3939", + "region": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1" +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml } headers: - Cache-Control: - - private Content-Type: - application/json; charset=UTF-8 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml Date: - Thu, 14 Mar 2024 17:40:32 GMT Server: @@ -147,6 +178,11 @@ interactions: status: 200 OK code: 200 duration: 462.916981ms +======= + status: 200 OK + code: 200 + duration: 451.513773ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml - id: 2 request: proto: HTTP/1.1 @@ -161,11 +197,13 @@ interactions: body: "" form: {} headers: - User-Agent: - - google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/operations/operation-1710438031884-613a2634d0282-3478b363-e0af1d97?alt=json&prettyPrint=false +======= + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/operations/operation-1710280409165-6137db041301e-c8b805d3-fe2f3939?alt=json&prettyPrint=false +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml method: GET response: proto: HTTP/2.0 @@ -175,12 +213,15 @@ interactions: trailer: {} content_length: -1 uncompressed: true +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml body: '{"kind":"compute#operation","id":"5139217832128448639","name":"operation-1710438031884-613a2634d0282-3478b363-e0af1d97","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q","targetId":"6493056936179566719","status":"DONE","user":"yuhou@google.com","progress":100,"insertTime":"2024-03-14T10:40:32.186-07:00","startTime":"2024-03-14T10:40:32.237-07:00","endTime":"2024-03-14T10:40:32.557-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/operations/operation-1710438031884-613a2634d0282-3478b363-e0af1d97","region":"https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1"}' +======= + body: '{"kind":"compute#operation","id":"6426718546362724406","name":"operation-1710280409165-6137db041301e-c8b805d3-fe2f3939","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}","targetId":"3271522381153005622","status":"DONE","user":"{user}","progress":100,"insertTime":"2024-03-12T14:53:29.437-07:00","startTime":"2024-03-12T14:53:29.473-07:00","endTime":"2024-03-12T14:53:29.755-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/operations/operation-1710280409165-6137db041301e-c8b805d3-fe2f3939","region":"https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1"}' +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml headers: - Cache-Control: - - private Content-Type: - application/json; charset=UTF-8 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml Date: - Thu, 14 Mar 2024 17:40:32 GMT Etag: @@ -200,6 +241,11 @@ interactions: status: 200 OK code: 200 duration: 169.399533ms +======= + status: 200 OK + code: 200 + duration: 134.839655ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml - id: 3 request: proto: HTTP/1.1 @@ -216,9 +262,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml User-Agent: - Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +======= + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}?alt=json +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml method: GET response: proto: HTTP/2.0 @@ -231,9 +281,15 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "id": "6493056936179566719", "creationTimestamp": "2024-03-14T10:40:32.200-07:00", "name": "computenodetemplate-ecutmuuaqyhab6sxwf7q", +======= + "id": "3271522381153005622", + "creationTimestamp": "2024-03-12T14:53:29.448-07:00", + "name": "computenodetemplate-{uniqueID}", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", "nodeAffinityLabels": { "managed-by-cnrm": "true", @@ -241,8 +297,13 @@ interactions: "memory_guarantee": "false" }, "status": "READY", +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "region": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q", +======= + "region": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1", + "selfLink": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -253,10 +314,9 @@ interactions: "cpuOvercommitType": "NONE" } headers: - Cache-Control: - - private Content-Type: - application/json; charset=UTF-8 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml Date: - Thu, 14 Mar 2024 17:40:33 GMT Server: @@ -274,6 +334,11 @@ interactions: status: 200 OK code: 200 duration: 187.773865ms +======= + status: 200 OK + code: 200 + duration: 106.807053ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml - id: 4 request: proto: HTTP/1.1 @@ -290,9 +355,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml User-Agent: - Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +======= + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}?alt=json +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml method: GET response: proto: HTTP/2.0 @@ -305,9 +374,15 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "id": "6493056936179566719", "creationTimestamp": "2024-03-14T10:40:32.200-07:00", "name": "computenodetemplate-ecutmuuaqyhab6sxwf7q", +======= + "id": "3271522381153005622", + "creationTimestamp": "2024-03-12T14:53:29.448-07:00", + "name": "computenodetemplate-{uniqueID}", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", "nodeAffinityLabels": { "managed-by-cnrm": "true", @@ -315,8 +390,13 @@ interactions: "memory_guarantee": "false" }, "status": "READY", +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "region": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q", +======= + "region": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1", + "selfLink": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -327,10 +407,9 @@ interactions: "cpuOvercommitType": "NONE" } headers: - Cache-Control: - - private Content-Type: - application/json; charset=UTF-8 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml Date: - Thu, 14 Mar 2024 17:40:33 GMT Server: @@ -348,6 +427,11 @@ interactions: status: 200 OK code: 200 duration: 175.398443ms +======= + status: 200 OK + code: 200 + duration: 140.531606ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml - id: 5 request: proto: HTTP/1.1 @@ -364,9 +448,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml User-Agent: - Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +======= + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}?alt=json +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml method: GET response: proto: HTTP/2.0 @@ -379,9 +467,15 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "id": "6493056936179566719", "creationTimestamp": "2024-03-14T10:40:32.200-07:00", "name": "computenodetemplate-ecutmuuaqyhab6sxwf7q", +======= + "id": "3271522381153005622", + "creationTimestamp": "2024-03-12T14:53:29.448-07:00", + "name": "computenodetemplate-{uniqueID}", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", "nodeAffinityLabels": { "memory_guarantee": "false", @@ -389,8 +483,13 @@ interactions: "cnrm-test": "true" }, "status": "READY", +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "region": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q", +======= + "region": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1", + "selfLink": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -401,10 +500,9 @@ interactions: "cpuOvercommitType": "NONE" } headers: - Cache-Control: - - private Content-Type: - application/json; charset=UTF-8 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml Date: - Thu, 14 Mar 2024 17:40:34 GMT Server: @@ -422,6 +520,11 @@ interactions: status: 200 OK code: 200 duration: 120.547305ms +======= + status: 200 OK + code: 200 + duration: 153.058018ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml - id: 6 request: proto: HTTP/1.1 @@ -438,9 +541,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml User-Agent: - Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +======= + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}?alt=json +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml method: DELETE response: proto: HTTP/2.0 @@ -453,24 +560,38 @@ interactions: body: | { "kind": "compute#operation", +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "id": "7466036151650781308", "name": "operation-1710438034990-613a2637c6612-777550f0-3427cc56", "operationType": "compute.nodeTemplates.delete", "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q", "targetId": "6493056936179566719", +======= + "id": "4268830769584894004", + "name": "operation-1710280411551-6137db0659526-4edea800-8a439711", + "operationType": "compute.nodeTemplates.delete", + "targetLink": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}", + "targetId": "3271522381153005622", +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "status": "RUNNING", - "user": "yuhou@google.com", + "user": "{user}", "progress": 0, +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml "insertTime": "2024-03-14T10:40:35.246-07:00", "startTime": "2024-03-14T10:40:35.264-07:00", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/operations/operation-1710438034990-613a2637c6612-777550f0-3427cc56", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1" +======= + "insertTime": "2024-03-12T14:53:31.759-07:00", + "startTime": "2024-03-12T14:53:31.773-07:00", + "selfLink": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/operations/operation-1710280411551-6137db0659526-4edea800-8a439711", + "region": "https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1" +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml } headers: - Cache-Control: - - private Content-Type: - application/json; charset=UTF-8 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml Date: - Thu, 14 Mar 2024 17:40:35 GMT Server: @@ -488,6 +609,11 @@ interactions: status: 200 OK code: 200 duration: 427.334726ms +======= + status: 200 OK + code: 200 + duration: 331.512368ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml - id: 7 request: proto: HTTP/1.1 @@ -502,11 +628,13 @@ interactions: body: "" form: {} headers: - User-Agent: - - google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/operations/operation-1710438034990-613a2637c6612-777550f0-3427cc56?alt=json&prettyPrint=false +======= + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/operations/operation-1710280411551-6137db0659526-4edea800-8a439711?alt=json&prettyPrint=false +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml method: GET response: proto: HTTP/2.0 @@ -516,12 +644,15 @@ interactions: trailer: {} content_length: -1 uncompressed: true +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml body: '{"kind":"compute#operation","id":"7466036151650781308","name":"operation-1710438034990-613a2637c6612-777550f0-3427cc56","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q","targetId":"6493056936179566719","status":"DONE","user":"yuhou@google.com","progress":100,"insertTime":"2024-03-14T10:40:35.246-07:00","startTime":"2024-03-14T10:40:35.264-07:00","endTime":"2024-03-14T10:40:35.573-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/operations/operation-1710438034990-613a2637c6612-777550f0-3427cc56","region":"https://www.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1"}' +======= + body: '{"kind":"compute#operation","id":"4268830769584894004","name":"operation-1710280411551-6137db0659526-4edea800-8a439711","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates/computenodetemplate-{uniqueID}","targetId":"3271522381153005622","status":"DONE","user":"{user}","progress":100,"insertTime":"2024-03-12T14:53:31.759-07:00","startTime":"2024-03-12T14:53:31.773-07:00","endTime":"2024-03-12T14:53:32.027-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/operations/operation-1710280411551-6137db0659526-4edea800-8a439711","region":"https://www.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1"}' +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml headers: - Cache-Control: - - private Content-Type: - application/json; charset=UTF-8 +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml Date: - Thu, 14 Mar 2024 17:40:35 GMT Etag: @@ -541,3 +672,8 @@ interactions: status: 200 OK code: 200 duration: 162.588352ms +======= + status: 200 OK + code: 200 + duration: 147.118897ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml