Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkg: address golangci var-naming issues #17584

Merged
merged 1 commit into from
Mar 24, 2024
Merged

pkg: address golangci var-naming issues #17584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/expect/expect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/creack/pty"
)

const DEBUG_LINES_TAIL = 40
const debugLinesTail = 40

var (
ErrProcessRunning = fmt.Errorf("process is still running")
Expand Down Expand Up @@ -218,7 +218,7 @@ func (ep *ExpectProcess) ExpectFunc(ctx context.Context, f func(string) bool) (s
}
}

lastLinesIndex := len(ep.lines) - DEBUG_LINES_TAIL
lastLinesIndex := len(ep.lines) - debugLinesTail
if lastLinesIndex < 0 {
lastLinesIndex = 0
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/grpc_testing/recorder.go → pkg/grpctesting/recorder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package grpc_testing
package grpctesting

import (
"context"
Expand All @@ -22,7 +22,7 @@ import (
"google.golang.org/grpc/metadata"
)

type GrpcRecorder struct {
type GRPCRecorder struct {
mux sync.RWMutex
requests []RequestInfo
}
Expand All @@ -32,15 +32,15 @@ type RequestInfo struct {
Authority string
}

func (ri *GrpcRecorder) UnaryInterceptor() grpc.UnaryServerInterceptor {
func (ri *GRPCRecorder) UnaryInterceptor() grpc.UnaryServerInterceptor {
return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
ri.record(toRequestInfo(ctx, info))
resp, err := handler(ctx, req)
return resp, err
}
}

func (ri *GrpcRecorder) RecordedRequests() []RequestInfo {
func (ri *GRPCRecorder) RecordedRequests() []RequestInfo {
ri.mux.RLock()
defer ri.mux.RUnlock()
reqs := make([]RequestInfo, len(ri.requests))
Expand All @@ -62,7 +62,7 @@ func toRequestInfo(ctx context.Context, info *grpc.UnaryServerInfo) RequestInfo
return req
}

func (ri *GrpcRecorder) record(r RequestInfo) {
func (ri *GRPCRecorder) record(r RequestInfo) {
ri.mux.Lock()
defer ri.mux.Unlock()
ri.requests = append(ri.requests, r)
Expand Down
2 changes: 1 addition & 1 deletion pkg/grpc_testing/stub_server.go → pkg/grpctesting/stub_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package grpc_testing
package grpctesting

import (
"context"
Expand Down
8 changes: 4 additions & 4 deletions tests/framework/integration/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/pkg/v3/types"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/pkg/v3/grpc_testing"
"go.etcd.io/etcd/pkg/v3/grpctesting"
"go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/embed"
"go.etcd.io/etcd/server/v3/etcdserver"
Expand Down Expand Up @@ -582,7 +582,7 @@ type Member struct {
IsLearner bool
Closed bool

GrpcServerRecorder *grpc_testing.GrpcRecorder
GrpcServerRecorder *grpctesting.GRPCRecorder

LogObserver *testutils.LogObserver
}
Expand Down Expand Up @@ -734,7 +734,7 @@ func MustNewMember(t testutil.TB, mcfg MemberConfig) *Member {
m.ExperimentalMaxLearners = mcfg.ExperimentalMaxLearners
}
m.V2Deprecation = config.V2_DEPR_DEFAULT
m.GrpcServerRecorder = &grpc_testing.GrpcRecorder{}
m.GrpcServerRecorder = &grpctesting.GRPCRecorder{}

m.Logger, m.LogObserver = memberLogger(t, mcfg.Name)

Expand Down Expand Up @@ -1118,7 +1118,7 @@ func (m *Member) Launch() error {
return nil
}

func (m *Member) RecordedRequests() []grpc_testing.RequestInfo {
func (m *Member) RecordedRequests() []grpctesting.RequestInfo {
return m.GrpcServerRecorder.RecordedRequests()
}

Expand Down
10 changes: 5 additions & 5 deletions tests/integration/clientv3/naming/resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ import (

"go.etcd.io/etcd/client/v3/naming/endpoints"
"go.etcd.io/etcd/client/v3/naming/resolver"
"go.etcd.io/etcd/pkg/v3/grpc_testing"
"go.etcd.io/etcd/pkg/v3/grpctesting"
integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
)

func testEtcdGrpcResolver(t *testing.T, lbPolicy string) {

// Setup two new dummy stub servers
payloadBody := []byte{'1'}
s1 := grpc_testing.NewDummyStubServer(payloadBody)
s1 := grpctesting.NewDummyStubServer(payloadBody)
if err := s1.Start(nil); err != nil {
t.Fatal("failed to start dummy grpc server (s1)", err)
}
defer s1.Stop()

s2 := grpc_testing.NewDummyStubServer(payloadBody)
s2 := grpctesting.NewDummyStubServer(payloadBody)
if err := s2.Start(nil); err != nil {
t.Fatal("failed to start dummy grpc server (s2)", err)
}
Expand Down Expand Up @@ -153,13 +153,13 @@ func TestEtcdEndpointManager(t *testing.T) {
integration2.BeforeTest(t)

s1PayloadBody := []byte{'1'}
s1 := grpc_testing.NewDummyStubServer(s1PayloadBody)
s1 := grpctesting.NewDummyStubServer(s1PayloadBody)
err := s1.Start(nil)
assert.NoError(t, err)
defer s1.Stop()

s2PayloadBody := []byte{'2'}
s2 := grpc_testing.NewDummyStubServer(s2PayloadBody)
s2 := grpctesting.NewDummyStubServer(s2PayloadBody)
err = s2.Start(nil)
assert.NoError(t, err)
defer s2.Stop()
Expand Down
Loading