From 3370d47ef419cd66f18e48c5f3983cf0394556b3 Mon Sep 17 00:00:00 2001 From: Noah Dietz Date: Fri, 12 Nov 2021 07:40:35 -0800 Subject: [PATCH] gapic: remove disable serv config dial opt (#812) Since https://github.com/googleapis/google-api-go-client/pull/1260 we need to start allowing the service config to be pulled. cc @mohanli-ml --- internal/gengapic/gengrpc.go | 1 - internal/gengapic/testdata/empty_opt.want | 1 - internal/gengapic/testdata/foo_opt.want | 1 - internal/gengapic/testdata/host_port_opt.want | 1 - internal/gengapic/testdata/iam_override_opt.want | 1 - 5 files changed, 5 deletions(-) diff --git a/internal/gengapic/gengrpc.go b/internal/gengapic/gengrpc.go index 79ae8217..e5abe719 100644 --- a/internal/gengapic/gengrpc.go +++ b/internal/gengapic/gengrpc.go @@ -199,7 +199,6 @@ func (g *generator) grpcClientOptions(serv *descriptor.ServiceDescriptorProto, s p(" internaloption.WithDefaultAudience(%q),", generateDefaultAudience(host)) p(" internaloption.WithDefaultScopes(DefaultAuthScopes()...),") p(" internaloption.EnableJwtWithScope(),") - p(" option.WithGRPCDialOption(grpc.WithDisableServiceConfig()),") p(" option.WithGRPCDialOption(grpc.WithDefaultCallOptions(") p(" grpc.MaxCallRecvMsgSize(math.MaxInt32))),") p(" }") diff --git a/internal/gengapic/testdata/empty_opt.want b/internal/gengapic/testdata/empty_opt.want index 45ae194f..f245fd80 100644 --- a/internal/gengapic/testdata/empty_opt.want +++ b/internal/gengapic/testdata/empty_opt.want @@ -22,7 +22,6 @@ func defaultGRPCClientOptions() []option.ClientOption { internaloption.WithDefaultAudience("https://foo.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(), - option.WithGRPCDialOption(grpc.WithDisableServiceConfig()), option.WithGRPCDialOption(grpc.WithDefaultCallOptions( grpc.MaxCallRecvMsgSize(math.MaxInt32))), } diff --git a/internal/gengapic/testdata/foo_opt.want b/internal/gengapic/testdata/foo_opt.want index bff1f4fc..29cec552 100644 --- a/internal/gengapic/testdata/foo_opt.want +++ b/internal/gengapic/testdata/foo_opt.want @@ -22,7 +22,6 @@ func defaultFooGRPCClientOptions() []option.ClientOption { internaloption.WithDefaultAudience("https://foo.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(), - option.WithGRPCDialOption(grpc.WithDisableServiceConfig()), option.WithGRPCDialOption(grpc.WithDefaultCallOptions( grpc.MaxCallRecvMsgSize(math.MaxInt32))), } diff --git a/internal/gengapic/testdata/host_port_opt.want b/internal/gengapic/testdata/host_port_opt.want index 6776db3b..6df43a80 100644 --- a/internal/gengapic/testdata/host_port_opt.want +++ b/internal/gengapic/testdata/host_port_opt.want @@ -20,7 +20,6 @@ func defaultBarGRPCClientOptions() []option.ClientOption { internaloption.WithDefaultAudience("https://foo.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(), - option.WithGRPCDialOption(grpc.WithDisableServiceConfig()), option.WithGRPCDialOption(grpc.WithDefaultCallOptions( grpc.MaxCallRecvMsgSize(math.MaxInt32))), } diff --git a/internal/gengapic/testdata/iam_override_opt.want b/internal/gengapic/testdata/iam_override_opt.want index 16554cb2..9d880403 100644 --- a/internal/gengapic/testdata/iam_override_opt.want +++ b/internal/gengapic/testdata/iam_override_opt.want @@ -19,7 +19,6 @@ func defaultBazGRPCClientOptions() []option.ClientOption { internaloption.WithDefaultAudience("https://foo.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(), - option.WithGRPCDialOption(grpc.WithDisableServiceConfig()), option.WithGRPCDialOption(grpc.WithDefaultCallOptions( grpc.MaxCallRecvMsgSize(math.MaxInt32))), }