From e22c4ad457fe24c203e4453f2fcc2b0340ae54c7 Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Wed, 18 Sep 2024 03:31:52 +0000 Subject: [PATCH] forwardingrule logs: realGCP with TF controller --- ...ct_globalcomputeforwardingrule.golden.yaml | 8 +- .../globalcomputeforwardingrule/_http.log | 86 +++++----- ...lobalcomputeforwardingrulefull.golden.yaml | 8 +- .../globalcomputeforwardingrulefull/_http.log | 100 +++++------- ...obalcomputeforwardingrulehttps.golden.yaml | 8 +- .../_http.log | 69 ++++---- ...globalcomputeforwardingrulessl.golden.yaml | 8 +- .../globalcomputeforwardingrulessl/_http.log | 69 ++++---- ...globalcomputeforwardingruletcp.golden.yaml | 8 +- .../globalcomputeforwardingruletcp/_http.log | 69 ++++---- ..._regionalcomputeforwardingrule.golden.yaml | 7 +- .../regionalcomputeforwardingrule/_http.log | 153 ++++-------------- 12 files changed, 209 insertions(+), 384 deletions(-) diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_generated_object_globalcomputeforwardingrule.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_generated_object_globalcomputeforwardingrule.golden.yaml index 8a8f698648..f2eb667952 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_generated_object_globalcomputeforwardingrule.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_generated_object_globalcomputeforwardingrule.golden.yaml @@ -4,10 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 2 + generation: 3 labels: cnrm-test: "true" label-one: value-one @@ -22,6 +23,7 @@ spec: networkRef: name: default portRange: "80" + resourceID: computeglobalforwardingrule-${uniqueId} target: targetHTTPProxyRef: name: computetargethttpproxy-2-${uniqueId} @@ -32,8 +34,6 @@ status: reason: UpToDate status: "True" type: Ready - creationTimestamp: "1970-01-01T00:00:00Z" - externalRef: //compute.googleapis.com/projects/${projectId}/global/forwardingrules/computeglobalforwardingrule-${uniqueId} labelFingerprint: abcdef0123A= - observedGeneration: 2 + observedGeneration: 3 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log index 45c33c38d8..d3d1f30f52 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log @@ -566,7 +566,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "6892156816374335225", + "targetId": "8040709866794777225", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "user": "user@example.com" } @@ -598,7 +598,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "6892156816374335225", + "targetId": "8040709866794777225", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "user": "user@example.com" } @@ -695,7 +695,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "5318909071783855822", + "targetId": "3909463378338773661", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "user": "user@example.com" } @@ -727,7 +727,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "5318909071783855822", + "targetId": "3909463378338773661", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "user": "user@example.com" } @@ -762,10 +762,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 404 Not Found Cache-Control: private @@ -794,10 +793,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "IPAddress": "8.8.8.8", @@ -842,10 +840,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -876,10 +872,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -903,19 +898,18 @@ X-Xss-Protection: 0 "labelFingerprint": "abcdef0123A=", "loadBalancingScheme": "INTERNAL_SELF_MANAGED", "name": "computeglobalforwardingrule-${uniqueId}", - "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -955,10 +949,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -987,19 +980,18 @@ X-Xss-Protection: 0 }, "loadBalancingScheme": "INTERNAL_SELF_MANAGED", "name": "computeglobalforwardingrule-${uniqueId}", - "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" @@ -1033,10 +1025,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1067,10 +1057,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1099,19 +1088,18 @@ X-Xss-Protection: 0 }, "loadBalancingScheme": "INTERNAL_SELF_MANAGED", "name": "computeglobalforwardingrule-${uniqueId}", - "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1141,10 +1129,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1228,7 +1214,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "5318909071783855822", + "targetId": "3909463378338773661", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "user": "user@example.com" } @@ -1260,7 +1246,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "5318909071783855822", + "targetId": "3909463378338773661", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "user": "user@example.com" } @@ -1320,7 +1306,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "6892156816374335225", + "targetId": "8040709866794777225", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "user": "user@example.com" } @@ -1352,7 +1338,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "6892156816374335225", + "targetId": "8040709866794777225", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "user": "user@example.com" } diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_generated_object_globalcomputeforwardingrulefull.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_generated_object_globalcomputeforwardingrulefull.golden.yaml index 61ee51661b..717a978bad 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_generated_object_globalcomputeforwardingrulefull.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_generated_object_globalcomputeforwardingrulefull.golden.yaml @@ -4,10 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 2 + generation: 3 labels: cnrm-test: "true" label-one: value-two @@ -30,6 +31,7 @@ spec: name: default networkTier: PREMIUM portRange: "80" + resourceID: computeglobalforwardingrule-${uniqueId} target: targetHTTPProxyRef: name: computetargethttpproxy-2-${uniqueId} @@ -40,8 +42,6 @@ status: reason: UpToDate status: "True" type: Ready - creationTimestamp: "1970-01-01T00:00:00Z" - externalRef: //compute.googleapis.com/projects/${projectId}/global/forwardingrules/computeglobalforwardingrule-${uniqueId} labelFingerprint: abcdef0123A= - observedGeneration: 2 + observedGeneration: 3 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_http.log index 2cb52c6e24..e70f5e79bc 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_http.log @@ -2,15 +2,6 @@ GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/netwo Content-Type: application/json User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager - - - ---- - -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?alt=json -Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager - 200 OK Cache-Control: private Content-Type: application/json; charset=UTF-8 @@ -575,7 +566,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "7666870965548582297", + "targetId": "106620693609184188", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "user": "user@example.com" } @@ -607,7 +598,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "7666870965548582297", + "targetId": "106620693609184188", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "user": "user@example.com" } @@ -704,7 +695,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "5364496451664053613", + "targetId": "2973759144647457712", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "user": "user@example.com" } @@ -736,7 +727,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "5364496451664053613", + "targetId": "2973759144647457712", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "user": "user@example.com" } @@ -771,10 +762,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 404 Not Found Cache-Control: private @@ -803,10 +793,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "IPAddress": "8.8.8.8", @@ -864,10 +853,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -898,10 +885,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -937,19 +923,18 @@ X-Xss-Protection: 0 } ], "name": "computeglobalforwardingrule-${uniqueId}", - "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -989,10 +974,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1033,19 +1017,18 @@ X-Xss-Protection: 0 } ], "name": "computeglobalforwardingrule-${uniqueId}", - "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -1085,10 +1068,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" @@ -1122,10 +1104,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1156,10 +1136,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1200,19 +1179,18 @@ X-Xss-Protection: 0 } ], "name": "computeglobalforwardingrule-${uniqueId}", - "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1242,10 +1220,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1329,7 +1305,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "5364496451664053613", + "targetId": "2973759144647457712", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "user": "user@example.com" } @@ -1361,7 +1337,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "5364496451664053613", + "targetId": "2973759144647457712", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "user": "user@example.com" } @@ -1421,7 +1397,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "7666870965548582297", + "targetId": "106620693609184188", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "user": "user@example.com" } @@ -1453,7 +1429,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "7666870965548582297", + "targetId": "106620693609184188", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "user": "user@example.com" } diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_generated_object_globalcomputeforwardingrulehttps.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_generated_object_globalcomputeforwardingrulehttps.golden.yaml index 4b645b887a..ffa5fe208e 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_generated_object_globalcomputeforwardingrulehttps.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_generated_object_globalcomputeforwardingrulehttps.golden.yaml @@ -4,10 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 2 + generation: 3 labels: cnrm-test: "true" label-one: value-two @@ -20,6 +21,7 @@ spec: name: computeaddress-${uniqueId} location: global portRange: "80" + resourceID: computeglobalforwardingrule-${uniqueId} target: targetHTTPSProxyRef: name: computetargethttpsproxy2-${uniqueId} @@ -30,8 +32,6 @@ status: reason: UpToDate status: "True" type: Ready - creationTimestamp: "1970-01-01T00:00:00Z" - externalRef: //compute.googleapis.com/projects/${projectId}/global/forwardingrules/computeglobalforwardingrule-${uniqueId} labelFingerprint: abcdef0123A= - observedGeneration: 2 + observedGeneration: 3 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_http.log index 200b16a95e..37a636e7fc 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_http.log @@ -1172,10 +1172,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 404 Not Found Cache-Control: private @@ -1204,10 +1203,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "IPAddress": "8.8.8.8", @@ -1251,10 +1249,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1285,10 +1281,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1315,15 +1310,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpsProxies/computetargethttpsproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpsProxies/computetargethttpsproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -1363,10 +1357,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1398,15 +1391,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpsProxies/computetargethttpsproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpsProxies/computetargethttpsproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -1446,10 +1438,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpsProxies/computetargethttpsproxy2-${uniqueId}" @@ -1483,10 +1474,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1517,10 +1506,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1552,15 +1540,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "80-80", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpsProxies/computetargethttpsproxy2-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpsProxies/computetargethttpsproxy2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1590,10 +1577,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_generated_object_globalcomputeforwardingrulessl.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_generated_object_globalcomputeforwardingrulessl.golden.yaml index 4b0f210f69..0325357b34 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_generated_object_globalcomputeforwardingrulessl.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_generated_object_globalcomputeforwardingrulessl.golden.yaml @@ -4,10 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 2 + generation: 3 labels: cnrm-test: "true" label-one: value-two @@ -21,6 +22,7 @@ spec: loadBalancingScheme: EXTERNAL location: global portRange: "443" + resourceID: computeglobalforwardingrule-${uniqueId} target: targetSSLProxyRef: name: computetargetsslproxy2-${uniqueId} @@ -31,8 +33,6 @@ status: reason: UpToDate status: "True" type: Ready - creationTimestamp: "1970-01-01T00:00:00Z" - externalRef: //compute.googleapis.com/projects/${projectId}/global/forwardingrules/computeglobalforwardingrule-${uniqueId} labelFingerprint: abcdef0123A= - observedGeneration: 2 + observedGeneration: 3 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_http.log index ea7fa3b0ea..3e65f020e8 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_http.log @@ -915,10 +915,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 404 Not Found Cache-Control: private @@ -947,10 +946,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "IPAddress": "8.8.8.8", @@ -994,10 +992,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1028,10 +1024,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1058,15 +1053,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "443-443", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetSslProxies/computetargetsslproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetSslProxies/computetargetsslproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -1106,10 +1100,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1141,15 +1134,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "443-443", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetSslProxies/computetargetsslproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetSslProxies/computetargetsslproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -1189,10 +1181,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetSslProxies/computetargetsslproxy2-${uniqueId}" @@ -1226,10 +1217,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1260,10 +1249,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1295,15 +1283,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "443-443", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetSslProxies/computetargetsslproxy2-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetSslProxies/computetargetsslproxy2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1333,10 +1320,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_generated_object_globalcomputeforwardingruletcp.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_generated_object_globalcomputeforwardingruletcp.golden.yaml index 966d258dbf..02801f8cda 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_generated_object_globalcomputeforwardingruletcp.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_generated_object_globalcomputeforwardingruletcp.golden.yaml @@ -4,10 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 2 + generation: 3 labels: cnrm-test: "true" label-one: value-two @@ -22,6 +23,7 @@ spec: loadBalancingScheme: EXTERNAL location: global portRange: "110" + resourceID: computeglobalforwardingrule-${uniqueId} target: targetTCPProxyRef: name: computetargettcpproxy2-${uniqueId} @@ -32,8 +34,6 @@ status: reason: UpToDate status: "True" type: Ready - creationTimestamp: "1970-01-01T00:00:00Z" - externalRef: //compute.googleapis.com/projects/${projectId}/global/forwardingrules/computeglobalforwardingrule-${uniqueId} labelFingerprint: abcdef0123A= - observedGeneration: 2 + observedGeneration: 3 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_http.log index 63ec3f1257..86234d2fbf 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_http.log @@ -771,10 +771,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 404 Not Found Cache-Control: private @@ -803,10 +802,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "IPAddress": "8.8.8.8", @@ -851,10 +849,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -885,10 +881,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -915,15 +910,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "110-110", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -963,10 +957,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -998,15 +991,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "110-110", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&resource=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -1046,10 +1038,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}/setTarget?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy2-${uniqueId}" @@ -1083,10 +1074,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -1117,10 +1106,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1152,15 +1140,14 @@ X-Xss-Protection: 0 "networkTier": "PREMIUM", "portRange": "110-110", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy2-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID} +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&forwarding_rule=computeglobalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -1190,10 +1177,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_generated_object_regionalcomputeforwardingrule.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_generated_object_regionalcomputeforwardingrule.golden.yaml index 0e214b39c9..e6b0ca7cbf 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_generated_object_regionalcomputeforwardingrule.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_generated_object_regionalcomputeforwardingrule.golden.yaml @@ -4,10 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 1 + generation: 2 labels: cnrm-test: "true" label-one: value-two @@ -20,6 +21,7 @@ spec: name: computeraddress-${uniqueId} ipProtocol: ESP location: us-central1 + resourceID: computeregionalforwardingrule-${uniqueId} target: targetVPNGatewayRef: name: computetargetvpngateway-${uniqueId} @@ -31,7 +33,6 @@ status: status: "True" type: Ready creationTimestamp: "1970-01-01T00:00:00Z" - externalRef: //compute.googleapis.com/projects/${projectId}/regions/us-central1/forwardingrules/computeregionalforwardingrule-${uniqueId} labelFingerprint: abcdef0123A= - observedGeneration: 1 + observedGeneration: 2 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_http.log index ff9fe9f501..e117e60dc0 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_http.log @@ -361,7 +361,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "8637566997880110908", + "targetId": "2637364386763111481", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}", "user": "user@example.com" } @@ -394,7 +394,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "8637566997880110908", + "targetId": "2637364386763111481", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}", "user": "user@example.com" } @@ -431,10 +431,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&forwarding_rule=computeregionalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 404 Not Found Cache-Control: private @@ -463,10 +462,9 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1 +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "IPAddress": "8.8.8.8", @@ -479,6 +477,7 @@ x-goog-request-params: project=${projectId}®ion=us-central1 }, "loadBalancingScheme": "EXTERNAL", "name": "computeregionalforwardingrule-${uniqueId}", + "region": "projects/${projectId}/global/regions/us-central1", "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" } @@ -500,7 +499,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", @@ -511,10 +510,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -535,7 +532,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 100, - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", @@ -546,10 +543,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&forwarding_rule=computeregionalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -574,17 +570,16 @@ X-Xss-Protection: 0 "loadBalancingScheme": "EXTERNAL", "name": "computeregionalforwardingrule-${uniqueId}", "networkTier": "PREMIUM", - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}/setLabels +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}/setLabels?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&resource=computeregionalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager { "labelFingerprint": "abcdef0123A=", @@ -614,7 +609,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "setLabels", "progress": 100, - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", @@ -625,10 +620,9 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&forwarding_rule=computeregionalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -658,101 +652,16 @@ X-Xss-Protection: 0 "loadBalancingScheme": "EXTERNAL", "name": "computeregionalforwardingrule-${uniqueId}", "networkTier": "PREMIUM", - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" -} - ---- - -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}/setLabels -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&resource=computeregionalforwardingrule-${uniqueId} - -{ - "labelFingerprint": "abcdef0123A=", - "labels": { - "cnrm-test": "true", - "label-one": "value-two", - "managed-by-cnrm": "true" - } -} - -200 OK -Cache-Control: private -Content-Type: application/json; charset=UTF-8 -Server: ESF -Vary: Origin -Vary: X-Origin -Vary: Referer -X-Content-Type-Options: nosniff -X-Frame-Options: SAMEORIGIN -X-Xss-Protection: 0 - -{ - "endTime": "2024-04-01T12:34:56.123456Z", - "id": "000000000000000000000", - "insertTime": "2024-04-01T12:34:56.123456Z", - "kind": "compute#operation", - "name": "${operationID}", - "operationType": "setLabels", - "progress": 100, - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", - "startTime": "2024-04-01T12:34:56.123456Z", - "status": "DONE", - "targetId": "${forwardingRulesId}", - "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}", - "user": "user@example.com" -} - ---- - -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&forwarding_rule=computeregionalforwardingrule-${uniqueId} - -200 OK -Cache-Control: private -Content-Type: application/json; charset=UTF-8 -Server: ESF -Vary: Origin -Vary: X-Origin -Vary: Referer -X-Content-Type-Options: nosniff -X-Frame-Options: SAMEORIGIN -X-Xss-Protection: 0 - -{ - "IPAddress": "8.8.8.8", - "IPProtocol": "ESP", - "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "description": "A regional forwarding rule", - "fingerprint": "abcdef0123A=", - "id": "000000000000000000000", - "kind": "compute#forwardingRule", - "labelFingerprint": "abcdef0123A=", - "labels": { - "cnrm-test": "true", - "label-one": "value-two", - "managed-by-cnrm": "true" - }, - "loadBalancingScheme": "EXTERNAL", - "name": "computeregionalforwardingrule-${uniqueId}", - "networkTier": "PREMIUM", - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}", - "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" + "target": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID} +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/${forwardingRuleID}?alt=json Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&forwarding_rule=computeregionalforwardingrule-${uniqueId} +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager 200 OK Cache-Control: private @@ -772,7 +681,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", @@ -783,10 +692,8 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID} -Content-Type: application/json -User-Agent: kcc/controller-manager -x-goog-request-params: project=${projectId}®ion=us-central1&operation=${operationID} +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}?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/kcc/controller-manager 200 OK Cache-Control: private @@ -807,7 +714,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 100, - "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", @@ -874,7 +781,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", - "targetId": "8637566997880110908", + "targetId": "2637364386763111481", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}", "user": "user@example.com" } @@ -907,7 +814,7 @@ X-Xss-Protection: 0 "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", - "targetId": "8637566997880110908", + "targetId": "2637364386763111481", "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}", "user": "user@example.com" }