Merge pull request #2725 from gemmahou/fix-ipaddress

(Part 4)Fix diffs in compute forwarding rule: normalize `IPAddress` in golden logs
GoogleCloudPlatform · Sep 19, 2024 · b147fdf · b147fdf
2 parents 0432fc9 + ff58381
commit b147fdf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/...estdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log b/...estdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log
@@ -747,7 +747,7 @@ User-Agent: kcc/controller-manager
 x-goog-request-params: project=${projectId}
 
 {
-  "IPAddress": "0.0.0.0",
+  "IPAddress": "8.8.8.8",
   "description": "A global forwarding rule",
   "labels": {
     "cnrm-test": "true",
@@ -840,7 +840,7 @@ X-Frame-Options: SAMEORIGIN
 X-Xss-Protection: 0
 
 {
-  "IPAddress": "0.0.0.0",
+  "IPAddress": "8.8.8.8",
   "IPProtocol": "TCP",
   "creationTimestamp": "2024-04-01T12:34:56.123456Z",
   "description": "A global forwarding rule",
@@ -919,7 +919,7 @@ X-Frame-Options: SAMEORIGIN
 X-Xss-Protection: 0
 
 {
-  "IPAddress": "0.0.0.0",
+  "IPAddress": "8.8.8.8",
   "IPProtocol": "TCP",
   "creationTimestamp": "2024-04-01T12:34:56.123456Z",
   "description": "A global forwarding rule",
@@ -1031,7 +1031,7 @@ X-Frame-Options: SAMEORIGIN
 X-Xss-Protection: 0
 
 {
-  "IPAddress": "0.0.0.0",
+  "IPAddress": "8.8.8.8",
   "IPProtocol": "TCP",
   "creationTimestamp": "2024-04-01T12:34:56.123456Z",
   "description": "A global forwarding rule",

diff --git a/...ata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_http.log b/...ata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrulefull/_http.log
@@ -747,7 +747,7 @@ User-Agent: kcc/controller-manager
 x-goog-request-params: project=${projectId}
 
 {
-  "IPAddress": "0.0.0.0",
+  "IPAddress": "8.8.8.8",
   "IPProtocol": "TCP",
   "description": "A global forwarding rule",
   "ipVersion": "IPV4",
@@ -854,7 +854,7 @@ X-Frame-Options: SAMEORIGIN
 X-Xss-Protection: 0
 
 {
-  "IPAddress": "0.0.0.0",
+  "IPAddress": "8.8.8.8",
   "IPProtocol": "TCP",
   "creationTimestamp": "2024-04-01T12:34:56.123456Z",
   "description": "A global forwarding rule",
@@ -945,7 +945,7 @@ X-Frame-Options: SAMEORIGIN
 X-Xss-Protection: 0
 
 {
-  "IPAddress": "0.0.0.0",
+  "IPAddress": "8.8.8.8",
   "IPProtocol": "TCP",
   "creationTimestamp": "2024-04-01T12:34:56.123456Z",
   "description": "A global forwarding rule",
@@ -1112,7 +1112,7 @@ X-Frame-Options: SAMEORIGIN
 X-Xss-Protection: 0
 
 {
-  "IPAddress": "0.0.0.0",
+  "IPAddress": "8.8.8.8",
   "IPProtocol": "TCP",
   "creationTimestamp": "2024-04-01T12:34:56.123456Z",
   "description": "A global forwarding rule",

diff --git a/tests/e2e/unified_test.go b/tests/e2e/unified_test.go
@@ -527,6 +527,9 @@ func runScenario(ctx context.Context, t *testing.T, testPause bool, fixture reso
 					addReplacement("natIP", "192.0.0.10")
 					addReplacement("labelFingerprint", "abcdef0123A=")
 					addReplacement("fingerprint", "abcdef0123A=")
+					// Matches the mock ip address of Compute forwarding rule
+					addReplacement("IPAddress", "8.8.8.8")
+
 					// Extract resource targetID numbers from compute operations
 					for _, event := range events {
 						body := event.Response.ParseBody()