From fc99669492c741b8eec7207e35f0f6dc25da303a Mon Sep 17 00:00:00 2001
From: Deepak Majeti <deepak.majeti@ibm.com>
Date: Wed, 25 Sep 2024 09:15:55 -0400
Subject: [PATCH] improve log message

---
 .../storage_adapters/gcs/GCSFileSystem.cpp    | 21 ++++++++++++-------
 .../gcs/tests/GCSFileSystemTest.cpp           |  1 -
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/velox/connectors/hive/storage_adapters/gcs/GCSFileSystem.cpp b/velox/connectors/hive/storage_adapters/gcs/GCSFileSystem.cpp
index f2e7495ae835..583a25c291e8 100644
--- a/velox/connectors/hive/storage_adapters/gcs/GCSFileSystem.cpp
+++ b/velox/connectors/hive/storage_adapters/gcs/GCSFileSystem.cpp
@@ -296,15 +296,20 @@ class GCSFileSystem::Impl {
     }
 
     auto credFile = hiveConfig_->gcsCredentialsPath();
-    if (!credFile.empty()) {
-      std::ifstream jsonFile(credFile);
-      std::stringstream credsBuffer;
-      credsBuffer << jsonFile.rdbuf();
-      auto creds = credsBuffer.str();
-      auto credentials = gc::MakeServiceAccountCredentials(std::move(creds));
-      options.set<gc::UnifiedCredentialsOption>(credentials);
+    if (!credFile.empty() && std::filesystem::exists(credFile)) {
+      std::ifstream jsonFile(credFile, std::ios::in);
+      if (!jsonFile.is_open()) {
+        LOG(WARNING) << "Error opening file " << credFile;
+      } else {
+        std::stringstream credsBuffer;
+        credsBuffer << jsonFile.rdbuf();
+        auto creds = credsBuffer.str();
+        auto credentials = gc::MakeServiceAccountCredentials(std::move(creds));
+        options.set<gc::UnifiedCredentialsOption>(credentials);
+      }
     } else {
-      LOG(WARNING) << "Config::gcsCredentials is empty";
+      LOG(WARNING)
+          << "Config hive.gcs.json-key-file-path is empty or key file path not found";
     }
 
     client_ = std::make_shared<gcs::Client>(options);
diff --git a/velox/connectors/hive/storage_adapters/gcs/tests/GCSFileSystemTest.cpp b/velox/connectors/hive/storage_adapters/gcs/tests/GCSFileSystemTest.cpp
index 778c31e33a83..69832a1b1896 100644
--- a/velox/connectors/hive/storage_adapters/gcs/tests/GCSFileSystemTest.cpp
+++ b/velox/connectors/hive/storage_adapters/gcs/tests/GCSFileSystemTest.cpp
@@ -355,7 +355,6 @@ TEST_F(GCSFileSystemTest, credentialsConfig) {
       std::make_shared<const config::ConfigBase>(std::move(configOverride));
 
   filesystems::GCSFileSystem gcfs(conf);
-
   gcfs.initializeClient();
   try {
     const std::string gcsFile =