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

Jump to bottom

feat: make versionClient a var #912

Merged
merged 3 commits into from Feb 23, 2022
Merged

feat: make versionClient a var #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db20377
feat: make versionClient a var
codyoss Feb 23, 2022
c38c4f8
Update internal/gengapic/doc_file.go
codyoss Feb 23, 2022
5db1520
Update internal/gengapic/doc_file.go
codyoss Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion internal/gengapic/doc_file.go
View file
Open in desktop
Expand Up @@ -131,7 +131,14 @@ func (g *generator) genDocFile(year int, scopes []string, serv *descriptor.Servi
p("type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error)")
p("")

p("const versionClient = %q", "UNKNOWN")
p("var versionClient string")
p("")
p("func getVersionClient() string {")
p(` if versionClient == "" {`)
p(` return "UNKNOWN"`)
p(" }")
p(" return versionClient")
p("}")
p("")

p("func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {")
Expand Down
2 changes: 1 addition & 1 deletion internal/gengapic/gengrpc.go
View file
Open in desktop
Expand Up @@ -393,7 +393,7 @@ func (g *generator) grpcClientUtilities(serv *descriptor.ServiceDescriptorProto,
p("// use by Google-written clients.")
p("func (c *%s) setGoogleClientInfo(keyval ...string) {", lowcaseServName)
p(` kv := append([]string{"gl-go", versionGo()}, keyval...)`)
p(` kv = append(kv, "gapic", versionClient, "gax", gax.Version, "grpc", grpc.Version)`)
p(` kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)`)
p(` c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))`)
p("}")
p("")
Expand Down
2 changes: 1 addition & 1 deletion internal/gengapic/genrest.go
View file
Open in desktop
Expand Up @@ -160,7 +160,7 @@ func (g *generator) restClientUtilities(serv *descriptor.ServiceDescriptorProto,
p("// use by Google-written clients.")
p("func (c *%s) setGoogleClientInfo(keyval ...string) {", lowcaseServName)
p(` kv := append([]string{"gl-go", versionGo()}, keyval...)`)
p(` kv = append(kv, "gapic", versionClient, "gax", gax.Version, "rest", "UNKNOWN")`)
p(` kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "rest", "UNKNOWN")`)
p(` c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))`)
p("}")
p("")
Expand Down
2 changes: 1 addition & 1 deletion internal/gengapic/testdata/custom_op_init.want
View file
Open in desktop
Expand Up @@ -95,7 +95,7 @@ func NewRESTClient(ctx context.Context, opts ...option.ClientOption) (*Client, e
// use by Google-written clients.
func (c *restClient) setGoogleClientInfo(keyval ...string) {
kv := append([]string{"gl-go", versionGo()}, keyval...)
kv = append(kv, "gapic", versionClient, "gax", gax.Version, "rest", "UNKNOWN")
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "rest", "UNKNOWN")
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}

Expand Down
4 changes: 2 additions & 2 deletions internal/gengapic/testdata/deprecated_client_init.want
View file
Open in desktop
Expand Up @@ -121,7 +121,7 @@ func (c *gRPCClient) Connection() *grpc.ClientConn {
// use by Google-written clients.
func (c *gRPCClient) setGoogleClientInfo(keyval ...string) {
kv := append([]string{"gl-go", versionGo()}, keyval...)
kv = append(kv, "gapic", versionClient, "gax", gax.Version, "grpc", grpc.Version)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}

Expand Down Expand Up @@ -169,7 +169,7 @@ func NewRESTClient(ctx context.Context, opts ...option.ClientOption) (*Client, e
// use by Google-written clients.
func (c *restClient) setGoogleClientInfo(keyval ...string) {
kv := append([]string{"gl-go", versionGo()}, keyval...)
kv = append(kv, "gapic", versionClient, "gax", gax.Version, "rest", "UNKNOWN")
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "rest", "UNKNOWN")
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}

Expand Down
9 changes: 8 additions & 1 deletion internal/gengapic/testdata/doc_file.want
View file
Open in desktop
Expand Up @@ -88,7 +88,14 @@ import (
type clientHookParams struct{}
type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error)

const versionClient = "UNKNOWN"
var versionClient string

func getVersionClient() string {
if versionClient == "" {
return "UNKNOWN"
}
return versionClient
}

func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
out, _ := metadata.FromOutgoingContext(ctx)
Expand Down
9 changes: 8 additions & 1 deletion internal/gengapic/testdata/doc_file_alpha.want
View file
Open in desktop
Expand Up @@ -90,7 +90,14 @@ import (
type clientHookParams struct{}
type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error)

const versionClient = "UNKNOWN"
var versionClient string

func getVersionClient() string {
if versionClient == "" {
return "UNKNOWN"
}
return versionClient
}

func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
out, _ := metadata.FromOutgoingContext(ctx)
Expand Down
9 changes: 8 additions & 1 deletion internal/gengapic/testdata/doc_file_alpha_emptyservice.want
View file
Open in desktop
Expand Up @@ -66,7 +66,14 @@ import (
type clientHookParams struct{}
type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error)

const versionClient = "UNKNOWN"
var versionClient string

func getVersionClient() string {
if versionClient == "" {
return "UNKNOWN"
}
return versionClient
}

func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
out, _ := metadata.FromOutgoingContext(ctx)
Expand Down
9 changes: 8 additions & 1 deletion internal/gengapic/testdata/doc_file_beta.want
View file
Open in desktop
Expand Up @@ -90,7 +90,14 @@ import (
type clientHookParams struct{}
type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error)

const versionClient = "UNKNOWN"
var versionClient string

func getVersionClient() string {
if versionClient == "" {
return "UNKNOWN"
}
return versionClient
}

func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
out, _ := metadata.FromOutgoingContext(ctx)
Expand Down
9 changes: 8 additions & 1 deletion internal/gengapic/testdata/doc_file_beta_emptyservice.want
View file
Open in desktop
Expand Up @@ -66,7 +66,14 @@ import (
type clientHookParams struct{}
type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error)

const versionClient = "UNKNOWN"
var versionClient string

func getVersionClient() string {
if versionClient == "" {
return "UNKNOWN"
}
return versionClient
}

func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
out, _ := metadata.FromOutgoingContext(ctx)
Expand Down
9 changes: 8 additions & 1 deletion internal/gengapic/testdata/doc_file_emptyservice.want
View file
Open in desktop
Expand Up @@ -64,7 +64,14 @@ import (
type clientHookParams struct{}
type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error)

const versionClient = "UNKNOWN"
var versionClient string

func getVersionClient() string {
if versionClient == "" {
return "UNKNOWN"
}
return versionClient
}

func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
out, _ := metadata.FromOutgoingContext(ctx)
Expand Down
4 changes: 2 additions & 2 deletions internal/gengapic/testdata/empty_client_init.want
View file
Open in desktop
Expand Up @@ -117,7 +117,7 @@ func (c *gRPCClient) Connection() *grpc.ClientConn {
// use by Google-written clients.
func (c *gRPCClient) setGoogleClientInfo(keyval ...string) {
kv := append([]string{"gl-go", versionGo()}, keyval...)
kv = append(kv, "gapic", versionClient, "gax", gax.Version, "grpc", grpc.Version)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}

Expand Down Expand Up @@ -163,7 +163,7 @@ func NewRESTClient(ctx context.Context, opts ...option.ClientOption) (*Client, e
// use by Google-written clients.
func (c *restClient) setGoogleClientInfo(keyval ...string) {
kv := append([]string{"gl-go", versionGo()}, keyval...)
kv = append(kv, "gapic", versionClient, "gax", gax.Version, "rest", "UNKNOWN")
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "rest", "UNKNOWN")
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}

Expand Down
2 changes: 1 addition & 1 deletion internal/gengapic/testdata/foo_client_init.want
View file
Open in desktop
Expand Up @@ -148,7 +148,7 @@ func (c *fooGRPCClient) Connection() *grpc.ClientConn {
// use by Google-written clients.
func (c *fooGRPCClient) setGoogleClientInfo(keyval ...string) {
kv := append([]string{"gl-go", versionGo()}, keyval...)
kv = append(kv, "gapic", versionClient, "gax", gax.Version, "grpc", grpc.Version)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}

Expand Down
2 changes: 1 addition & 1 deletion internal/gengapic/testdata/foo_rest_client_init.want
View file
Open in desktop
Expand Up @@ -107,7 +107,7 @@ func NewFooRESTClient(ctx context.Context, opts ...option.ClientOption) (*FooCli
// use by Google-written clients.
func (c *fooRESTClient) setGoogleClientInfo(keyval ...string) {
kv := append([]string{"gl-go", versionGo()}, keyval...)
kv = append(kv, "gapic", versionClient, "gax", gax.Version, "rest", "UNKNOWN")
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "rest", "UNKNOWN")
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}

Expand Down
2 changes: 1 addition & 1 deletion internal/gengapic/testdata/lro_client_init.want
View file
Open in desktop
Expand Up @@ -173,7 +173,7 @@ func (c *fooGRPCClient) Connection() *grpc.ClientConn {
// use by Google-written clients.
func (c *fooGRPCClient) setGoogleClientInfo(keyval ...string) {
kv := append([]string{"gl-go", versionGo()}, keyval...)
kv = append(kv, "gapic", versionClient, "gax", gax.Version, "grpc", grpc.Version)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}

Expand Down