Merge pull request aws#462 from bmoffatt/main

carlzogh · web-flow · commit 4c09e84d0e3e · 2022-08-11T09:04:21.000+01:00
add 1.19 to the unit test matrix
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,6 +18,6 @@ jobs:
 
       - name: golangci-golint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.45.0
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.48.0
           ./bin/golangci-lint run -v ./...
        
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,6 +10,7 @@ jobs:
     strategy:
       matrix:
         go:
+          - "1.19"
           - "1.18"
           - "1.17"
           - "1.16"
diff --git a/cfn/event_test.go b/cfn/event_test.go
@@ -4,7 +4,7 @@ package cfn
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/cfn/response.go b/cfn/response.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"log"
 	"net/http"
 )
diff --git a/cfn/wrap.go b/cfn/wrap.go
@@ -71,14 +71,14 @@ func lambdaWrapWithClient(lambdaFunction CustomResourceFunction, client httpClie
 // plate is taken away from the customer and it makes writing a Custom Resource
 // simpler.
 //
-// 	func myLambda(ctx context.Context, event cfn.Event) (physicalResourceID string, data map[string]interface{}, err error) {
-// 		physicalResourceID = "arn:...."
-// 		return
-// 	}
+//	func myLambda(ctx context.Context, event cfn.Event) (physicalResourceID string, data map[string]interface{}, err error) {
+//		physicalResourceID = "arn:...."
+//		return
+//	}
 //
-// 	func main() {
-// 		lambda.Start(cfn.LambdaWrap(myLambda))
-// 	}
+//	func main() {
+//		lambda.Start(cfn.LambdaWrap(myLambda))
+//	}
 func LambdaWrap(lambdaFunction CustomResourceFunction) (fn CustomResourceLambdaFunction) {
 	return lambdaWrapWithClient(lambdaFunction, http.DefaultClient)
 }
diff --git a/cfn/wrap_test.go b/cfn/wrap_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"net/http"
 	"testing"
 
diff --git a/cmd/build-lambda-zip/main.go b/cmd/build-lambda-zip/main.go
@@ -6,7 +6,7 @@ import (
 	"archive/zip"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"log"
 	"os"
 	"path/filepath"
diff --git a/cmd/build-lambda-zip/main_test.go b/cmd/build-lambda-zip/main_test.go
@@ -5,7 +5,7 @@ package main
 import (
 	"archive/zip"
 	"fmt"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"os"
 	"os/exec"
 	"path"
diff --git a/cmd/build-lambda-zip/testdata/apigw.go b/cmd/build-lambda-zip/testdata/apigw.go
@@ -9,8 +9,8 @@ import (
 	"github.com/aws/aws-lambda-go/lambda"
 )
 
-func main () {
-	lambda.Start(func (ctx context.Context, event events.APIGatewayV2HTTPRequest) (*events.APIGatewayProxyResponse, error) {
+func main() {
+	lambda.Start(func(ctx context.Context, event events.APIGatewayV2HTTPRequest) (*events.APIGatewayProxyResponse, error) {
 		return &events.APIGatewayProxyResponse{
 			Body: fmt.Sprintf("Hello %v", event),
 		}, nil
diff --git a/cmd/build-lambda-zip/testdata/noop.go b/cmd/build-lambda-zip/testdata/noop.go
@@ -8,11 +8,12 @@ import (
 )
 
 type BinaryHandler func(context.Context, []byte) ([]byte, error)
+
 func (bh BinaryHandler) Invoke(ctx context.Context, req []byte) ([]byte, error) {
 	return bh(ctx, req)
 }
 
-func noop (ctx context.Context, req []byte) ([]byte, error) {
+func noop(ctx context.Context, req []byte) ([]byte, error) {
 	return req, nil
 }
 
diff --git a/events/alb_test.go b/events/alb_test.go
@@ -2,7 +2,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/apigw_test.go b/events/apigw_test.go
@@ -4,7 +4,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/appsync_test.go b/events/appsync_test.go
@@ -2,7 +2,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/clientvpn_test.go b/events/clientvpn_test.go
@@ -2,7 +2,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/codebuild.go b/events/codebuild.go
@@ -93,7 +93,7 @@ type CodeBuildEventDetail struct {
 	CompletedPhaseEnd      CodeBuildTime        `json:"completed-phase-end"`
 }
 
-//CodeBuildEventAdditionalInformation represents additional information to the code build event
+// CodeBuildEventAdditionalInformation represents additional information to the code build event
 type CodeBuildEventAdditionalInformation struct {
 	Artifact CodeBuildArtifact `json:"artifact"`
 
diff --git a/events/codebuild_test.go b/events/codebuild_test.go
@@ -2,7 +2,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 	"time"
 
diff --git a/events/codedeploy_test.go b/events/codedeploy_test.go
@@ -3,7 +3,7 @@ package events
 import (
 	"encoding/json"
 	"github.com/stretchr/testify/require"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 	"time"
 )
diff --git a/events/codepipeline.go b/events/codepipeline.go
@@ -1,6 +1,7 @@
 package events
 
 // CodePipelineJob has been incorrectly assigned as CodePipelineEvent
-//  - https://github.com/aws/aws-lambda-go/issues/244
+//   - https://github.com/aws/aws-lambda-go/issues/244
+//
 // This maintains backwards compatability until a v2 release
 type CodePipelineEvent = CodePipelineJobEvent
diff --git a/events/codepipeline_cloudwatch_test.go b/events/codepipeline_cloudwatch_test.go
@@ -3,7 +3,7 @@ package events
 import (
 	"encoding/json"
 	"github.com/stretchr/testify/require"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 	"time"
 )
diff --git a/events/codepipeline_job_test.go b/events/codepipeline_job_test.go
@@ -3,7 +3,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/codepipeline_test.go b/events/codepipeline_test.go
@@ -3,7 +3,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/cognito_test.go b/events/cognito_test.go
@@ -3,7 +3,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/config_test.go b/events/config_test.go
@@ -3,7 +3,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/iot_test.go b/events/iot_test.go
@@ -2,7 +2,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/aws/aws-lambda-go/events/test"
diff --git a/events/lambda_function_urls_test.go b/events/lambda_function_urls_test.go
@@ -4,7 +4,7 @@ package events
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/stretchr/testify/assert"
diff --git a/events/test/assert.go b/events/test/assert.go
@@ -2,13 +2,13 @@ package test
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
-//nolint: stylecheck
+// nolint: stylecheck
 func AssertJsonFile(t *testing.T, file string, o interface{}) {
 	inputJSON, err := ioutil.ReadFile(file)
 	if err != nil {
@@ -17,7 +17,7 @@ func AssertJsonFile(t *testing.T, file string, o interface{}) {
 	AssertJsonBytes(t, inputJSON, o)
 }
 
-//nolint: stylecheck
+// nolint: stylecheck
 func AssertJsonBytes(t *testing.T, inputJSON []byte, o interface{}) {
 	// de-serialize
 	if err := json.Unmarshal(inputJSON, o); err != nil {
diff --git a/events/test/jsonblobs.go b/events/test/jsonblobs.go
@@ -1,6 +1,6 @@
 package test
 
-//nolint: stylecheck
+// nolint: stylecheck
 func GetMalformedJson() []byte {
 	return []byte(`{ "Records`)
 }
diff --git a/events/test/jsonsyntax.go b/events/test/jsonsyntax.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 )
 
-//nolint: stylecheck
+// nolint: stylecheck
 func TestMalformedJson(t *testing.T, objectToDeserialize interface{}) {
 	// 1. read JSON from file
 	inputJson := GetMalformedJson()
diff --git a/events/test/readjson.go b/events/test/readjson.go
@@ -1,7 +1,7 @@
 package test
 
 import (
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"testing"
 )
 
diff --git a/lambda/entry.go b/lambda/entry.go
@@ -14,24 +14,24 @@ import (
 //
 // Rules:
 //
-// 	* handler must be a function
-// 	* handler may take between 0 and two arguments.
-// 	* if there are two arguments, the first argument must satisfy the "context.Context" interface.
-// 	* handler may return between 0 and two arguments.
-// 	* if there are two return values, the second argument must be an error.
-// 	* if there is one return value it must be an error.
+//   - handler must be a function
+//   - handler may take between 0 and two arguments.
+//   - if there are two arguments, the first argument must satisfy the "context.Context" interface.
+//   - handler may return between 0 and two arguments.
+//   - if there are two return values, the second argument must be an error.
+//   - if there is one return value it must be an error.
 //
 // Valid function signatures:
 //
-// 	func ()
-// 	func () error
-// 	func (TIn) error
-// 	func () (TOut, error)
-// 	func (TIn) (TOut, error)
-// 	func (context.Context) error
-// 	func (context.Context, TIn) error
-// 	func (context.Context) (TOut, error)
-// 	func (context.Context, TIn) (TOut, error)
+//	func ()
+//	func () error
+//	func (TIn) error
+//	func () (TOut, error)
+//	func (TIn) (TOut, error)
+//	func (context.Context) error
+//	func (context.Context, TIn) error
+//	func (context.Context) (TOut, error)
+//	func (context.Context, TIn) (TOut, error)
 //
 // Where "TIn" and "TOut" are types compatible with the "encoding/json" standard library.
 // See https://golang.org/pkg/encoding/json/#Unmarshal for how deserialization behaves
@@ -51,7 +51,7 @@ func StartWithContext(ctx context.Context, handler interface{}) {
 //
 // Handler implementation requires a single "Invoke()" function:
 //
-//  func Invoke(context.Context, []byte) ([]byte, error)
+//	func Invoke(context.Context, []byte) ([]byte, error)
 //
 // Deprecated: use lambda.Start(handler) instead
 func StartHandler(handler Handler) {
@@ -83,7 +83,7 @@ var (
 //
 // Handler implementation requires a single "Invoke()" function:
 //
-//  func Invoke(context.Context, []byte) ([]byte, error)
+//	func Invoke(context.Context, []byte) ([]byte, error)
 //
 // Deprecated: use lambda.StartWithOptions(handler, lambda.WithContext(ctx)) instead
 func StartHandlerWithContext(ctx context.Context, handler Handler) {
diff --git a/lambda/extensions_api_client.go b/lambda/extensions_api_client.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"io/ioutil" //nolint: staticcheck
 	"net/http"
 )
 
diff --git a/lambda/handler.go b/lambda/handler.go
diff --git a/lambda/runtime_api_client.go b/lambda/runtime_api_client.go
diff --git a/lambda/runtime_api_client_test.go b/lambda/runtime_api_client_test.go
diff --git a/lambda/sigterm_test.go b/lambda/sigterm_test.go

-Original file line number
+Diff line change
     strategy:
       matrix:
         go:
 +          - "1.19"
           - "1.18"
           - "1.17"
           - "1.16"
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"bytes"`
`7`	`7`	`"encoding/json"`
`8`	`8`	`"fmt"`
`9`		`- "io/ioutil"`
	`9`	`+ "io/ioutil" //nolint: staticcheck`
`10`	`10`	`"log"`
`11`	`11`	`"net/http"`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,12 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type BinaryHandler func(context.Context, []byte) ([]byte, error)`
	`11`	`+`
`11`	`12`	`func (bh BinaryHandler) Invoke(ctx context.Context, req []byte) ([]byte, error) {`
`12`	`13`	`return bh(ctx, req)`
`13`	`14`	`}`
`14`	`15`
`15`		`-func noop (ctx context.Context, req []byte) ([]byte, error) {`
	`16`	`+func noop(ctx context.Context, req []byte) ([]byte, error) {`
`16`	`17`	`return req, nil`
`17`	`18`	`}`
`18`	`19`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ type CodeBuildEventDetail struct {`
`93`	`93`	CompletedPhaseEnd CodeBuildTime `json:"completed-phase-end"`
`94`	`94`	`}`
`95`	`95`
`96`		`-//CodeBuildEventAdditionalInformation represents additional information to the code build event`
	`96`	`+// CodeBuildEventAdditionalInformation represents additional information to the code build event`
`97`	`97`	`type CodeBuildEventAdditionalInformation struct {`
`98`	`98`	Artifact CodeBuildArtifact `json:"artifact"`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package events`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"github.com/stretchr/testify/require"`
`6`		`- "io/ioutil"`
	`6`	`+ "io/ioutil" //nolint: staticcheck`
`7`	`7`	`"testing"`
`8`	`8`	`"time"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package test`
`2`	`2`
`3`		`-//nolint: stylecheck`
	`3`	`+// nolint: stylecheck`
`4`	`4`	`func GetMalformedJson() []byte {`
`5`	`5`	return []byte(`{ "Records`)
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"testing"`
`8`	`8`	`)`
`9`	`9`
`10`		`-//nolint: stylecheck`
	`10`	`+// nolint: stylecheck`
`11`	`11`	`func TestMalformedJson(t *testing.T, objectToDeserialize interface{}) {`
`12`	`12`	`// 1. read JSON from file`
`13`	`13`	`inputJson := GetMalformedJson()`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package test`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "io/ioutil"`
	`4`	`+ "io/ioutil" //nolint: staticcheck`
`5`	`5`	`"testing"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"fmt"`
`7`	`7`	`"io"`
`8`		`- "io/ioutil"`
	`8`	`+ "io/ioutil" //nolint: staticcheck`
`9`	`9`	`"net/http"`
`10`	`10`	`)`
`11`	`11`