PSMDB-1278 Update AWS SDK to version 1.9.379

percona · Jun 8, 2023 · 95941d9 · 95941d9
1 parent 928e9a4
commit 95941d9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -193,12 +193,12 @@ Debian/Ubuntu
 
       export AWS_LIBS=/tmp/lib/aws
 
-   -  Percona Server for MongoDB is built with AWS SDK CPP 1.8.187
+   -  Percona Server for MongoDB is built with AWS SDK CPP 1.9.379
       version. Switch to this version
 
    .. code:: sh
 
-      cd aws-sdk-cpp && git checkout 1.8.187
+      cd aws-sdk-cpp && git checkout 1.9.379 && git submodule update --init --recursive
 
    -  It is recommended to keep build files outside the SDK directory.
       Create a build directory and navigate to it
@@ -308,12 +308,12 @@ Red Hat Enterprise Linux/CentOS
 
       export AWS_LIBS=/tmp/lib/aws
 
-   -  Percona Server for MongoDB is built with AWS SDK CPP 1.8.187
+   -  Percona Server for MongoDB is built with AWS SDK CPP 1.9.379
       version. Switch to this version
 
    .. code:: sh
 
-      cd aws-sdk-cpp && git checkout 1.8.187
+      cd aws-sdk-cpp && git checkout 1.9.379 && git submodule update --init --recursive
 
    -  It is recommended to keep build files outside of the SDK
       directory. Create a build directory and navigate to it

diff --git a/percona-packaging/scripts/psmdb_builder.sh b/percona-packaging/scripts/psmdb_builder.sh
@@ -175,7 +175,8 @@ get_sources(){
             cd aws-sdk-cpp
                 git reset --hard
                 git clean -xdf
-                git checkout 1.8.187
+                git checkout 1.9.379
+                git submodule update --init --recursive
                 mkdir build
     cd ../../
     tar --owner=0 --group=0 --exclude=.* -czf ${PRODUCT}-${PSM_VER}-${PSM_RELEASE}.tar.gz ${PRODUCT}-${PSM_VER}-${PSM_RELEASE}
@@ -291,7 +292,8 @@ aws_sdk_build(){
         cd aws-sdk-cpp
             git reset --hard
             git clean -xdf
-            git checkout 1.8.187
+            git checkout 1.9.379
+            git submodule update --init --recursive
             mkdir build
             cd build
             CMAKE_CMD="cmake"
@@ -863,7 +865,8 @@ build_tarball(){
             cd aws-sdk-cpp
             git reset --hard
             git clean -xdf
-            git checkout 1.8.187
+            git checkout 1.9.379
+            git submodule update --init --recursive
             mkdir build
             cd build
             set_compiler

diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
@@ -110,7 +110,17 @@ wtEnv.Library(
         'aws-cpp-sdk-transfer',
         'aws-cpp-sdk-s3',
         'aws-cpp-sdk-core',
+        'aws-crt-cpp',
         'aws-c-event-stream',
+        'aws-c-mqtt',
+        'aws-c-s3',
+        'aws-c-auth',
+        'aws-c-http',
+        'aws-c-compression',
+        'aws-c-io',
+        'aws-c-cal',
+        'aws-c-sdkutils',
+        's2n',
         'aws-c-common',
         'aws-checksums',
         'curl',