diff --git a/internal/gengapic/gengrpc.go b/internal/gengapic/gengrpc.go index efff793a2..773d8ee65 100644 --- a/internal/gengapic/gengrpc.go +++ b/internal/gengapic/gengrpc.go @@ -181,7 +181,6 @@ func (g *generator) grpcClientOptions(serv *descriptor.ServiceDescriptorProto, s p(" internaloption.WithDefaultEndpoint(%q),", host) p(" internaloption.WithDefaultEndpointTemplate(%q),", generateDefaultEndpointTemplate(host)) p(" internaloption.WithDefaultMTLSEndpoint(%q),", generateDefaultMTLSEndpoint(host)) - p(" internaloption.WithDefaultUniverseDomain(%q),", googleDefaultUniverse) p(" internaloption.WithDefaultAudience(%q),", generateDefaultAudience(host)) p(" internaloption.WithDefaultScopes(DefaultAuthScopes()...),") p(" internaloption.EnableJwtWithScope(),") diff --git a/internal/gengapic/genrest.go b/internal/gengapic/genrest.go index 6ce417356..97ab8b041 100644 --- a/internal/gengapic/genrest.go +++ b/internal/gengapic/genrest.go @@ -134,7 +134,6 @@ func (g *generator) restClientOptions(serv *descriptor.ServiceDescriptorProto, s p(" internaloption.WithDefaultEndpoint(%q),", host) p(" internaloption.WithDefaultEndpointTemplate(%q),", generateDefaultEndpointTemplate(host)) p(" internaloption.WithDefaultMTLSEndpoint(%q),", generateDefaultMTLSEndpoint(host)) - p(" internaloption.WithDefaultUniverseDomain(%q),", googleDefaultUniverse) p(" internaloption.WithDefaultAudience(%q),", generateDefaultAudience(host)) p(" internaloption.WithDefaultScopes(DefaultAuthScopes()...),") p(" }") diff --git a/internal/gengapic/testdata/empty_opt.want b/internal/gengapic/testdata/empty_opt.want index a5603fe69..c7741b9ff 100644 --- a/internal/gengapic/testdata/empty_opt.want +++ b/internal/gengapic/testdata/empty_opt.want @@ -20,7 +20,6 @@ func defaultGRPCClientOptions() []option.ClientOption { internaloption.WithDefaultEndpoint("foo.googleapis.com:443"), internaloption.WithDefaultEndpointTemplate("foo.UNIVERSE_DOMAIN:443"), internaloption.WithDefaultMTLSEndpoint("foo.mtls.googleapis.com:443"), - internaloption.WithDefaultUniverseDomain("googleapis.com"), internaloption.WithDefaultAudience("https://foo.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(), diff --git a/internal/gengapic/testdata/foo_opt.want b/internal/gengapic/testdata/foo_opt.want index 54e43936a..a91142505 100644 --- a/internal/gengapic/testdata/foo_opt.want +++ b/internal/gengapic/testdata/foo_opt.want @@ -20,7 +20,6 @@ func defaultFooGRPCClientOptions() []option.ClientOption { internaloption.WithDefaultEndpoint("foo.googleapis.com:443"), internaloption.WithDefaultEndpointTemplate("foo.UNIVERSE_DOMAIN:443"), internaloption.WithDefaultMTLSEndpoint("foo.mtls.googleapis.com:443"), - internaloption.WithDefaultUniverseDomain("googleapis.com"), internaloption.WithDefaultAudience("https://foo.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(), diff --git a/internal/gengapic/testdata/host_port_opt.want b/internal/gengapic/testdata/host_port_opt.want index 879720a6a..f461fc8b2 100644 --- a/internal/gengapic/testdata/host_port_opt.want +++ b/internal/gengapic/testdata/host_port_opt.want @@ -18,7 +18,6 @@ func defaultBarGRPCClientOptions() []option.ClientOption { internaloption.WithDefaultEndpoint("foo.googleapis.com:1234"), internaloption.WithDefaultEndpointTemplate("foo.UNIVERSE_DOMAIN:1234"), internaloption.WithDefaultMTLSEndpoint("foo.mtls.googleapis.com:1234"), - internaloption.WithDefaultUniverseDomain("googleapis.com"), internaloption.WithDefaultAudience("https://foo.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(), diff --git a/internal/gengapic/testdata/iam_override_opt.want b/internal/gengapic/testdata/iam_override_opt.want index f7aede362..b84bb22b2 100644 --- a/internal/gengapic/testdata/iam_override_opt.want +++ b/internal/gengapic/testdata/iam_override_opt.want @@ -17,7 +17,6 @@ func defaultBazGRPCClientOptions() []option.ClientOption { internaloption.WithDefaultEndpoint("foo.googleapis.com:1234"), internaloption.WithDefaultEndpointTemplate("foo.UNIVERSE_DOMAIN:1234"), internaloption.WithDefaultMTLSEndpoint("foo.mtls.googleapis.com:1234"), - internaloption.WithDefaultUniverseDomain("googleapis.com"), internaloption.WithDefaultAudience("https://foo.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(),