SNOW-2100781: Fix use_virtual_url in GCS (snowflakedb#2320)

Author: sfc-gh-pbulawa

DESCRIPTION.md

@@ -10,6 +10,7 @@ Source code is also available at: https://github.com/snowflakedb/snowflake-conne
 - v3.16(TBD)
   - Added basic arrow support for Interval types.
   - Fix `write_pandas` special characters usage in the location name.
+  - Fix usage of `use_virtual_url` when building the location for gcs storage client.
 
 - v3.15.0(Apr 29,2025)
   - Bumped up min boto and botocore version to 1.24.

src/snowflake/connector/gcs_storage_client.py

@@ -464,7 +464,7 @@ def generate_file_url(
         use_virtual_url: bool = False,
     ) -> str:
         gcs_location = SnowflakeGCSRestClient.get_location(
-            stage_location, use_regional_url, region, endpoint
+            stage_location, use_regional_url, region, endpoint, use_virtual_url
         )
         full_file_path = f"{gcs_location.path}{filename}"
 

test/unit/test_gcs_client.py

@@ -350,64 +350,93 @@ def test_get_file_header_none_with_presigned_url(tmp_path):
 
 
 @pytest.mark.parametrize(
-    "region,return_url,use_regional_url,endpoint,use_virtual_url",
+    "region,return_url,use_regional_url,endpoint,use_virtual_url,complete_url",
     [
         (
             "US-CENTRAL1",
             "https://storage.us-central1.rep.googleapis.com",
             True,
             None,
             False,
+            "https://storage.us-central1.rep.googleapis.com/location/filename",
         ),
         (
             "ME-CENTRAL2",
             "https://storage.me-central2.rep.googleapis.com",
             True,
             None,
             False,
+            "https://storage.me-central2.rep.googleapis.com/location/filename",
         ),
-        ("US-CENTRAL1", "https://storage.googleapis.com", False, None, False),
-        ("US-CENTRAL1", "https://storage.googleapis.com", False, None, False),
-        ("US-CENTRAL1", "https://location.storage.googleapis.com", False, None, True),
-        ("US-CENTRAL1", "https://location.storage.googleapis.com", True, None, True),
         (
             "US-CENTRAL1",
-            "https://overriddenurl.com",
+            "https://storage.googleapis.com",
             False,
-            "https://overriddenurl.com",
+            None,
             False,
+            "https://storage.googleapis.com/location/filename",
         ),
         (
             "US-CENTRAL1",
-            "https://overriddenurl.com",
+            "https://storage.us-central1.rep.googleapis.com",
             True,
-            "https://overriddenurl.com",
+            None,
             False,
+            "https://storage.us-central1.rep.googleapis.com/location/filename",
         ),
         (
             "US-CENTRAL1",
-            "https://overriddenurl.com",
+            "https://location.storage.googleapis.com",
+            False,
+            None,
             True,
-            "https://overriddenurl.com",
+            "https://location.storage.googleapis.com/filename",
+        ),
+        (
+            "US-CENTRAL1",
+            "https://location.storage.googleapis.com",
             True,
+            None,
+            True,
+            "https://location.storage.googleapis.com/filename",
         ),
         (
             "US-CENTRAL1",
             "https://overriddenurl.com",
             False,
             "https://overriddenurl.com",
             False,
+            "https://overriddenurl.com/location/filename",
+        ),
+        (
+            "US-CENTRAL1",
+            "https://overriddenurl.com",
+            True,
+            "https://overriddenurl.com",
+            False,
+            "https://overriddenurl.com/location/filename",
+        ),
+        (
+            "US-CENTRAL1",
+            "https://overriddenurl.com",
+            True,
+            "https://overriddenurl.com",
+            True,
+            "https://overriddenurl.com/filename",
         ),
         (
             "US-CENTRAL1",
             "https://overriddenurl.com",
             False,
             "https://overriddenurl.com",
             True,
+            "https://overriddenurl.com/filename",
         ),
     ],
 )
-def test_url(region, return_url, use_regional_url, endpoint, use_virtual_url):
+def test_url(
+    region, return_url, use_regional_url, endpoint, use_virtual_url, complete_url
+):
     gcs_location = SnowflakeGCSRestClient.get_location(
         stage_location="location",
         use_regional_url=use_regional_url,
@@ -417,6 +446,17 @@ def test_url(region, return_url, use_regional_url, endpoint, use_virtual_url):
     )
     assert gcs_location.endpoint == return_url
 
+    generated_url = SnowflakeGCSRestClient.generate_file_url(
+        stage_location="location",
+        filename="filename",
+        use_regional_url=use_regional_url,
+        region=region,
+        endpoint=endpoint,
+        use_virtual_url=use_virtual_url,
+    )
+
+    assert generated_url == complete_url
+
 
 @pytest.mark.parametrize(
     "region,use_regional_url,return_value",