Skip to content

Commit b85c9ff

Browse files
krapiekrapie
committed
Lint codes
1 parent 745ad56 commit b85c9ff

27 files changed

+96
-61
lines changed

‎admin/auth.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
package admin
1818

1919
import (
20-
"connectrpc.com/connect"
2120
"context"
2221

22+
"connectrpc.com/connect"
23+
2324
"github.com/yorkie-team/yorkie/api/types"
2425
"github.com/yorkie-team/yorkie/internal/version"
2526
)

‎admin/client.go

+11-13
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818
package admin
1919

2020
import (
21-
"connectrpc.com/connect"
2221
"context"
2322
"fmt"
24-
api "github.com/yorkie-team/yorkie/api/yorkie/v1"
25-
"github.com/yorkie-team/yorkie/api/yorkie/v1/v1connect"
2623
"net/http"
2724
"strings"
2825

26+
"connectrpc.com/connect"
2927
"go.uber.org/zap"
30-
"google.golang.org/grpc/metadata"
3128

3229
"github.com/yorkie-team/yorkie/api/converter"
3330
"github.com/yorkie-team/yorkie/api/types"
31+
api "github.com/yorkie-team/yorkie/api/yorkie/v1"
32+
"github.com/yorkie-team/yorkie/api/yorkie/v1/v1connect"
3433
"github.com/yorkie-team/yorkie/pkg/document"
3534
"github.com/yorkie-team/yorkie/pkg/document/key"
3635
)
@@ -276,13 +275,13 @@ func (c *Client) RemoveDocument(
276275
apiKey := project.PublicKey
277276

278277
_, err = c.client.RemoveDocumentByAdmin(
279-
withShardKey(ctx, apiKey, documentKey),
280-
connect.NewRequest(&api.RemoveDocumentByAdminRequest{
278+
ctx,
279+
withShardKey(connect.NewRequest(&api.RemoveDocumentByAdminRequest{
281280
ProjectName: projectName,
282281
DocumentKey: documentKey,
283282
Force: force,
284283
},
285-
))
284+
), apiKey, documentKey))
286285
return err
287286
}
288287

