Revert "Bump AWS sdk version to 1.9.76 (openvinotoolkit#834)" (openvi…

…notoolkit#854) This reverts commit bbb6ceb.
ivikhrev · Aug 20, 2021 · 0a0c867 · 0a0c867
1 parent fa9e50a
commit 0a0c867
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 49 deletions.
diff --git a/Dockerfile.centos b/Dockerfile.centos
@@ -174,13 +174,11 @@ RUN cd azure-storage-cpp/Microsoft.WindowsAzure.Storage/build.release && CASABLA
 ####### End of Azure SDK
 
 # Build AWS S3 SDK
-RUN git clone https://github.com/aws/aws-sdk-cpp.git --branch 1.9.76 --single-branch --depth 1 /awssdk
-WORKDIR /awssdk
-RUN git submodule update --init --recursive
+RUN git clone https://github.com/aws/aws-sdk-cpp.git --branch 1.7.129 --single-branch --depth 1 /awssdk
 WORKDIR /awssdk/build
-RUN cmake3 -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_INSTALL_LIBDIR="lib" -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " ..
+RUN cmake3 -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " ..
 RUN make --jobs=$JOBS
-RUN make install
+RUN mv .deps/install/lib64 .deps/install/lib
 
 ####### End of AWS S3 SDK
 

diff --git a/Dockerfile.redhat b/Dockerfile.redhat
@@ -111,13 +111,11 @@ RUN cd azure-storage-cpp/Microsoft.WindowsAzure.Storage/build.release && CASABLA
 ####### End of Azure SDK
 
 # Build AWS S3 SDK
-RUN git clone https://github.com/aws/aws-sdk-cpp.git --branch 1.9.76 --single-branch --depth 1 /awssdk
-WORKDIR /awssdk
-RUN git submodule update --init --recursive
+RUN git clone https://github.com/aws/aws-sdk-cpp.git --branch 1.7.129 --single-branch --depth 1 /awssdk
 WORKDIR /awssdk/build
-RUN cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_INSTALL_LIBDIR="lib" -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " ..
+RUN cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " ..
 RUN make --jobs=$JOBS
-RUN make install
+RUN mv .deps/install/lib64 .deps/install/lib
 
 ####### End of AWS S3 SDK
 
@@ -175,4 +173,4 @@ COPY ${ovms_metadata_file} metadata.json
 
 RUN ./bazel-bin/src/./ovms
 COPY release_files/thirdparty-licenses/ /ovms/release_files/thirdparty-licenses/
-COPY release_files/LICENSE /ovms/release_files/LICENSE
+COPY release_files/LICENSE /ovms/release_files/LICENSE
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -117,14 +117,11 @@ RUN cd azure-storage-cpp/Microsoft.WindowsAzure.Storage/build.release && CASABLA
 ####### End of Azure SDK
 
 # Build AWS S3 SDK
-RUN git clone https://github.com/aws/aws-sdk-cpp.git --branch 1.9.76 --single-branch --depth 1 /awssdk
-WORKDIR /awssdk
-RUN git submodule update --init --recursive
+RUN git clone https://github.com/aws/aws-sdk-cpp.git --branch 1.7.129 --single-branch --depth 1 /awssdk
 WORKDIR /awssdk/build
-RUN cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_INSTALL_LIBDIR="lib" -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " ..
+RUN cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " ..
 RUN make --jobs=$JOBS
 #RUN mv .deps/install/lib64 .deps/install/lib
-RUN make install
 
 ####### End of AWS S3 SDK
 

diff --git a/WORKSPACE b/WORKSPACE
@@ -56,37 +56,7 @@ cc_library(
 )
 """,
 )
-# AWS SDL
-new_local_repository(
-    name = "awssdk",
-    path = "/usr/",
-    build_file_content = """
-package(
-    default_visibility = ["//visibility:public"],
-)
-cc_library(
-    name = "core",
-    hdrs = glob(["local/include/aws/*h"]),
-    srcs = [
-        "local/lib/linux/intel64/Release/libaws-cpp-sdk-s3.a",
-        "local/lib/linux/intel64/Release/libaws-cpp-sdk-core.a",
-        "local/lib/libaws-crt-cpp.a",
-        "local/lib/libaws-c-s3.a",
-        "local/lib/libaws-c-http.a",
-        "local/lib/libaws-c-auth.a",
-        "local/lib/libaws-c-compression.a",
-        "local/lib/libaws-c-event-stream.a",
-        "local/lib/libaws-c-io.a",
-        "local/lib/libaws-c-cal.a",
-        "local/lib/libaws-c-mqtt.a",
-        "local/lib/libaws-checksums.a",
-        "local/lib/libaws-c-common.a",
-        "local/lib/libs2n.a",
-    ],
-)
-""",
-)
-
+# Tensorflow serving
 git_repository(
     name = "tensorflow_serving",
     remote = "https://github.com/tensorflow/serving.git",
@@ -130,6 +100,13 @@ workspace()
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 rules_pkg_dependencies()
 
+# AWS S3 SDK
+new_local_repository(
+    name = "awssdk",
+    build_file = "@//third_party/aws:BUILD",
+    path = "/awssdk",
+)
+
 # Azure Storage SDK
 new_local_repository(
     name = "azure",

diff --git a/src/BUILD b/src/BUILD
@@ -171,7 +171,9 @@ cc_library(
         "@rapidjson//:rapidjson",
         "@spdlog//:spdlog",
         "@cxxopts//:cxxopts",
+        "@awssdk//:s3",
         "@awssdk//:core",
+        "@awssdk//:deps",
 	    "@azure//:storage",
 	    "@cpprest//:sdk",
 	    "@boost//:lib",

diff --git a/src/s3filesystem.cpp b/src/s3filesystem.cpp
@@ -166,8 +166,7 @@ S3FileSystem::S3FileSystem(const Aws::SDKOptions& options, const std::string& s3
             provider,
             config,
             Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
-            true,
-            Aws::S3::US_EAST_1_REGIONAL_ENDPOINT_OPTION::LEGACY);
+            true);
     }
 }
 

diff --git a/third_party/aws/BUILD b/third_party/aws/BUILD
@@ -0,0 +1,50 @@
+#
+# Copyright (c) 2020 Intel Corporation
+#
+# 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.
+#
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "core",
+    srcs = ["build/aws-cpp-sdk-core/libaws-cpp-sdk-core.a"],
+    hdrs = glob([
+        "aws-cpp-sdk-core/include/**/*.h",
+    ]),
+    strip_include_prefix = "aws-cpp-sdk-core/include",
+)
+
+cc_library(
+    name = "s3",
+    srcs = ["build/aws-cpp-sdk-s3/libaws-cpp-sdk-s3.a"],
+    hdrs = glob([
+        "aws-cpp-sdk-s3/include/**/*.h",
+    ]),
+    strip_include_prefix = "aws-cpp-sdk-s3/include"
+)
+
+cc_library(
+    name = "deps",
+    srcs = [
+        "build/.deps/install/lib/libaws-c-event-stream.a",
+        "build/.deps/install/lib/libaws-checksums.a",
+        "build/.deps/install/lib/libaws-c-common.a"
+    ],
+    hdrs = glob([
+        "build/.deps/install/include/**/*.*",
+    ]),
+    strip_include_prefix = "build/.deps/install/include"
+)
-Original file line number
+Diff line change
@@ Expand Up @@
                 provider,
                 config,
                 Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
-                true,
-                Aws::S3::US_EAST_1_REGIONAL_ENDPOINT_OPTION::LEGACY);
+                true);
         }
     }
@@ Expand Down @@