style(cmd/errors/examples/middleware/transport): fix common words' spelling mistakes (#1872)

* matchs to matches
* contraint to constraint
* resovle to resolver
* ser to set

Signed-off-by: kwanhur <huang_hua2012@163.com>
pull/1873/head
kwanhur 3 years ago committed by GitHub
parent 4387085047
commit ac99a5c877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      cmd/kratos/internal/proto/server/server.go
  2. 4
      errors/errors_test.go
  3. 2
      examples/benchmark/test.sh
  4. 2
      examples/i18n/README.md
  5. 4
      examples/i18n/third_party/validate/validate.proto
  6. 6
      middleware/selector/selector.go
  7. 4
      third_party/validate/validate.proto
  8. 2
      transport/grpc/server_test.go
  9. 2
      transport/http/resolver.go
  10. 10
      transport/http/resolver_test.go

@ -69,7 +69,7 @@ func run(cmd *cobra.Command, args []string) {
}),
)
if _, err := os.Stat(targetDir); os.IsNotExist(err) {
fmt.Printf("Target directory: %s does not exsits\n", targetDir)
fmt.Printf("Target directory: %s does not exsit\n", targetDir)
return
}
for _, s := range res {

@ -32,10 +32,10 @@ func TestError(t *testing.T) {
}
if !errors.As(err, &base) {
t.Errorf("should be matchs: %v", err)
t.Errorf("should be matches: %v", err)
}
if !IsBadRequest(err) {
t.Errorf("should be matchs: %v", err)
t.Errorf("should be matches: %v", err)
}
if reason := Reason(err); reason != err3.Reason {

@ -26,7 +26,7 @@ test_web_framework()
pkill -9 $server_bin_name
sleep 2
echo "finsihed testing $2"
echo "finished testing $2"
echo
}

@ -103,7 +103,7 @@ goi18n extract
The string which should be translated will be extracted from your code, and write into `active.en.toml`
You should create the empty target language file:
```bash
touch tranlate.zh.toml
touch translate.zh.toml
```
Then fill the translate file:

@ -733,11 +733,11 @@ message RepeatedRules {
optional uint64 max_items = 2;
// Unique specifies that all elements in this field must be unique. This
// contraint is only applicable to scalar and enum types (messages are not
// constraint is only applicable to scalar and enum types (messages are not
// supported).
optional bool unique = 3;
// Items specifies the contraints to be applied to each item in the field.
// Items specifies the constraints to be applied to each item in the field.
// Repeated message fields will still execute validation against each item
// unless skip is specified here.
optional FieldRules items = 4;

@ -79,11 +79,11 @@ func (b *Builder) Build() middleware.Middleware {
} else {
transporter = serverTransporter
}
return selector(transporter, b.matchs, b.ms...)
return selector(transporter, b.matches, b.ms...)
}
// matchs is match operation compliance Builder
func (b *Builder) matchs(ctx context.Context, transporter transporter) bool {
// matches is match operation compliance Builder
func (b *Builder) matches(ctx context.Context, transporter transporter) bool {
info, ok := transporter(ctx)
if !ok {
return false

@ -733,11 +733,11 @@ message RepeatedRules {
optional uint64 max_items = 2;
// Unique specifies that all elements in this field must be unique. This
// contraint is only applicable to scalar and enum types (messages are not
// constraint is only applicable to scalar and enum types (messages are not
// supported).
optional bool unique = 3;
// Items specifies the contraints to be applied to each item in the field.
// Items specifies the constraints to be applied to each item in the field.
// Repeated message fields will still execute validation against each item
// unless skip is specified here.
optional FieldRules items = 4;

@ -211,7 +211,7 @@ func TestUnaryInterceptor(t *testing.T) {
}
}
func TestStramInterceptor(t *testing.T) {
func TestStreamInterceptor(t *testing.T) {
o := &Server{}
v := []grpc.StreamServerInterceptor{
func(srv interface{}, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {

@ -125,7 +125,7 @@ func (r *resolver) update(services []*registry.ServiceInstance) bool {
nodes = append(nodes, selector.NewNode(ept, ins))
}
if len(nodes) == 0 {
r.logger.Warnf("[http resovler]Zero endpoint found,refused to write,ser: %s ins: %v", r.target.Endpoint, nodes)
r.logger.Warnf("[http resolver]Zero endpoint found,refused to write,set: %s ins: %v", r.target.Endpoint, nodes)
return false
}
r.rebalancer.Apply(nodes)

@ -59,15 +59,15 @@ type mockRebalancer struct{}
func (m *mockRebalancer) Apply(nodes []selector.Node) {}
type mockDiscoverys struct {
type mockDiscoveries struct {
isSecure bool
}
func (d *mockDiscoverys) GetService(ctx context.Context, serviceName string) ([]*registry.ServiceInstance, error) {
func (d *mockDiscoveries) GetService(ctx context.Context, serviceName string) ([]*registry.ServiceInstance, error) {
return nil, nil
}
func (d *mockDiscoverys) Watch(ctx context.Context, serviceName string) (registry.Watcher, error) {
func (d *mockDiscoveries) Watch(ctx context.Context, serviceName string) (registry.Watcher, error) {
return &mockWatch{isSecure: d.isSecure}, nil
}
@ -104,11 +104,11 @@ func TestResolver(t *testing.T) {
Authority: "",
Endpoint: "discovery://helloworld",
}
_, err := newResolver(context.Background(), &mockDiscoverys{true}, ta, &mockRebalancer{}, false, false)
_, err := newResolver(context.Background(), &mockDiscoveries{true}, ta, &mockRebalancer{}, false, false)
if err != nil {
t.Errorf("expect %v, got %v", nil, err)
}
_, err = newResolver(context.Background(), &mockDiscoverys{false}, ta, &mockRebalancer{}, true, true)
_, err = newResolver(context.Background(), &mockDiscoveries{false}, ta, &mockRebalancer{}, true, true)
if err != nil {
t.Errorf("expect %v, got %v", nil, err)
}

Loading…
Cancel
Save