Merge pull request #7516 from sfc-gh-jslocum/awscreds_cleanup

Cleaning up AWS creds

fdbclient/CMakeLists.txt

@@ -68,11 +68,6 @@ endif()
 
 if(WITH_AWS_BACKUP)
   add_compile_definitions(BUILD_AWS_BACKUP)
-
-  set(FDBCLIENT_SRCS
-    ${FDBCLIENT_SRCS}
-    FDBAWSCredentialsProvider.h)
-
   include(awssdk)
 endif()
 

fdbclient/FDBAWSCredentialsProvider.cpp

@@ -0,0 +1,44 @@
+
+/*
+ * FDBAWSCredentialsProvider.cpp
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2022 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fdbclient/FDBAWSCredentialsProvider.h"
+#include "fdbclient/Tracing.h"
+
+#ifdef BUILD_AWS_BACKUP
+
+// You're supposed to call AWS::ShutdownAPI(options); once done
+// But we want this to live for the lifetime of the process, so we don't do that
+namespace FDBAWSCredentialsProvider {
+Aws::Auth::AWSCredentials getAwsCredentials() {
+	static bool doneInit = false;
+	if (!doneInit) {
+		doneInit = true;
+		Aws::SDKOptions options;
+		Aws::InitAPI(options);
+		TraceEvent("AWSSDKInitSuccessful");
+	}
+	Aws::Auth::DefaultAWSCredentialsProviderChain credProvider;
+	Aws::Auth::AWSCredentials creds = credProvider.GetAWSCredentials();
+	return creds;
+}
+} // namespace FDBAWSCredentialsProvider
+
+#endif

fdbclient/include/fdbclient/FDBAWSCredentialsProvider.h

@@ -22,26 +22,15 @@
 #define FDB_AWS_CREDENTIALS_PROVIDER_H
 #pragma once
 
+#ifdef BUILD_AWS_BACKUP
+
 #include "aws/core/Aws.h"
 #include "aws/core/auth/AWSCredentialsProviderChain.h"
 
-// Singleton
 namespace FDBAWSCredentialsProvider {
-bool doneInit = false;
-
-// You're supposed to call AWS::ShutdownAPI(options); once done
-// But we want this to live for the lifetime of the process, so we don't do that
-static Aws::Auth::AWSCredentials getAwsCredentials() {
-	if (!doneInit) {
-		doneInit = true;
-		Aws::SDKOptions options;
-		Aws::InitAPI(options);
-		TraceEvent("AWSSDKInitSuccessful");
-	}
-	Aws::Auth::DefaultAWSCredentialsProviderChain credProvider;
-	Aws::Auth::AWSCredentials creds = credProvider.GetAWSCredentials();
-	return creds;
+Aws::Auth::AWSCredentials getAwsCredentials();
 }
-} // namespace FDBAWSCredentialsProvider
+
+#endif
 
 #endif