This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/answer.git
The following commit(s) were added to refs/heads/dev by this push:
new bc629db1 chore(deps): bump mockgen to 0.6.0 for go1.25 support
bc629db1 is described below
commit bc629db13266dfcd9560da38b39d71a615a1664f
Author: ferhat elmas <[email protected]>
AuthorDate: Thu Nov 27 22:05:14 2025 +0100
chore(deps): bump mockgen to 0.6.0 for go1.25 support
Signed-off-by: ferhat elmas <[email protected]>
---
Makefile | 4 ++--
README.md | 2 +-
cmd/wire_gen.go | 8 ++++----
docs/docs.go | 32 +++++++++++++++++++++++---------
docs/swagger.json | 32 +++++++++++++++++++++++---------
docs/swagger.yaml | 28 +++++++++++++++++++---------
go.mod | 14 +++++++-------
go.sum | 36 ++++++++++++++++++------------------
8 files changed, 97 insertions(+), 59 deletions(-)
diff --git a/Makefile b/Makefile
index 6e9679a8..8ab23cce 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,10 @@ universal: generate
generate:
@$(GO) get github.com/swaggo/swag/cmd/[email protected]
@$(GO) get github.com/google/wire/cmd/[email protected]
- @$(GO) get go.uber.org/mock/[email protected]
+ @$(GO) get go.uber.org/mock/[email protected]
@$(GO) install github.com/swaggo/swag/cmd/[email protected]
@$(GO) install github.com/google/wire/cmd/[email protected]
- @$(GO) install go.uber.org/mock/[email protected]
+ @$(GO) install go.uber.org/mock/[email protected]
@$(GO) generate ./...
@$(GO) mod tidy
diff --git a/README.md b/README.md
index 8d201500..36236549 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ You can also check out the [plugins
here](https://answer.apache.org/plugins).
- Golang >= 1.23
- Node.js >= 20
- pnpm >= 9
-- [mockgen](https://github.com/uber-go/mock?tab=readme-ov-file#installation)
>= 1.6.0
+- [mockgen](https://github.com/uber-go/mock?tab=readme-ov-file#installation)
>= 0.6.0
- [wire](https://github.com/google/wire/) >= 0.5.0
### Build
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index bda555bc..aae1c6af 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -192,22 +192,22 @@ func initApplication(debug bool, serverConf *conf.Server,
dbConf *data.Database,
objService := object_info.NewObjService(answerRepo, questionRepo,
commentCommonRepo, tagCommonRepo, tagCommonService)
notificationQueueService := notice_queue.NewNotificationQueueService()
externalNotificationQueueService :=
notice_queue.NewNewQuestionNotificationQueueService()
+ reviewRepo := review.NewReviewRepo(dataData)
+ reviewService := review2.NewReviewService(reviewRepo, objService,
userCommon, userRepo, questionRepo, answerRepo, userRoleRelService,
externalNotificationQueueService, tagCommonService, questionCommon,
notificationQueueService, siteInfoCommonService, commentCommonRepo)
+ commentService := comment2.NewCommentService(commentRepo,
commentCommonRepo, userCommon, objService, voteRepo, emailService, userRepo,
notificationQueueService, externalNotificationQueueService,
activityQueueService, eventQueueService, reviewService)
rolePowerRelRepo := role.NewRolePowerRelRepo(dataData)
rolePowerRelService := role2.NewRolePowerRelService(rolePowerRelRepo,
userRoleRelService)
rankService := rank2.NewRankService(userCommon, userRankRepo,
objService, userRoleRelService, rolePowerRelService, configService)
limitRepo := limit.NewRateLimitRepo(dataData)
rateLimitMiddleware := middleware.NewRateLimitMiddleware(limitRepo)
+ commentController := controller.NewCommentController(commentService,
rankService, captchaService, rateLimitMiddleware)
reportRepo := report.NewReportRepo(dataData, uniqueIDRepo)
tagService := tag2.NewTagService(tagRepo, tagCommonService,
revisionService, followRepo, siteInfoCommonService, activityQueueService)
answerActivityRepo := activity.NewAnswerActivityRepo(dataData,
activityRepo, userRankRepo, notificationQueueService)
answerActivityService :=
activity2.NewAnswerActivityService(answerActivityRepo, configService)
externalNotificationService :=
notification.NewExternalNotificationService(dataData,
userNotificationConfigRepo, followRepo, emailService, userRepo,
externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
- reviewRepo := review.NewReviewRepo(dataData)
- reviewService := review2.NewReviewService(reviewRepo, objService,
userCommon, userRepo, questionRepo, answerRepo, userRoleRelService,
externalNotificationQueueService, tagCommonService, questionCommon,
notificationQueueService, siteInfoCommonService, commentCommonRepo)
questionService := content.NewQuestionService(activityRepo,
questionRepo, answerRepo, tagCommonService, tagService, questionCommon,
userCommon, userRepo, userRoleRelService, revisionService, metaCommonService,
collectionCommon, answerActivityService, emailService,
notificationQueueService, externalNotificationQueueService,
activityQueueService, siteInfoCommonService, externalNotificationService,
reviewService, configService, eventQueueService, reviewRepo)
answerService := content.NewAnswerService(answerRepo, questionRepo,
questionCommon, userCommon, collectionCommon, userRepo, revisionService,
answerActivityService, answerCommon, voteRepo, emailService,
userRoleRelService, notificationQueueService, externalNotificationQueueService,
activityQueueService, reviewService, eventQueueService)
- commentService := comment2.NewCommentService(commentRepo,
commentCommonRepo, userCommon, objService, voteRepo, emailService, userRepo,
notificationQueueService, externalNotificationQueueService,
activityQueueService, eventQueueService, reviewService)
- commentController := controller.NewCommentController(commentService,
rankService, captchaService, rateLimitMiddleware)
reportHandle := report_handle.NewReportHandle(questionService,
answerService, commentService)
reportService := report2.NewReportService(reportRepo, objService,
userCommon, answerRepo, questionRepo, commentCommonRepo, reportHandle,
configService, eventQueueService)
reportController := controller.NewReportController(reportService,
rankService, captchaService)
diff --git a/docs/docs.go b/docs/docs.go
index 263e6775..c8731391 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -9780,8 +9780,6 @@ const docTemplate = `{
"schema.QuestionAdd": {
"type": "object",
"required": [
- "content",
- "tags",
"title"
],
"properties": {
@@ -9796,7 +9794,7 @@ const docTemplate = `{
"description": "content",
"type": "string",
"maxLength": 65535,
- "minLength": 6
+ "minLength": 0
},
"tags": {
"description": "tags",
@@ -9817,8 +9815,6 @@ const docTemplate = `{
"type": "object",
"required": [
"answer_content",
- "content",
- "tags",
"title"
],
"properties": {
@@ -9838,7 +9834,7 @@ const docTemplate = `{
"description": "content",
"type": "string",
"maxLength": 65535,
- "minLength": 6
+ "minLength": 0
},
"mention_username_list": {
"type": "array",
@@ -10119,9 +10115,7 @@ const docTemplate = `{
"schema.QuestionUpdate": {
"type": "object",
"required": [
- "content",
"id",
- "tags",
"title"
],
"properties": {
@@ -10136,7 +10130,7 @@ const docTemplate = `{
"description": "content",
"type": "string",
"maxLength": 65535,
- "minLength": 6
+ "minLength": 0
},
"edit_summary": {
"description": "edit summary",
@@ -11047,6 +11041,16 @@ const docTemplate = `{
"max_image_size": {
"type": "integer"
},
+ "min_content": {
+ "type": "integer",
+ "maximum": 65535,
+ "minimum": 0
+ },
+ "min_tags": {
+ "type": "integer",
+ "maximum": 5,
+ "minimum": 0
+ },
"recommend_tags": {
"type": "array",
"items": {
@@ -11091,6 +11095,16 @@ const docTemplate = `{
"max_image_size": {
"type": "integer"
},
+ "min_content": {
+ "type": "integer",
+ "maximum": 65535,
+ "minimum": 0
+ },
+ "min_tags": {
+ "type": "integer",
+ "maximum": 5,
+ "minimum": 0
+ },
"recommend_tags": {
"type": "array",
"items": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 8cc85e26..9f89cb15 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -9753,8 +9753,6 @@
"schema.QuestionAdd": {
"type": "object",
"required": [
- "content",
- "tags",
"title"
],
"properties": {
@@ -9769,7 +9767,7 @@
"description": "content",
"type": "string",
"maxLength": 65535,
- "minLength": 6
+ "minLength": 0
},
"tags": {
"description": "tags",
@@ -9790,8 +9788,6 @@
"type": "object",
"required": [
"answer_content",
- "content",
- "tags",
"title"
],
"properties": {
@@ -9811,7 +9807,7 @@
"description": "content",
"type": "string",
"maxLength": 65535,
- "minLength": 6
+ "minLength": 0
},
"mention_username_list": {
"type": "array",
@@ -10092,9 +10088,7 @@
"schema.QuestionUpdate": {
"type": "object",
"required": [
- "content",
"id",
- "tags",
"title"
],
"properties": {
@@ -10109,7 +10103,7 @@
"description": "content",
"type": "string",
"maxLength": 65535,
- "minLength": 6
+ "minLength": 0
},
"edit_summary": {
"description": "edit summary",
@@ -11020,6 +11014,16 @@
"max_image_size": {
"type": "integer"
},
+ "min_content": {
+ "type": "integer",
+ "maximum": 65535,
+ "minimum": 0
+ },
+ "min_tags": {
+ "type": "integer",
+ "maximum": 5,
+ "minimum": 0
+ },
"recommend_tags": {
"type": "array",
"items": {
@@ -11064,6 +11068,16 @@
"max_image_size": {
"type": "integer"
},
+ "min_content": {
+ "type": "integer",
+ "maximum": 65535,
+ "minimum": 0
+ },
+ "min_tags": {
+ "type": "integer",
+ "maximum": 5,
+ "minimum": 0
+ },
"recommend_tags": {
"type": "array",
"items": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 9cdf248e..d2dd076c 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1589,7 +1589,7 @@ definitions:
content:
description: content
maxLength: 65535
- minLength: 6
+ minLength: 0
type: string
tags:
description: tags
@@ -1602,8 +1602,6 @@ definitions:
minLength: 6
type: string
required:
- - content
- - tags
- title
type: object
schema.QuestionAddByAnswer:
@@ -1620,7 +1618,7 @@ definitions:
content:
description: content
maxLength: 65535
- minLength: 6
+ minLength: 0
type: string
mention_username_list:
items:
@@ -1638,8 +1636,6 @@ definitions:
type: string
required:
- answer_content
- - content
- - tags
- title
type: object
schema.QuestionInfoResp:
@@ -1826,7 +1822,7 @@ definitions:
content:
description: content
maxLength: 65535
- minLength: 6
+ minLength: 0
type: string
edit_summary:
description: edit summary
@@ -1849,9 +1845,7 @@ definitions:
minLength: 6
type: string
required:
- - content
- id
- - tags
- title
type: object
schema.QuestionUpdateInviteUser:
@@ -2453,6 +2447,14 @@ definitions:
type: integer
max_image_size:
type: integer
+ min_content:
+ maximum: 65535
+ minimum: 0
+ type: integer
+ min_tags:
+ maximum: 5
+ minimum: 0
+ type: integer
recommend_tags:
items:
$ref: '#/definitions/schema.SiteWriteTag'
@@ -2482,6 +2484,14 @@ definitions:
type: integer
max_image_size:
type: integer
+ min_content:
+ maximum: 65535
+ minimum: 0
+ type: integer
+ min_tags:
+ maximum: 5
+ minimum: 0
+ type: integer
recommend_tags:
items:
$ref: '#/definitions/schema.SiteWriteTag'
diff --git a/go.mod b/go.mod
index 41768812..969d9ebb 100644
--- a/go.mod
+++ b/go.mod
@@ -56,12 +56,12 @@ require (
github.com/swaggo/swag v1.16.3
github.com/tidwall/gjson v1.17.3
github.com/yuin/goldmark v1.7.4
- go.uber.org/mock v0.5.0
- golang.org/x/crypto v0.36.0
+ go.uber.org/mock v0.6.0
+ golang.org/x/crypto v0.41.0
golang.org/x/image v0.20.0
- golang.org/x/net v0.38.0
- golang.org/x/term v0.30.0
- golang.org/x/text v0.23.0
+ golang.org/x/net v0.43.0
+ golang.org/x/term v0.34.0
+ golang.org/x/text v0.28.0
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
gopkg.in/yaml.v3 v3.0.1
modernc.org/sqlite v1.33.0
@@ -161,8 +161,8 @@ require (
go.uber.org/zap v1.27.0 // indirect
golang.org/x/arch v0.10.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
- golang.org/x/sys v0.31.0 // indirect
- golang.org/x/tools v0.25.0 // indirect
+ golang.org/x/sys v0.35.0 // indirect
+ golang.org/x/tools v0.36.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/alexcesaro/quotedprintable.v3
v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
diff --git a/go.sum b/go.sum
index b45d881f..35db004d 100644
--- a/go.sum
+++ b/go.sum
@@ -654,8 +654,8 @@ go.uber.org/atomic v1.5.0/go.mod
h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.6.0/go.mod
h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod
h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
-go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
+go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
+go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
go.uber.org/multierr v1.1.0/go.mod
h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.3.0/go.mod
h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.5.0/go.mod
h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
@@ -685,8 +685,8 @@ golang.org/x/crypto
v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWP
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod
h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod
h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod
h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod
h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.41.0/go.mod
h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod
h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod
h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
@@ -703,8 +703,8 @@ golang.org/x/mod
v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod
h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod
h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod
h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod
h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -731,8 +731,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod
h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod
h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod
h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -743,8 +743,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod
h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod
h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod
h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -779,14 +779,14 @@ golang.org/x/sys
v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod
h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod
h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-golang.org/x/term v0.30.0/go.mod
h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
+golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
+golang.org/x/term v0.34.0/go.mod
h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -795,8 +795,8 @@ golang.org/x/text v0.3.6/go.mod
h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod
h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod
h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod
h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -820,8 +820,8 @@ golang.org/x/tools
v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod
h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod
h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.12/go.mod
h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
-golang.org/x/tools v0.25.0/go.mod
h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod
h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=