Merge pull request #22 from speakeasy-api/dependabot/go_modules/github.com/labstack/echo/v4-4.9.0

TristanSpeakEasy · web-flow · commit e8304a0362f6 · 2022-10-31T17:19:10.000Z
chore(deps): bump github.com/labstack/echo/v4 from 4.7.2 to 4.9.0
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.14
+          go-version: 1.16
 
       - name: Configure git for private modules
         env:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        go-version: [1.14.x, 1.15.x, 1.16.x, 1.17.x, 1.18.x]
+        go-version: [1.16.x, 1.17.x, 1.18.x, 1.19.x]
 
     name: Tests - Go ${{ matrix.go-version }}
 
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,68 +1,68 @@
 linters:
-  enable-all: true
-  disable:
-    - lll
-    - varnamelen
-    - exhaustivestruct
-    - exhaustruct
-    - godox
-    - nlreturn
-    - wsl
-    - wrapcheck
-    - gochecknoglobals
-    - paralleltest
-    - dupl
-    - golint
-    - maligned
-    # deprecated/archived
-    - interfacer
-    - scopelint
-issues:
-  include:
-    - EXC0002
-    - EXC0011
-    - EXC0012
-    - EXC0013
-    - EXC0014
-    - EXC0015
-  exclude:
-    - "returns unexported type"
-    - "unlambda"
-  exclude-rules:
-    # Exclude some linters from running on tests files.
-    - path: _test\.go
-      linters:
-        - goerr113
-        - funlen
-        - godot
+    enable-all: true
+    disable:
+        - lll
+        - varnamelen
+        - exhaustivestruct
+        - exhaustruct
+        - godox
+        - nlreturn
+        - wsl
+        - wrapcheck
+        - gochecknoglobals
+        - paralleltest
         - dupl
