fix golangci-lint warnings

shogo82148 · shogo82148 · commit e4d48bd41388 · 2025-12-07T00:42:39.000+09:00
diff --git a/events/alb.go b/events/alb.go
@@ -20,7 +20,7 @@ type ALBTargetGroupRequestContext struct {
 
 // ELBContext contains the information to identify the ARN invoking the lambda
 type ELBContext struct {
-	TargetGroupArn string `json:"targetGroupArn"` //nolint: stylecheck
+	TargetGroupArn string `json:"targetGroupArn"` //nolint: staticcheck
 }
 
 // ALBTargetGroupResponse configures the response to be returned by the ALB Lambda target group for the request
diff --git a/events/apigw.go b/events/apigw.go
@@ -208,7 +208,7 @@ type APIGatewayRequestIdentity struct {
 	SourceIP                      string                                                          `json:"sourceIp"`
 	CognitoAuthenticationType     string                                                          `json:"cognitoAuthenticationType,omitempty"`
 	CognitoAuthenticationProvider string                                                          `json:"cognitoAuthenticationProvider,omitempty"`
-	UserArn                       string                                                          `json:"userArn,omitempty"` //nolint: stylecheck
+	UserArn                       string                                                          `json:"userArn,omitempty"` //nolint: staticcheck
 	UserAgent                     string                                                          `json:"userAgent"`
 	User                          string                                                          `json:"user,omitempty"`
 	ClientCert                    *APIGatewayCustomAuthorizerRequestTypeRequestIdentityClientCert `json:"clientCert,omitempty"`
@@ -317,7 +317,7 @@ type APIGatewayV2CustomAuthorizerV1RequestTypeRequestContext struct {
 type APIGatewayV2CustomAuthorizerV1Request struct {
 	Version               string                                                  `json:"version"`
 	Type                  string                                                  `json:"type"`
-	MethodArn             string                                                  `json:"methodArn"` //nolint: stylecheck
+	MethodArn             string                                                  `json:"methodArn"` //nolint: staticcheck
 	IdentitySource        string                                                  `json:"identitySource"`
 	AuthorizationToken    string                                                  `json:"authorizationToken"`
 	Resource              string                                                  `json:"resource"`
@@ -333,7 +333,7 @@ type APIGatewayV2CustomAuthorizerV1Request struct {
 type APIGatewayV2CustomAuthorizerV2Request struct {
 	Version               string                         `json:"version"`
 	Type                  string                         `json:"type"`
-	RouteArn              string                         `json:"routeArn"` //nolint: stylecheck
+	RouteArn              string                         `json:"routeArn"` //nolint: staticcheck
 	IdentitySource        []string                       `json:"identitySource"`
 	RouteKey              string                         `json:"routeKey"`
 	RawPath               string                         `json:"rawPath"`
@@ -372,13 +372,13 @@ type APIGatewayCustomAuthorizerRequestTypeRequestContext struct {
 type APIGatewayCustomAuthorizerRequest struct {
 	Type               string `json:"type"`
 	AuthorizationToken string `json:"authorizationToken"`
-	MethodArn          string `json:"methodArn"` //nolint: stylecheck
+	MethodArn          string `json:"methodArn"` //nolint: staticcheck
 }
 
 // APIGatewayCustomAuthorizerRequestTypeRequest contains data coming in to a custom API Gateway authorizer function.
 type APIGatewayCustomAuthorizerRequestTypeRequest struct {
 	Type                            string                                              `json:"type"`
-	MethodArn                       string                                              `json:"methodArn"` //nolint: stylecheck
+	MethodArn                       string                                              `json:"methodArn"` //nolint: staticcheck
 	Resource                        string                                              `json:"resource"`
 	Path                            string                                              `json:"path"`
 	HTTPMethod                      string                                              `json:"httpMethod"`
diff --git a/events/attributevalue.go b/events/attributevalue.go
@@ -20,7 +20,7 @@ type DynamoDBAttributeValue struct {
 
 // This struct represents DynamoDBAttributeValue which doesn't
 // implement fmt.Stringer interface and safely `fmt.Sprintf`able
-type dynamoDbAttributeValue DynamoDBAttributeValue //nolint: stylecheck
+type dynamoDbAttributeValue DynamoDBAttributeValue //nolint: staticcheck
 
 // Binary provides access to an attribute of type Binary.
 // Method panics if the attribute is not of type Binary.
diff --git a/events/code_commit.go b/events/code_commit.go
@@ -52,7 +52,7 @@ type CodeCommitRecord struct {
 	EventPartNumber      uint64               `json:"eventPartNumber"`
 	CodeCommit           CodeCommitCodeCommit `json:"codecommit"`
 	EventName            string               `json:"eventName"`
-	EventTriggerConfigId string               `json:"eventTriggerConfigId"` //nolint: stylecheck
+	EventTriggerConfigId string               `json:"eventTriggerConfigId"` //nolint: staticcheck
 	EventSourceARN       string               `json:"eventSourceARN"`
 	UserIdentityARN      string               `json:"userIdentityARN"`
 	EventSource          string               `json:"eventSource"`
diff --git a/events/config.go b/events/config.go
@@ -7,13 +7,13 @@ type ConfigEvent struct {
 	// The ID of the AWS account that owns the rule
 	AccountID string `json:"accountId"`
 	// The ARN that AWS Config assigned to the rule
-	ConfigRuleArn string `json:"configRuleArn"` //nolint:stylecheck
-	ConfigRuleID  string `json:"configRuleId"`  //nolint:stylecheck
+	ConfigRuleArn string `json:"configRuleArn"` //nolint:staticcheck
+	ConfigRuleID  string `json:"configRuleId"`  //nolint:staticcheck
 	// The name that you assigned to the rule that caused AWS Config to publish the event
 	ConfigRuleName string `json:"configRuleName"`
 	// A boolean value that indicates whether the AWS resource to be evaluated has been removed from the rule's scope
 	EventLeftScope   bool   `json:"eventLeftScope"`
-	ExecutionRoleArn string `json:"executionRoleArn"` //nolint:stylecheck
+	ExecutionRoleArn string `json:"executionRoleArn"` //nolint:staticcheck
 	// If the event is published in response to a resource configuration change, this value contains a JSON configuration item
 	InvokingEvent string `json:"invokingEvent"`
 	// A token that the function must pass to AWS Config with the PutEvaluations call
diff --git a/events/dynamodb.go b/events/dynamodb.go
@@ -56,7 +56,7 @@ type DynamoDBEventRecord struct {
 	EventVersion string `json:"eventVersion"`
 
 	// The event source ARN of DynamoDB
-	EventSourceArn string `json:"eventSourceARN"` //nolint: stylecheck
+	EventSourceArn string `json:"eventSourceARN"` //nolint: staticcheck
 
 	// Items that are deleted by the Time to Live process after expiration have
 	// the following fields:
diff --git a/events/firehose.go b/events/firehose.go
@@ -5,8 +5,8 @@ package events
 // KinesisFirehoseEvent represents the input event from Amazon Kinesis Firehose. It is used as the input parameter.
 type KinesisFirehoseEvent struct {
 	InvocationID           string                       `json:"invocationId"`
-	DeliveryStreamArn      string                       `json:"deliveryStreamArn"`      //nolint: stylecheck
-	SourceKinesisStreamArn string                       `json:"sourceKinesisStreamArn"` //nolint: stylecheck
+	DeliveryStreamArn      string                       `json:"deliveryStreamArn"`      //nolint: staticcheck
+	SourceKinesisStreamArn string                       `json:"sourceKinesisStreamArn"` //nolint: staticcheck
 	Region                 string                       `json:"region"`
 	Records                []KinesisFirehoseEventRecord `json:"records"`
 }
diff --git a/events/kinesis.go b/events/kinesis.go
@@ -20,13 +20,13 @@ type KinesisTimeWindowEventResponse struct {
 }
 
 type KinesisEventRecord struct {
-	AwsRegion         string        `json:"awsRegion"` //nolint: stylecheck
+	AwsRegion         string        `json:"awsRegion"` //nolint: staticcheck
 	EventID           string        `json:"eventID"`
 	EventName         string        `json:"eventName"`
 	EventSource       string        `json:"eventSource"`
-	EventSourceArn    string        `json:"eventSourceARN"` //nolint: stylecheck
+	EventSourceArn    string        `json:"eventSourceARN"` //nolint: staticcheck
 	EventVersion      string        `json:"eventVersion"`
-	InvokeIdentityArn string        `json:"invokeIdentityArn"` //nolint: stylecheck
+	InvokeIdentityArn string        `json:"invokeIdentityArn"` //nolint: staticcheck
 	Kinesis           KinesisRecord `json:"kinesis"`
 }
 
diff --git a/events/s3.go b/events/s3.go
@@ -44,7 +44,7 @@ type S3Entity struct {
 type S3Bucket struct {
 	Name          string         `json:"name"`
 	OwnerIdentity S3UserIdentity `json:"ownerIdentity"`
-	Arn           string         `json:"arn"` //nolint: stylecheck
+	Arn           string         `json:"arn"` //nolint: staticcheck
 }
 
 type S3Object struct {
diff --git a/events/sns.go b/events/sns.go
@@ -12,7 +12,7 @@ type SNSEvent struct {
 
 type SNSEventRecord struct {
 	EventVersion         string    `json:"EventVersion"`
-	EventSubscriptionArn string    `json:"EventSubscriptionArn"` //nolint: stylecheck
+	EventSubscriptionArn string    `json:"EventSubscriptionArn"` //nolint: staticcheck
 	EventSource          string    `json:"EventSource"`
 	SNS                  SNSEntity `json:"Sns"`
 }
@@ -21,7 +21,7 @@ type SNSEntity struct {
 	Signature         string                 `json:"Signature"`
 	MessageID         string                 `json:"MessageId"`
 	Type              string                 `json:"Type"`
-	TopicArn          string                 `json:"TopicArn"` //nolint: stylecheck
+	TopicArn          string                 `json:"TopicArn"` //nolint: staticcheck
 	MessageAttributes map[string]interface{} `json:"MessageAttributes"`
 	SignatureVersion  string                 `json:"SignatureVersion"`
 	Timestamp         time.Time              `json:"Timestamp"`
diff --git a/events/sqs.go b/events/sqs.go
@@ -7,7 +7,7 @@ type SQSEvent struct {
 }
 
 type SQSMessage struct {
-	MessageId              string                         `json:"messageId"` //nolint: stylecheck
+	MessageId              string                         `json:"messageId"` //nolint: staticcheck
 	ReceiptHandle          string                         `json:"receiptHandle"`
 	Body                   string                         `json:"body"`
 	Md5OfBody              string                         `json:"md5OfBody"`
diff --git a/events/test/assert.go b/events/test/assert.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-// nolint: stylecheck
+// nolint: staticcheck
 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: staticcheck
 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: staticcheck
 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: staticcheck
 func TestMalformedJson(t *testing.T, objectToDeserialize interface{}) {
 	// 1. read JSON from file
 	inputJson := GetMalformedJson()
diff --git a/lambda/handler_test.go b/lambda/handler_test.go
@@ -76,7 +76,7 @@ func TestInvalidHandlers(t *testing.T) {
 		{
 			name:     "handler returning two values does not declare error as the second return value",
 			expected: errors.New("handler returns two values, but the second does not implement error"),
-			//nolint: stylecheck
+			//nolint: staticcheck
 			handler: func() (error, string) {
 				return nil, "hello"
 			},
diff --git a/lambda/messages/messages.go b/lambda/messages/messages.go
@@ -10,21 +10,21 @@ type PingRequest struct {
 type PingResponse struct {
 }
 
-//nolint:stylecheck
+//nolint:staticcheck
 type InvokeRequest_Timestamp struct {
 	Seconds int64
 	Nanos   int64
 }
 
-//nolint:stylecheck
+//nolint:staticcheck
 type InvokeRequest struct {
 	Payload               []byte
-	RequestId             string //nolint:stylecheck
+	RequestId             string //nolint:staticcheck
 	XAmznTraceId          string
 	Deadline              InvokeRequest_Timestamp
 	InvokedFunctionArn    string
-	CognitoIdentityId     string //nolint:stylecheck
-	CognitoIdentityPoolId string //nolint:stylecheck
+	CognitoIdentityId     string //nolint:staticcheck
+	CognitoIdentityPoolId string //nolint:staticcheck
 	ClientContext         []byte
 }
 
@@ -33,7 +33,7 @@ type InvokeResponse struct {
 	Error   *InvokeResponse_Error
 }
 
-//nolint:stylecheck
+//nolint:staticcheck
 type InvokeResponse_Error struct {
 	Message    string                             `json:"errorMessage"`
 	Type       string                             `json:"errorType"`
@@ -45,7 +45,7 @@ func (e InvokeResponse_Error) Error() string {
 	return fmt.Sprintf("%#v", e)
 }
 
-//nolint:stylecheck
+//nolint:staticcheck
 type InvokeResponse_Error_StackFrame struct {
 	Path  string `json:"path"`
 	Line  int32  `json:"line"`
diff --git a/lambdacontext/context.go b/lambdacontext/context.go
@@ -73,8 +73,8 @@ type CognitoIdentity struct {
 
 // LambdaContext is the set of metadata that is passed for every Invoke.
 type LambdaContext struct {
-	AwsRequestID       string //nolint: stylecheck
-	InvokedFunctionArn string //nolint: stylecheck
+	AwsRequestID       string //nolint: staticcheck
+	InvokedFunctionArn string //nolint: staticcheck
 	Identity           CognitoIdentity
 	ClientContext      ClientContext
 	TenantID           string `json:",omitempty"`

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type ALBTargetGroupRequestContext struct {`
`20`	`20`
`21`	`21`	`// ELBContext contains the information to identify the ARN invoking the lambda`
`22`	`22`	`type ELBContext struct {`
`23`		- TargetGroupArn string `json:"targetGroupArn"` //nolint: stylecheck
	`23`	+ TargetGroupArn string `json:"targetGroupArn"` //nolint: staticcheck
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// ALBTargetGroupResponse configures the response to be returned by the ALB Lambda target group for the request`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ type S3Entity struct {`
`44`	`44`	`type S3Bucket struct {`
`45`	`45`	Name string `json:"name"`
`46`	`46`	OwnerIdentity S3UserIdentity `json:"ownerIdentity"`
`47`		- Arn string `json:"arn"` //nolint: stylecheck
	`47`	+ Arn string `json:"arn"` //nolint: staticcheck
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`type S3Object struct {`