Merge pull request #21 from speakeasy-api/update-tests

TristanSpeakEasy · web-flow · commit e70bc270c9de · 2022-10-03T11:11:20.000+01:00
chore: update SDK with latest test-suite output
diff --git a/harbuilder.go b/harbuilder.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"net/http"
-	"net/http/httptest"
 	"net/url"
 	"sort"
 	"strconv"
@@ -131,17 +130,9 @@ func (h *harBuilder) getHarRequest(ctx context.Context, cw *captureWriter, r *ht
 
 	reqCookies := getHarCookies(r.Cookies(), time.Time{}, c.requestCookieMasks)
 
-	hw := httptest.NewRecorder()
-
-	for k, vv := range r.Header {
-		for _, v := range vv {
-			hw.Header().Set(k, v)
-		}
-	}
-
 	b := bytes.NewBuffer([]byte{})
 	headerSize := -1
-	if err := hw.Header().Write(b); err != nil {
+	if err := r.Header.Write(b); err != nil {
 		log.From(ctx).Error("speakeasy-sdk: failed to read length of request headers", zap.Error(err))
 	} else {
 		headerSize = b.Len()
diff --git a/middleware_test.go b/middleware_test.go
@@ -151,7 +151,7 @@ func TestSpeakeasy_Middleware_Capture_Success(t *testing.T) {
 					assert.Equal(t, testApiID, req.ApiId)
 					assert.Equal(t, testVersionID, req.VersionId)
 
-					assert.Equal(t, tt.WantHAR, req.Har)
+					assert.JSONEq(t, tt.WantHAR, req.Har)
 					captured = true
 					wg.Done()
 				}),
@@ -646,7 +646,7 @@ func TestSpeakeasy_GinMiddleware_Success(t *testing.T) {
 				ApiID:     testApiID,
 				VersionID: testVersionID,
 				GRPCDialer: dialer(func(ctx context.Context, req *ingest.IngestRequest) {
-					assert.Equal(t, tt.WantHAR, req.Har)
+					assert.JSONEq(t, tt.WantHAR, req.Har)
 					captured = true
 					wg.Done()
 				}),
@@ -886,7 +886,7 @@ func TestSpeakeasy_EchoMiddleware_Success(t *testing.T) {
 				ApiID:     testApiID,
 				VersionID: testVersionID,
 				GRPCDialer: dialer(func(ctx context.Context, req *ingest.IngestRequest) {
-					assert.Equal(t, tt.WantHAR, req.Har)
+					assert.JSONEq(t, tt.WantHAR, req.Har)
 					captured = true
 					wg.Done()
 				}),
diff --git a/speakeasy.go b/speakeasy.go
@@ -29,7 +29,7 @@ const (
 )
 
 var (
-	speakeasyVersion = "1.3.0" // TODO get this from CI
+	speakeasyVersion = "1.3.4" // TODO get this from CI
 	serverURL        = "grpc.prod.speakeasyapi.dev:443"
 
 	defaultInstance *Speakeasy
diff --git a/testdata/captures_basic_request_and_no_response_body_output.json b/testdata/captures_basic_request_and_no_response_body_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
diff --git a/testdata/captures_basic_request_and_response_output.json b/testdata/captures_basic_request_and_response_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
diff --git a/testdata/captures_basic_request_and_response_with_different_content_types_output.json b/testdata/captures_basic_request_and_response_with_different_content_types_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
diff --git a/testdata/captures_basic_request_and_response_with_no_response_header_set_output.json b/testdata/captures_basic_request_and_response_with_no_response_header_set_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
diff --git a/testdata/captures_basic_request_and_response_with_repeat_headers_input.json b/testdata/captures_basic_request_and_response_with_repeat_headers_input.json
@@ -0,0 +1,48 @@
+{
+  "name": "captures basic request and response with repeat headers",
+  "fields": {
+    "max_capture_size": 9437184
+  },
+  "args": {
+    "method": "GET",
+    "url": "http://test.com/test",
+    "response_status": 200,
+    "response_body": "test",
+    "headers": [
+      {
+        "key": "Vary",
+        "values": ["Origin"]
+      },
+      {
+        "key": "Vary",
+        "values": ["Access-Control-Request-Method"]
+      },
+      {
+        "key": "Vary",
+        "values": ["Access-Control-Request-Headers"]
+      }
+    ],
+    "response_headers": [
+      {
+        "key": "Vary",
+        "values": ["Origin"]
+      },
+      {
+        "key": "Vary",
+        "values": ["Access-Control-Request-Method"]
+      },
+      {
+        "key": "Vary",
+        "values": ["Access-Control-Request-Headers"]
+      },
+      {
+        "key": "Content-Type",
+        "values": ["application/octet-stream"]
+      },
+      {
+        "key": "Content-Length",
+        "values": ["4"]
+      }
+    ]
+  }
+}
diff --git a/testdata/captures_basic_request_and_response_with_repeat_headers_output.json b/testdata/captures_basic_request_and_response_with_repeat_headers_output.json
@@ -0,0 +1,82 @@
+{
+  "log": {
+    "comment": "request capture for http://test.com/test",
+    "creator": {
+      "name": "speakeasy-go-sdk",
+      "version": "1.3.4"
+    },
+    "version": "1.2",
+    "entries": [
+      {
+        "startedDateTime": "2020-01-01T00:00:00Z",
+        "time": 1,
+        "request": {
+          "method": "GET",
+          "url": "http://test.com/test",
+          "httpVersion": "HTTP/1.1",
+          "cookies": [],
+          "headers": [
+            {
+              "name": "Vary",
+              "value": "Origin"
+            },
+            {
+              "name": "Vary",
+              "value": "Access-Control-Request-Method"
+            },
+            {
+              "name": "Vary",
+              "value": "Access-Control-Request-Headers"
+            }
+          ],
+          "queryString": [],
+          "headersSize": 89,
+          "bodySize": -1
+        },
+        "response": {
+          "status": 200,
+          "statusText": "OK",
+          "httpVersion": "HTTP/1.1",
+          "cookies": [],
+          "headers": [
+            {
+              "name": "Content-Length",
+              "value": "4"
+            },
+            {
+              "name": "Content-Type",
+              "value": "application/octet-stream"
+            },
+            {
+              "name": "Vary",
+              "value": "Origin"
+            },
+            {
+              "name": "Vary",
+              "value": "Access-Control-Request-Method"
+            },
+            {
+              "name": "Vary",
+              "value": "Access-Control-Request-Headers"
+            }
+          ],
+          "content": {
+            "size": 4,
+            "mimeType": "application/octet-stream",
+            "text": "test"
+          },
+          "redirectURL": "",
+          "headersSize": 148,
+          "bodySize": 4
+        },
+        "cache": {},
+        "timings": {
+          "send": -1,
+          "wait": -1,
+          "receive": -1
+        },
+        "serverIPAddress": "test.com"
+      }
+    ]
+  }
+}
diff --git a/testdata/captures_basic_request_with_nano_precision_output.json b/testdata/captures_basic_request_with_nano_precision_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
diff --git a/testdata/captures_cookies_output.json b/testdata/captures_cookies_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
diff --git a/testdata/captures_masked_request_response_input.json b/testdata/captures_masked_request_response_input.json
@@ -12,15 +12,15 @@
         "values": ["cookie1=value1; cookie2=value2; cookie3=value3"]
       },
       { "key": "Content-Type", "values": ["application/json"] },
-      { "key": "Content-Length", "values": ["103"] },
+      { "key": "Content-Length", "values": ["93"] },
       { "key": "Host", "values": ["test.com"] },
       { "key": "Accept-Encoding", "values": ["gzip, deflate"] },
       { "key": "Connection", "values": ["close"] },
       { "key": "Authorization", "values": ["Basic dXNlcjpwYXNzd29yZA=="] }
     ],
-    "body": "{\"test\": \"test\", \"test1\": 123.456, \"address\": {\"line1\": \"line1\", \"line2\": \"line2\", \"street\": \"street\"}}",
+    "body": "{\"test\":\"test\",\"test1\":123.456,\"address\":{\"line1\":\"line1\",\"line2\":\"line2\",\"street\":\"street\"}}",
     "response_status": -1,
-    "response_body": "{\r\n  \"test\":\"test\",\r\n  \"test1\":123.456,\r\n  \"address\":{\r\n    \"line1\":\"line1\",\r\n    \"line2\":\"line2\",\r\n    \"street\":\"street\"\r\n  }\r\n}",
+    "response_body": "{\"test\":\"test\",\"test1\":123.456,\"address\":{\"line1\":\"line1\",\"line2\":\"line2\",\"street\":\"street\"}}",
     "response_headers": [
       {
         "key": "Set-Cookie",
@@ -31,7 +31,7 @@
         ]
       },
       { "key": "Content-Type", "values": ["application/json; charset=utf-8"] },
-      { "key": "Content-Length", "values": ["129"] },
+      { "key": "Content-Length", "values": ["93"] },
       { "key": "Session", "values": ["session_data"] },
       { "key": "X-Custom-Header", "values": ["1", "2", "3"] }
     ],
diff --git a/testdata/captures_masked_request_response_output.json b/testdata/captures_masked_request_response_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
@@ -42,7 +42,7 @@
             },
             {
               "name": "Content-Length",
-              "value": "103"
+              "value": "93"
             },
             {
               "name": "Content-Type",
@@ -74,10 +74,10 @@
           "postData": {
             "mimeType": "application/json",
             "params": [],
-            "text": "{\"test\": \"test\", \"test1\": -12321, \"address\": {\"line1\": \"__masked__\", \"line2\": \"line2\", \"street\": \"_____\"}}"
+            "text": "{\"test\":\"test\",\"test1\":-12321,\"address\":{\"line1\":\"__masked__\",\"line2\":\"line2\",\"street\":\"_____\"}}"
           },
-          "headersSize": 219,
-          "bodySize": 103
+          "headersSize": 218,
+          "bodySize": 93
         },
         "response": {
           "status": 200,
@@ -101,7 +101,7 @@
           "headers": [
             {
               "name": "Content-Length",
-              "value": "129"
+              "value": "93"
             },
             {
               "name": "Content-Type",
@@ -137,13 +137,13 @@
             }
           ],
           "content": {
-            "size": 129,
+            "size": 93,
             "mimeType": "application/json; charset=utf-8",
-            "text": "{\r\n  \"test\":\"test\",\r\n  \"test1\":-12321,\r\n  \"address\":{\r\n    \"line1\":\"__masked__\",\r\n    \"line2\":\"line2\",\r\n    \"street\":\"_____\"\r\n  }\r\n}"
+            "text": "{\"test\":\"test\",\"test1\":-12321,\"address\":{\"line1\":\"__masked__\",\"line2\":\"line2\",\"street\":\"_____\"}}"
           },
           "redirectURL": "",
-          "headersSize": 249,
-          "bodySize": 129
+          "headersSize": 248,
+          "bodySize": 93
         },
         "cache": {},
         "timings": { "send": -1, "wait": -1, "receive": -1 },
diff --git a/testdata/captures_no_response_body_when_not_modified_output.json b/testdata/captures_no_response_body_when_not_modified_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
diff --git a/testdata/captures_post_request_with_body_input.json b/testdata/captures_post_request_with_body_input.json
@@ -8,12 +8,12 @@
     "url": "http://test.com/test",
     "headers": [
       { "key": "Content-Type", "values": ["application/json"] },
-      { "key": "Content-Length", "values": ["16"] },
+      { "key": "Content-Length", "values": ["15"] },
       { "key": "Host", "values": ["test.com"] },
       { "key": "Accept-Encoding", "values": ["gzip, deflate"] },
       { "key": "Connection", "values": ["close"] }
     ],
-    "body": "{\"test\": \"test\"}",
+    "body": "{\"test\":\"test\"}",
     "response_status": -1,
     "response_body": "test",
     "response_headers": [
diff --git a/testdata/captures_post_request_with_body_output.json b/testdata/captures_post_request_with_body_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
@@ -25,7 +25,7 @@
             },
             {
               "name": "Content-Length",
-              "value": "16"
+              "value": "15"
             },
             {
               "name": "Content-Type",
@@ -40,10 +40,10 @@
           "postData": {
             "mimeType": "application/json",
             "params": [],
-            "text": "{\"test\": \"test\"}"
+            "text": "{\"test\":\"test\"}"
           },
           "headersSize": 119,
-          "bodySize": 16
+          "bodySize": 15
         },
         "response": {
           "status": 200,
diff --git a/testdata/captures_query_params_output.json b/testdata/captures_query_params_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-go-sdk",
-      "version": "1.3.0"
+      "version": "1.3.4"
     },
     "entries": [
       {
diff --git a/testdata/captures_redirect_output.json b/testdata/captures_redirect_output.json
diff --git a/testdata/drops_request_and_response_bodies_when_request_body_too_large_input.json b/testdata/drops_request_and_response_bodies_when_request_body_too_large_input.json
diff --git a/testdata/drops_request_and_response_bodies_when_request_body_too_large_output.json b/testdata/drops_request_and_response_bodies_when_request_body_too_large_output.json
diff --git a/testdata/drops_response_body_when_too_large_input.json b/testdata/drops_response_body_when_too_large_input.json
diff --git a/testdata/drops_response_body_when_too_large_output.json b/testdata/drops_response_body_when_too_large_output.json

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ const (`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`var (`
`32`		`- speakeasyVersion = "1.3.0" // TODO get this from CI`
	`32`	`+ speakeasyVersion = "1.3.4" // TODO get this from CI`
`33`	`33`	`serverURL = "grpc.prod.speakeasyapi.dev:443"`
`34`	`34`
`35`	`35`	`defaultInstance *Speakeasy`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"version": "1.2",`
`4`	`4`	`"creator": {`
`5`	`5`	`"name": "speakeasy-go-sdk",`
`6`		`- "version": "1.3.0"`
	`6`	`+ "version": "1.3.4"`
`7`	`7`	`},`
`8`	`8`	`"entries": [`
`9`	`9`	`{`