-        - gocognit
-        - cyclop
-        - noctx
-        - nosnakecase
-        - maintidx
-        - gosec
-        - gocyclo
-    - path: _exports_test\.go
-      linters:
-        - testpackage
-    - path: cmd/*
-      linters:
-        - funlen
+        - golint
+        - maligned
+        # deprecated/archived
+        - interfacer
+        - scopelint
+issues:
+    include:
+        - EXC0002
+        - EXC0011
+        - EXC0012
+        - EXC0013
+        - EXC0014
+        - EXC0015
+    exclude:
+        - "returns unexported type"
+        - "unlambda"
+    exclude-rules:
+        # Exclude some linters from running on tests files.
+        - path: _test\.go
+          linters:
+              - goerr113
+              - funlen
+              - godot
+              - dupl
+              - gocognit
+              - cyclop
+              - noctx
+              - nosnakecase
+              - maintidx
+              - gosec
+              - gocyclo
+        - path: _exports_test\.go
+          linters:
+              - testpackage
+        - path: cmd/*
+          linters:
+              - funlen
 linters-settings:
-  tagliatelle:
-    case:
-      use-field-name: true
-      rules:
-        json: snake
-        yaml: camel
-  revive:
-    rules:
-      - name: var-naming
-        arguments: [["API"], []]
-  stylecheck:
-    checks: ["all", "-ST1000", "-ST1003"]
-  cyclop:
-    max-complexity: 15
+    tagliatelle:
+        case:
+            use-field-name: true
+            rules:
+                json: snake
+                yaml: camel
+    revive:
+        rules:
+            - name: var-naming
+              arguments: [["API"], []]
+    stylecheck:
+        checks: ["all", "-ST1000", "-ST1003"]
+    cyclop:
+        max-complexity: 15
 run:
-  go: "1.14"
+    go: "1.16"
diff --git a/capture.go b/capture.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"time"
@@ -48,7 +47,7 @@ func (s *Speakeasy) handleRequestResponseError(w http.ResponseWriter, r *http.Re
 		// (as io.Reader is a stream and can only be read once) but we are potentially storing a large request (such as a file upload)
 		// in memory, so we may need to allow the middleware to be configured to not read the body or have a max size
 		tee := io.TeeReader(r.Body, cw.GetRequestWriter())
-		r.Body = ioutil.NopCloser(tee)
+		r.Body = io.NopCloser(tee)
 	}
 
 	ctx, c := contextWithController(r.Context(), s)
@@ -81,7 +80,7 @@ func (s *Speakeasy) captureRequestResponse(cw *captureWriter, r *http.Request, s
 	if cw.IsReqValid() && cw.GetReqBuffer().Len() == 0 && r.Body != nil {
 		// Read the body just in case it was not read in the handler
 		//nolint: errcheck
-		io.Copy(ioutil.Discard, r.Body)
+		io.Copy(io.Discard, r.Body)
 	}
 
 	harData, err := json.Marshal(s.harBuilder.buildHarFile(ctx, cw, r, startTime, c))
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/speakeasy-api/speakeasy-go-sdk
 
-go 1.14
+go 1.16
 
 require (
 	github.com/chromedp/cdproto v0.0.0-20220629234738-4cfc9cdeeb92
@@ -13,7 +13,7 @@ require (
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
-	github.com/labstack/echo/v4 v4.7.2
+	github.com/labstack/echo/v4 v4.9.0
 	github.com/speakeasy-api/speakeasy-schemas v1.3.0
 	go.uber.org/zap v1.21.0
 	google.golang.org/grpc v1.48.0
diff --git a/go.sum b/go.sum
@@ -91,8 +91,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.7.2 h1:Kv2/p8OaQ+M6Ex4eGimg9b9e6icoxA42JSlOR3msKtI=
-github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
+github.com/labstack/echo/v4 v4.9.0 h1:wPOF1CE6gvt/kmbMR4dGzWvHMPT+sAEUJOwOTtvITVY=
+github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
 github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o=
 github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
diff --git a/harbuilder.go b/harbuilder.go
@@ -209,7 +209,6 @@ func (h *harBuilder) getHarResponse(ctx context.Context, cw *captureWriter, r *h
 		contentLength := cw.origResW.Header().Get("Content-Length")
 		if contentLength != "" {
 			var err error
-			//nolint:gomnd
 			bodySize, err = strconv.ParseInt(contentLength, 10, 64)
 			if err != nil {
 				bodySize = -1
diff --git a/middleware_test.go b/middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"log"
 	"math/rand"
 	"net"
@@ -83,22 +83,22 @@ const (
 func loadTestData(t *testing.T) []test {
 	t.Helper()
 
-	files, err := ioutil.ReadDir("testdata")
+	files, err := os.ReadDir("testdata")
 	require.NoError(t, err)
 
 	tests := []test{}
 	for _, file := range files {
 		if strings.HasSuffix(file.Name(), "_input.json") {
 			baseName := strings.TrimSuffix(file.Name(), "_input.json")
 
-			inputData, err := ioutil.ReadFile("testdata/" + file.Name())
+			inputData, err := os.ReadFile("testdata/" + file.Name())
 			require.NoError(t, err)
 
 			tt := test{}
 			err = json.Unmarshal(inputData, &tt)
 			require.NoError(t, err)
 
-			outputData, err := ioutil.ReadFile("testdata/" + baseName + "_output.json")
+			outputData, err := os.ReadFile("testdata/" + baseName + "_output.json")
 			require.NoError(t, err)
 
 			outputDataMinified := bytes.NewBuffer([]byte{})
@@ -221,7 +221,7 @@ func TestSpeakeasy_Middleware_Capture_Success(t *testing.T) {
 				}
 
 				if req.Body != nil {
-					data, err := ioutil.ReadAll(req.Body)
+					data, err := io.ReadAll(req.Body)
 					assert.NoError(t, err)
 					assert.Equal(t, tt.Args.Body, string(data))
 				}
@@ -719,7 +719,7 @@ func TestSpeakeasy_GinMiddleware_Success(t *testing.T) {
 				}
 
 				if ctx.Request.Body != nil {
-					data, err := ioutil.ReadAll(ctx.Request.Body)
+					data, err := io.ReadAll(ctx.Request.Body)
 					assert.NoError(t, err)
 					assert.Equal(t, tt.Args.Body, string(data))
 				}
@@ -959,7 +959,7 @@ func TestSpeakeasy_EchoMiddleware_Success(t *testing.T) {
 				}
 
 				if c.Request().Body != nil {
-					data, err := ioutil.ReadAll(c.Request().Body)
+					data, err := io.ReadAll(c.Request().Body)
 					assert.NoError(t, err)
 					assert.Equal(t, tt.Args.Body, string(data))
 				}
