mockgcp tests: ignore content-length header

GoogleCloudPlatform · Feb 23, 2025 · e7eb077 · e7eb077
1 parent 991e813
commit e7eb077
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 42 deletions.
diff --git a/mockgcp/mockcompute/testdata/address/crud/_http.log b/mockgcp/mockcompute/testdata/address/crud/_http.log
@@ -2,7 +2,6 @@ POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 33
 Content-Type: application/json
 
 {
@@ -42,7 +41,6 @@ POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private
@@ -78,7 +76,6 @@ GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-c
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private
@@ -112,7 +109,6 @@ GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-c
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private
@@ -146,7 +142,6 @@ DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/u
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private
@@ -181,7 +176,6 @@ POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private

diff --git a/mockgcp/mockfilestore/testdata/instance/crud/_http.log b/mockgcp/mockfilestore/testdata/instance/crud/_http.log
@@ -2,7 +2,6 @@ POST https://file.googleapis.com/v1/projects/${projectId}/locations/us-central1-
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 151
 Content-Type: application/json
 
 {
@@ -49,7 +48,6 @@ GET https://file.googleapis.com/v1/projects/${projectId}/locations/us-central1-a
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private
@@ -104,7 +102,6 @@ GET https://file.googleapis.com/v1/projects/${projectId}/locations/us-central1-a
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private
@@ -146,7 +143,6 @@ DELETE https://file.googleapis.com/v1/projects/${projectId}/locations/us-central
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private
@@ -176,7 +172,6 @@ GET https://file.googleapis.com/v1/projects/${projectId}/locations/us-central1-a
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private

diff --git a/mockgcp/mockgcptests/e2e_test.go b/mockgcp/mockgcptests/e2e_test.go
@@ -93,6 +93,10 @@ func TestScripts(t *testing.T) {
 					// gcloud includes a UUID in the user-agent, along with a lot of other client info (e.g. kernel version, python version)
 					// Just remove it from the golden output.
 					httpEvent.Request.RemoveHeader("user-agent")
+
+					// Remove the Content-Length header, as it changes with dynamic values
+					httpEvent.Request.RemoveHeader("Content-Length")
+					httpEvent.Response.RemoveHeader("Content-Length")
 				}
 
 				folderID := ""

diff --git a/mockgcp/mockiam/testdata/role/crud/_http.log b/mockgcp/mockiam/testdata/role/crud/_http.log
@@ -2,7 +2,6 @@ POST https://iam.googleapis.com/v1/permissions:queryTestablePermissions?alt=json
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 101
 Content-Type: application/json
 
 {
@@ -28,7 +27,6 @@ POST https://iam.googleapis.com/v1/projects/${projectId}/roles?alt=json
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 165
 Content-Type: application/json
 
 {
@@ -70,7 +68,6 @@ GET https://iam.googleapis.com/v1/projects/${projectId}/roles/test_${uniqueId}?a
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -99,7 +96,6 @@ GET https://iam.googleapis.com/v1/projects/${projectId}/roles/test_${uniqueId}?a
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -128,7 +124,6 @@ POST https://iam.googleapis.com/v1/permissions:queryTestablePermissions?alt=json
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 101
 Content-Type: application/json
 
 {
@@ -154,7 +149,6 @@ PATCH https://iam.googleapis.com/v1/projects/${projectId}/roles/test_${uniqueId}
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 134
 Content-Type: application/json
 
 {
@@ -195,7 +189,6 @@ DELETE https://iam.googleapis.com/v1/projects/${projectId}/roles/test_${uniqueId
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8

diff --git a/mockgcp/mockiam/testdata/serviceaccount/crud/_http.log b/mockgcp/mockiam/testdata/serviceaccount/crud/_http.log
@@ -2,7 +2,6 @@ POST https://iam.googleapis.com/v1/projects/${projectId}/serviceAccounts?alt=jso
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 136
 Content-Type: application/json
 
 {
@@ -40,7 +39,6 @@ GET https://iam.googleapis.com/v1/projects/-/serviceAccounts/test-${uniqueId}@${
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -69,7 +67,6 @@ PATCH https://iam.googleapis.com/v1/projects/${projectId}/serviceAccounts/test-$
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 87
 Content-Type: application/json
 
 {
@@ -100,7 +97,6 @@ PATCH https://iam.googleapis.com/v1/projects/${projectId}/serviceAccounts/test-$
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 88
 Content-Type: application/json
 
 {
@@ -131,7 +127,6 @@ GET https://iam.googleapis.com/v1/projects/-/serviceAccounts/test-${uniqueId}@${
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -160,7 +155,6 @@ DELETE https://iam.googleapis.com/v1/projects/-/serviceAccounts/test-${uniqueId}
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8

diff --git a/mockgcp/mockpubsub/testdata/topic/crud/_http.log b/mockgcp/mockpubsub/testdata/topic/crud/_http.log
@@ -2,7 +2,6 @@ PUT https://pubsub.googleapis.com/v1/projects/${projectId}/topics/test-${uniqueI
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 62
 Content-Type: application/json
 
 {
@@ -30,7 +29,6 @@ GET https://pubsub.googleapis.com/v1/projects/${projectId}/topics/test-${uniqueI
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private
@@ -53,7 +51,6 @@ DELETE https://pubsub.googleapis.com/v1/projects/${projectId}/topics/test-${uniq
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private

diff --git a/mockgcp/mockstorage/testdata/bucket/crud/_http.log b/mockgcp/mockstorage/testdata/bucket/crud/_http.log
@@ -2,7 +2,6 @@ POST https://storage.googleapis.com/storage/v1/b?alt=json&enableObjectRetention=
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 33
 Content-Type: application/json
 
 {
@@ -51,7 +50,6 @@ GET https://storage.googleapis.com/storage/v1/b/test-${uniqueId}?alt=json&projec
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Cache-Control: private, max-age=0, must-revalidate, no-transform
@@ -94,7 +92,6 @@ DELETE https://storage.googleapis.com/storage/v1/b/test-${uniqueId}?alt=json
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 204 No Content
 Cache-Control: no-cache, no-store, max-age=0, must-revalidate

diff --git a/mockgcp/mockworkflows/testdata/workflow/crud/_http.log b/mockgcp/mockworkflows/testdata/workflow/crud/_http.log
@@ -2,7 +2,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 404 Not Found
 Content-Type: application/json; charset=UTF-8
@@ -28,7 +27,6 @@ POST https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-cent
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 235
 Content-Type: application/json
 
 {
@@ -62,7 +60,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -104,7 +101,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -133,7 +129,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -162,7 +157,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -191,7 +185,6 @@ PATCH https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-cen
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 235
 Content-Type: application/json
 
 {
@@ -225,7 +218,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -267,7 +259,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -296,7 +287,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -325,7 +315,6 @@ DELETE https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-ce
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8
@@ -354,7 +343,6 @@ GET https://workflows.googleapis.com/v1/projects/${projectId}/locations/us-centr
 Accept: application/json
 Authorization: (removed)
 Connection: keep-alive
-Content-Length: 0
 
 200 OK
 Content-Type: application/json; charset=UTF-8