Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg: address golangci var-naming issues

Browse Source 
Signed-off-by: Ivan Valdes <ivan@vald.es>
This commit is contained in:
Ivan Valdes 2024-03-06 16:22:42 -08:00
parent 82925537e0
commit d98ff0d4ff
No known key found for this signature in database
GPG Key ID: 4037D37741ED0CC5
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/expect/expect.go
View File

@ -32,7 +32,7 @@ import (
"github.com/creack/pty" "github.com/creack/pty"
) )
const DEBUG_LINES_TAIL = 40 const debugLinesTail = 40
var ( var (
ErrProcessRunning = fmt.Errorf("process is still running") ErrProcessRunning = fmt.Errorf("process is still running")
@ -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 { if lastLinesIndex < 0 {
lastLinesIndex = 0 lastLinesIndex = 0
} }

10
pkg/grpc_testing/recorder.go → pkg/grpctesting/recorder.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package grpc_testing package grpctesting
import ( import (
"context" "context"
@ -22,7 +22,7 @@ import (
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
) )
type GrpcRecorder struct { type GRPCRecorder struct {
mux sync.RWMutex mux sync.RWMutex
requests []RequestInfo requests []RequestInfo
} }
@ -32,7 +32,7 @@ type RequestInfo struct {
Authority string 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) { return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
ri.record(toRequestInfo(ctx, info)) ri.record(toRequestInfo(ctx, info))
resp, err := handler(ctx, req) resp, err := handler(ctx, req)
@ -40,7 +40,7 @@ func (ri *GrpcRecorder) UnaryInterceptor() grpc.UnaryServerInterceptor {
} }
} }
func (ri *GrpcRecorder) RecordedRequests() []RequestInfo { func (ri *GRPCRecorder) RecordedRequests() []RequestInfo {
ri.mux.RLock() ri.mux.RLock()
defer ri.mux.RUnlock() defer ri.mux.RUnlock()
reqs := make([]RequestInfo, len(ri.requests)) reqs := make([]RequestInfo, len(ri.requests))
@ -62,7 +62,7 @@ func toRequestInfo(ctx context.Context, info *grpc.UnaryServerInfo) RequestInfo
return req return req
} }
func (ri *GrpcRecorder) record(r RequestInfo) { func (ri *GRPCRecorder) record(r RequestInfo) {
ri.mux.Lock() ri.mux.Lock()
defer ri.mux.Unlock() defer ri.mux.Unlock()
ri.requests = append(ri.requests, r) ri.requests = append(ri.requests, r)

2
pkg/grpc_testing/stub_server.go → pkg/grpctesting/stub_server.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package grpc_testing package grpctesting
import ( import (
"context" "context"

8
tests/framework/integration/cluster.go
View File

@ -50,7 +50,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
clientv3 "go.etcd.io/etcd/client/v3" 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/config"
"go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/embed"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"
@ -582,7 +582,7 @@ type Member struct {
IsLearner bool IsLearner bool
Closed bool Closed bool
GrpcServerRecorder *grpc_testing.GrpcRecorder GrpcServerRecorder *grpctesting.GRPCRecorder
LogObserver *testutils.LogObserver LogObserver *testutils.LogObserver
} }
@ -734,7 +734,7 @@ func MustNewMember(t testutil.TB, mcfg MemberConfig) *Member {
m.ExperimentalMaxLearners = mcfg.ExperimentalMaxLearners m.ExperimentalMaxLearners = mcfg.ExperimentalMaxLearners
} }
m.V2Deprecation = config.V2_DEPR_DEFAULT m.V2Deprecation = config.V2_DEPR_DEFAULT
m.GrpcServerRecorder = &grpc_testing.GrpcRecorder{} m.GrpcServerRecorder = &grpctesting.GRPCRecorder{}
m.Logger, m.LogObserver = memberLogger(t, mcfg.Name) m.Logger, m.LogObserver = memberLogger(t, mcfg.Name)
@ -1118,7 +1118,7 @@ func (m *Member) Launch() error {
return nil return nil
} }
func (m *Member) RecordedRequests() []grpc_testing.RequestInfo { func (m *Member) RecordedRequests() []grpctesting.RequestInfo {
return m.GrpcServerRecorder.RecordedRequests() return m.GrpcServerRecorder.RecordedRequests()
} }

10
tests/integration/clientv3/naming/resolver_test.go
View File

@ -28,7 +28,7 @@ import (
"go.etcd.io/etcd/client/v3/naming/endpoints" "go.etcd.io/etcd/client/v3/naming/endpoints"
"go.etcd.io/etcd/client/v3/naming/resolver" "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" integration2 "go.etcd.io/etcd/tests/v3/framework/integration"
) )
@ -36,13 +36,13 @@ func testEtcdGrpcResolver(t *testing.T, lbPolicy string) {
// Setup two new dummy stub servers // Setup two new dummy stub servers
payloadBody := []byte{'1'} payloadBody := []byte{'1'}
s1 := grpc_testing.NewDummyStubServer(payloadBody) s1 := grpctesting.NewDummyStubServer(payloadBody)
if err := s1.Start(nil); err != nil { if err := s1.Start(nil); err != nil {
t.Fatal("failed to start dummy grpc server (s1)", err) t.Fatal("failed to start dummy grpc server (s1)", err)
} }
defer s1.Stop() defer s1.Stop()
s2 := grpc_testing.NewDummyStubServer(payloadBody) s2 := grpctesting.NewDummyStubServer(payloadBody)
if err := s2.Start(nil); err != nil { if err := s2.Start(nil); err != nil {
t.Fatal("failed to start dummy grpc server (s2)", err) t.Fatal("failed to start dummy grpc server (s2)", err)
} }
@ -153,13 +153,13 @@ func TestEtcdEndpointManager(t *testing.T) {
integration2.BeforeTest(t) integration2.BeforeTest(t)
s1PayloadBody := []byte{'1'} s1PayloadBody := []byte{'1'}
s1 := grpc_testing.NewDummyStubServer(s1PayloadBody) s1 := grpctesting.NewDummyStubServer(s1PayloadBody)
err := s1.Start(nil) err := s1.Start(nil)
assert.NoError(t, err) assert.NoError(t, err)
defer s1.Stop() defer s1.Stop()
s2PayloadBody := []byte{'2'} s2PayloadBody := []byte{'2'}
s2 := grpc_testing.NewDummyStubServer(s2PayloadBody) s2 := grpctesting.NewDummyStubServer(s2PayloadBody)
err = s2.Start(nil) err = s2.Start(nil)
assert.NoError(t, err) assert.NoError(t, err)
defer s2.Stop() defer s2.Stop()