From 6532a694cb5c5c3b8f7ed11a87abb7ad7ef528ab Mon Sep 17 00:00:00 2001 From: congqixia Date: Tue, 22 Aug 2023 22:28:16 +0800 Subject: [PATCH] Bump golang.org/x/net version manually (#437) Signed-off-by: Congqi Xia --- .github/workflows/golangci-lint.yml | 4 ++-- client/client_mock_test.go | 2 +- client/client_test.go | 2 +- client/data.go | 2 +- client/maintainance.go | 2 +- client/options.go | 2 +- client/row.go | 9 +-------- entity/resource_group.go | 2 +- go.mod | 6 +++--- go.sum | 11 +++++++---- 10 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index aa3fa08c..d6fc7035 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -24,13 +24,13 @@ jobs: uses: golangci/golangci-lint-action@v3 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.41 + version: v1.53.3 # Optional: working directory, useful for monorepos # working-directory: somedir # Optional: golangci-lint command line arguments. - args: --timeout=10m + args: --timeout=10m --out-format=colored-line-number # Optional: show only new issues if it's a pull request. The default value is `false`. # only-new-issues: true diff --git a/client/client_mock_test.go b/client/client_mock_test.go index 2583a054..eab51289 100644 --- a/client/client_mock_test.go +++ b/client/client_mock_test.go @@ -138,7 +138,7 @@ func (s *MockSuiteBase) setupHasPartitionError(errorCode common.ErrorCode, err e }, err) } -func (s *MockSuiteBase) setupDescribeCollection(collName string, schema *entity.Schema) { +func (s *MockSuiteBase) setupDescribeCollection(_ string, schema *entity.Schema) { s.mock.EXPECT().DescribeCollection(mock.Anything, mock.AnythingOfType("*milvuspb.DescribeCollectionRequest")). Call.Return(func(ctx context.Context, req *server.DescribeCollectionRequest) *server.DescribeCollectionResponse { return &server.DescribeCollectionResponse{ diff --git a/client/client_test.go b/client/client_test.go index 47ddb13c..6a910d6a 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -258,7 +258,7 @@ type Tserver struct { SuccessCount uint } -func (s *Tserver) SayHello(ctx context.Context, in *helloworld.HelloRequest) (*helloworld.HelloReply, error) { +func (s *Tserver) SayHello(_ context.Context, in *helloworld.HelloRequest) (*helloworld.HelloReply, error) { log.Printf("Received: %s", in.Name) s.reqCounter++ if s.reqCounter%s.SuccessCount == 0 { diff --git a/client/data.go b/client/data.go index 49335b7a..c0be0069 100644 --- a/client/data.go +++ b/client/data.go @@ -92,7 +92,7 @@ func (c *GrpcClient) Search(ctx context.Context, collName string, partitions []s return sr, nil } -func (c *GrpcClient) parseSearchResult(sch *entity.Schema, outputFields []string, fieldDataList []*schema.FieldData, idx, from, to int) ([]entity.Column, error) { +func (c *GrpcClient) parseSearchResult(_ *entity.Schema, outputFields []string, fieldDataList []*schema.FieldData, _, from, to int) ([]entity.Column, error) { //dynamicField := sch.GetDynamicField() fields := make(map[string]*schema.FieldData) var dynamicColumn *entity.ColumnJSONBytes diff --git a/client/maintainance.go b/client/maintainance.go index 1cc99168..f0fc6c2b 100644 --- a/client/maintainance.go +++ b/client/maintainance.go @@ -25,7 +25,7 @@ import ( ) // ManualCompaction triggers a compaction on provided collection -func (c *GrpcClient) ManualCompaction(ctx context.Context, collName string, toleranceDuration time.Duration) (int64, error) { +func (c *GrpcClient) ManualCompaction(ctx context.Context, collName string, _ time.Duration) (int64, error) { if c.Service == nil { return 0, ErrClientNotReady } diff --git a/client/options.go b/client/options.go index 4ed12af1..7a4906aa 100644 --- a/client/options.go +++ b/client/options.go @@ -175,7 +175,7 @@ func WithGuaranteeTimestamp(gt uint64) SearchQueryOptionFunc { } // Deprecated: time travel is not supported since v2.3.0 -func WithTravelTimestamp(tt uint64) SearchQueryOptionFunc { +func WithTravelTimestamp(_ uint64) SearchQueryOptionFunc { return func(option *SearchQueryOption) {} } diff --git a/client/row.go b/client/row.go index 43c550ac..a9b66466 100644 --- a/client/row.go +++ b/client/row.go @@ -133,7 +133,7 @@ type SearchResultByRows struct { } // SearchResultToRows converts search result proto to rows -func SearchResultToRows(sch *entity.Schema, results *schema.SearchResultData, t reflect.Type, output map[string]struct{}) ([]SearchResultByRows, error) { +func SearchResultToRows(sch *entity.Schema, results *schema.SearchResultData, t reflect.Type, _ map[string]struct{}) ([]SearchResultByRows, error) { var err error offset := 0 // new will have a pointer, so de-reference first if type is pointer to struct @@ -162,9 +162,6 @@ func SearchResultToRows(sch *entity.Schema, results *schema.SearchResultData, t for _, field := range sch.Fields { f := v.FieldByName(field.Name) // TODO silverxia field may be annotated by tags, which means the field name will not be the same if !f.IsValid() { - if _, has := output[field.Name]; has { - // TODO silverxia in output field list but not defined in rows - } continue } // Primary key has different field from search result @@ -193,10 +190,6 @@ func SearchResultToRows(sch *entity.Schema, results *schema.SearchResultData, t // fieldDataList fieldData, has := nameFieldData[field.Name] if !has || fieldData == nil { - if _, has := output[field.Name]; has { - // TODO silverxia in output field list but not defined in rows - } - continue } diff --git a/entity/resource_group.go b/entity/resource_group.go index f090f2e5..77eb070f 100644 --- a/entity/resource_group.go +++ b/entity/resource_group.go @@ -1,6 +1,6 @@ package entity -//ResourceGroup information model struct. +// ResourceGroup information model struct. type ResourceGroup struct { Name string Capacity int32 diff --git a/go.mod b/go.mod index 94ed2de6..4d3f7217 100644 --- a/go.mod +++ b/go.mod @@ -28,9 +28,9 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect - golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect - golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect - golang.org/x/text v0.3.8 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect google.golang.org/genproto v0.0.0-20220503193339-ba3ae3f07e29 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 536c1667..ef7d95a0 100644 --- a/go.sum +++ b/go.sum @@ -286,8 +286,9 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -326,18 +327,20 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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/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= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= 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.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=