Merge branch 'devel' into refactor-DAPS-1522-Note-Router-Logging-Improvements

Author: megatnt1122

.gitignore

@@ -53,7 +53,8 @@ scripts/admin_datafed_backup.sh
 scripts/admin_refresh_certs.sh
 scripts/globus/__pycache__
 services/
-tmp/
+tests/mock_core/Version.hpp
+tmp
 web/SDMS.proto
 web/SDMS_Anon.proto
 web/SDMS_Auth.proto

CMakeLists.txt

@@ -27,6 +27,7 @@ OPTION(BUILD_PYTHON_CLIENT "Build python client" TRUE)
 OPTION(BUILD_TESTS "Build Tests" TRUE)
 OPTION(BUILD_WEB_SERVER "Build DataFed Web Server" TRUE)
 OPTION(ENABLE_UNIT_TESTS "Enable unit tests" TRUE)
+OPTION(ENABLE_INTEGRATION_TESTS "Enable integration tests" TRUE)
 OPTION(ENABLE_MEMORY_TESTS "Enable memory tests" FALSE)
 OPTION(BUILD_SHARED_LIBS "By default DataFed tries to build static libraries
 with the exception of libdatafed-authz which must always be a shared library,
@@ -79,7 +80,6 @@ endif()
 
 if(NOT DEFINED DATAFED_DOMAIN)
   get_value_from_datafed_sh("DATAFED_DOMAIN" DATAFED_DOMAIN)
-  message("TESTING: DATAFED_DOMAIN : ${DATAFED_DOMAIN}")
 endif()
 
 if(NOT DEFINED DATAFED_DEPENDENCIES_INSTALL_PATH)
@@ -188,6 +188,12 @@ if( BUILD_FOXX OR BUILD_CORE_SERVER )
   add_subdirectory( core )
 endif()
 
+# Must occur before building authz, location of mock keys are defined here
+# ENV DATAFED_MOCK_CORE_PUB_KEY
+if (ENABLE_INTEGRATION_TESTS OR ENABLE_END_TO_END_TESTS)
+    add_subdirectory(tests)
+endif()
+
 if( BUILD_REPO_SERVER OR BUILD_AUTHZ)
   add_subdirectory( repository )
 endif()
@@ -241,26 +247,6 @@ if( INSTALL_FOXX )
          )
 endif()
 
-if (ENABLE_END_TO_END_TESTS)
-	if (NOT ENABLE_END_TO_END_API_TESTS AND NOT ENABLE_END_TO_END_WEB_TESTS)
-    message (FATAL_ERROR "Cannot run end-to-end tests because one of the ENABLE_END_TO_END web or API flag is not on")
-  else()
-    add_subdirectory(tests/end-to-end)
-    add_subdirectory(tests/end-to-end/web-UI)
-  endif()
-else()
-  if (ENABLE_END_TO_END_API_TESTS)
-    if (BUILD_PYTHON_CLIENT)
-      add_subdirectory(tests/end-to-end)
-    else()
-      message (FATAL_ERROR "Cannot run end-to-end tests because BUILD_PYTHON_CLIENT is not on")
-    endif()
-  endif()
-  if (ENABLE_END_TO_END_WEB_TESTS)
-    add_subdirectory(tests/end-to-end/web-UI)
-  endif()
-endif()
-
 find_library(SODIUM NAMES libsodium.a PATHS ${DEPENDENCY_INSTALL_PATH}/lib)
 
 # This is not needed but it is used by zmq I think so we want to print what is found locally just in case

cmake/Boost.cmake

@@ -1,4 +1,9 @@
 
+# Allow using legacy Boost find_package call.
+if(POLICY CMP0167)
+  cmake_policy(SET CMP0167 OLD)
+endif()
+
 function(find_boost_library)
   if ( DEFINED ENV{BOOST_INC} AND DEFINED ENV{BOOST_LIB} )
     message( "BOOST_INC:" $ENV{BOOST_INC} )

