SNOW-1889398: Handle endpoint without protocol for GCS (#2038)

snowflakedb · Jan 20, 2025 · f2ec619 · f2ec619
1 parent bee2e4b
commit f2ec619
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java
@@ -1314,7 +1314,7 @@ private void setupGCSClient(
       if (accessToken != null) {
         // We are authenticated with an oauth access token.
         StorageOptions.Builder builder = StorageOptions.newBuilder();
-        stage.gcsCustomEndpoint().ifPresent(builder::setHost);
+        overrideHost(stage, builder);
 
         if (areDisabledGcsDefaultCredentials(session)) {
           logger.debug(
@@ -1335,7 +1335,7 @@ private void setupGCSClient(
         // Use anonymous authentication.
         HttpStorageOptions.Builder builder =
             HttpStorageOptions.newBuilder().setCredentials(NoCredentials.getInstance());
-        stage.gcsCustomEndpoint().ifPresent(builder::setHost);
+        overrideHost(stage, builder);
         this.gcsClient = builder.build().getService();
       }
 
@@ -1357,6 +1357,19 @@ private void setupGCSClient(
     }
   }
 
+  private static void overrideHost(StageInfo stage, StorageOptions.Builder builder) {
+    stage
+        .gcsCustomEndpoint()
+        .ifPresent(
+            host -> {
+              if (host.startsWith("https://")) {
+                builder.setHost(host);
+              } else {
+                builder.setHost("https://" + host);
+              }
+            });
+  }
+
   private static boolean areDisabledGcsDefaultCredentials(SFSession session) {
     return session != null && session.getDisableGcsDefaultCredentials()
         || convertSystemPropertyToBooleanValue(