chore(storage): remove fallback allowed option for direct connectivity (#13823)

cpriti-os · web-flow · commit 90678f097954 · 2026-02-10T14:32:42.000+05:30
diff --git a/storage/grpc_client.go b/storage/grpc_client.go
@@ -69,12 +69,11 @@ const (
 	// which only does a single read per stream.
 	defaultReadID = 1
 
-	forceDirectConnectivityFallbackAllowed = "FALLBACK_ALLOWED"
-	forceDirectConnectivityEnforced        = "ENFORCED"
-	forceDirectConnectivityOptedOut        = "OPTED_OUT"
-	directConnectivityHeaderKey            = "force_direct_connectivity"
-	requestParamsHeaderKey                 = "x-goog-request-params"
-	directPathEndpointPrefix               = "google-c2p:///"
+	forceDirectConnectivityEnforced = "ENFORCED"
+	forceDirectConnectivityOptedOut = "OPTED_OUT"
+	directConnectivityHeaderKey     = "force_direct_connectivity"
+	requestParamsHeaderKey          = "x-goog-request-params"
+	directPathEndpointPrefix        = "google-c2p:///"
 )
 
 // defaultGRPCOptions returns a set of the default client options
@@ -216,30 +215,31 @@ func (c *grpcStorageClient) prepareDirectPathMetadata(ctx context.Context, targe
 	}
 
 	// Determine the intended mode based on user configuration.
-	value := forceDirectConnectivityFallbackAllowed // Default
+	value := ""
 	if c.config.grpcDirectPathEnforced {
 		value = forceDirectConnectivityEnforced
 	}
 
 	// Downgrade based on connection status.
 	if !isDirectPath {
-		// TODO: Reject call if set to ENFORCED when supported.
 		// Downgrade to OPTED_OUT for server-side monitoring.
 		value = forceDirectConnectivityOptedOut
 	}
 
 	dc := directConnectivityHeaderKey + "=" + value
 
-	// Inject header.
 	md, ok := metadata.FromOutgoingContext(ctx)
 	if !ok {
 		md = metadata.MD{}
 	}
 
-	if vals := md.Get(requestParamsHeaderKey); len(vals) > 0 {
-		md.Set(requestParamsHeaderKey, vals[0]+"&"+dc)
-	} else {
-		md.Set(requestParamsHeaderKey, dc)
+	// Inject the header only if we have a value to set.
+	if value != "" {
+		if vals := md.Get(requestParamsHeaderKey); len(vals) > 0 {
+			md.Set(requestParamsHeaderKey, vals[0]+"&"+dc)
+		} else {
+			md.Set(requestParamsHeaderKey, dc)
+		}
 	}
 
 	return metadata.NewOutgoingContext(ctx, md), nil
diff --git a/storage/grpc_client_test.go b/storage/grpc_client_test.go
@@ -443,20 +443,19 @@ func TestPrepareDirectPathMetadata(t *testing.T) {
 			want:     "force_direct_connectivity=ENFORCED",
 		},
 		{
-			desc:     "DirectPath target with FALLBACK_ALLOWED",
+			desc:     "DirectPath target with NOT ENFORCED",
 			enforced: false,
 			target:   "google-c2p:///storage.googleapis.com",
-			want:     "force_direct_connectivity=FALLBACK_ALLOWED",
+			want:     "",
 		},
 		{
 			desc:     "CloudPath target with ENFORCED",
 			enforced: true,
 			target:   "dns:///storage.googleapis.com",
-			// This currently downgrades to OPTED_OUT instead of rejecting.
-			want: "force_direct_connectivity=OPTED_OUT",
+			want:     "force_direct_connectivity=OPTED_OUT",
 		},
 		{
-			desc:     "CloudPath target with FALLBACK_ALLOWED",
+			desc:     "CloudPath target with NOT ENFORCED",
 			enforced: false,
 			target:   "dns:///storage.googleapis.com",
 			want:     "force_direct_connectivity=OPTED_OUT",
@@ -492,10 +491,10 @@ func TestPrepareDirectPathMetadata(t *testing.T) {
 
 			got := md.Get(requestParamsHeaderKey)
 			if len(got) == 0 {
-				t.Fatal("request params header not found")
-			}
-
-			if got[0] != tc.want {
+				if tc.want != "" {
+					t.Fatal("request params header not found")
+				}
+			} else if got[0] != tc.want {
 				t.Errorf("got metadata %q, want %q", got[0], tc.want)
 			}
 		})
