Merge pull request #1879 from ORNL/staging

Staging

Author: JoshuaSBrown

.gitlab/common.yml

@@ -161,41 +161,6 @@
         reports:
             dotenv: build.env
 
-#.image_check:
-#    tags:
-#        - docker
-#    script:
-#        - |
-#            BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
-#            docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
-#            FORCE_BUILD="FALSE"
-#            set +e
-#            docker pull --quiet "${REGISTRY}/${PROJECT}/${COMPONENT}-${BRANCH_LOWER}:latest"
-#            if [ $? -eq 0 ]; then echo "Image exists"; else FORCE_BUILD="TRUE"; fi;
-#            set -e
-#            if [ "${BUILD_INTERMEDIATE}" == "TRUE" ]
-#            then
-#              set +e
-#              docker pull --quiet "${REGISTRY}/${PROJECT}/${COMPONENT}-${INTERMEDIATE_LAYER_NAME}-${BRANCH_LOWER}:latest"
-#              if [ $? -eq 0 ]; then echo "Image exists"; else FORCE_BUILD="TRUE"; fi;
-#             set -e
-#            fi
-#            if [ "$FORCE_BUILD" == "TRUE" ]
-#            then
-#              cp .gitlab/build/force_build_${COMPONENT}_image.yml ${COMPONENT}_image.yml
-#            else
-#              cp .gitlab/build/build_${COMPONENT}_image.yml ${COMPONENT}_image.yml
-#            fi
-#            echo "REGISTRY=${REGISTRY}" >> build.env
-#            echo "HARBOR_USER=${HARBOR_USER}" >> build.env
-#            echo "HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN=${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}" >> build.env
-#            sed -i 's/\(HARBOR_USER=.*\)\$/\1$$/g' build.env
-#    artifacts:
-#        paths:
-#            - ${COMPONENT}_image.yml
-#        reports:
-#            dotenv: build.env
-
 # The purpose of this anchor is to check that an image has been uploaded correctly
 # to the registry and if it has not attempt to upload it again.
 #

CMakeLists.txt

@@ -36,7 +36,7 @@ building with static depencies is not completely possible because some system
 libraries must be shared libraries for DataFed to be interoperable. If this
 setting is turned on DataFed will build it's libraries as shared and try to
 link to shared libraries." OFF)
-OPTION(ENABLE_END_TO_END_API_TESTS "Enable end-to-end API testing" FALSE) 
+OPTION(ENABLE_END_TO_END_API_TESTS "Enable end-to-end API testing" FALSE)
 OPTION(ENABLE_END_TO_END_WEB_TESTS "Enable end-to-end web testing with Playwright" FALSE)
 OPTION(ENABLE_FOXX_TESTS "Enable Foxx testing, off by default because it
   will overwrite the test database." FALSE)
@@ -88,7 +88,7 @@ endif()
 
 set(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PATH}")
 
-if ( BUILD_TESTS ) 
+if ( BUILD_TESTS )
   include(CTest)
   ENABLE_TESTING()
   set(CMAKE_CTEST_ARGUMENTS "--output-on-failure")
@@ -112,13 +112,13 @@ if( NOT DEFINED ENABLE_END_TO_END_TESTS )
 endif()
 
 if(CMAKE_MAKE_PROGRAM MATCHES "(make|gmake)")
-    add_definitions( -Wall -Wextra )
+  add_definitions( -Wall -Wextra )
 endif()
 
 
-if ( BUILD_REPO_SERVER OR BUILD_CORE_SERVER OR BUILD_AUTHZ OR BUILD_COMMON OR BUILD_PYTHON_CLIENT OR BUILD_WEB_SERVER) 
+if ( BUILD_REPO_SERVER OR BUILD_CORE_SERVER OR BUILD_AUTHZ OR BUILD_COMMON OR BUILD_PYTHON_CLIENT OR BUILD_WEB_SERVER)
+
 
-  
   # Create file glob here because need to be made visible here as well
   file(GLOB_RECURSE ProtoFiles "${PROJECT_SOURCE_DIR}/common/proto3/common/*.proto")
   include(./cmake/Protobuf.cmake)
@@ -128,7 +128,7 @@ endif()
 if( BUILD_WEB_SERVER )
   include(./cmake/Web.cmake)
 
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/common/proto3/common/" 
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/common/proto3/common/"
      DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/web/proto3/")
 
   if( ENABLE_UNIT_TESTS )
@@ -143,7 +143,7 @@ if( BUILD_AUTHZ_TESTS )
   include(./cmake/GlobusCommon.cmake)
 endif()
 
-if ( BUILD_REPO_SERVER OR BUILD_CORE_SERVER OR BUILD_AUTHZ OR BUILD_COMMON) 
+if ( BUILD_REPO_SERVER OR BUILD_CORE_SERVER OR BUILD_AUTHZ OR BUILD_COMMON)
 
   include_directories( "/usr/include/globus" )
 
@@ -171,7 +171,7 @@ if ( BUILD_REPO_SERVER OR BUILD_CORE_SERVER OR BUILD_AUTHZ OR BUILD_COMMON)
 
 endif()
 
-if( BUILD_COMMON ) 
+if( BUILD_COMMON )
   add_subdirectory( common )
 endif()
 
@@ -190,7 +190,7 @@ 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)
+  add_subdirectory(tests)
 endif()
 
 if( BUILD_REPO_SERVER OR BUILD_AUTHZ)
