diff --git a/xds/internal/balancer/xds_test.go b/xds/internal/balancer/xds_test.go index 6e099e0d4..0197866f4 100644 --- a/xds/internal/balancer/xds_test.go +++ b/xds/internal/balancer/xds_test.go @@ -281,7 +281,7 @@ func (s) TestXdsFallbackResolvedAddrs(t *testing.T) { t.Fatalf("got new subconn address %v, want %v", gotAddrs, test.wantAddrs) } case <-time.After(2 * time.Second): - t.Fatal("timeout when geting new subconn result") + t.Fatal("timeout when getting new subconn result") } } } @@ -315,7 +315,7 @@ func (s) TestXdsBalanceHandleBalancerConfigBalancerNameUpdate(t *testing.T) { t.Fatalf("got new subconn address %v, want %v", nsc, append(addrs, specialAddrForBalancerA)) } case <-time.After(2 * time.Second): - t.Fatalf("timeout when geting new subconn result") + t.Fatalf("timeout when getting new subconn result") } var cleanups []func() @@ -507,7 +507,7 @@ func (s) TestXdsBalanceHandleBalancerConfigFallBackUpdate(t *testing.T) { t.Fatalf("got new subconn address %v, want %v", nsc, append(addrs, specialAddrForBalancerB)) } case <-time.After(5 * time.Second): - t.Fatalf("timeout when geting new subconn result") + t.Fatalf("timeout when getting new subconn result") } cfg3 := cfg @@ -524,7 +524,7 @@ func (s) TestXdsBalanceHandleBalancerConfigFallBackUpdate(t *testing.T) { t.Fatalf("got new subconn address %v, want %v", nsc, append(addrs, specialAddrForBalancerA)) } case <-time.After(2 * time.Second): - t.Fatalf("timeout when geting new subconn result") + t.Fatalf("timeout when getting new subconn result") } } diff --git a/xds/internal/internal.go b/xds/internal/internal.go index 85717fd0c..52b3ebb84 100644 --- a/xds/internal/internal.go +++ b/xds/internal/internal.go @@ -105,7 +105,7 @@ func (l *LBConfig) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON returns a JSON enconding of l. +// MarshalJSON returns a JSON encoding of l. func (l *LBConfig) MarshalJSON() ([]byte, error) { return nil, nil } @@ -117,7 +117,7 @@ type LoadBalancingConfig struct { Config json.RawMessage } -// MarshalJSON returns a JSON enconding of l. +// MarshalJSON returns a JSON encoding of l. func (l *LoadBalancingConfig) MarshalJSON() ([]byte, error) { m := make(map[string]json.RawMessage) m[l.Name] = l.Config