Fix errors.

TileDB-Inc · Sep 18, 2024 · 73ae35f · 73ae35f
1 parent 03b5e9f
commit 73ae35f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/tiledb/CMakeLists.txt b/tiledb/CMakeLists.txt
@@ -192,7 +192,7 @@ set(TILEDB_CORE_SOURCES
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/filesystem/posix.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/filesystem/s3.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/filesystem/s3_thread_pool_executor.cc
-  ${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/filesystem/s3/AwsCredentialsProviderChain.cc
+  ${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/filesystem/s3/AWSCredentialsProviderChain.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/filesystem/s3/GeneralHTTPCredentialsProvider.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/filesystem/s3/STSCredentialsProvider.cc
   ${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/filesystem/s3/STSProfileWithWebIdentityCredentialsProvider.cc

diff --git a/tiledb/sm/filesystem/s3.cc b/tiledb/sm/filesystem/s3.cc
@@ -1409,6 +1409,7 @@ Status S3::init_client() const {
         credentials_provider_ = make_shared<
             tiledb::sm::filesystem::s3::DefaultAWSCredentialsProviderChain>(
             HERE(), client_config_);
+        break;
       case 1:
       case 2:
         throw S3Exception(

diff --git a/tiledb/sm/filesystem/s3.h b/tiledb/sm/filesystem/s3.h
@@ -55,7 +55,6 @@
 
 #undef GetObject
 #include <aws/core/Aws.h>
-#include <aws/core/auth/AWSCredentialsProviderChain.h>
 #include <aws/core/client/ClientConfiguration.h>
 #include <aws/core/client/RetryStrategy.h>
 #include <aws/core/http/HttpClient.h>

diff --git a/tiledb/sm/filesystem/s3/AWSCredentialsProviderChain.cc b/tiledb/sm/filesystem/s3/AWSCredentialsProviderChain.cc
@@ -40,6 +40,8 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
+#ifdef HAVE_S3
+
 #include "tiledb/sm/filesystem/s3/AWSCredentialsProviderChain.h"
 
 #include "tiledb/common/common.h"
@@ -160,3 +162,5 @@ DefaultAWSCredentialsProviderChain::DefaultAWSCredentialsProviderChain(
   }
 }
 }  // namespace tiledb::sm::filesystem::s3
+
+#endif  // HAVE_S3
diff --git a/tiledb/sm/filesystem/s3/GeneralHTTPCredentialsProvider.cc b/tiledb/sm/filesystem/s3/GeneralHTTPCredentialsProvider.cc
@@ -40,6 +40,8 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
+#ifdef HAVE_S3
+
 #include "tiledb/sm/filesystem/s3/GeneralHTTPCredentialsProvider.h"
 #include "tiledb/common/common.h"
 
@@ -383,3 +385,5 @@ void GeneralHTTPCredentialsProvider::RefreshIfExpired() {
   Reload();
 }
 }  // namespace tiledb::sm::filesystem::s3
+
+#endif  // HAVE_S3
diff --git a/tiledb/sm/filesystem/s3/STSCredentialsProvider.cc b/tiledb/sm/filesystem/s3/STSCredentialsProvider.cc
@@ -40,6 +40,8 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
+#ifdef HAVE_S3
+
 #include "tiledb/sm/filesystem/s3/STSCredentialsProvider.h"
 #include "tiledb/common/common.h"
 
@@ -227,3 +229,5 @@ void STSAssumeRoleWebIdentityCredentialsProvider::RefreshIfExpired() {
   Reload();
 }
 }  // namespace tiledb::sm::filesystem::s3
+
+#endif