Revert "conditionally enable directpath for storagecontrol.googleapis.com (#1…" (#1667)

This reverts commit 1e451fa.

Author: rockspore

internal/gengapic/generator.go

@@ -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,

internal/gengapic/gengrpc.go

@@ -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\"),")

internal/gengapic/testdata/foo_opt.want

@@ -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(),