Skip to content

Revert "feat(gengapic): conditionally enable directpath for storagecontrol" #1667

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

Merged
quartzmo merged 1 commit into from
Nov 12, 2025
Merged

Revert "feat(gengapic): conditionally enable directpath for storagecontrol" #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions internal/gengapic/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,6 @@ var enableWrapperTypesForPageSize = map[string]bool{
"google.cloud.bigquery.v2": true,
}

// keyed by the API + service name joined by "/", e.g. "storage.googleapis.com/StorageControl".
var enableDirectPath = map[string]bool{
"storage.googleapis.com/StorageControl": true,
// for test purposes.
"showcase.googleapis.com/Foo": true,
}

var enableMtlsHardBoundTokens = map[string]bool{
"bigquery.googleapis.com": true,
"cloudasset.googleapis.com": true,
Expand Down
4 changes: 0 additions & 4 deletions internal/gengapic/gengrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@ func (g *generator) grpcClientOptions(serv *descriptorpb.ServiceDescriptorProto,
p(" internaloption.WithDefaultUniverseDomain(%q),", googleDefaultUniverse)
p(" internaloption.WithDefaultAudience(%q),", generateDefaultAudience(host))
p(" internaloption.WithDefaultScopes(DefaultAuthScopes()...),")
if _, ok := enableDirectPath[fmt.Sprintf("%s/%s", g.serviceConfig.GetName(), servName)]; ok {
p(" internaloption.EnableDirectPath(true),")
p(" internaloption.EnableDirectPathXds(),")
}
p(" internaloption.EnableJwtWithScope(),")
if _, ok := enableMtlsHardBoundTokens[g.serviceConfig.GetName()]; ok {
p("internaloption.AllowHardBoundTokens(\"MTLS_S2A\"),")
Expand Down
2 changes: 0 additions & 2 deletions internal/gengapic/testdata/foo_opt.want
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ func defaultFooGRPCClientOptions() []option.ClientOption {
internaloption.WithDefaultUniverseDomain("googleapis.com"),
internaloption.WithDefaultAudience("https://foo.googleapis.com/"),
internaloption.WithDefaultScopes(DefaultAuthScopes()...),
internaloption.EnableDirectPath(true),
internaloption.EnableDirectPathXds(),
internaloption.EnableJwtWithScope(),
internaloption.AllowHardBoundTokens("MTLS_S2A"),
internaloption.EnableNewAuthLibrary(),
Expand Down