Adjusting paths and dependencies preparing for testing core

Author: sdavtaker

cmake/dependencies.cmake

@@ -2,7 +2,7 @@
 find_package(CURL REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(OpenSSL REQUIRED COMPONENTS Crypto)
-pkg_check_modules(tinyxml2 REQUIRED IMPORTED_TARGET tinyxml2>=9.0.0)
+find_package(tinyxml2 9.0.0 REQUIRED)
 pkg_check_modules(CJSON REQUIRED IMPORTED_TARGET libcjson>=1.7.15)
 message(STATUS "Checking for aws-crt-cpp version 0.18.2")
 find_package(aws-crt-cpp 0.18.2 EXACT REQUIRED)
@@ -11,8 +11,14 @@ message(STATUS "  Found aws-crt-cpp version ${aws-crt-cpp_VERSION}")
 set(aws-crt-cpp_INCLUDE_DIR "${aws-crt-cpp_DIR}/../../../include")
 set(aws-crt-cpp_INCLUDE_DIRS "${aws-crt-cpp_DIR}/../../../include")
 set(aws-crt-cpp_LIBRARY_DIRS "${aws-crt-cpp_DIR}/../..")
-set(aws-crt-cpp_LIBRARIES aws-crt-cpp aws-c-common aws-c-event-stream aws-c-mqtt aws-c-s3 aws-c-auth aws-c-sdkutils aws-c-http aws-c-compression aws-c-io s2n aws-checksums aws-c-common aws-c-cal)
-set(aws-crt-cpp_LIBRARY_DIRS "${aws-crt-cpp_DIR}/..")
+set(aws-crt-cpp_LIBRARIES aws-crt-cpp aws-c-common aws-c-event-stream aws-c-mqtt aws-c-s3 aws-c-auth aws-c-sdkutils aws-c-http aws-c-compression aws-c-io aws-checksums aws-c-common aws-c-cal)
+set(aws-crt-cpp_LIBRARY_DIRS "${aws-crt-cpp_DIR}/../..")
+find_package(s2n QUIET)
+if (s2n_FOUND)
+    message(STATUS "  Found s2n version ${s2n_VERSION}")
+    set(aws-crt-cpp_LIBRARIES ${aws-crt-cpp_LIBRARIES} s2n)
+endif ()
+# Up to here can be removed once CRT updated to provide this data
 
 if (BUILD_TESTING)
     message(STATUS "Building tests")

cmake_legacy/sdks.cmake

@@ -241,7 +241,7 @@ function(add_sdks)
 
     #testing
     if(ENABLE_TESTING)
-        add_subdirectory(tests/testing-resources)
+        add_subdirectory(src/aws-cpp-sdk-core-tests/testing-resources)
 
         if(ENABLE_FUNCTIONAL_TESTING)
             message(STATUS "Clearing existing directory for document-test to prepare for generation.")

src/aws-cpp-sdk-core-tests/CMakeLists.txt

@@ -3,22 +3,27 @@ if (NOT LEGACY_BUILD)
     add_library(aws-sdk-cpp::test-resources ALIAS aws-sdk-cpp-test-resources)
     target_link_libraries(
             aws-sdk-cpp-test-resources
+            GTest::GTest
             aws-sdk-cpp::core
+            aws-sdk-cpp::test-resources
+            aws-crt-cpp
     )
     add_subdirectory(testing-resources)
 
     add_executable(aws_core_test)
     target_link_libraries(
             aws_core_test
-            PRIVATE GTest::GTest
-            PRIVATE aws-sdk-cpp::core
-            PRIVATE aws-sdk-cpp::test-resources
+            GTest::GTest
+            aws-sdk-cpp::core
+            aws-sdk-cpp::test-resources
+            aws-crt-cpp
     )
-    target_sources(aws_core_test
+    target_sources(
+            aws_core_test
             PRIVATE
             ${CMAKE_CURRENT_SOURCE_DIR}/RunTests.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/VersionTests.cpp
-            )
+    )
     gtest_discover_tests(aws_core_test)
 
     message(WARNING "Building core test with new cmake scripts not yet implemented")

src/aws-cpp-sdk-core-tests/testing-resources/include/CMakeLists.txt

@@ -2,5 +2,4 @@ target_include_directories(
         aws-sdk-cpp-test-resources
         BEFORE
         PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-
 )

testing-resources/include/aws/external/gtest/gtest-assertion-result.h renamed to src/aws-cpp-sdk-core-tests/testing-resources/include/aws/external/gtest/gtest-assertion-result.h

@@ -8,6 +8,7 @@ if (NOT LEGACY_BUILD)
             PUBLIC ${CJSON_INCLUDE_DIRS}
             PUBLIC ${tinyxml2_INCLUDE_DIRS}
     )
+    message(STATUS "CRT: ${aws-crt-cpp_LIBRARY_DIRS}")
     target_link_directories(
             aws-sdk-cpp-core
             PUBLIC ${aws-crt-cpp_LIBRARY_DIRS}
@@ -18,7 +19,8 @@ if (NOT LEGACY_BUILD)
             aws-sdk-cpp-core
             ${aws-crt-cpp_LIBRARIES}
             ${CJSON_LIBRARIES}
-            ${tinyxml2_LIBRARIES}
+            tinyxml2::tinyxml2
+            CURL::libcurl
     )
     add_subdirectory(include)
     add_subdirectory(source)

testing-resources/include/aws/external/gtest/gtest-aws-helper.h renamed to src/aws-cpp-sdk-core-tests/testing-resources/include/aws/external/gtest/gtest-aws-helper.h

@@ -1,9 +1,9 @@
 target_sources(aws-sdk-cpp-core
         PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/AWSAuthSigner.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/AWSAuthSignerProvider.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/AWSCredentialsProvider.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/AWSCredentialsProviderChain.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/SSOCredentialsProvider.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/STSCredentialsProvider.cpp
-        )
+        )
+add_subdirectory(signer)
+add_subdirectory(signer-provider)

testing-resources/include/aws/external/gtest/gtest-death-test.h renamed to src/aws-cpp-sdk-core-tests/testing-resources/include/aws/external/gtest/gtest-death-test.h

@@ -0,0 +1,4 @@
+target_sources(aws-sdk-cpp-core
+        PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/DefaultAuthSignerProvider.cpp
+        )

testing-resources/include/aws/external/gtest/gtest-matchers.h renamed to src/aws-cpp-sdk-core-tests/testing-resources/include/aws/external/gtest/gtest-matchers.h

@@ -0,0 +1,8 @@
+target_sources(aws-sdk-cpp-core
+        PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/AWSAuthEventStreamV4Signer.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/AWSAuthSignerCommon.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/AWSAuthSignerHelper.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/AWSAuthV4Signer.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/AWSNullSigner.cpp
+        )

testing-resources/include/aws/external/gtest/gtest-message.h renamed to src/aws-cpp-sdk-core-tests/testing-resources/include/aws/external/gtest/gtest-message.h

@@ -1,5 +1,8 @@
 target_sources(aws-sdk-cpp-core
         PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/defaults/ClientConfigurationDefaults.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/AWSProfileConfigLoader.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/AWSConfigFileProfileConfigLoader.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/AWSProfileConfigLoaderBase.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/ConfigAndCredentialsCacheManager.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/EC2InstanceProfileConfigLoader.cpp
         )