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

grpclb: rename grpclbstate package back to state #5962

Merged
merged 2 commits into from
Jan 24, 2023
Merged

grpclb: rename grpclbstate package back to state #5962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810139b
grpclb: rename `grpclb/grpclbstate` package back to `grpclb/state`
dfawley Jan 24, 2023
23fd83f
fix tests
dfawley Jan 24, 2023
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
2 changes: 1 addition & 1 deletion balancer/grpclb/grpclb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (

"google.golang.org/grpc"
"google.golang.org/grpc/balancer"
"google.golang.org/grpc/balancer/grpclb/grpclbstate"
grpclbstate "google.golang.org/grpc/balancer/grpclb/state"
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
Expand Down
2 changes: 1 addition & 1 deletion balancer/grpclb/grpclb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (

"google.golang.org/grpc"
"google.golang.org/grpc/balancer"
"google.golang.org/grpc/balancer/grpclb/grpclbstate"
grpclbstate "google.golang.org/grpc/balancer/grpclb/state"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/internal"
Expand Down
8 changes: 4 additions & 4 deletions balancer/grpclb/grpclbstate/state.go → balancer/grpclb/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*
*/

// Package grpclbstate declares grpclb types to be set by resolvers wishing to
// pass information to grpclb via resolver.State Attributes.
package grpclbstate
// Package state declares grpclb types to be set by resolvers wishing to pass
// information to grpclb via resolver.State Attributes.
package state

import (
"google.golang.org/grpc/resolver"
Expand All @@ -27,7 +27,7 @@ import (
// keyType is the key to use for storing State in Attributes.
type keyType string

const key = keyType("grpc.grpclb.grpclbstate")
const key = keyType("grpc.grpclb.state")

// State contains gRPCLB-relevant data passed from the name resolver.
type State struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/resolver/dns/dns_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"sync"
"time"

grpclbstate "google.golang.org/grpc/balancer/grpclb/grpclbstate"
grpclbstate "google.golang.org/grpc/balancer/grpclb/state"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/internal/backoff"
"google.golang.org/grpc/internal/envconfig"
Expand Down
2 changes: 1 addition & 1 deletion internal/resolver/dns/dns_resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"google.golang.org/grpc/balancer"
grpclbstate "google.golang.org/grpc/balancer/grpclb/grpclbstate"
grpclbstate "google.golang.org/grpc/balancer/grpclb/state"
"google.golang.org/grpc/internal/envconfig"
"google.golang.org/grpc/internal/leakcheck"
"google.golang.org/grpc/internal/testutils"
Expand Down