Merge pull request #8706 from nimrod-becker/backport_to_5_18

Backport to 5.18
noobaa · Jan 21, 2025 · 5b73c2b · 5b73c2b
2 parents 82d4224 + 6c81d9e
commit 5b73c2b
Show file tree

Hide file tree

Showing 15 changed files with 691 additions and 333 deletions.
diff --git a/src/deploy/NVA_build/builder.Dockerfile b/src/deploy/NVA_build/builder.Dockerfile
@@ -21,9 +21,13 @@ RUN dnf update -y -q --nobest && \
 COPY ./src/deploy/NVA_build/install_arrow_build.sh ./src/deploy/NVA_build/install_arrow_build.sh
 ARG BUILD_S3SELECT_PARQUET=0
 RUN ./src/deploy/NVA_build/install_arrow_build.sh $BUILD_S3SELECT_PARQUET
-RUN dnf install -y -q wget unzip which vim python3 boost-devel libcap-devel && \
+RUN dnf install -y -q wget unzip which vim python3.9 boost-devel libcap-devel && \
     dnf group install -y -q "Development Tools" && \
     dnf clean all
+
+# It's not important to report this failure (fails for Centos9)
+RUN alternatives --auto python3 || exit 0
+
 RUN version="2.15.05" && \
     wget -q -O nasm-${version}.tar.gz https://github.com/netwide-assembler/nasm/archive/nasm-${version}.tar.gz && \
     tar -xf nasm-${version}.tar.gz && \

diff --git a/src/deploy/RPM_build/noobaa.spec b/src/deploy/RPM_build/noobaa.spec
@@ -26,7 +26,7 @@ URL:  https://www.noobaa.io/
 Source0:  %{noobaatar}
 
 BuildRequires:  systemd
-BuildRequires:  python3
+BuildRequires:  python3.9
 BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  boost-devel

diff --git a/src/endpoint/iam/iam_rest.js b/src/endpoint/iam/iam_rest.js
@@ -19,7 +19,8 @@ const RPC_ERRORS_TO_IAM = Object.freeze({
     INVALID_ACCESS_KEY_ID: IamError.InvalidClientTokenId,
     DEACTIVATED_ACCESS_KEY_ID: IamError.InvalidClientTokenIdInactiveAccessKey,
     NO_SUCH_ACCOUNT: IamError.AccessDeniedException,
-    NO_SUCH_ROLE: IamError.AccessDeniedException
+    NO_SUCH_ROLE: IamError.AccessDeniedException,
+    VALIDATION_ERROR: IamError.ValidationError,
 });
 
 const ACTIONS = Object.freeze({