fix(storage): do not enforce DirectPath for Rapid buckets

Author: alleaditya

internal/storage/storage_handle.go

@@ -188,7 +188,7 @@ func setRetryConfig(ctx context.Context, sc *storage.Client, clientConfig *stora
 }
 
 // Followed https://pkg.go.dev/cloud.google.com/go/storage#hdr-Experimental_gRPC_API to create the gRPC client.
-func createGRPCClientHandle(ctx context.Context, clientConfig *storageutil.StorageClientConfig, isbucketRapid bool, enableBidiConfig bool, bucketName string, billingProject string) (*storage.Client, error) {
+func createGRPCClientHandle(ctx context.Context, clientConfig *storageutil.StorageClientConfig, isBucketRapid bool, enableBidiConfig bool, bucketName string, billingProject string) (*storage.Client, error) {
 	if err := os.Setenv("GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS", "true"); err != nil {
 		return nil, fmt.Errorf("error setting direct path env var: %w", err)
 	}
@@ -202,7 +202,7 @@ func createGRPCClientHandle(ctx context.Context, clientConfig *storageutil.Stora
 
 	// Add DirectPath enforcement - client creation will fail if DirectPath is not available.
 	// Rapid buckets do not support DirectPath enforcement headers.
-	if !isbucketRapid {
+	if !isBucketRapid {
 		clientOpts = append(clientOpts, experimental.WithDirectConnectivityEnforced())
 	}
 
@@ -217,14 +217,15 @@ func createGRPCClientHandle(ctx context.Context, clientConfig *storageutil.Stora
 		setRetryConfig(ctx, sc, clientConfig)
 	}()
 
-	// Direct-path verification is fatal for regional. Todo(b/503624405): Make it fatal for all after making the dummy-stat reliable.
-	if verifyErr := verifyDirectPathConnectivity(ctx, clientConfig, bucketName, sc, billingProject); verifyErr != nil {
-		logger.Warnf("DirectPath verification failed with error: %v", verifyErr)
-		if !isbucketRapid {
+	// Skip DirectPath verification for Rapid buckets as DirectPath is not supported/enforced.
+	if !isBucketRapid {
+		// DirectPath verification is fatal for regional. Todo(b/503624405): Make it fatal for all after making the dummy-stat reliable.
+		if verifyErr := verifyDirectPathConnectivity(ctx, clientConfig, bucketName, sc, billingProject); verifyErr != nil {
+			logger.Warnf("DirectPath verification failed with error: %v", verifyErr)
 			return nil, verifyErr
+		} else {
+			logger.Infof("DirectPath verification succeeded, continuing with DirectPath.")
 		}
-	} else {
-		logger.Infof("DirectPath verification succeeded, continuing with DirectPath.")
 	}
 
 	return sc, nil

internal/storage/storage_handle_test.go

@@ -1129,11 +1129,12 @@ func (testSuite *StorageHandleTest) TestControlClientForBucketHandle_NonZonalBuc
 
 func (testSuite *StorageHandleTest) TestCreateGRPCClientHandle_RapidBucket() {
 	sc := storageutil.GetDefaultStorageClientConfig(keyFile)
-	// For rapid buckets (isbucketRapid = true), createGRPCClientHandle should omit WithDirectConnectivityEnforced
-	// and should not return an error when verifyDirectPathConnectivity fails.
+	// For rapid buckets (isBucketRapid = true), createGRPCClientHandle should omit WithDirectConnectivityEnforced
+	// and skip verifyDirectPathConnectivity entirely.
 	client, err := createGRPCClientHandle(testSuite.ctx, &sc, true, true, TestBucketName, "")
-	assert.NoError(testSuite.T(), err)
-	assert.NotNil(testSuite.T(), client)
+	require.NoError(testSuite.T(), err)
+	require.NotNil(testSuite.T(), client)
+	defer client.Close()
 }
 
 func (testSuite *StorageHandleTest) TestCreateGRPCClientHandle_NonRapidBucket() {
@@ -1144,4 +1145,3 @@ func (testSuite *StorageHandleTest) TestCreateGRPCClientHandle_NonRapidBucket()
 	assert.Error(testSuite.T(), err)
 	assert.Nil(testSuite.T(), client)
 }
-