diff --git a/internal/gengapic/generator.go b/internal/gengapic/generator.go index fa8961ab..731bd7b9 100644 --- a/internal/gengapic/generator.go +++ b/internal/gengapic/generator.go @@ -36,23 +36,6 @@ import ( "google.golang.org/protobuf/types/pluginpb" ) -var enableNewAuthLibraryBlocklist = map[string]bool{ - "generativelanguage.googleapis.com": true, - "aiplatform.googleapis.com": true, - "analyticshub.googleapis.com": true, - "biglake.googleapis.com": true, - "bigtableadmin.googleapis.com": true, - "bigtable.googleapis.com": true, - "datastore.googleapis.com": true, - "clouderrorreporting.googleapis.com": true, - "firestore.googleapis.com": true, - "logging.googleapis.com": true, - "cloudprofiler.googleapis.com": true, - "pubsub.googleapis.com": true, - "pubsublite.googleapis.com": true, - "spanner.googleapis.com": true, -} - // keyed by proto package name, e.g. "google.cloud.foo.v1". var enableWrapperTypesForPageSize = map[string]bool{ "google.cloud.bigquery.v2": true, diff --git a/internal/gengapic/gengrpc.go b/internal/gengapic/gengrpc.go index 909b2edf..1751f13c 100644 --- a/internal/gengapic/gengrpc.go +++ b/internal/gengapic/gengrpc.go @@ -185,9 +185,7 @@ func (g *generator) grpcClientOptions(serv *descriptorpb.ServiceDescriptorProto, p(" internaloption.WithDefaultAudience(%q),", generateDefaultAudience(host)) p(" internaloption.WithDefaultScopes(DefaultAuthScopes()...),") p(" internaloption.EnableJwtWithScope(),") - if _, ok := enableNewAuthLibraryBlocklist[g.serviceConfig.GetName()]; !ok { - p("internaloption.EnableNewAuthLibrary(),") - } + p(" internaloption.EnableNewAuthLibrary(),") p(" option.WithGRPCDialOption(grpc.WithDefaultCallOptions(") p(" grpc.MaxCallRecvMsgSize(math.MaxInt32))),") p(" }") diff --git a/internal/gengapic/genrest.go b/internal/gengapic/genrest.go index a40bc57e..b9bf409b 100644 --- a/internal/gengapic/genrest.go +++ b/internal/gengapic/genrest.go @@ -137,9 +137,7 @@ func (g *generator) restClientOptions(serv *descriptorpb.ServiceDescriptorProto, p(" internaloption.WithDefaultUniverseDomain(%q),", googleDefaultUniverse) p(" internaloption.WithDefaultAudience(%q),", generateDefaultAudience(host)) p(" internaloption.WithDefaultScopes(DefaultAuthScopes()...),") - if _, ok := enableNewAuthLibraryBlocklist[g.serviceConfig.GetName()]; !ok { - p("internaloption.EnableNewAuthLibrary(),") - } + p(" internaloption.EnableNewAuthLibrary(),") p(" }") p("}") }