compose/all/generate_globus_files.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
-SCRIPT=$(realpath "$0")
+SCRIPT=$(realpath "${BASH_SOURCE[0]}")
 SOURCE=$(dirname "$SCRIPT")
 PROJECT_ROOT=$(realpath "${SOURCE}/../../")
 
+set -euf -o pipefail
+
 "${PROJECT_ROOT}/scripts/compose_generate_globus_files.sh" -d "$(pwd)"

compose/metadata/generate_globus_files.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+SCRIPT=$(realpath "${BASH_SOURCE[0]}")
+SOURCE=$(dirname "$SCRIPT")
+PROJECT_ROOT=$(realpath "${SOURCE}/../../")
+
+set -euf -o pipefail
+
+"${PROJECT_ROOT}/scripts/compose_generate_web_server_globus_credentials.sh" -d "$(pwd)"

compose/repo/generate_globus_files.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
-SCRIPT=$(realpath "$0")
+SCRIPT=$(realpath "${BASH_SOURCE[0]}")
 SOURCE=$(dirname "$SCRIPT")
 PROJECT_ROOT=$(realpath "${SOURCE}/../../")
 
+set -euf -o pipefail
+
 "${PROJECT_ROOT}/scripts/compose_generate_globus_files.sh" -d "$(pwd)"

core/docker/Dockerfile

@@ -52,7 +52,8 @@ RUN ${DATAFED_DEPENDENCIES_ROOT}/scripts/generate_dependencies_config.sh && \
       -DBUILD_WEB_SERVER=False \
       -DBUILD_DOCS=False \
       -DBUILD_PYTHON_CLIENT=False \
-      -DBUILD_FOXX=False
+      -DBUILD_FOXX=False \
+      -DENABLE_INTEGRATION_TESTS=False
 RUN ${DATAFED_DEPENDENCIES_INSTALL_PATH}/bin/cmake --build build -j 8
 RUN ${DATAFED_DEPENDENCIES_INSTALL_PATH}/bin/cmake --build build --target install
 

docker/entrypoint_foxx.sh

@@ -67,6 +67,7 @@ if [ ! -f "$install_flag" ]; then
     -DBUILD_PYTHON_CLIENT=False
     -DBUILD_FOXX=True
     -DINSTALL_FOXX=True
+    -DENABLE_INTEGRATION_TESTS=False
   )
 
   # Add the ENABLE_FOXX_TESTS option if it's set to TRUE

repository/docker/Dockerfile

@@ -53,7 +53,8 @@ RUN ${DATAFED_DEPENDENCIES_ROOT}/scripts/generate_dependencies_config.sh && \
   -DBUILD_WEB_SERVER=False    \
   -DBUILD_DOCS=False          \
   -DBUILD_PYTHON_CLIENT=False \
-  -DBUILD_FOXX=False
+  -DBUILD_FOXX=False          \
+  -DENABLE_INTEGRATION_TESTS=False
 RUN ${DATAFED_DEPENDENCIES_INSTALL_PATH}/bin/cmake --build build -j 8
 RUN ${DATAFED_DEPENDENCIES_INSTALL_PATH}/bin/cmake --build build --target install
 

repository/docker/Dockerfile.gcs

@@ -70,7 +70,8 @@ RUN ${DATAFED_DEPENDENCIES_ROOT}/scripts/generate_dependencies_config.sh &&  \
   -DBUILD_WEB_SERVER=False          \
   -DBUILD_DOCS=False                \
   -DBUILD_PYTHON_CLIENT=False       \
-  -DBUILD_FOXX=False
+  -DBUILD_FOXX=False                \
+  -DENABLE_INTEGRATION_TESTS=False
 RUN ${DATAFED_DEPENDENCIES_INSTALL_PATH}/bin/cmake --build build -j 8
 RUN ${DATAFED_DEPENDENCIES_INSTALL_PATH}/bin/cmake --build build --target install