From 273ece97a4f1c7345560aa376af5addfa5d4f9a7 Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Mon, 11 Mar 2024 23:34:56 +0000 Subject: [PATCH 1/6] use go-vcr package --- config/tests/samples/create/harness.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go index f24590d6a8..4944bde8f7 100644 --- a/config/tests/samples/create/harness.go +++ b/config/tests/samples/create/harness.go @@ -24,6 +24,8 @@ 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" From 69810abce4bbf7c7e81c7639d167b678f4b94999 Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Mon, 11 Mar 2024 23:34:56 +0000 Subject: [PATCH 2/6] use go-vcr package --- ...InSeries_fixtures_computenodetemplate.yaml | 339 ++++++++++++++++++ tests/e2e/unified_test.go | 55 ++- 2 files changed, 388 insertions(+), 6 deletions(-) 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 23b92fd40a..3204f0bc8c 100644 --- a/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +++ b/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml @@ -31,7 +31,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +>>>>>>> 0bd8e264f (use go-vcr package) method: GET response: proto: HTTP/2.0 @@ -45,6 +51,7 @@ interactions: { "error": { "code": 404, +<<<<<<< HEAD "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", "errors": [ { @@ -52,16 +59,49 @@ interactions: "domain": "global", "reason": "notFound", "debugInfo": "fake debug info" +======= + "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", + "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" +>>>>>>> 0bd8e264f (use go-vcr package) } ] } } headers: +<<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 status: 404 Not Found code: 404 duration: 214.994989ms +======= + Cache-Control: + - private + Content-Type: + - application/json; charset=UTF-8 + Date: + - Thu, 14 Mar 2024 17:40:31 GMT + Server: + - ESF + Vary: + - Origin + - X-Origin + - Referer + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Xss-Protection: + - "0" + status: 404 Not Found + code: 404 + duration: 400.888332ms +>>>>>>> 0bd8e264f (use go-vcr package) - id: 1 request: proto: HTTP/1.1 @@ -74,12 +114,22 @@ interactions: remote_addr: "" request_uri: "" body: | +<<<<<<< HEAD {"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-uniqueid111111","nodeAffinityLabels":{"cnrm-test":"true","managed-by-cnrm":"true","memory_guarantee":"false"},"nodeTypeFlexibility":{"cpus":"96","memory":"any"},"region":"projects/cnrm-user/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-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"} +>>>>>>> 0bd8e264f (use go-vcr package) form: {} headers: Content-Type: - application/json +<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates?alt=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 +>>>>>>> 0bd8e264f (use go-vcr package) method: POST response: proto: HTTP/2.0 @@ -92,6 +142,7 @@ interactions: body: | { "kind": "compute#operation", +<<<<<<< HEAD "id": "6628313260286154337", "name": "operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", "operationType": "compute.nodeTemplates.insert", @@ -111,6 +162,43 @@ interactions: status: 200 OK code: 200 duration: 765.124261ms +======= + "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": "RUNNING", + "user": "yuhou@google.com", + "progress": 0, + "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" + } + headers: + Cache-Control: + - private + Content-Type: + - application/json; charset=UTF-8 + Date: + - Thu, 14 Mar 2024 17:40:32 GMT + Server: + - ESF + Vary: + - Origin + - X-Origin + - Referer + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Xss-Protection: + - "0" + status: 200 OK + code: 200 + duration: 462.916981ms +>>>>>>> 0bd8e264f (use go-vcr package) - id: 2 request: proto: HTTP/1.1 @@ -125,9 +213,17 @@ interactions: body: "" form: {} headers: +<<<<<<< HEAD X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456?alt=json&prettyPrint=false +======= + 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 + url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/operations/operation-1710438031884-613a2634d0282-3478b363-e0af1d97?alt=json&prettyPrint=false +>>>>>>> 0bd8e264f (use go-vcr package) method: GET response: proto: HTTP/2.0 @@ -137,6 +233,7 @@ interactions: trailer: {} content_length: -1 uncompressed: true +<<<<<<< HEAD body: '{"kind":"compute#operation","id":"6628313260286154337","name":"operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:54.656-07:00","startTime":"2024-03-14T18:46:54.697-07:00","endTime":"2024-03-14T18:46:54.994-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' headers: Content-Type: @@ -144,6 +241,33 @@ interactions: status: 200 OK code: 200 duration: 346.050124ms +======= + 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"}' + headers: + Cache-Control: + - private + Content-Type: + - application/json; charset=UTF-8 + Date: + - Thu, 14 Mar 2024 17:40:32 GMT + Etag: + - 1vemYvWuEDeqfn1kfmHKCImCsU0=/NcvrT1ClOcogrjM0_klTx3TguZ8= + Server: + - ESF + Vary: + - Origin + - X-Origin + - Referer + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Xss-Protection: + - "0" + status: 200 OK + code: 200 + duration: 169.399533ms +>>>>>>> 0bd8e264f (use go-vcr package) - id: 3 request: proto: HTTP/1.1 @@ -160,7 +284,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +>>>>>>> 0bd8e264f (use go-vcr package) method: GET response: proto: HTTP/2.0 @@ -173,6 +303,7 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", "name": "computenodetemplate-uniqueid111111", @@ -185,6 +316,20 @@ interactions: "status": "READY", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", +======= + "id": "6493056936179566719", + "creationTimestamp": "2024-03-14T10:40:32.200-07:00", + "name": "computenodetemplate-ecutmuuaqyhab6sxwf7q", + "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", + "cnrm-test": "true", + "memory_guarantee": "false" + }, + "status": "READY", + "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", +>>>>>>> 0bd8e264f (use go-vcr package) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -195,11 +340,35 @@ interactions: "cpuOvercommitType": "NONE" } headers: +<<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 duration: 170.297617ms +======= + Cache-Control: + - private + Content-Type: + - application/json; charset=UTF-8 + Date: + - Thu, 14 Mar 2024 17:40:33 GMT + Server: + - ESF + Vary: + - Origin + - X-Origin + - Referer + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Xss-Protection: + - "0" + status: 200 OK + code: 200 + duration: 187.773865ms +>>>>>>> 0bd8e264f (use go-vcr package) - id: 4 request: proto: HTTP/1.1 @@ -216,7 +385,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +>>>>>>> 0bd8e264f (use go-vcr package) method: GET response: proto: HTTP/2.0 @@ -229,6 +404,7 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", "name": "computenodetemplate-uniqueid111111", @@ -241,6 +417,20 @@ interactions: "status": "READY", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", +======= + "id": "6493056936179566719", + "creationTimestamp": "2024-03-14T10:40:32.200-07:00", + "name": "computenodetemplate-ecutmuuaqyhab6sxwf7q", + "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", + "cnrm-test": "true", + "memory_guarantee": "false" + }, + "status": "READY", + "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", +>>>>>>> 0bd8e264f (use go-vcr package) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -251,11 +441,35 @@ interactions: "cpuOvercommitType": "NONE" } headers: +<<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 duration: 172.725397ms +======= + Cache-Control: + - private + Content-Type: + - application/json; charset=UTF-8 + Date: + - Thu, 14 Mar 2024 17:40:33 GMT + Server: + - ESF + Vary: + - Origin + - X-Origin + - Referer + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Xss-Protection: + - "0" + status: 200 OK + code: 200 + duration: 175.398443ms +>>>>>>> 0bd8e264f (use go-vcr package) - id: 5 request: proto: HTTP/1.1 @@ -272,7 +486,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +>>>>>>> 0bd8e264f (use go-vcr package) method: GET response: proto: HTTP/2.0 @@ -285,6 +505,7 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", "name": "computenodetemplate-uniqueid111111", @@ -297,6 +518,20 @@ interactions: "status": "READY", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", +======= + "id": "6493056936179566719", + "creationTimestamp": "2024-03-14T10:40:32.200-07:00", + "name": "computenodetemplate-ecutmuuaqyhab6sxwf7q", + "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", + "managed-by-cnrm": "true", + "cnrm-test": "true" + }, + "status": "READY", + "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", +>>>>>>> 0bd8e264f (use go-vcr package) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -307,11 +542,35 @@ interactions: "cpuOvercommitType": "NONE" } headers: +<<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 duration: 139.970247ms +======= + Cache-Control: + - private + Content-Type: + - application/json; charset=UTF-8 + Date: + - Thu, 14 Mar 2024 17:40:34 GMT + Server: + - ESF + Vary: + - Origin + - X-Origin + - Referer + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Xss-Protection: + - "0" + status: 200 OK + code: 200 + duration: 120.547305ms +>>>>>>> 0bd8e264f (use go-vcr package) - id: 6 request: proto: HTTP/1.1 @@ -328,7 +587,13 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json +>>>>>>> 0bd8e264f (use go-vcr package) method: DELETE response: proto: HTTP/2.0 @@ -341,6 +606,7 @@ interactions: body: | { "kind": "compute#operation", +<<<<<<< HEAD "id": "7418327646336849534", "name": "operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", "operationType": "compute.nodeTemplates.delete", @@ -360,6 +626,43 @@ interactions: status: 200 OK code: 200 duration: 405.508656ms +======= + "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": "RUNNING", + "user": "yuhou@google.com", + "progress": 0, + "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" + } + headers: + Cache-Control: + - private + Content-Type: + - application/json; charset=UTF-8 + Date: + - Thu, 14 Mar 2024 17:40:35 GMT + Server: + - ESF + Vary: + - Origin + - X-Origin + - Referer + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Xss-Protection: + - "0" + status: 200 OK + code: 200 + duration: 427.334726ms +>>>>>>> 0bd8e264f (use go-vcr package) - id: 7 request: proto: HTTP/1.1 @@ -374,9 +677,17 @@ interactions: body: "" form: {} headers: +<<<<<<< HEAD X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678?alt=json&prettyPrint=false +======= + 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 + url: https://compute.googleapis.com/compute/beta/projects/cnrm-yuhou/regions/us-central1/operations/operation-1710438034990-613a2637c6612-777550f0-3427cc56?alt=json&prettyPrint=false +>>>>>>> 0bd8e264f (use go-vcr package) method: GET response: proto: HTTP/2.0 @@ -386,6 +697,7 @@ interactions: trailer: {} content_length: -1 uncompressed: true +<<<<<<< HEAD body: '{"kind":"compute#operation","id":"7418327646336849534","name":"operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:57.768-07:00","startTime":"2024-03-14T18:46:57.795-07:00","endTime":"2024-03-14T18:46:58.153-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' headers: Content-Type: @@ -393,3 +705,30 @@ interactions: status: 200 OK code: 200 duration: 152.277906ms +======= + 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"}' + headers: + Cache-Control: + - private + Content-Type: + - application/json; charset=UTF-8 + Date: + - Thu, 14 Mar 2024 17:40:35 GMT + Etag: + - 2MJ_12wFKqT8OoVT31IKuaAwXAQ=/mgH6ljY_zd1ysot_F3HGai5q11Y= + Server: + - ESF + Vary: + - Origin + - X-Origin + - Referer + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Xss-Protection: + - "0" + status: 200 OK + code: 200 + duration: 162.588352ms +>>>>>>> 0bd8e264f (use go-vcr package) diff --git a/tests/e2e/unified_test.go b/tests/e2e/unified_test.go index 5724c3483f..dc2147fdbb 100644 --- a/tests/e2e/unified_test.go +++ b/tests/e2e/unified_test.go @@ -15,10 +15,14 @@ package e2e import ( + "bytes" "context" "encoding/json" "fmt" + "io" + "io/ioutil" "k8s.io/klog/v2" + "net/http" "os" "path/filepath" "strings" @@ -166,6 +170,12 @@ func testFixturesInSeries(ctx context.Context, t *testing.T, testPause bool, can } }) + replaceFunc := func(s string) string { + result := strings.Replace(s, uniqueID, "uniqueid111111", -1) + result = strings.Replace(result, project.ProjectID, "cnrm-user", -1) + return result + } + hook := func(i *cassette.Interaction) error { var requestHeadersToRemove = []string{ "Authorization", @@ -189,12 +199,6 @@ func testFixturesInSeries(ctx context.Context, t *testing.T, testPause bool, can delete(i.Response.Headers, header) } - replaceFunc := func(s string) string { - result := strings.Replace(s, uniqueID, "uniqueid111111", -1) - result = strings.Replace(result, project.ProjectID, "cnrm-user", -1) - return result - } - i.Request.Body = replaceFunc(i.Request.Body) i.Response.Body = replaceFunc(i.Response.Body) i.Request.URL = replaceFunc(i.Request.URL) @@ -228,6 +232,45 @@ func testFixturesInSeries(ctx context.Context, t *testing.T, testPause bool, can return nil } h.VCRRecorder.AddHook(hook, recorder.BeforeSaveHook) + + h.VCRRecorder.SetMatcher(func(r *http.Request, i cassette.Request) bool { + // We applied BeforeSaveHook, need to modify the incoming request, + // so that incoming request matches the saved request. + modifiedURL := replaceFunc(r.URL.String()) + // Request saved in cassette + expected := []string{i.Method, i.URL} + // Incoming request + got := []string{r.Method, modifiedURL} + + if r.Method != i.Method || modifiedURL != i.URL { + klog.Fatalf("[VCR] Request does not match: expected: %s, got: %s.", + strings.Join(expected, " "), + strings.Join(got, " ")) + return false + } + + // If request body exists, check body as well + if r.Body != nil && r.Body != http.NoBody { + var reqBody []byte + var err error + reqBody, err = io.ReadAll(r.Body) + if err != nil { + t.Fatal("[VCR] Failed to read request body") + } + r.Body.Close() + r.Body = ioutil.NopCloser(bytes.NewBuffer(reqBody)) + + modifiedBody := replaceFunc(string(reqBody)) + if modifiedBody != i.Body { + klog.Fatalf("[VCR] Request body does not match: expected: %s, got: %s.", + modifiedBody, + i.Body) + return false + } + } + return true + }) + } primaryResource, opt := loadFixture(project) From e2dcd784a0436203ff2b24ee15c79c4756091f0b Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Tue, 12 Mar 2024 20:28:34 +0000 Subject: [PATCH 3/6] add hook --- config/tests/samples/create/harness.go | 7 + ...InSeries_fixtures_computenodetemplate.yaml | 289 +++++++++++++++++- 2 files changed, 286 insertions(+), 10 deletions(-) diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go index 4944bde8f7..16e43daab1 100644 --- a/config/tests/samples/create/harness.go +++ b/config/tests/samples/create/harness.go @@ -327,10 +327,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 3204f0bc8c..7addd2e4ad 100644 --- a/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +++ b/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml @@ -31,6 +31,7 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -38,6 +39,15 @@ interactions: - 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 >>>>>>> 0bd8e264f (use go-vcr package) +======= +<<<<<<< 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 +>>>>>>> 6dabbac2d (add hook) method: GET response: proto: HTTP/2.0 @@ -51,6 +61,7 @@ interactions: { "error": { "code": 404, +<<<<<<< HEAD <<<<<<< HEAD "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", "errors": [ @@ -60,10 +71,19 @@ interactions: "reason": "notFound", "debugInfo": "fake debug info" ======= +======= +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) "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" @@ -73,6 +93,7 @@ interactions: } } headers: +<<<<<<< HEAD <<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 @@ -82,8 +103,11 @@ interactions: ======= Cache-Control: - private +======= +>>>>>>> 6dabbac2d (add hook) 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: @@ -101,7 +125,15 @@ interactions: status: 404 Not Found code: 404 duration: 400.888332ms +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + status: 404 Not Found + code: 404 + duration: 193.994653ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) - id: 1 request: proto: HTTP/1.1 @@ -114,15 +146,24 @@ interactions: remote_addr: "" request_uri: "" body: | +<<<<<<< HEAD <<<<<<< HEAD {"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-uniqueid111111","nodeAffinityLabels":{"cnrm-test":"true","managed-by-cnrm":"true","memory_guarantee":"false"},"nodeTypeFlexibility":{"cpus":"96","memory":"any"},"region":"projects/cnrm-user/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-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"} >>>>>>> 0bd8e264f (use go-vcr package) +======= +<<<<<<< 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 +>>>>>>> 6dabbac2d (add hook) form: {} headers: Content-Type: - application/json +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates?alt=json ======= @@ -130,6 +171,9 @@ interactions: - 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 >>>>>>> 0bd8e264f (use go-vcr package) +======= + url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates?alt=json +>>>>>>> 6dabbac2d (add hook) method: POST response: proto: HTTP/2.0 @@ -142,6 +186,7 @@ interactions: body: | { "kind": "compute#operation", +<<<<<<< HEAD <<<<<<< HEAD "id": "6628313260286154337", "name": "operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", @@ -163,24 +208,40 @@ interactions: code: 200 duration: 765.124261ms ======= +======= +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) "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: @@ -198,7 +259,15 @@ interactions: status: 200 OK code: 200 duration: 462.916981ms +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + status: 200 OK + code: 200 + duration: 451.513773ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) - id: 2 request: proto: HTTP/1.1 @@ -213,6 +282,7 @@ interactions: body: "" form: {} headers: +<<<<<<< HEAD <<<<<<< HEAD X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 @@ -220,10 +290,19 @@ interactions: ======= User-Agent: - google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev +======= +>>>>>>> 6dabbac2d (add hook) 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 +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + 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 +>>>>>>> 6dabbac2d (add hook) method: GET response: proto: HTTP/2.0 @@ -233,6 +312,7 @@ interactions: trailer: {} content_length: -1 uncompressed: true +<<<<<<< HEAD <<<<<<< HEAD body: '{"kind":"compute#operation","id":"6628313260286154337","name":"operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:54.656-07:00","startTime":"2024-03-14T18:46:54.697-07:00","endTime":"2024-03-14T18:46:54.994-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' headers: @@ -242,12 +322,17 @@ interactions: code: 200 duration: 346.050124ms ======= +======= +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) 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: @@ -267,7 +352,15 @@ interactions: status: 200 OK code: 200 duration: 169.399533ms +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + status: 200 OK + code: 200 + duration: 134.839655ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) - id: 3 request: proto: HTTP/1.1 @@ -284,6 +377,7 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -291,6 +385,15 @@ interactions: - 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 >>>>>>> 0bd8e264f (use go-vcr package) +======= +<<<<<<< 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 +>>>>>>> 6dabbac2d (add hook) method: GET response: proto: HTTP/2.0 @@ -303,6 +406,7 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", @@ -317,9 +421,17 @@ interactions: "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", ======= +======= +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) "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", @@ -327,9 +439,17 @@ 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", +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + "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 +>>>>>>> 6dabbac2d (add hook) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -340,6 +460,7 @@ interactions: "cpuOvercommitType": "NONE" } headers: +<<<<<<< HEAD <<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 @@ -349,8 +470,11 @@ interactions: ======= Cache-Control: - private +======= +>>>>>>> 6dabbac2d (add hook) 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: @@ -368,7 +492,15 @@ interactions: status: 200 OK code: 200 duration: 187.773865ms +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + status: 200 OK + code: 200 + duration: 106.807053ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) - id: 4 request: proto: HTTP/1.1 @@ -385,6 +517,7 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -392,6 +525,15 @@ interactions: - 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 >>>>>>> 0bd8e264f (use go-vcr package) +======= +<<<<<<< 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 +>>>>>>> 6dabbac2d (add hook) method: GET response: proto: HTTP/2.0 @@ -404,6 +546,7 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", @@ -418,9 +561,17 @@ interactions: "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", ======= +======= +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) "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", @@ -428,9 +579,17 @@ 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", +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + "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 +>>>>>>> 6dabbac2d (add hook) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -441,6 +600,7 @@ interactions: "cpuOvercommitType": "NONE" } headers: +<<<<<<< HEAD <<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 @@ -450,8 +610,11 @@ interactions: ======= Cache-Control: - private +======= +>>>>>>> 6dabbac2d (add hook) 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: @@ -469,7 +632,15 @@ interactions: status: 200 OK code: 200 duration: 175.398443ms +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + status: 200 OK + code: 200 + duration: 140.531606ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) - id: 5 request: proto: HTTP/1.1 @@ -486,6 +657,7 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -493,6 +665,15 @@ interactions: - 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 >>>>>>> 0bd8e264f (use go-vcr package) +======= +<<<<<<< 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 +>>>>>>> 6dabbac2d (add hook) method: GET response: proto: HTTP/2.0 @@ -505,6 +686,7 @@ interactions: body: | { "kind": "compute#nodeTemplate", +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", @@ -519,9 +701,17 @@ interactions: "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", ======= +======= +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) "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", @@ -529,9 +719,17 @@ 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", +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + "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 +>>>>>>> 6dabbac2d (add hook) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -542,6 +740,7 @@ interactions: "cpuOvercommitType": "NONE" } headers: +<<<<<<< HEAD <<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 @@ -551,8 +750,11 @@ interactions: ======= Cache-Control: - private +======= +>>>>>>> 6dabbac2d (add hook) 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: @@ -570,7 +772,15 @@ interactions: status: 200 OK code: 200 duration: 120.547305ms +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + status: 200 OK + code: 200 + duration: 153.058018ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) - id: 6 request: proto: HTTP/1.1 @@ -587,6 +797,7 @@ interactions: headers: Content-Type: - application/json +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -594,6 +805,15 @@ interactions: - 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 >>>>>>> 0bd8e264f (use go-vcr package) +======= +<<<<<<< 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 +>>>>>>> 6dabbac2d (add hook) method: DELETE response: proto: HTTP/2.0 @@ -606,6 +826,7 @@ interactions: body: | { "kind": "compute#operation", +<<<<<<< HEAD <<<<<<< HEAD "id": "7418327646336849534", "name": "operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", @@ -627,24 +848,40 @@ interactions: code: 200 duration: 405.508656ms ======= +======= +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) "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: @@ -662,7 +899,15 @@ interactions: status: 200 OK code: 200 duration: 427.334726ms +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + status: 200 OK + code: 200 + duration: 331.512368ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) - id: 7 request: proto: HTTP/1.1 @@ -677,6 +922,7 @@ interactions: body: "" form: {} headers: +<<<<<<< HEAD <<<<<<< HEAD X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 @@ -684,10 +930,19 @@ interactions: ======= User-Agent: - google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev +======= +>>>>>>> 6dabbac2d (add hook) 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 +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + 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 +>>>>>>> 6dabbac2d (add hook) method: GET response: proto: HTTP/2.0 @@ -697,6 +952,7 @@ interactions: trailer: {} content_length: -1 uncompressed: true +<<<<<<< HEAD <<<<<<< HEAD body: '{"kind":"compute#operation","id":"7418327646336849534","name":"operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:57.768-07:00","startTime":"2024-03-14T18:46:57.795-07:00","endTime":"2024-03-14T18:46:58.153-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' headers: @@ -706,12 +962,17 @@ interactions: code: 200 duration: 152.277906ms ======= +======= +<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) 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: @@ -731,4 +992,12 @@ interactions: status: 200 OK code: 200 duration: 162.588352ms +<<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) +======= +======= + status: 200 OK + code: 200 + duration: 147.118897ms +>>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +>>>>>>> 6dabbac2d (add hook) From 5c2351c9774381d07d93ce4bbb858ea26f247572 Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Thu, 14 Mar 2024 02:27:21 +0000 Subject: [PATCH 4/6] remove debugInfo --- config/tests/samples/create/harness.go | 7 - ...InSeries_fixtures_computenodetemplate.yaml | 317 ++++++++---------- 2 files changed, 143 insertions(+), 181 deletions(-) diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go index 16e43daab1..4944bde8f7 100644 --- a/config/tests/samples/create/harness.go +++ b/config/tests/samples/create/harness.go @@ -327,17 +327,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 { 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 7addd2e4ad..6226b5e218 100644 --- a/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +++ b/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml @@ -32,6 +32,7 @@ interactions: Content-Type: - application/json <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -48,6 +49,9 @@ interactions: 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 >>>>>>> 6dabbac2d (add hook) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json +>>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -62,6 +66,7 @@ interactions: "error": { "code": 404, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", "errors": [ @@ -75,19 +80,20 @@ interactions: <<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) "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", + "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", +>>>>>>> b048a7b73 (remove debugInfo) "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 + "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", "domain": "global", "reason": "notFound", +<<<<<<< HEAD "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" >>>>>>> 0bd8e264f (use go-vcr package) +======= + "debugInfo": "fake debug info" +>>>>>>> b048a7b73 (remove debugInfo) } ] } @@ -107,23 +113,9 @@ interactions: >>>>>>> 6dabbac2d (add hook) 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: - - ESF - Vary: - - Origin - - X-Origin - - Referer - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - SAMEORIGIN - X-Xss-Protection: - - "0" status: 404 Not Found code: 404 +<<<<<<< HEAD duration: 400.888332ms <<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) @@ -134,6 +126,9 @@ interactions: duration: 193.994653ms >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) +======= + duration: 214.994989ms +>>>>>>> b048a7b73 (remove debugInfo) - id: 1 request: proto: HTTP/1.1 @@ -147,6 +142,7 @@ interactions: request_uri: "" body: | <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD {"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-uniqueid111111","nodeAffinityLabels":{"cnrm-test":"true","managed-by-cnrm":"true","memory_guarantee":"false"},"nodeTypeFlexibility":{"cpus":"96","memory":"any"},"region":"projects/cnrm-user/global/regions/us-central1"} ======= @@ -159,11 +155,15 @@ interactions: {"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 >>>>>>> 6dabbac2d (add hook) +======= + {"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-uniqueid111111","nodeAffinityLabels":{"cnrm-test":"true","managed-by-cnrm":"true","memory_guarantee":"false"},"nodeTypeFlexibility":{"cpus":"96","memory":"any"},"region":"projects/cnrm-user/global/regions/us-central1"} +>>>>>>> b048a7b73 (remove debugInfo) form: {} headers: Content-Type: - application/json <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates?alt=json ======= @@ -174,6 +174,9 @@ interactions: ======= url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates?alt=json >>>>>>> 6dabbac2d (add hook) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates?alt=json +>>>>>>> b048a7b73 (remove debugInfo) method: POST response: proto: HTTP/2.0 @@ -187,6 +190,7 @@ interactions: { "kind": "compute#operation", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "6628313260286154337", "name": "operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", @@ -213,51 +217,27 @@ interactions: >>>>>>> 6dabbac2d (add hook) "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", + "id": "6628313260286154337", + "name": "operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", +>>>>>>> b048a7b73 (remove debugInfo) "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 + "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", + "targetId": "1840433634538821217", "status": "RUNNING", - "user": "{user}", + "user": "user@google.com", "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 + "insertTime": "2024-03-14T18:46:54.656-07:00", + "startTime": "2024-03-14T18:46:54.697-07:00", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", + "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1" } headers: 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: - - ESF - Vary: - - Origin - - X-Origin - - Referer - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - SAMEORIGIN - X-Xss-Protection: - - "0" status: 200 OK code: 200 +<<<<<<< HEAD duration: 462.916981ms <<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) @@ -268,6 +248,9 @@ interactions: duration: 451.513773ms >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) +======= + duration: 765.124261ms +>>>>>>> b048a7b73 (remove debugInfo) - id: 2 request: proto: HTTP/1.1 @@ -294,6 +277,7 @@ interactions: >>>>>>> 6dabbac2d (add hook) X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 +<<<<<<< HEAD <<<<<<< 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 <<<<<<< HEAD @@ -303,6 +287,9 @@ interactions: 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 >>>>>>> 6dabbac2d (add hook) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456?alt=json&prettyPrint=false +>>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -313,6 +300,7 @@ interactions: content_length: -1 uncompressed: true <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD body: '{"kind":"compute#operation","id":"6628313260286154337","name":"operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:54.656-07:00","startTime":"2024-03-14T18:46:54.697-07:00","endTime":"2024-03-14T18:46:54.994-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' headers: @@ -329,28 +317,15 @@ interactions: ======= 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 +======= + body: '{"kind":"compute#operation","id":"6628313260286154337","name":"operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:54.656-07:00","startTime":"2024-03-14T18:46:54.697-07:00","endTime":"2024-03-14T18:46:54.994-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' +>>>>>>> b048a7b73 (remove debugInfo) headers: 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: - - 1vemYvWuEDeqfn1kfmHKCImCsU0=/NcvrT1ClOcogrjM0_klTx3TguZ8= - Server: - - ESF - Vary: - - Origin - - X-Origin - - Referer - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - SAMEORIGIN - X-Xss-Protection: - - "0" status: 200 OK code: 200 +<<<<<<< HEAD duration: 169.399533ms <<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) @@ -361,6 +336,9 @@ interactions: duration: 134.839655ms >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) +======= + duration: 346.050124ms +>>>>>>> b048a7b73 (remove debugInfo) - id: 3 request: proto: HTTP/1.1 @@ -378,6 +356,7 @@ interactions: Content-Type: - application/json <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -394,6 +373,9 @@ interactions: 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 >>>>>>> 6dabbac2d (add hook) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json +>>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -407,6 +389,7 @@ interactions: { "kind": "compute#nodeTemplate", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", @@ -432,13 +415,19 @@ interactions: "creationTimestamp": "2024-03-12T14:53:29.448-07:00", "name": "computenodetemplate-{uniqueID}", >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +======= + "id": "1840433634538821217", + "creationTimestamp": "2024-03-14T18:46:54.668-07:00", + "name": "computenodetemplate-uniqueid111111", +>>>>>>> b048a7b73 (remove debugInfo) "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", - "cnrm-test": "true", - "memory_guarantee": "false" + "memory_guarantee": "false", + "cnrm-test": "true" }, "status": "READY", +<<<<<<< HEAD <<<<<<< 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", @@ -450,6 +439,10 @@ interactions: "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 >>>>>>> 6dabbac2d (add hook) +======= + "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", +>>>>>>> b048a7b73 (remove debugInfo) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -474,23 +467,9 @@ interactions: >>>>>>> 6dabbac2d (add hook) 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: - - ESF - Vary: - - Origin - - X-Origin - - Referer - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - SAMEORIGIN - X-Xss-Protection: - - "0" status: 200 OK code: 200 +<<<<<<< HEAD duration: 187.773865ms <<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) @@ -501,6 +480,9 @@ interactions: duration: 106.807053ms >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) +======= + duration: 170.297617ms +>>>>>>> b048a7b73 (remove debugInfo) - id: 4 request: proto: HTTP/1.1 @@ -518,6 +500,7 @@ interactions: Content-Type: - application/json <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -534,6 +517,9 @@ interactions: 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 >>>>>>> 6dabbac2d (add hook) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json +>>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -547,6 +533,7 @@ interactions: { "kind": "compute#nodeTemplate", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", @@ -572,13 +559,19 @@ interactions: "creationTimestamp": "2024-03-12T14:53:29.448-07:00", "name": "computenodetemplate-{uniqueID}", >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +======= + "id": "1840433634538821217", + "creationTimestamp": "2024-03-14T18:46:54.668-07:00", + "name": "computenodetemplate-uniqueid111111", +>>>>>>> b048a7b73 (remove debugInfo) "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", "cnrm-test": "true", + "managed-by-cnrm": "true", "memory_guarantee": "false" }, "status": "READY", +<<<<<<< HEAD <<<<<<< 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", @@ -590,6 +583,10 @@ interactions: "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 >>>>>>> 6dabbac2d (add hook) +======= + "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", +>>>>>>> b048a7b73 (remove debugInfo) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -614,23 +611,9 @@ interactions: >>>>>>> 6dabbac2d (add hook) 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: - - ESF - Vary: - - Origin - - X-Origin - - Referer - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - SAMEORIGIN - X-Xss-Protection: - - "0" status: 200 OK code: 200 +<<<<<<< HEAD duration: 175.398443ms <<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) @@ -641,6 +624,9 @@ interactions: duration: 140.531606ms >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) +======= + duration: 172.725397ms +>>>>>>> b048a7b73 (remove debugInfo) - id: 5 request: proto: HTTP/1.1 @@ -658,6 +644,7 @@ interactions: Content-Type: - application/json <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -674,6 +661,9 @@ interactions: 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 >>>>>>> 6dabbac2d (add hook) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json +>>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -687,6 +677,7 @@ interactions: { "kind": "compute#nodeTemplate", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", @@ -712,13 +703,19 @@ interactions: "creationTimestamp": "2024-03-12T14:53:29.448-07:00", "name": "computenodetemplate-{uniqueID}", >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +======= + "id": "1840433634538821217", + "creationTimestamp": "2024-03-14T18:46:54.668-07:00", + "name": "computenodetemplate-uniqueid111111", +>>>>>>> b048a7b73 (remove debugInfo) "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", "managed-by-cnrm": "true", + "memory_guarantee": "false", "cnrm-test": "true" }, "status": "READY", +<<<<<<< HEAD <<<<<<< 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", @@ -730,6 +727,10 @@ interactions: "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 >>>>>>> 6dabbac2d (add hook) +======= + "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", +>>>>>>> b048a7b73 (remove debugInfo) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -754,23 +755,9 @@ interactions: >>>>>>> 6dabbac2d (add hook) 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: - - ESF - Vary: - - Origin - - X-Origin - - Referer - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - SAMEORIGIN - X-Xss-Protection: - - "0" status: 200 OK code: 200 +<<<<<<< HEAD duration: 120.547305ms <<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) @@ -781,6 +768,9 @@ interactions: duration: 153.058018ms >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) +======= + duration: 139.970247ms +>>>>>>> b048a7b73 (remove debugInfo) - id: 6 request: proto: HTTP/1.1 @@ -798,6 +788,7 @@ interactions: Content-Type: - application/json <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ======= @@ -814,6 +805,9 @@ interactions: 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 >>>>>>> 6dabbac2d (add hook) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json +>>>>>>> b048a7b73 (remove debugInfo) method: DELETE response: proto: HTTP/2.0 @@ -827,6 +821,7 @@ interactions: { "kind": "compute#operation", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "7418327646336849534", "name": "operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", @@ -853,51 +848,27 @@ interactions: >>>>>>> 6dabbac2d (add hook) "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", + "id": "7418327646336849534", + "name": "operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", +>>>>>>> b048a7b73 (remove debugInfo) "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 + "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", + "targetId": "1840433634538821217", "status": "RUNNING", - "user": "{user}", + "user": "user@google.com", "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 + "insertTime": "2024-03-14T18:46:57.768-07:00", + "startTime": "2024-03-14T18:46:57.795-07:00", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", + "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1" } headers: 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: - - ESF - Vary: - - Origin - - X-Origin - - Referer - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - SAMEORIGIN - X-Xss-Protection: - - "0" status: 200 OK code: 200 +<<<<<<< HEAD duration: 427.334726ms <<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) @@ -908,6 +879,9 @@ interactions: duration: 331.512368ms >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) +======= + duration: 405.508656ms +>>>>>>> b048a7b73 (remove debugInfo) - id: 7 request: proto: HTTP/1.1 @@ -934,6 +908,7 @@ interactions: >>>>>>> 6dabbac2d (add hook) X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 +<<<<<<< HEAD <<<<<<< 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 <<<<<<< HEAD @@ -943,6 +918,9 @@ interactions: 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 >>>>>>> 6dabbac2d (add hook) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678?alt=json&prettyPrint=false +>>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -953,6 +931,7 @@ interactions: content_length: -1 uncompressed: true <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD body: '{"kind":"compute#operation","id":"7418327646336849534","name":"operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:57.768-07:00","startTime":"2024-03-14T18:46:57.795-07:00","endTime":"2024-03-14T18:46:58.153-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' headers: @@ -969,28 +948,15 @@ interactions: ======= 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 +======= + body: '{"kind":"compute#operation","id":"7418327646336849534","name":"operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:57.768-07:00","startTime":"2024-03-14T18:46:57.795-07:00","endTime":"2024-03-14T18:46:58.153-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' +>>>>>>> b048a7b73 (remove debugInfo) headers: 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: - - 2MJ_12wFKqT8OoVT31IKuaAwXAQ=/mgH6ljY_zd1ysot_F3HGai5q11Y= - Server: - - ESF - Vary: - - Origin - - X-Origin - - Referer - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - SAMEORIGIN - X-Xss-Protection: - - "0" status: 200 OK code: 200 +<<<<<<< HEAD duration: 162.588352ms <<<<<<< HEAD >>>>>>> 0bd8e264f (use go-vcr package) @@ -1001,3 +967,6 @@ interactions: duration: 147.118897ms >>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml >>>>>>> 6dabbac2d (add hook) +======= + duration: 152.277906ms +>>>>>>> b048a7b73 (remove debugInfo) From 845dd49b8287ea8123183e7a7e738c09ef6c60c9 Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Thu, 14 Mar 2024 02:27:21 +0000 Subject: [PATCH 5/6] remove debugInfo --- config/tests/samples/create/harness.go | 2 +- ...InSeries_fixtures_computenodetemplate.yaml | 113 +++++++++++++----- 2 files changed, 87 insertions(+), 28 deletions(-) diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go index 4944bde8f7..a3db3d61b6 100644 --- a/config/tests/samples/create/harness.go +++ b/config/tests/samples/create/harness.go @@ -322,7 +322,7 @@ func NewHarness(ctx context.Context, t *testing.T) *Harness { testName := strings.ReplaceAll(t.Name(), "/", "_") opts := &recorder.Options{ CassetteName: filepath.Join(dir, testName), - Mode: recorder.ModeRecordOnly, + Mode: recorder.ModeReplayOnly, RealTransport: ret.Transport, } r, err := recorder.NewWithOptions(opts) 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 6226b5e218..107c9ed79e 100644 --- a/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +++ b/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml @@ -1,17 +1,3 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - --- version: 2 interactions: @@ -105,6 +91,7 @@ interactions: - application/json; charset=UTF-8 status: 404 Not Found code: 404 +<<<<<<< HEAD duration: 214.994989ms ======= Cache-Control: @@ -129,6 +116,9 @@ interactions: ======= duration: 214.994989ms >>>>>>> b048a7b73 (remove debugInfo) +======= + duration: 197.569162ms +>>>>>>> 49cc6df02 (remove debugInfo) - id: 1 request: proto: HTTP/1.1 @@ -191,18 +181,23 @@ interactions: "kind": "compute#operation", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "6628313260286154337", "name": "operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", +======= + "id": "809028059089735866", + "name": "operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac", +>>>>>>> 49cc6df02 (remove debugInfo) "operationType": "compute.nodeTemplates.insert", "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", - "targetId": "1840433634538821217", + "targetId": "8740527968291262650", "status": "RUNNING", "user": "user@google.com", "progress": 0, - "insertTime": "2024-03-14T18:46:54.656-07:00", - "startTime": "2024-03-14T18:46:54.697-07:00", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", + "insertTime": "2024-03-14T19:11:33.089-07:00", + "startTime": "2024-03-14T19:11:33.130-07:00", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1" } headers: @@ -210,6 +205,7 @@ interactions: - application/json; charset=UTF-8 status: 200 OK code: 200 +<<<<<<< HEAD duration: 765.124261ms ======= ======= @@ -251,6 +247,9 @@ interactions: ======= duration: 765.124261ms >>>>>>> b048a7b73 (remove debugInfo) +======= + duration: 444.535917ms +>>>>>>> 49cc6df02 (remove debugInfo) - id: 2 request: proto: HTTP/1.1 @@ -269,6 +268,7 @@ interactions: <<<<<<< HEAD X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 +<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456?alt=json&prettyPrint=false ======= User-Agent: @@ -290,6 +290,9 @@ interactions: ======= url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456?alt=json&prettyPrint=false >>>>>>> b048a7b73 (remove debugInfo) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac?alt=json&prettyPrint=false +>>>>>>> 49cc6df02 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -301,13 +304,18 @@ interactions: uncompressed: true <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD body: '{"kind":"compute#operation","id":"6628313260286154337","name":"operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:54.656-07:00","startTime":"2024-03-14T18:46:54.697-07:00","endTime":"2024-03-14T18:46:54.994-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' +======= + body: '{"kind":"compute#operation","id":"809028059089735866","name":"operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"8740527968291262650","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T19:11:33.089-07:00","startTime":"2024-03-14T19:11:33.130-07:00","endTime":"2024-03-14T19:11:33.417-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' +>>>>>>> 49cc6df02 (remove debugInfo) headers: Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 +<<<<<<< HEAD duration: 346.050124ms ======= ======= @@ -339,6 +347,9 @@ interactions: ======= duration: 346.050124ms >>>>>>> b048a7b73 (remove debugInfo) +======= + duration: 155.709356ms +>>>>>>> 49cc6df02 (remove debugInfo) - id: 3 request: proto: HTTP/1.1 @@ -390,15 +401,20 @@ interactions: "kind": "compute#nodeTemplate", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", +======= + "id": "8740527968291262650", + "creationTimestamp": "2024-03-14T19:11:33.102-07:00", +>>>>>>> 49cc6df02 (remove debugInfo) "name": "computenodetemplate-uniqueid111111", "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", "nodeAffinityLabels": { + "cnrm-test": "true", "managed-by-cnrm": "true", - "memory_guarantee": "false", - "cnrm-test": "true" + "memory_guarantee": "false" }, "status": "READY", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", @@ -459,6 +475,7 @@ interactions: - application/json; charset=UTF-8 status: 200 OK code: 200 +<<<<<<< HEAD duration: 170.297617ms ======= Cache-Control: @@ -483,6 +500,9 @@ interactions: ======= duration: 170.297617ms >>>>>>> b048a7b73 (remove debugInfo) +======= + duration: 167.271382ms +>>>>>>> 49cc6df02 (remove debugInfo) - id: 4 request: proto: HTTP/1.1 @@ -534,15 +554,20 @@ interactions: "kind": "compute#nodeTemplate", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", +======= + "id": "8740527968291262650", + "creationTimestamp": "2024-03-14T19:11:33.102-07:00", +>>>>>>> 49cc6df02 (remove debugInfo) "name": "computenodetemplate-uniqueid111111", "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", "nodeAffinityLabels": { "cnrm-test": "true", - "managed-by-cnrm": "true", - "memory_guarantee": "false" + "memory_guarantee": "false", + "managed-by-cnrm": "true" }, "status": "READY", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", @@ -603,6 +628,7 @@ interactions: - application/json; charset=UTF-8 status: 200 OK code: 200 +<<<<<<< HEAD duration: 172.725397ms ======= Cache-Control: @@ -627,6 +653,9 @@ interactions: ======= duration: 172.725397ms >>>>>>> b048a7b73 (remove debugInfo) +======= + duration: 158.168515ms +>>>>>>> 49cc6df02 (remove debugInfo) - id: 5 request: proto: HTTP/1.1 @@ -678,14 +707,19 @@ interactions: "kind": "compute#nodeTemplate", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "1840433634538821217", "creationTimestamp": "2024-03-14T18:46:54.668-07:00", +======= + "id": "8740527968291262650", + "creationTimestamp": "2024-03-14T19:11:33.102-07:00", +>>>>>>> 49cc6df02 (remove debugInfo) "name": "computenodetemplate-uniqueid111111", "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", "memory_guarantee": "false", + "managed-by-cnrm": "true", "cnrm-test": "true" }, "status": "READY", @@ -747,6 +781,7 @@ interactions: - application/json; charset=UTF-8 status: 200 OK code: 200 +<<<<<<< HEAD duration: 139.970247ms ======= Cache-Control: @@ -771,6 +806,9 @@ interactions: ======= duration: 139.970247ms >>>>>>> b048a7b73 (remove debugInfo) +======= + duration: 130.205646ms +>>>>>>> 49cc6df02 (remove debugInfo) - id: 6 request: proto: HTTP/1.1 @@ -822,18 +860,23 @@ interactions: "kind": "compute#operation", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "id": "7418327646336849534", "name": "operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", +======= + "id": "9145340086322073784", + "name": "operation-1710468695674-613a987014c9b-95256e64-4948256e", +>>>>>>> 49cc6df02 (remove debugInfo) "operationType": "compute.nodeTemplates.delete", "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", - "targetId": "1840433634538821217", + "targetId": "8740527968291262650", "status": "RUNNING", "user": "user@google.com", "progress": 0, - "insertTime": "2024-03-14T18:46:57.768-07:00", - "startTime": "2024-03-14T18:46:57.795-07:00", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", + "insertTime": "2024-03-14T19:11:35.953-07:00", + "startTime": "2024-03-14T19:11:35.994-07:00", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468695674-613a987014c9b-95256e64-4948256e", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1" } headers: @@ -841,6 +884,7 @@ interactions: - application/json; charset=UTF-8 status: 200 OK code: 200 +<<<<<<< HEAD duration: 405.508656ms ======= ======= @@ -882,6 +926,9 @@ interactions: ======= duration: 405.508656ms >>>>>>> b048a7b73 (remove debugInfo) +======= + duration: 465.449049ms +>>>>>>> 49cc6df02 (remove debugInfo) - id: 7 request: proto: HTTP/1.1 @@ -900,6 +947,7 @@ interactions: <<<<<<< HEAD X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 +<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678?alt=json&prettyPrint=false ======= User-Agent: @@ -921,6 +969,9 @@ interactions: ======= url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678?alt=json&prettyPrint=false >>>>>>> b048a7b73 (remove debugInfo) +======= + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468695674-613a987014c9b-95256e64-4948256e?alt=json&prettyPrint=false +>>>>>>> 49cc6df02 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -932,13 +983,18 @@ interactions: uncompressed: true <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD body: '{"kind":"compute#operation","id":"7418327646336849534","name":"operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:57.768-07:00","startTime":"2024-03-14T18:46:57.795-07:00","endTime":"2024-03-14T18:46:58.153-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' +======= + body: '{"kind":"compute#operation","id":"9145340086322073784","name":"operation-1710468695674-613a987014c9b-95256e64-4948256e","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"8740527968291262650","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T19:11:35.953-07:00","startTime":"2024-03-14T19:11:35.994-07:00","endTime":"2024-03-14T19:11:36.373-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468695674-613a987014c9b-95256e64-4948256e","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' +>>>>>>> 49cc6df02 (remove debugInfo) headers: Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 +<<<<<<< HEAD duration: 152.277906ms ======= ======= @@ -970,3 +1026,6 @@ interactions: ======= duration: 152.277906ms >>>>>>> b048a7b73 (remove debugInfo) +======= + duration: 128.679846ms +>>>>>>> 49cc6df02 (remove debugInfo) From d1500122950f7cde71ed132e489cb6508b461a2a Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Fri, 15 Mar 2024 02:47:30 +0000 Subject: [PATCH 6/6] custom matcher --- config/tests/samples/create/harness.go | 4 +- ...InSeries_fixtures_computenodetemplate.yaml | 730 ++---------------- tests/e2e/unified_test.go | 14 +- 3 files changed, 50 insertions(+), 698 deletions(-) diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go index a3db3d61b6..f24590d6a8 100644 --- a/config/tests/samples/create/harness.go +++ b/config/tests/samples/create/harness.go @@ -24,8 +24,6 @@ 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" @@ -322,7 +320,7 @@ func NewHarness(ctx context.Context, t *testing.T) *Harness { testName := strings.ReplaceAll(t.Name(), "/", "_") opts := &recorder.Options{ CassetteName: filepath.Join(dir, testName), - Mode: recorder.ModeReplayOnly, + Mode: recorder.ModeRecordOnly, RealTransport: ret.Transport, } r, err := recorder.NewWithOptions(opts) 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 107c9ed79e..bf1c62a6c0 100644 --- a/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml +++ b/pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml @@ -1,3 +1,17 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + --- version: 2 interactions: @@ -17,27 +31,7 @@ interactions: headers: Content-Type: - application/json -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json ->>>>>>> 0bd8e264f (use go-vcr package) -======= -<<<<<<< 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 ->>>>>>> 6dabbac2d (add hook) -======= - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ->>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -51,74 +45,23 @@ interactions: { "error": { "code": 404, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", - "errors": [ - { - "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", - "domain": "global", - "reason": "notFound", - "debugInfo": "fake debug info" -======= -======= -<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) - "message": "The resource 'projects/cnrm-yuhou/regions/us-central1/nodeTemplates/computenodetemplate-ecutmuuaqyhab6sxwf7q' was not found", -======= "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", ->>>>>>> b048a7b73 (remove debugInfo) "errors": [ { "message": "The resource 'projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111' was not found", "domain": "global", "reason": "notFound", -<<<<<<< HEAD - "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" ->>>>>>> 0bd8e264f (use go-vcr package) -======= "debugInfo": "fake debug info" ->>>>>>> b048a7b73 (remove debugInfo) } ] } } headers: -<<<<<<< HEAD -<<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 status: 404 Not Found code: 404 -<<<<<<< HEAD - duration: 214.994989ms -======= - Cache-Control: - - private -======= ->>>>>>> 6dabbac2d (add hook) - Content-Type: - - application/json; charset=UTF-8 - status: 404 Not Found - code: 404 -<<<<<<< HEAD - duration: 400.888332ms -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - status: 404 Not Found - code: 404 - duration: 193.994653ms ->>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) -======= - duration: 214.994989ms ->>>>>>> b048a7b73 (remove debugInfo) -======= - duration: 197.569162ms ->>>>>>> 49cc6df02 (remove debugInfo) + duration: 217.52251ms - id: 1 request: proto: HTTP/1.1 @@ -131,42 +74,12 @@ interactions: remote_addr: "" request_uri: "" body: | -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - {"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-uniqueid111111","nodeAffinityLabels":{"cnrm-test":"true","managed-by-cnrm":"true","memory_guarantee":"false"},"nodeTypeFlexibility":{"cpus":"96","memory":"any"},"region":"projects/cnrm-user/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-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"} ->>>>>>> 0bd8e264f (use go-vcr package) -======= -<<<<<<< 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 ->>>>>>> 6dabbac2d (add hook) -======= {"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-uniqueid111111","nodeAffinityLabels":{"cnrm-test":"true","managed-by-cnrm":"true","memory_guarantee":"false"},"nodeTypeFlexibility":{"cpus":"96","memory":"any"},"region":"projects/cnrm-user/global/regions/us-central1"} ->>>>>>> b048a7b73 (remove debugInfo) form: {} headers: Content-Type: - application/json -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates?alt=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 ->>>>>>> 0bd8e264f (use go-vcr package) -======= - url: https://compute.googleapis.com/compute/beta/projects/{projectID}/regions/us-central1/nodeTemplates?alt=json ->>>>>>> 6dabbac2d (add hook) -======= - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates?alt=json ->>>>>>> b048a7b73 (remove debugInfo) method: POST response: proto: HTTP/2.0 @@ -179,25 +92,17 @@ interactions: body: | { "kind": "compute#operation", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "id": "6628313260286154337", - "name": "operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", -======= - "id": "809028059089735866", - "name": "operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac", ->>>>>>> 49cc6df02 (remove debugInfo) + "id": "1302384153447785103", + "name": "operation-1710742623772-613e94e645e42-0e46b5eb-36d6a6e7", "operationType": "compute.nodeTemplates.insert", "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", - "targetId": "8740527968291262650", + "targetId": "1885163588622639759", "status": "RUNNING", "user": "user@google.com", "progress": 0, - "insertTime": "2024-03-14T19:11:33.089-07:00", - "startTime": "2024-03-14T19:11:33.130-07:00", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac", + "insertTime": "2024-03-17T23:17:04.077-07:00", + "startTime": "2024-03-17T23:17:04.115-07:00", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710742623772-613e94e645e42-0e46b5eb-36d6a6e7", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1" } headers: @@ -205,51 +110,7 @@ interactions: - application/json; charset=UTF-8 status: 200 OK code: 200 -<<<<<<< HEAD - duration: 765.124261ms -======= -======= -<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) - "id": "5139217832128448639", - "name": "operation-1710438031884-613a2634d0282-3478b363-e0af1d97", -======= - "id": "6628313260286154337", - "name": "operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", ->>>>>>> b048a7b73 (remove debugInfo) - "operationType": "compute.nodeTemplates.insert", - "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", - "targetId": "1840433634538821217", - "status": "RUNNING", - "user": "user@google.com", - "progress": 0, - "insertTime": "2024-03-14T18:46:54.656-07:00", - "startTime": "2024-03-14T18:46:54.697-07:00", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456", - "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1" - } - headers: - Content-Type: - - application/json; charset=UTF-8 - status: 200 OK - code: 200 -<<<<<<< HEAD - duration: 462.916981ms -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - status: 200 OK - code: 200 - duration: 451.513773ms ->>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) -======= - duration: 765.124261ms ->>>>>>> b048a7b73 (remove debugInfo) -======= - duration: 444.535917ms ->>>>>>> 49cc6df02 (remove debugInfo) + duration: 474.632907ms - id: 2 request: proto: HTTP/1.1 @@ -264,35 +125,9 @@ interactions: body: "" form: {} headers: -<<<<<<< HEAD -<<<<<<< HEAD X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 -<<<<<<< HEAD - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456?alt=json&prettyPrint=false -======= - User-Agent: - - google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev -======= ->>>>>>> 6dabbac2d (add hook) - X-Goog-Api-Client: - - gl-go/1.21.5 gdcl/0.160.0 -<<<<<<< HEAD -<<<<<<< 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 -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - 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 ->>>>>>> 6dabbac2d (add hook) -======= - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456?alt=json&prettyPrint=false ->>>>>>> b048a7b73 (remove debugInfo) -======= - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac?alt=json&prettyPrint=false ->>>>>>> 49cc6df02 (remove debugInfo) + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710742623772-613e94e645e42-0e46b5eb-36d6a6e7?alt=json&prettyPrint=false method: GET response: proto: HTTP/2.0 @@ -302,54 +137,13 @@ interactions: trailer: {} content_length: -1 uncompressed: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - body: '{"kind":"compute#operation","id":"6628313260286154337","name":"operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:54.656-07:00","startTime":"2024-03-14T18:46:54.697-07:00","endTime":"2024-03-14T18:46:54.994-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' -======= - body: '{"kind":"compute#operation","id":"809028059089735866","name":"operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"8740527968291262650","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T19:11:33.089-07:00","startTime":"2024-03-14T19:11:33.130-07:00","endTime":"2024-03-14T19:11:33.417-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468692787-613a986d53f56-f2fc7213-0b60c8ac","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' ->>>>>>> 49cc6df02 (remove debugInfo) - headers: - Content-Type: - - application/json; charset=UTF-8 - status: 200 OK - code: 200 -<<<<<<< HEAD - duration: 346.050124ms -======= -======= -<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) - 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 -======= - body: '{"kind":"compute#operation","id":"6628313260286154337","name":"operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:54.656-07:00","startTime":"2024-03-14T18:46:54.697-07:00","endTime":"2024-03-14T18:46:54.994-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467214059-613a92eb1a9a2-e761c6e4-c35dd456","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' ->>>>>>> b048a7b73 (remove debugInfo) + body: '{"kind":"compute#operation","id":"1302384153447785103","name":"operation-1710742623772-613e94e645e42-0e46b5eb-36d6a6e7","operationType":"compute.nodeTemplates.insert","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1885163588622639759","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-17T23:17:04.077-07:00","startTime":"2024-03-17T23:17:04.115-07:00","endTime":"2024-03-17T23:17:04.425-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710742623772-613e94e645e42-0e46b5eb-36d6a6e7","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' headers: Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 -<<<<<<< HEAD - duration: 169.399533ms -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - status: 200 OK - code: 200 - duration: 134.839655ms ->>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) -======= - duration: 346.050124ms ->>>>>>> b048a7b73 (remove debugInfo) -======= - duration: 155.709356ms ->>>>>>> 49cc6df02 (remove debugInfo) + duration: 154.077924ms - id: 3 request: proto: HTTP/1.1 @@ -366,27 +160,7 @@ interactions: headers: Content-Type: - application/json -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json ->>>>>>> 0bd8e264f (use go-vcr package) -======= -<<<<<<< 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 ->>>>>>> 6dabbac2d (add hook) -======= url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ->>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -399,66 +173,18 @@ interactions: body: | { "kind": "compute#nodeTemplate", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "id": "1840433634538821217", - "creationTimestamp": "2024-03-14T18:46:54.668-07:00", -======= - "id": "8740527968291262650", - "creationTimestamp": "2024-03-14T19:11:33.102-07:00", ->>>>>>> 49cc6df02 (remove debugInfo) - "name": "computenodetemplate-uniqueid111111", - "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", - "nodeAffinityLabels": { - "cnrm-test": "true", - "managed-by-cnrm": "true", - "memory_guarantee": "false" - }, - "status": "READY", - "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", -======= -======= -<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) - "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 -======= - "id": "1840433634538821217", - "creationTimestamp": "2024-03-14T18:46:54.668-07:00", + "id": "1885163588622639759", + "creationTimestamp": "2024-03-17T23:17:04.087-07:00", "name": "computenodetemplate-uniqueid111111", ->>>>>>> b048a7b73 (remove debugInfo) "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", "memory_guarantee": "false", + "managed-by-cnrm": "true", "cnrm-test": "true" }, "status": "READY", -<<<<<<< HEAD -<<<<<<< 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", -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - "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 ->>>>>>> 6dabbac2d (add hook) -======= "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", ->>>>>>> b048a7b73 (remove debugInfo) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -469,40 +195,11 @@ interactions: "cpuOvercommitType": "NONE" } headers: -<<<<<<< HEAD -<<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 -<<<<<<< HEAD - duration: 170.297617ms -======= - Cache-Control: - - private -======= ->>>>>>> 6dabbac2d (add hook) - Content-Type: - - application/json; charset=UTF-8 - status: 200 OK - code: 200 -<<<<<<< HEAD - duration: 187.773865ms -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - status: 200 OK - code: 200 - duration: 106.807053ms ->>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) -======= - duration: 170.297617ms ->>>>>>> b048a7b73 (remove debugInfo) -======= - duration: 167.271382ms ->>>>>>> 49cc6df02 (remove debugInfo) + duration: 250.057884ms - id: 4 request: proto: HTTP/1.1 @@ -519,27 +216,7 @@ interactions: headers: Content-Type: - application/json -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json ->>>>>>> 0bd8e264f (use go-vcr package) -======= -<<<<<<< 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 ->>>>>>> 6dabbac2d (add hook) -======= url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ->>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -552,43 +229,9 @@ interactions: body: | { "kind": "compute#nodeTemplate", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "id": "1840433634538821217", - "creationTimestamp": "2024-03-14T18:46:54.668-07:00", -======= - "id": "8740527968291262650", - "creationTimestamp": "2024-03-14T19:11:33.102-07:00", ->>>>>>> 49cc6df02 (remove debugInfo) + "id": "1885163588622639759", + "creationTimestamp": "2024-03-17T23:17:04.087-07:00", "name": "computenodetemplate-uniqueid111111", - "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", - "nodeAffinityLabels": { - "cnrm-test": "true", - "memory_guarantee": "false", - "managed-by-cnrm": "true" - }, - "status": "READY", - "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", -======= -======= -<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) - "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 -======= - "id": "1840433634538821217", - "creationTimestamp": "2024-03-14T18:46:54.668-07:00", - "name": "computenodetemplate-uniqueid111111", ->>>>>>> b048a7b73 (remove debugInfo) "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", "nodeAffinityLabels": { "cnrm-test": "true", @@ -596,22 +239,8 @@ interactions: "memory_guarantee": "false" }, "status": "READY", -<<<<<<< HEAD -<<<<<<< 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", -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - "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 ->>>>>>> 6dabbac2d (add hook) -======= "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", ->>>>>>> b048a7b73 (remove debugInfo) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -622,40 +251,11 @@ interactions: "cpuOvercommitType": "NONE" } headers: -<<<<<<< HEAD -<<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 -<<<<<<< HEAD - duration: 172.725397ms -======= - Cache-Control: - - private -======= ->>>>>>> 6dabbac2d (add hook) - Content-Type: - - application/json; charset=UTF-8 - status: 200 OK - code: 200 -<<<<<<< HEAD - duration: 175.398443ms -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - status: 200 OK - code: 200 - duration: 140.531606ms ->>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) -======= - duration: 172.725397ms ->>>>>>> b048a7b73 (remove debugInfo) -======= - duration: 158.168515ms ->>>>>>> 49cc6df02 (remove debugInfo) + duration: 108.804931ms - id: 5 request: proto: HTTP/1.1 @@ -672,27 +272,7 @@ interactions: headers: Content-Type: - application/json -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json ->>>>>>> 0bd8e264f (use go-vcr package) -======= -<<<<<<< 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 ->>>>>>> 6dabbac2d (add hook) -======= url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ->>>>>>> b048a7b73 (remove debugInfo) method: GET response: proto: HTTP/2.0 @@ -705,66 +285,18 @@ interactions: body: | { "kind": "compute#nodeTemplate", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "id": "1840433634538821217", - "creationTimestamp": "2024-03-14T18:46:54.668-07:00", -======= - "id": "8740527968291262650", - "creationTimestamp": "2024-03-14T19:11:33.102-07:00", ->>>>>>> 49cc6df02 (remove debugInfo) + "id": "1885163588622639759", + "creationTimestamp": "2024-03-17T23:17:04.087-07:00", "name": "computenodetemplate-uniqueid111111", "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", - "managed-by-cnrm": "true", - "cnrm-test": "true" - }, - "status": "READY", - "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", -======= -======= -<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) - "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 -======= - "id": "1840433634538821217", - "creationTimestamp": "2024-03-14T18:46:54.668-07:00", - "name": "computenodetemplate-uniqueid111111", ->>>>>>> b048a7b73 (remove debugInfo) - "description": "Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type.", - "nodeAffinityLabels": { + "cnrm-test": "true", "managed-by-cnrm": "true", - "memory_guarantee": "false", - "cnrm-test": "true" + "memory_guarantee": "false" }, "status": "READY", -<<<<<<< HEAD -<<<<<<< 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", -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - "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 ->>>>>>> 6dabbac2d (add hook) -======= "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", ->>>>>>> b048a7b73 (remove debugInfo) "nodeTypeFlexibility": { "cpus": "96", "memory": "any" @@ -775,40 +307,11 @@ interactions: "cpuOvercommitType": "NONE" } headers: -<<<<<<< HEAD -<<<<<<< HEAD Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 -<<<<<<< HEAD - duration: 139.970247ms -======= - Cache-Control: - - private -======= ->>>>>>> 6dabbac2d (add hook) - Content-Type: - - application/json; charset=UTF-8 - status: 200 OK - code: 200 -<<<<<<< HEAD - duration: 120.547305ms -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - status: 200 OK - code: 200 - duration: 153.058018ms ->>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) -======= - duration: 139.970247ms ->>>>>>> b048a7b73 (remove debugInfo) -======= - duration: 130.205646ms ->>>>>>> 49cc6df02 (remove debugInfo) + duration: 172.9582ms - id: 6 request: proto: HTTP/1.1 @@ -825,27 +328,7 @@ interactions: headers: Content-Type: - application/json -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=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/computenodetemplate-ecutmuuaqyhab6sxwf7q?alt=json ->>>>>>> 0bd8e264f (use go-vcr package) -======= -<<<<<<< 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 ->>>>>>> 6dabbac2d (add hook) -======= url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111?alt=json ->>>>>>> b048a7b73 (remove debugInfo) method: DELETE response: proto: HTTP/2.0 @@ -858,25 +341,17 @@ interactions: body: | { "kind": "compute#operation", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "id": "7418327646336849534", - "name": "operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", -======= - "id": "9145340086322073784", - "name": "operation-1710468695674-613a987014c9b-95256e64-4948256e", ->>>>>>> 49cc6df02 (remove debugInfo) + "id": "1935185951732687501", + "name": "operation-1710742626712-613e94e9139de-33ed3c19-1121ea67", "operationType": "compute.nodeTemplates.delete", "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", - "targetId": "8740527968291262650", + "targetId": "1885163588622639759", "status": "RUNNING", "user": "user@google.com", "progress": 0, - "insertTime": "2024-03-14T19:11:35.953-07:00", - "startTime": "2024-03-14T19:11:35.994-07:00", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468695674-613a987014c9b-95256e64-4948256e", + "insertTime": "2024-03-17T23:17:06.938-07:00", + "startTime": "2024-03-17T23:17:06.965-07:00", + "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710742626712-613e94e9139de-33ed3c19-1121ea67", "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1" } headers: @@ -884,51 +359,7 @@ interactions: - application/json; charset=UTF-8 status: 200 OK code: 200 -<<<<<<< HEAD - duration: 405.508656ms -======= -======= -<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) - "id": "7466036151650781308", - "name": "operation-1710438034990-613a2637c6612-777550f0-3427cc56", -======= - "id": "7418327646336849534", - "name": "operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", ->>>>>>> b048a7b73 (remove debugInfo) - "operationType": "compute.nodeTemplates.delete", - "targetLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111", - "targetId": "1840433634538821217", - "status": "RUNNING", - "user": "user@google.com", - "progress": 0, - "insertTime": "2024-03-14T18:46:57.768-07:00", - "startTime": "2024-03-14T18:46:57.795-07:00", - "selfLink": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678", - "region": "https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1" - } - headers: - Content-Type: - - application/json; charset=UTF-8 - status: 200 OK - code: 200 -<<<<<<< HEAD - duration: 427.334726ms -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - status: 200 OK - code: 200 - duration: 331.512368ms ->>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) -======= - duration: 405.508656ms ->>>>>>> b048a7b73 (remove debugInfo) -======= - duration: 465.449049ms ->>>>>>> 49cc6df02 (remove debugInfo) + duration: 363.349932ms - id: 7 request: proto: HTTP/1.1 @@ -943,35 +374,9 @@ interactions: body: "" form: {} headers: -<<<<<<< HEAD -<<<<<<< HEAD - X-Goog-Api-Client: - - gl-go/1.21.5 gdcl/0.160.0 -<<<<<<< HEAD - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678?alt=json&prettyPrint=false -======= - User-Agent: - - google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/dev -======= ->>>>>>> 6dabbac2d (add hook) X-Goog-Api-Client: - gl-go/1.21.5 gdcl/0.160.0 -<<<<<<< HEAD -<<<<<<< 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 -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - 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 ->>>>>>> 6dabbac2d (add hook) -======= - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678?alt=json&prettyPrint=false ->>>>>>> b048a7b73 (remove debugInfo) -======= - url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468695674-613a987014c9b-95256e64-4948256e?alt=json&prettyPrint=false ->>>>>>> 49cc6df02 (remove debugInfo) + url: https://compute.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710742626712-613e94e9139de-33ed3c19-1121ea67?alt=json&prettyPrint=false method: GET response: proto: HTTP/2.0 @@ -981,51 +386,10 @@ interactions: trailer: {} content_length: -1 uncompressed: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - body: '{"kind":"compute#operation","id":"7418327646336849534","name":"operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:57.768-07:00","startTime":"2024-03-14T18:46:57.795-07:00","endTime":"2024-03-14T18:46:58.153-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' -======= - body: '{"kind":"compute#operation","id":"9145340086322073784","name":"operation-1710468695674-613a987014c9b-95256e64-4948256e","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"8740527968291262650","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T19:11:35.953-07:00","startTime":"2024-03-14T19:11:35.994-07:00","endTime":"2024-03-14T19:11:36.373-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710468695674-613a987014c9b-95256e64-4948256e","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' ->>>>>>> 49cc6df02 (remove debugInfo) + body: '{"kind":"compute#operation","id":"1935185951732687501","name":"operation-1710742626712-613e94e9139de-33ed3c19-1121ea67","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1885163588622639759","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-17T23:17:06.938-07:00","startTime":"2024-03-17T23:17:06.965-07:00","endTime":"2024-03-17T23:17:07.308-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710742626712-613e94e9139de-33ed3c19-1121ea67","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' headers: Content-Type: - application/json; charset=UTF-8 status: 200 OK code: 200 -<<<<<<< HEAD - duration: 152.277906ms -======= -======= -<<<<<<< HEAD:pkg/test/resourcefixture/testdata/vcr/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) - 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 -======= - body: '{"kind":"compute#operation","id":"7418327646336849534","name":"operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","operationType":"compute.nodeTemplates.delete","targetLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/nodeTemplates/computenodetemplate-uniqueid111111","targetId":"1840433634538821217","status":"DONE","user":"user@google.com","progress":100,"insertTime":"2024-03-14T18:46:57.768-07:00","startTime":"2024-03-14T18:46:57.795-07:00","endTime":"2024-03-14T18:46:58.153-07:00","selfLink":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1/operations/operation-1710467217500-613a92ee627a5-f1e1baa3-4ae62678","region":"https://www.googleapis.com/compute/beta/projects/cnrm-user/regions/us-central1"}' ->>>>>>> b048a7b73 (remove debugInfo) - headers: - Content-Type: - - application/json; charset=UTF-8 - status: 200 OK - code: 200 -<<<<<<< HEAD - duration: 162.588352ms -<<<<<<< HEAD ->>>>>>> 0bd8e264f (use go-vcr package) -======= -======= - status: 200 OK - code: 200 - duration: 147.118897ms ->>>>>>> e848f5336 (add hook):vcr/fixtures/cassette/TestAllInSeries_fixtures_computenodetemplate.yaml ->>>>>>> 6dabbac2d (add hook) -======= - duration: 152.277906ms ->>>>>>> b048a7b73 (remove debugInfo) -======= - duration: 128.679846ms ->>>>>>> 49cc6df02 (remove debugInfo) + duration: 171.223683ms diff --git a/tests/e2e/unified_test.go b/tests/e2e/unified_test.go index dc2147fdbb..855a1df1fd 100644 --- a/tests/e2e/unified_test.go +++ b/tests/e2e/unified_test.go @@ -237,19 +237,13 @@ func testFixturesInSeries(ctx context.Context, t *testing.T, testPause bool, can // We applied BeforeSaveHook, need to modify the incoming request, // so that incoming request matches the saved request. modifiedURL := replaceFunc(r.URL.String()) - // Request saved in cassette - expected := []string{i.Method, i.URL} - // Incoming request - got := []string{r.Method, modifiedURL} if r.Method != i.Method || modifiedURL != i.URL { - klog.Fatalf("[VCR] Request does not match: expected: %s, got: %s.", - strings.Join(expected, " "), - strings.Join(got, " ")) return false } - // If request body exists, check body as well + // Default matcher only checks the request URL and Method. If request body exists, check the body as well. + // This guarantees that the replayed response matches what the real service would return for that particular request. if r.Body != nil && r.Body != http.NoBody { var reqBody []byte var err error @@ -262,15 +256,11 @@ func testFixturesInSeries(ctx context.Context, t *testing.T, testPause bool, can modifiedBody := replaceFunc(string(reqBody)) if modifiedBody != i.Body { - klog.Fatalf("[VCR] Request body does not match: expected: %s, got: %s.", - modifiedBody, - i.Body) return false } } return true }) - } primaryResource, opt := loadFixture(project)