SNOW-2032703: Add support for virtual style domains (#1165)

Author: sfc-gh-ext-simba-lf

Snowflake.Data.Tests/UnitTests/SFGCSClientTest.cs

@@ -368,6 +368,37 @@ public void TestUseUriWithRegionsWhenNeeded(string region, string endPoint, bool
             Assert.AreEqual(expectedRequestUri, uri);
         }
 
+        [Test]
+        [TestCase("mock-stage", null, false, true, "https://mock-stage.storage.googleapis.com/")]
+        [TestCase("mock-stage/mock-id/mock-key", null, false, true, "https://mock-stage.storage.googleapis.com/mock-id/mock-key/")]
+        [TestCase("mock-stage/mock-id/mock-key", null, true, true, "https://mock-stage.storage.googleapis.com/mock-id/mock-key/")]
+        [TestCase("mock-stage/mock-id/mock-key", "https://example.com", true, true, "https://example.com/mock-id/mock-key/")]
+        public void TestUsesVirtualUrlWhenExpected(string location, string endPoint, bool useRegionalUrl, bool useVirtualUrl, string expectedRequestUri)
+        {
+            var fileMetadata = new SFFileMetadata()
+            {
+                stageInfo = new PutGetStageInfo()
+                {
+                    endPoint = endPoint,
+                    location = location,
+                    locationType = SFRemoteStorageUtil.GCS_FS,
+                    path = LocationPath,
+                    presignedUrl = null,
+                    region = null,
+                    stageCredentials = _stageCredentials,
+                    storageAccount = null,
+                    useRegionalUrl = useRegionalUrl,
+                    useVirtualUrl = useVirtualUrl
+                }
+            };
+
+            // act
+            var uri = _client.FormBaseRequest(fileMetadata, "PUT").RequestUri.ToString();
+
+            // assert
+            Assert.AreEqual(expectedRequestUri, uri);
+        }
+
         [Test]
         [TestCase("some-header-name", "SOME-HEADER-NAME")]
         [TestCase("SOME-HEADER-NAME", "some-header-name")]

Snowflake.Data/Core/FileTransfer/StorageClient/SFGCSClient.cs

@@ -238,7 +238,8 @@ internal string generateFileURL(PutGetStageInfo stageInfo, string fileName)
             var storageHostPath = ExtractStorageHostPath(stageInfo);
             var gcsLocation = ExtractBucketNameAndPath(stageInfo.location);
             var fullFilePath = gcsLocation.key + fileName;
-            var link = storageHostPath + gcsLocation.bucket + "/" + fullFilePath;
+            var path = stageInfo.useVirtualUrl ? fullFilePath : gcsLocation.bucket + "/" + fullFilePath;
+            var link = storageHostPath + path;
             return link;
         }
 

Snowflake.Data/Core/RestResponse.cs

@@ -448,6 +448,9 @@ internal class PutGetStageInfo
         [JsonProperty(PropertyName = "useRegionalUrl", NullValueHandling = NullValueHandling.Ignore)]
         internal bool useRegionalUrl { get; set; }
 
+        [JsonProperty(PropertyName = "useVirtualUrl", NullValueHandling = NullValueHandling.Ignore)]
+        internal bool useVirtualUrl { get; set; }
+
         private const string GcsRegionMeCentral2 = "me-central2";
 
         internal string GcsCustomEndpoint()
@@ -456,6 +459,11 @@ internal string GcsCustomEndpoint()
                 return null;
             if (!string.IsNullOrWhiteSpace(endPoint) && endPoint != "null")
                 return endPoint;
+            if (useVirtualUrl)
+            {
+                var bucketName = location.Contains("/") ? location.Substring(0, location.IndexOf('/')) : location;
+                return $"{bucketName}.storage.googleapis.com";
+            }
             if (GcsRegionMeCentral2.Equals(region, StringComparison.OrdinalIgnoreCase) || useRegionalUrl)
                 return $"storage.{region.ToLower()}.rep.googleapis.com";
             return null;