@@ -358,10 +357,9 @@ func (c *Client) ListChangeSummaries(
358357
/**
359358
* withShardKey returns a context with the given shard key in metadata.
360359
*/
361-
func withShardKey(ctx context.Context, keys ...string) context.Context {
362-
return metadata.AppendToOutgoingContext(
363-
ctx,
364-
types.APIKeyKey, keys[0],
365-
types.ShardKey, strings.Join(keys, "/"),
366-
)
360+
func withShardKey[T any](conn *connect.Request[T], keys ...string) *connect.Request[T] {
361+
conn.Header().Add(types.APIKeyKey, keys[0])
362+
conn.Header().Add(types.ShardKey, strings.Join(keys, "/"))
363+
364+
return conn
367365
}

‎api/converter/from_bytes.go

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package converter
1919
import (
2020
"errors"
2121
"fmt"
22+
2223
"google.golang.org/protobuf/proto"
2324

2425
api "github.com/yorkie-team/yorkie/api/yorkie/v1"

‎api/converter/from_pb.go

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package converter
1818

1919
import (
2020
"fmt"
21+
2122
"github.com/yorkie-team/yorkie/api/types"
2223
api "github.com/yorkie-team/yorkie/api/yorkie/v1"
2324
"github.com/yorkie-team/yorkie/pkg/document/change"

‎api/converter/to_bytes.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ package converter
1818

1919
import (
2020
"fmt"
21-
"google.golang.org/protobuf/proto"
2221
"reflect"
2322

23+
"google.golang.org/protobuf/proto"
24+
2425
api "github.com/yorkie-team/yorkie/api/yorkie/v1"
2526
"github.com/yorkie-team/yorkie/pkg/document/crdt"
2627
"github.com/yorkie-team/yorkie/pkg/document/innerpresence"

‎api/converter/to_pb.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ package converter
1818

1919
import (
2020
"fmt"
21+
"reflect"
22+
2123
"google.golang.org/protobuf/types/known/timestamppb"
2224
"google.golang.org/protobuf/types/known/wrapperspb"
23-
"reflect"
2425

2526
"github.com/yorkie-team/yorkie/api/types"
2627
api "github.com/yorkie-team/yorkie/api/yorkie/v1"

‎api/yorkie/v1/admin.pb.go

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/yorkie/v1/resources.pb.go

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/yorkie/v1/v1connect/admin.connect.go

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/yorkie/v1/v1connect/yorkie.connect.go

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/yorkie/v1/yorkie.pb.go

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/auth.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
package client
1818

1919
import (
20-
"connectrpc.com/connect"
2120
"context"
2221

22+
"connectrpc.com/connect"
23+
2324
"github.com/yorkie-team/yorkie/api/types"
2425
"github.com/yorkie-team/yorkie/internal/version"
2526
)

‎client/client.go

+5-8
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,20 @@
1919
package client
2020

2121
import (
22-
"connectrpc.com/connect"
2322
"context"
2423
"errors"
2524
"fmt"
26-
"github.com/rs/xid"
27-
"github.com/yorkie-team/yorkie/api/yorkie/v1/v1connect"
28-
"go.uber.org/zap"
2925
"net/http"
3026
"strings"
3127

32-
//"google.golang.org/grpc"
33-
//"google.golang.org/grpc/credentials"
34-
//"google.golang.org/grpc/credentials/insecure"
35-
//"google.golang.org/grpc/metadata"
28+
"connectrpc.com/connect"
29+
"github.com/rs/xid"
30+
"go.uber.org/zap"
3631

3732
"github.com/yorkie-team/yorkie/api/converter"
3833
"github.com/yorkie-team/yorkie/api/types"
3934
api "github.com/yorkie-team/yorkie/api/yorkie/v1"
35+
"github.com/yorkie-team/yorkie/api/yorkie/v1/v1connect"
4036
"github.com/yorkie-team/yorkie/pkg/document"
4137
"github.com/yorkie-team/yorkie/pkg/document/innerpresence"
4238
"github.com/yorkie-team/yorkie/pkg/document/json"
@@ -731,5 +727,6 @@ func (c *Client) broadcast(ctx context.Context, doc *document.Document, topic st
731727
*/
732728
func withShardKey[T any](conn *connect.Request[T], keys ...string) *connect.Request[T] {
733729
conn.Header().Add(types.ShardKey, strings.Join(keys, "/"))
730+
734731
return conn
735732
}

‎client/client_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TODO(Krapie) go:build amd64
1+
//go:build amd64
22

33
/*
44
* Copyright 2021 The Yorkie Authors. All rights reserved.
@@ -19,19 +19,21 @@
1919
package client_test
2020

2121
import (
22-
"connectrpc.com/connect"
2322
"context"
24-
"github.com/yorkie-team/yorkie/api/yorkie/v1/v1connect"
2523
"net/http"
2624
"net/http/httptest"
2725
"reflect"
2826
"testing"
2927

28+
"connectrpc.com/connect"
29+
3030
"github.com/rs/xid"
3131
"github.com/stretchr/testify/assert"
3232
monkey "github.com/undefinedlabs/go-mpatch"
33+
3334
"github.com/yorkie-team/yorkie/api/types"
3435
api "github.com/yorkie-team/yorkie/api/yorkie/v1"
36+
"github.com/yorkie-team/yorkie/api/yorkie/v1/v1connect"
3537
"github.com/yorkie-team/yorkie/client"
3638
)
3739

‎server/backend/database/change_info.go

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"encoding/json"
2121
"errors"
2222
"fmt"
23+
2324
"google.golang.org/protobuf/proto"
2425

2526
"github.com/yorkie-team/yorkie/api/converter"

‎server/packs/serverpacks.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717
package packs
1818

1919
import (
20+
"google.golang.org/protobuf/proto"
21+
2022
"github.com/yorkie-team/yorkie/api/converter"
2123
api "github.com/yorkie-team/yorkie/api/yorkie/v1"
2224
"github.com/yorkie-team/yorkie/pkg/document/change"
2325
"github.com/yorkie-team/yorkie/pkg/document/innerpresence"
2426
"github.com/yorkie-team/yorkie/pkg/document/key"
2527
"github.com/yorkie-team/yorkie/pkg/document/time"
2628
"github.com/yorkie-team/yorkie/server/backend/database"
27-
"google.golang.org/protobuf/proto"
2829
)
2930

3031
// ServerPack is similar to change.Pack, but has ChangeInfos instead of Changes

‎server/profiling/prometheus/metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var (
5252
type Metrics struct {
5353
registry *prometheus.Registry
5454
serverMetrics *grpcprometheus.ServerMetrics
55-
55+
5656
serverVersion *prometheus.GaugeVec
5757

5858
pushPullResponseSeconds prometheus.Histogram

‎server/rpc/admin_server.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
package rpc
1818

1919
import (
20-
"connectrpc.com/connect"
2120
"context"
2221
"fmt"
2322

23+
"connectrpc.com/connect"
24+
2425
"github.com/yorkie-team/yorkie/api/converter"
2526
"github.com/yorkie-team/yorkie/api/types"
2627
api "github.com/yorkie-team/yorkie/api/yorkie/v1"

‎server/rpc/connecthelper/logging.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
package connecthelper
1919

2020
import (
21-
"connectrpc.com/connect"
2221
"context"
23-
"github.com/yorkie-team/yorkie/server/logging"
2422
"strconv"
2523
"sync/atomic"
24+
25+
"connectrpc.com/connect"
26+
27+
"github.com/yorkie-team/yorkie/server/logging"
2628
)
2729

2830
type reqID int32

‎server/rpc/connecthelper/status.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
package connecthelper
1818

1919
import (
20-
"connectrpc.com/connect"
2120
"errors"
2221
"fmt"
22+
23+
"connectrpc.com/connect"
2324
"google.golang.org/genproto/googleapis/rpc/errdetails"
2425
"google.golang.org/protobuf/runtime/protoiface"
2526

‎server/rpc/interceptors/admin_auth.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
package interceptors
1818

1919
import (
20-
"connectrpc.com/connect"
2120
"context"
2221
"net/http"
2322
"strings"
2423

24+
"connectrpc.com/connect"
25+
2526
"google.golang.org/grpc/codes"
2627
grpcstatus "google.golang.org/grpc/status"
2728

‎server/rpc/interceptors/context.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
package interceptors
1919

2020
import (
21-
"connectrpc.com/connect"
2221
"context"
2322
"errors"
24-
"github.com/yorkie-team/yorkie/server/rpc/connecthelper"
2523
"net/http"
2624
"strings"
2725

26+
"connectrpc.com/connect"
27+
28+
"github.com/yorkie-team/yorkie/server/rpc/connecthelper"
29+
2830
"github.com/yorkie-team/yorkie/api/types"
2931
"github.com/yorkie-team/yorkie/pkg/cache"
3032
"github.com/yorkie-team/yorkie/server/backend"

‎server/rpc/interceptors/default.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
package interceptors
1818

1919
import (
20-
"connectrpc.com/connect"
2120
"context"
2221
"errors"
23-
"github.com/yorkie-team/yorkie/server/rpc/connecthelper"
2422
gotime "time"
2523

24+
"connectrpc.com/connect"
25+
26+
"github.com/yorkie-team/yorkie/server/rpc/connecthelper"
27+
2628
"github.com/yorkie-team/yorkie/server/logging"
2729
)
2830

0 commit comments

Comments
 (0)