Merge pull request GoogleCloudPlatform#3148 from gemmahou/reference-r…

…egional-tcp test: Add test case for reference regional target tcp proxy in CFR
katrielt · Dec 30, 2024 · 974a6ea · 974a6ea
2 parents afaf658 + dd994d1
commit 974a6ea
Show file tree

Hide file tree

Showing 67 changed files with 4,206 additions and 89 deletions.
diff --git a/dev/tasks/run-e2e b/dev/tasks/run-e2e
@@ -26,7 +26,7 @@ if [[ -z "${KUBEBUILDER_ASSETS:-}" ]]; then
 fi
 
 if [[ -z "${KCC_USE_DIRECT_RECONCILERS:-}" ]]; then
-  KCC_USE_DIRECT_RECONCILERS=ComputeForwardingRule,GKEHubFeatureMembership,SpannerInstance
+  KCC_USE_DIRECT_RECONCILERS=GKEHubFeatureMembership,SpannerInstance
 fi
 echo "Using direct controllers: $KCC_USE_DIRECT_RECONCILERS"
 export KCC_USE_DIRECT_RECONCILERS

diff --git a/...t_globalcomputeforwardingrule.golden.yaml → ...lcomputeforwardingrule-direct.golden.yaml b/...t_globalcomputeforwardingrule.golden.yaml → ...lcomputeforwardingrule-direct.golden.yaml
@@ -2,6 +2,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeForwardingRule
 metadata:
   annotations:
+    alpha.cnrm.cloud.google.com/reconciler: direct
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
     cnrm.cloud.google.com/project-id: ${projectId}
   finalizers:

diff --git a/...ule/globalcomputeforwardingrule/_http.log → ...balcomputeforwardingrule-direct/_http.log b/...ule/globalcomputeforwardingrule/_http.log → ...balcomputeforwardingrule-direct/_http.log
diff --git a/...eforwardingrule/_vcr_cassettes/nontf.yaml → ...dingrule-direct/_vcr_cassettes/nontf.yaml b/...eforwardingrule/_vcr_cassettes/nontf.yaml → ...dingrule-direct/_vcr_cassettes/nontf.yaml
diff --git a/...eforwardingrule/_vcr_cassettes/oauth.yaml → ...dingrule-direct/_vcr_cassettes/oauth.yaml b/...eforwardingrule/_vcr_cassettes/oauth.yaml → ...dingrule-direct/_vcr_cassettes/oauth.yaml
diff --git a/...puteforwardingrule/_vcr_cassettes/tf.yaml → ...wardingrule-direct/_vcr_cassettes/tf.yaml b/...puteforwardingrule/_vcr_cassettes/tf.yaml → ...wardingrule-direct/_vcr_cassettes/tf.yaml
diff --git a/...e/globalcomputeforwardingrule/create.yaml → ...lcomputeforwardingrule-direct/create.yaml b/...e/globalcomputeforwardingrule/create.yaml → ...lcomputeforwardingrule-direct/create.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-one"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeglobalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...alcomputeforwardingrule/dependencies.yaml → ...teforwardingrule-direct/dependencies.yaml b/...alcomputeforwardingrule/dependencies.yaml → ...teforwardingrule-direct/dependencies.yaml
diff --git a/...e/globalcomputeforwardingrule/update.yaml → ...lcomputeforwardingrule-direct/update.yaml b/...e/globalcomputeforwardingrule/update.yaml → ...lcomputeforwardingrule-direct/update.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-one"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeglobalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...obalcomputeforwardingrulefull.golden.yaml → ...puteforwardingrulefull-direct.golden.yaml b/...obalcomputeforwardingrulefull.golden.yaml → ...puteforwardingrulefull-direct.golden.yaml
@@ -2,6 +2,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeForwardingRule
 metadata:
   annotations:
+    alpha.cnrm.cloud.google.com/reconciler: direct
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
     cnrm.cloud.google.com/project-id: ${projectId}
   finalizers:

