From a5d743bf2fd1dccfe2df363cbb2671539e3bd7b9 Mon Sep 17 00:00:00 2001
From: stephb9959 <stephane.bourque@gmail.com>
Date: Sun, 27 Mar 2022 08:24:50 -0700
Subject: [PATCH] Removing dependency on AWS.

---
 CMakeLists.txt |  7 -------
 Dockerfile     | 21 ---------------------
 build          |  2 +-
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f89a86..5a651b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,13 +39,7 @@ endif()
 
 add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
 
-set(BUILD_SHARED_LIBS 1)
-set(Boost_USE_STATIC_LIBS OFF)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
-
 find_package(OpenSSL    REQUIRED)
-find_package(AWSSDK     REQUIRED COMPONENTS s3)
 find_package(Poco       REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
 find_package(nlohmann_json  REQUIRED)
 find_package(nlohmann_json_schema_validator REQUIRED)
@@ -148,7 +142,6 @@ target_link_libraries(owprov PUBLIC
         ${Poco_LIBRARIES}
         ${MySQL_LIBRARIES}
         ${ZLIB_LIBRARIES}
-        ${AWSSDK_LINK_LIBRARIES}
         CppKafka::cppkafka
         fmt::fmt
         nlohmann_json_schema_validator)
diff --git a/Dockerfile b/Dockerfile
index f511b56..f51129c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,21 +55,6 @@ RUN cmake ..
 RUN make
 RUN make install
 
-FROM build-base AS aws-sdk-cpp-build
-
-ADD https://api.github.com/repos/aws/aws-sdk-cpp/git/refs/heads/main version.json
-RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp /aws-sdk-cpp
-
-WORKDIR /aws-sdk-cpp
-RUN mkdir cmake-build
-WORKDIR cmake-build
-RUN cmake .. -DBUILD_ONLY="sns;s3" \
-             -DCMAKE_BUILD_TYPE=Release \
-             -DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=uninitialized" \
-             -DAUTORUN_UNIT_TESTS=OFF
-RUN cmake --build . --config Release -j8
-RUN cmake --build . --target install
-
 FROM build-base AS owprov-build
 
 ADD CMakeLists.txt build /owprov/
@@ -83,9 +68,6 @@ COPY --from=cppkafka-build /usr/local/include /usr/local/include
 COPY --from=cppkafka-build /usr/local/lib /usr/local/lib
 COPY --from=json-schema-validator-build /usr/local/include /usr/local/include
 COPY --from=json-schema-validator-build /usr/local/lib /usr/local/lib
-COPY --from=aws-sdk-cpp-build /usr/local/include /usr/local/include
-COPY --from=aws-sdk-cpp-build /usr/local/lib /usr/local/lib
-
 COPY --from=fmtlib-build /usr/local/include /usr/local/include
 COPY --from=fmtlib-build /usr/local/lib /usr/local/lib
 
@@ -123,9 +105,6 @@ RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentr
 COPY --from=owprov-build /owprov/cmake-build/owprov /openwifi/owprov
 COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib
 COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-core/libaws-cpp-sdk-core.so /usr/local/lib
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-s3/libaws-cpp-sdk-s3.so /usr/local/lib
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-sns/libaws-cpp-sdk-sns.so /usr/local/lib
 
 EXPOSE 16005 17005 16105
 
diff --git a/build b/build
index 0aeb548..efee1f8 100644
--- a/build
+++ b/build
@@ -1 +1 @@
-74
\ No newline at end of file
+78
\ No newline at end of file