[SNOW-943964] Fix GCP downscope token issue (#1539)

* [SNOW-943964] Fix GCP downscope token issue * [DoNotMerge][SNOW-943964] Hot Fix for GCS connectivity issues * additional logs * Formatting issues
snowflakedb · Oct 26, 2023 · 8720b4c · 8720b4c
1 parent 4453b41
commit 8720b4c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/FIPS/pom.xml b/FIPS/pom.xml
@@ -811,10 +811,6 @@
                        <shadedPattern>${shadeBase}.google.iam</shadedPattern>
                      </relocation>
                      <relocation>
-                       <pattern>storage</pattern>
-                       <shadedPattern>${shadeBase}.storage</shadedPattern>
-                     </relocation>
-                      <relocation>
                        <pattern>io.opencensus</pattern>
                        <shadedPattern>${shadeBase}.opencensus</shadedPattern>
                      </relocation>

diff --git a/src/main/java/net/snowflake/client/jdbc/DefaultSFConnectionHandler.java b/src/main/java/net/snowflake/client/jdbc/DefaultSFConnectionHandler.java
@@ -99,15 +99,17 @@ public SFBaseStatement getSFStatement() {
 
   protected void initialize(SnowflakeConnectString conStr, String appID, String appVersion)
       throws SQLException {
-    logger.debug(
-        "Trying to establish session, JDBC driver version: {}", SnowflakeDriver.implementVersion);
     TelemetryService.getInstance().updateContext(conStr);
 
     try {
       // pass the parameters to sfSession
       initSessionProperties(conStr, appID, appVersion);
       setClientConfig();
       initLogger();
+      logger.debug(
+          "Trying to establish session, JDBC driver version: {} : {}",
+          SnowflakeDriver.getImplementationTitle(),
+          SnowflakeDriver.implementVersion);
       if (!skipOpen) {
         sfSession.open();
       }

diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
@@ -145,6 +145,16 @@ public static String getDisableArrowResultFormatMessage() {
     return disableArrowResultFormatMessage;
   }
 
+  /**
+   * Utility method to verify if the standard or fips snowflake-jdbc driver is being used.
+   *
+   * @return
+   */
+  public static String getImplementationTitle() {
+    Package pkg = Package.getPackage("net.snowflake.client.jdbc");
+    return pkg.getImplementationTitle();
+  }
+
   /**
    * Checks whether a given url is in a valid format.
    *

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
@@ -152,6 +152,8 @@ public void shutdown() {
   public StorageObjectSummaryCollection listObjects(String remoteStorageLocation, String prefix)
       throws StorageProviderException {
     try {
+      logger.debug(
+          "Listing objects in the bucket {} with prefix {}", remoteStorageLocation, prefix);
       Page<Blob> blobs = this.gcsClient.list(remoteStorageLocation, BlobListOption.prefix(prefix));
       return new StorageObjectSummaryCollection(blobs);
     } catch (Exception e) {
@@ -633,7 +635,7 @@ public void upload(
     }
 
     if (!Strings.isNullOrEmpty(presignedUrl)) {
-      logger.debug("Starting upload", false);
+      logger.debug("Starting upload with downscope token", false);
       uploadWithPresignedUrl(
           session.getNetworkTimeoutInMilli(),
           session.getAuthTimeout(),
@@ -720,6 +722,7 @@ private void uploadWithDownScopedToken(
       String contentEncoding,
       Map<String, String> metadata,
       InputStream content) {
+    logger.debug("Uploading file {} to bucket {}", destFileName, remoteStorageLocation);
     BlobId blobId = BlobId.of(remoteStorageLocation, destFileName);
     BlobInfo blobInfo =
         BlobInfo.newBuilder(blobId)