diff --git a/...globalcomputeforwardingrulefull/_http.log → ...omputeforwardingrulefull-direct/_http.log b/...globalcomputeforwardingrulefull/_http.log → ...omputeforwardingrulefull-direct/_http.log
diff --git a/...obalcomputeforwardingrulefull/create.yaml → ...puteforwardingrulefull-direct/create.yaml b/...obalcomputeforwardingrulefull/create.yaml → ...puteforwardingrulefull-direct/create.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-one"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeglobalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...mputeforwardingrulefull/dependencies.yaml → ...rwardingrulefull-direct/dependencies.yaml b/...mputeforwardingrulefull/dependencies.yaml → ...rwardingrulefull-direct/dependencies.yaml
diff --git a/...obalcomputeforwardingrulefull/update.yaml → ...puteforwardingrulefull-direct/update.yaml b/...obalcomputeforwardingrulefull/update.yaml → ...puteforwardingrulefull-direct/update.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-two"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeglobalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...omputeforwardingrulegrpcproxy.golden.yaml → ...orwardingrulegrpcproxy-direct.golden.yaml b/...omputeforwardingrulegrpcproxy.golden.yaml → ...orwardingrulegrpcproxy-direct.golden.yaml
@@ -2,6 +2,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeForwardingRule
 metadata:
   annotations:
+    alpha.cnrm.cloud.google.com/reconciler: direct
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
     cnrm.cloud.google.com/project-id: ${projectId}
   finalizers:

diff --git a/...lcomputeforwardingrulegrpcproxy/_http.log → ...eforwardingrulegrpcproxy-direct/_http.log b/...lcomputeforwardingrulegrpcproxy/_http.log → ...eforwardingrulegrpcproxy-direct/_http.log
diff --git a/...omputeforwardingrulegrpcproxy/create.yaml → ...orwardingrulegrpcproxy-direct/create.yaml b/...omputeforwardingrulegrpcproxy/create.yaml → ...orwardingrulegrpcproxy-direct/create.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-one"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeregionalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...forwardingrulegrpcproxy/dependencies.yaml → ...ingrulegrpcproxy-direct/dependencies.yaml b/...forwardingrulegrpcproxy/dependencies.yaml → ...ingrulegrpcproxy-direct/dependencies.yaml
diff --git a/...omputeforwardingrulegrpcproxy/update.yaml → ...orwardingrulegrpcproxy-direct/update.yaml b/...omputeforwardingrulegrpcproxy/update.yaml → ...orwardingrulegrpcproxy-direct/update.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-two"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeregionalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...balcomputeforwardingrulehttps.golden.yaml → ...uteforwardingrulehttps-direct.golden.yaml b/...balcomputeforwardingrulehttps.golden.yaml → ...uteforwardingrulehttps-direct.golden.yaml
@@ -2,6 +2,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeForwardingRule
 metadata:
   annotations:
+    alpha.cnrm.cloud.google.com/reconciler: direct
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
     cnrm.cloud.google.com/project-id: ${projectId}
   finalizers:

diff --git a/...lobalcomputeforwardingrulehttps/_http.log → ...mputeforwardingrulehttps-direct/_http.log b/...lobalcomputeforwardingrulehttps/_http.log → ...mputeforwardingrulehttps-direct/_http.log
diff --git a/...balcomputeforwardingrulehttps/create.yaml → ...uteforwardingrulehttps-direct/create.yaml b/...balcomputeforwardingrulehttps/create.yaml → ...uteforwardingrulehttps-direct/create.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-one"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeglobalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...puteforwardingrulehttps/dependencies.yaml → ...wardingrulehttps-direct/dependencies.yaml b/...puteforwardingrulehttps/dependencies.yaml → ...wardingrulehttps-direct/dependencies.yaml
diff --git a/...balcomputeforwardingrulehttps/update.yaml → ...uteforwardingrulehttps-direct/update.yaml b/...balcomputeforwardingrulehttps/update.yaml → ...uteforwardingrulehttps-direct/update.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-two"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeglobalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...alforwardingrulepscgoogleapis.golden.yaml → ...rdingrulepscgoogleapis-direct.golden.yaml b/...alforwardingrulepscgoogleapis.golden.yaml → ...rdingrulepscgoogleapis-direct.golden.yaml
@@ -2,6 +2,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeForwardingRule
 metadata:
   annotations:
+    alpha.cnrm.cloud.google.com/reconciler: direct
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
     cnrm.cloud.google.com/project-id: ${projectId}
   finalizers:

diff --git a/...obalforwardingrulepscgoogleapis/_http.log → ...wardingrulepscgoogleapis-direct/_http.log b/...obalforwardingrulepscgoogleapis/_http.log → ...wardingrulepscgoogleapis-direct/_http.log
diff --git a/...alforwardingrulepscgoogleapis/create.yaml → ...rdingrulepscgoogleapis-direct/create.yaml b/...alforwardingrulepscgoogleapis/create.yaml → ...rdingrulepscgoogleapis-direct/create.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-one"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: rule${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...ardingrulepscgoogleapis/dependencies.yaml → ...ulepscgoogleapis-direct/dependencies.yaml b/...ardingrulepscgoogleapis/dependencies.yaml → ...ulepscgoogleapis-direct/dependencies.yaml
diff --git a/...alforwardingrulepscgoogleapis/update.yaml → ...rdingrulepscgoogleapis-direct/update.yaml b/...alforwardingrulepscgoogleapis/update.yaml → ...rdingrulepscgoogleapis-direct/update.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-two"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: rule${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...lobalcomputeforwardingrulessl.golden.yaml → ...mputeforwardingrulessl-direct.golden.yaml b/...lobalcomputeforwardingrulessl.golden.yaml → ...mputeforwardingrulessl-direct.golden.yaml
@@ -2,6 +2,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeForwardingRule
 metadata:
   annotations:
+    alpha.cnrm.cloud.google.com/reconciler: direct
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
     cnrm.cloud.google.com/project-id: ${projectId}
   finalizers:

diff --git a/.../globalcomputeforwardingrulessl/_http.log → ...computeforwardingrulessl-direct/_http.log b/.../globalcomputeforwardingrulessl/_http.log → ...computeforwardingrulessl-direct/_http.log
diff --git a/...lobalcomputeforwardingrulessl/create.yaml → ...mputeforwardingrulessl-direct/create.yaml b/...lobalcomputeforwardingrulessl/create.yaml → ...mputeforwardingrulessl-direct/create.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-one"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeglobalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...omputeforwardingrulessl/dependencies.yaml → ...orwardingrulessl-direct/dependencies.yaml b/...omputeforwardingrulessl/dependencies.yaml → ...orwardingrulessl-direct/dependencies.yaml
diff --git a/...lobalcomputeforwardingrulessl/update.yaml → ...mputeforwardingrulessl-direct/update.yaml b/...lobalcomputeforwardingrulessl/update.yaml → ...mputeforwardingrulessl-direct/update.yaml
@@ -17,6 +17,8 @@ kind: ComputeForwardingRule
 metadata:
   labels:
     label-one: "value-two"
+  annotations:
+    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computeglobalforwardingrule-${uniqueId}
 spec:
   description: "A global forwarding rule"

diff --git a/...lobalcomputeforwardingruletcp.golden.yaml → ...rdingruletcp-direct-directtcp.golden.yaml b/...lobalcomputeforwardingruletcp.golden.yaml → ...rdingruletcp-direct-directtcp.golden.yaml
@@ -2,6 +2,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeForwardingRule
 metadata:
   annotations:
+    alpha.cnrm.cloud.google.com/reconciler: direct
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
     cnrm.cloud.google.com/project-id: ${projectId}
   finalizers:

diff --git a/.../globalcomputeforwardingruletcp/_http.log → ...wardingruletcp-direct-directtcp/_http.log b/.../globalcomputeforwardingruletcp/_http.log → ...wardingruletcp-direct-directtcp/_http.log
@@ -424,9 +424,10 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}?alt=json
+GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}&target_tcp_proxy=${targetTcpProxyID}
 
 404 Not Found
 Cache-Control: private
@@ -455,15 +456,16 @@ X-Xss-Protection: 0
 
 ---
 
-POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies?alt=json
+POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}
 
 {
   "description": "test description",
   "name": "computetargettcpproxy-${uniqueId}",
   "proxyHeader": "NONE",
-  "service": "projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
+  "service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
 }
 
 200 OK
@@ -494,8 +496,10 @@ X-Xss-Protection: 0
 
 ---
 
-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
+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}
 
 200 OK
 Cache-Control: private
@@ -526,9 +530,10 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}?alt=json
+GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}&target_tcp_proxy=${targetTcpProxyID}
 
 200 OK
 Cache-Control: private
@@ -549,14 +554,15 @@ X-Xss-Protection: 0
   "name": "computetargettcpproxy-${uniqueId}",
   "proxyHeader": "NONE",
   "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy-${uniqueId}",
-  "service": "projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
+  "service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
 }
 
 ---
 
-GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}?alt=json
+GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}&target_tcp_proxy=${targetTcpProxyID}
 
 404 Not Found
 Cache-Control: private
@@ -585,15 +591,16 @@ X-Xss-Protection: 0
 
 ---
 
-POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies?alt=json
+POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}
 
 {
   "description": "other test description",
   "name": "computetargettcpproxy2-${uniqueId}",
   "proxyHeader": "NONE",
-  "service": "projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
+  "service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
 }
 
 200 OK
@@ -624,8 +631,10 @@ X-Xss-Protection: 0
 
 ---
 
-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
+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}
 
 200 OK
 Cache-Control: private
@@ -656,9 +665,10 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}?alt=json
+GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}&target_tcp_proxy=${targetTcpProxyID}
 
 200 OK
 Cache-Control: private
@@ -679,7 +689,7 @@ X-Xss-Protection: 0
   "name": "computetargettcpproxy2-${uniqueId}",
   "proxyHeader": "NONE",
   "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy2-${uniqueId}",
-  "service": "projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
+  "service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
 }
 
 ---
@@ -1137,9 +1147,10 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}?alt=json
+GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}&target_tcp_proxy=${targetTcpProxyID}
 
 200 OK
 Cache-Control: private
@@ -1160,14 +1171,15 @@ X-Xss-Protection: 0
   "name": "computetargettcpproxy2-${uniqueId}",
   "proxyHeader": "NONE",
   "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy2-${uniqueId}",
-  "service": "projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
+  "service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
 }
 
 ---
 
-DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}?alt=json
+DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}&target_tcp_proxy=${targetTcpProxyID}
 
 200 OK
 Cache-Control: private
@@ -1197,8 +1209,10 @@ X-Xss-Protection: 0
 
 ---
 
-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
+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}
 
 200 OK
 Cache-Control: private
@@ -1229,9 +1243,10 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}?alt=json
+GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}&target_tcp_proxy=${targetTcpProxyID}
 
 200 OK
 Cache-Control: private
@@ -1252,14 +1267,15 @@ X-Xss-Protection: 0
   "name": "computetargettcpproxy-${uniqueId}",
   "proxyHeader": "NONE",
   "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/computetargettcpproxy-${uniqueId}",
-  "service": "projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
+  "service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}"
 }
 
 ---
 
-DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}?alt=json
+DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetTcpProxies/${targetTcpProxyID}
 Content-Type: application/json
-User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
+User-Agent: kcc/controller-manager
+x-goog-request-params: project=${projectId}&target_tcp_proxy=${targetTcpProxyID}
 
 200 OK
 Cache-Control: private
@@ -1289,8 +1305,10 @@ X-Xss-Protection: 0
 
 ---
 
-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
+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}
 
 200 OK
 Cache-Control: private