update affected logs

gemmahou · Oct 4, 2024 · 26d323b · 26d323b
1 parent 1adc00f
commit 26d323b
Show file tree

Hide file tree

Showing 24 changed files with 99 additions and 82 deletions.
diff --git a/mockgcp/mockcompute/regionalforwardingrulev1.go b/mockgcp/mockcompute/regionalforwardingrulev1.go
@@ -82,7 +82,7 @@ func (s *RegionalForwardingRulesV1) Insert(ctx context.Context, req *pb.InsertFo
 	if obj.NetworkTier == nil {
 		obj.NetworkTier = PtrTo("PREMIUM")
 	}
-	if *obj.LoadBalancingScheme == "" {
+	if obj.LoadBalancingScheme != nil && *obj.LoadBalancingScheme == "" {
 		obj.LoadBalancingScheme = nil
 	}
 

diff --git a/mockgcp/mockcompute/targetgrpcproxyv1.go b/mockgcp/mockcompute/targetgrpcproxyv1.go
@@ -123,7 +123,7 @@ func (n *targetGrpcProxyName) String() string {
 func (s *MockService) parseTargetGrpcProxyName(name string) (*targetGrpcProxyName, error) {
 	tokens := strings.Split(name, "/")
 
-	if len(tokens) == 5 && tokens[0] == "projects" && tokens[3] == "targetGrpcProxies" {
+	if len(tokens) == 5 && tokens[0] == "projects" && tokens[2] == "global" && tokens[3] == "targetGrpcProxies" {
 		project, err := s.Projects.GetProjectByID(tokens[1])
 		if err != nil {
 			return nil, err

diff --git a/...estdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log b/...estdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log
@@ -344,11 +344,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 
@@ -456,11 +456,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found"
   }
 }
 

diff --git a/...ata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_http.log b/...ata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_http.log
@@ -344,11 +344,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 
@@ -456,11 +456,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found"
   }
 }
 

diff --git a/...ta/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_http.log b/...ta/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulehttps/_http.log
@@ -331,11 +331,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 
@@ -443,11 +443,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found"
   }
 }
 
@@ -533,11 +533,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}' was not found"
   }
 }
 

diff --git a/...data/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_http.log b/...data/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulessl/_http.log
@@ -331,11 +331,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 

diff --git a/...data/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_http.log b/...data/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingruletcp/_http.log
@@ -331,11 +331,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 

diff --git a/...a/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrulefull/_http.log b/...a/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrulefull/_http.log
@@ -295,11 +295,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 
@@ -410,11 +410,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/regions/us-central1/backendServices/computebackendservice-2-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/regions/us-central1/backendServices/computebackendservice-2-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/regions/us-central1/backendServices/computebackendservice-2-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/regions/us-central1/backendServices/computebackendservice-2-${uniqueId}' was not found"
   }
 }
 

diff --git a/.../testdata/basic/compute/v1beta1/computeforwardingrule/regionalforwardingrulepsc/_http.log b/.../testdata/basic/compute/v1beta1/computeforwardingrule/regionalforwardingrulepsc/_http.log
@@ -1159,11 +1159,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 

diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeserviceattachment/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeserviceattachment/_http.log
@@ -521,11 +521,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/example-project-01/regions/us-west1/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/example-project-01/regions/us-west1/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/example-project-01/regions/us-west1/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/example-project-01/regions/us-west1/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 

diff --git a/...mpute/v1beta1/computetargetgrpcproxy/_generated_object_computetargetgrpcproxy.golden.yaml b/...mpute/v1beta1/computetargetgrpcproxy/_generated_object_computetargetgrpcproxy.golden.yaml
@@ -32,3 +32,4 @@ status:
   fingerprint: abcdef0123A=
   observedGeneration: 2
   selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetGrpcProxies/computetargetgrpcproxy-${uniqueId}
+  selfLinkWithId: https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetGrpcProxies/${targetGrpcProxiesID}
diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetgrpcproxy/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetgrpcproxy/_http.log
@@ -321,6 +321,7 @@ X-Xss-Protection: 0
   "kind": "compute#targetGrpcProxy",
   "name": "computetargetgrpcproxy-${uniqueId}",
   "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetGrpcProxies/computetargetgrpcproxy-${uniqueId}",
+  "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetGrpcProxies/${targetGrpcProxiesId}",
   "urlMap": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}",
   "validateForProxyless": true
 }

diff --git a/...ure/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_http.log b/...ure/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_http.log
@@ -127,11 +127,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 
@@ -239,11 +239,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found"
   }
 }
 
@@ -329,11 +329,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}' was not found"
   }
 }
 

diff --git a/...e/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_http.log b/...e/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_http.log
@@ -129,11 +129,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 
@@ -246,11 +246,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}' was not found"
   }
 }
 
@@ -338,11 +338,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}' was not found"
   }
 }
 

diff --git a/...tdata/basic/compute/v1beta1/computetargethttpsproxy/crossregiontargethttpsproxy/_http.log b/...tdata/basic/compute/v1beta1/computetargethttpsproxy/crossregiontargethttpsproxy/_http.log
@@ -19,11 +19,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 
@@ -264,11 +264,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found"
   }
 }
 

diff --git a/...ta/basic/compute/v1beta1/computetargethttpsproxy/globaltargethttpsproxy-certmap/_http.log b/...ta/basic/compute/v1beta1/computetargethttpsproxy/globaltargethttpsproxy-certmap/_http.log
@@ -127,11 +127,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "backendService \"projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}' was not found"
   }
 }
 
@@ -239,11 +239,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}' was not found"
   }
 }
 
@@ -329,11 +329,11 @@ X-Xss-Protection: 0
     "errors": [
       {
         "domain": "global",
-        "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}\" not found",
+        "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}' was not found",
         "reason": "notFound"
       }
     ],
-    "message": "urlMap \"projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}\" not found"
+    "message": "The resource 'projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}' was not found"
   }
 }