@@ -233,7 +233,7 @@ if( INSTALL_WEB_SERVER )
   install( FILES ${PROJECT_SOURCE_DIR}/web/version.js DESTINATION ${DATAFED_INSTALL_PATH}/web )
 endif()
 
-if( INSTALL_FOXX ) 
+if( INSTALL_FOXX )
   install(CODE "execute_process(COMMAND ${DataFed_SOURCE_DIR}/scripts/install_foxx.sh
                                 OUTPUT_VARIABLE _out
                                 ERROR_VARIABLE _err

cmake/Version.cmake

@@ -1,45 +1,45 @@
 
 
-set(DATAFED_RELEASE_YEAR 2025)
-set(DATAFED_RELEASE_MONTH 11)
-set(DATAFED_RELEASE_DAY 17)
-set(DATAFED_RELEASE_HOUR 14)
+set(DATAFED_RELEASE_YEAR 2026)
+set(DATAFED_RELEASE_MONTH 2)
+set(DATAFED_RELEASE_DAY 24)
+set(DATAFED_RELEASE_HOUR 10)
 set(DATAFED_RELEASE_MINUTE 0)
 
-set(DATAFED_COMMON_LIB_MAJOR 1)
+set(DATAFED_COMMON_LIB_MAJOR 3)
 set(DATAFED_COMMON_LIB_MINOR 0)
-set(DATAFED_COMMON_LIB_PATCH 3)
+set(DATAFED_COMMON_LIB_PATCH 0)
 
-set(DATAFED_COMMON_PROTOCOL_API_MAJOR 1)
-set(DATAFED_COMMON_PROTOCOL_API_MINOR 2)
+set(DATAFED_COMMON_PROTOCOL_API_MAJOR 3)
+set(DATAFED_COMMON_PROTOCOL_API_MINOR 0)
 set(DATAFED_COMMON_PROTOCOL_API_PATCH 0)
 
-set(DATAFED_CORE_MAJOR 1)
-set(DATAFED_CORE_MINOR 1)
+set(DATAFED_CORE_MAJOR 3)
+set(DATAFED_CORE_MINOR 0)
 set(DATAFED_CORE_PATCH 0)
 
 set(DATAFED_FOXX_MAJOR 1)
-set(DATAFED_FOXX_MINOR 2)
+set(DATAFED_FOXX_MINOR 3)
 set(DATAFED_FOXX_PATCH 0)
 
 set(DATAFED_FOXX_API_MAJOR 1)
-set(DATAFED_FOXX_API_MINOR 2)
+set(DATAFED_FOXX_API_MINOR 3)
 set(DATAFED_FOXX_API_PATCH 0)
 
-set(DATAFED_WEB_MAJOR 1)
-set(DATAFED_WEB_MINOR 1)
-set(DATAFED_WEB_PATCH 1)
+set(DATAFED_WEB_MAJOR 3)
+set(DATAFED_WEB_MINOR 0)
+set(DATAFED_WEB_PATCH 0)
 
-set(DATAFED_REPO_MAJOR 1)
+set(DATAFED_REPO_MAJOR 3)
 set(DATAFED_REPO_MINOR 0)
-set(DATAFED_REPO_PATCH 1)
+set(DATAFED_REPO_PATCH 0)
 
-set(DATAFED_AUTHZ_MAJOR 1)
+set(DATAFED_AUTHZ_MAJOR 3)
 set(DATAFED_AUTHZ_MINOR 0)
-set(DATAFED_AUTHZ_PATCH 2)
+set(DATAFED_AUTHZ_PATCH 0)
 
-set(DATAFED_PYTHON_CLIENT_MAJOR 3)
-set(DATAFED_PYTHON_CLIENT_MINOR 1)
+set(DATAFED_PYTHON_CLIENT_MAJOR 5)
+set(DATAFED_PYTHON_CLIENT_MINOR 0)
 set(DATAFED_PYTHON_CLIENT_PATCH 0)
 set(DATAFED_PYTHON_CLIENT_RELEASE_TYPE "")
 set(DATAFED_PYTHON_CLIENT_PRE_RELEASE_IDENTIFER "")

common/proto3/common/auth/query_update_request.proto

@@ -10,4 +10,5 @@ message QueryUpdateRequest {
     string id = 1;
     optional string title = 2;
     SearchRequest query = 3;
+    bool replace_query = 4;
 }

common/proto3/common/enums/dependency_dir.proto

@@ -5,6 +5,6 @@ package SDMS;
 option cc_enable_arenas = true;
 
 enum DependencyDir {
-    DEPENDENCY_DIR_IN = 0;
-    DEPENDENCY_DIR_OUT = 1;
+    DIR_IN = 0;
+    DIR_OUT = 1;
 }

common/proto3/common/enums/dependency_type.proto

@@ -5,7 +5,7 @@ package SDMS;
 option cc_enable_arenas = true;
 
 enum DependencyType {
-    DEPENDENCY_TYPE_IS_DERIVED_FROM = 0;
-    DEPENDENCY_TYPE_IS_COMPONENT_OF = 1;
-    DEPENDENCY_TYPE_IS_NEW_VERSION_OF = 2;
+    DEP_IS_DERIVED_FROM = 0;
+    DEP_IS_COMPONENT_OF = 1;
+    DEP_IS_NEW_VERSION_OF = 2;
 }

common/proto3/common/enums/execution_method.proto

@@ -5,7 +5,7 @@ package SDMS;
 option cc_enable_arenas = true;
 
 enum ExecutionMethod {
-    EXECUTION_METHOD_UNSPECIFIED = 0;
-    EXECUTION_METHOD_DIRECT = 1;
-    EXECUTION_METHOD_DEFERRED = 2;
+    EXEC_UNSPECIFIED = 0;
+    DIRECT = 1;
+    DEFERRED = 2;
 }

common/source/ServerFactory.cpp

@@ -1,6 +1,7 @@
 
 // Local private includes
 #include "servers/Proxy.hpp"
+#include "servers/ProxyBasicZMQ.hpp"
 
 // Local public includes
 #include "common/IServer.hpp"
@@ -39,7 +40,7 @@ std::unique_ptr<IServer> ServerFactory::create(
                       "been provided that will never be used!");
     }
     return std::unique_ptr<IServer>(
-        new Proxy(socket_options, socket_credentials, m_log_context));
+        new ProxyBasicZMQ(socket_options, socket_credentials, m_log_context));
   }
 
   EXCEPT_PARAM(1, "Error Server type unsupported");

common/source/communicators/ZeroMQCommunicator.cpp

@@ -373,10 +373,11 @@ void receiveBody(IMessage &msg, Buffer &buffer, ProtoBufFactory &factory,
     if (frame_size > 0) {
 
       if (zmq_msg_size(&zmq_msg) != frame_size) {
+	size_t msg_size = zmq_msg_size(&zmq_msg);
         zmq_msg_close(&zmq_msg);
         EXCEPT_PARAM(1, "RCV Invalid message body received. Expected: "
                             << frame_size
-                            << ", got: " << zmq_msg_size(&zmq_msg));
+                            << ", got: " << msg_size);
       }
 
       // Deserialize wire bytes into Envelope

core/database/foxx/api/acl_router.js

@@ -234,7 +234,7 @@ router
 
 router
     .get("/view", function (req, res) {
-        let rules = null;
+        let rules = [];
         try {
             logger.logRequestStarted({
                 client: req.queryParams.client,
@@ -296,7 +296,7 @@ router
     .description("View current ACL on an object (data record or collection)");
 router
     .get("/shared/list", function (req, res) {
-        let result = null;
+        let result = [];
         try {
             const client = g_lib.getUserFromClientID(req.queryParams.client);
             result = g_lib.getACLOwnersBySubject(