Merge branch 'develop' of github.com:userver-framework/userver into easy0

Author: apolukhin

.github/workflows/alpine.yml

@@ -0,0 +1,68 @@
+name: Alpine Linux
+
+'on':
+    pull_request:
+    push:
+        branches:
+          - master
+          - develop
+          - feature/**
+
+env:
+    UBSAN_OPTIONS: print_stacktrace=1
+    ASAN_OPTIONS: detect_odr_violation=2
+    CXX: clang++-18
+
+jobs:
+    posix:
+        strategy:
+            fail-fast: false
+
+        name: Alpine Linux
+        runs-on: ubuntu-24.04
+
+        steps:
+          - uses: actions/checkout@v4
+            with:
+                fetch-depth: 0
+
+          - name: Setup latest Alpine Linux
+            uses: jirutka/setup-alpine@v1
+
+          - name: Run script inside Alpine chroot as root
+            shell: alpine.sh --root {0}
+            run: |
+                pwd
+                cat /etc/alpine-release
+                apk add $(cat scripts/docs/en/deps/alpine.md)
+
+          - name: Run cmake
+            shell: alpine.sh {0}
+            run: |
+                pwd
+                mkdir build_debug
+                cd build_debug
+                cmake \
+                    -DCMAKE_BUILD_TYPE=Debug \
+                    -DUSERVER_NO_WERROR=OFF \
+                    -DUSERVER_BUILD_ALL_COMPONENTS=1 \
+                    -DUSERVER_BUILD_SAMPLES=1 \
+                    -DUSERVER_BUILD_TESTS=1 \
+                    -DUSERVER_FEATURE_JEMALLOC=OFF \
+                    -DUSERVER_FEATURE_KAFKA=OFF \
+                    -DUSERVER_FEATURE_STACKTRACE=OFF \
+                    -DUSERVER_DOWNLOAD_PACKAGE_PROTOBUF=ON \
+                    -DUSERVER_DISABLE_RSEQ_ACCELERATION=YES \
+                    ..
+
+          - name: Compile
+            shell: alpine.sh {0}
+            run: |
+                cd build_debug
+                cmake --build . -j$(nproc)
+
+          - name: Run tests
+            shell: alpine.sh {0}
+            run: |
+                cd build_debug
+                ctest -V

.github/workflows/docker.yaml

@@ -22,7 +22,7 @@ jobs:
                         -DUSERVER_FEATURE_CORE=1
                         -DUSERVER_FEATURE_CHAOTIC=0
                     image: ubuntu-22.04-userver-base
-                    info: ubuntu + clang + cxx17 + core
+                    info: ubuntu + gcc + cxx17 + core
                     id: ubuntu_clang_cxx17_core
                   - cmake-flags: >-
                         -DCMAKE_C_COMPILER=clang-16
@@ -50,7 +50,6 @@ jobs:
                         -DCMAKE_C_COMPILER=clang-16
                         -DCMAKE_CXX_COMPILER=clang++-16
                         -DCMAKE_CXX_STANDARD=20
-                        -DUSERVER_NO_WERROR=0
                         -DUSERVER_BUILD_ALL_COMPONENTS=1
                         -DUSERVER_BUILD_SAMPLES=1
                         -DUSERVER_BUILD_TESTS=1

.mapping.json

@@ -8,6 +8,7 @@
   ".github/dependabot.yml":"taxi/uservices/userver/.github/dependabot.yml",
   ".github/docker-compose.yml":"taxi/uservices/userver/.github/docker-compose.yml",
   ".github/pull_request_template.md":"taxi/uservices/userver/.github/pull_request_template.md",
+  ".github/workflows/alpine.yml":"taxi/uservices/userver/.github/workflows/alpine.yml",
   ".github/workflows/ci-conan.yml":"taxi/uservices/userver/.github/workflows/ci-conan.yml",
   ".github/workflows/ci.yml":"taxi/uservices/userver/.github/workflows/ci.yml",
   ".github/workflows/codeql-analysis.yml":"taxi/uservices/userver/.github/workflows/codeql-analysis.yml",
@@ -118,6 +119,9 @@
   "chaotic/include/userver/chaotic/io/userver/utils/strong_typedef.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/io/userver/utils/strong_typedef.hpp",
   "chaotic/include/userver/chaotic/object.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/object.hpp",
   "chaotic/include/userver/chaotic/oneof_with_discriminator.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/oneof_with_discriminator.hpp",
+  "chaotic/include/userver/chaotic/openapi/parameters.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/openapi/parameters.hpp",
+  "chaotic/include/userver/chaotic/openapi/parameters_read.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/openapi/parameters_read.hpp",
+  "chaotic/include/userver/chaotic/openapi/parameters_write.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/openapi/parameters_write.hpp",
   "chaotic/include/userver/chaotic/primitive.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/primitive.hpp",
   "chaotic/include/userver/chaotic/ref.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/ref.hpp",
   "chaotic/include/userver/chaotic/timepoint_tz.hpp":"taxi/uservices/userver/chaotic/include/userver/chaotic/timepoint_tz.hpp",
@@ -179,6 +183,11 @@
   "chaotic/src/chaotic/io/userver/utils/datetime/date.cpp":"taxi/uservices/userver/chaotic/src/chaotic/io/userver/utils/datetime/date.cpp",
   "chaotic/src/chaotic/io/userver/utils/datetime/time_point_tz.cpp":"taxi/uservices/userver/chaotic/src/chaotic/io/userver/utils/datetime/time_point_tz.cpp",
   "chaotic/src/chaotic/io/userver/utils/datetime/time_point_tz_iso_basic.cpp":"taxi/uservices/userver/chaotic/src/chaotic/io/userver/utils/datetime/time_point_tz_iso_basic.cpp",
+  "chaotic/src/chaotic/openapi/parameters.cpp":"taxi/uservices/userver/chaotic/src/chaotic/openapi/parameters.cpp",
+  "chaotic/src/chaotic/openapi/parameters_read.cpp":"taxi/uservices/userver/chaotic/src/chaotic/openapi/parameters_read.cpp",
+  "chaotic/src/chaotic/openapi/parameters_read_test.cpp":"taxi/uservices/userver/chaotic/src/chaotic/openapi/parameters_read_test.cpp",
+  "chaotic/src/chaotic/openapi/parameters_write.cpp":"taxi/uservices/userver/chaotic/src/chaotic/openapi/parameters_write.cpp",
+  "chaotic/src/chaotic/openapi/parameters_write_test.cpp":"taxi/uservices/userver/chaotic/src/chaotic/openapi/parameters_write_test.cpp",
   "chaotic/tests/back/cpp/conftest.py":"taxi/uservices/userver/chaotic/tests/back/cpp/conftest.py",
   "chaotic/tests/back/cpp/test_external.py":"taxi/uservices/userver/chaotic/tests/back/cpp/test_external.py",
   "chaotic/tests/back/cpp/test_tr_array.py":"taxi/uservices/userver/chaotic/tests/back/cpp/test_tr_array.py",
@@ -817,6 +826,7 @@
   "core/include/userver/server/http/http_error.hpp":"taxi/uservices/userver/core/include/userver/server/http/http_error.hpp",
   "core/include/userver/server/http/http_method.hpp":"taxi/uservices/userver/core/include/userver/server/http/http_method.hpp",
   "core/include/userver/server/http/http_request.hpp":"taxi/uservices/userver/core/include/userver/server/http/http_request.hpp",
+  "core/include/userver/server/http/http_request_builder.hpp":"taxi/uservices/userver/core/include/userver/server/http/http_request_builder.hpp",
   "core/include/userver/server/http/http_response.hpp":"taxi/uservices/userver/core/include/userver/server/http/http_response.hpp",
   "core/include/userver/server/http/http_response_body_stream.hpp":"taxi/uservices/userver/core/include/userver/server/http/http_response_body_stream.hpp",
   "core/include/userver/server/http/http_response_body_stream_fwd.hpp":"taxi/uservices/userver/core/include/userver/server/http/http_response_body_stream_fwd.hpp",
@@ -826,7 +836,6 @@
   "core/include/userver/server/middlewares/configuration.hpp":"taxi/uservices/userver/core/include/userver/server/middlewares/configuration.hpp",
   "core/include/userver/server/middlewares/headers_propagator.hpp":"taxi/uservices/userver/core/include/userver/server/middlewares/headers_propagator.hpp",
   "core/include/userver/server/middlewares/http_middleware_base.hpp":"taxi/uservices/userver/core/include/userver/server/middlewares/http_middleware_base.hpp",
-  "core/include/userver/server/request/request_base.hpp":"taxi/uservices/userver/core/include/userver/server/request/request_base.hpp",
   "core/include/userver/server/request/request_config.hpp":"taxi/uservices/userver/core/include/userver/server/request/request_config.hpp",
   "core/include/userver/server/request/request_context.hpp":"taxi/uservices/userver/core/include/userver/server/request/request_context.hpp",
   "core/include/userver/server/request/response_base.hpp":"taxi/uservices/userver/core/include/userver/server/request/response_base.hpp",
@@ -1507,6 +1516,7 @@
   "core/src/server/http/http_error.cpp":"taxi/uservices/userver/core/src/server/http/http_error.cpp",
   "core/src/server/http/http_method.cpp":"taxi/uservices/userver/core/src/server/http/http_method.cpp",
   "core/src/server/http/http_request.cpp":"taxi/uservices/userver/core/src/server/http/http_request.cpp",
+  "core/src/server/http/http_request_builder.cpp":"taxi/uservices/userver/core/src/server/http/http_request_builder.cpp",
   "core/src/server/http/http_request_constructor.cpp":"taxi/uservices/userver/core/src/server/http/http_request_constructor.cpp",
   "core/src/server/http/http_request_constructor.hpp":"taxi/uservices/userver/core/src/server/http/http_request_constructor.hpp",
   "core/src/server/http/http_request_constructor_benchmark.cpp":"taxi/uservices/userver/core/src/server/http/http_request_constructor_benchmark.cpp",
@@ -1515,7 +1525,6 @@
   "core/src/server/http/http_request_handler.cpp":"taxi/uservices/userver/core/src/server/http/http_request_handler.cpp",
   "core/src/server/http/http_request_handler.hpp":"taxi/uservices/userver/core/src/server/http/http_request_handler.hpp",
   "core/src/server/http/http_request_headers_benchmark.cpp":"taxi/uservices/userver/core/src/server/http/http_request_headers_benchmark.cpp",
-  "core/src/server/http/http_request_impl.cpp":"taxi/uservices/userver/core/src/server/http/http_request_impl.cpp",
   "core/src/server/http/http_request_impl.hpp":"taxi/uservices/userver/core/src/server/http/http_request_impl.hpp",
   "core/src/server/http/http_request_method_test.cpp":"taxi/uservices/userver/core/src/server/http/http_request_method_test.cpp",
   "core/src/server/http/http_request_parser.cpp":"taxi/uservices/userver/core/src/server/http/http_request_parser.cpp",
@@ -1580,9 +1589,7 @@
   "core/src/server/pph_config.hpp":"taxi/uservices/userver/core/src/server/pph_config.hpp",
   "core/src/server/request/internal_request_context.cpp":"taxi/uservices/userver/core/src/server/request/internal_request_context.cpp",
   "core/src/server/request/internal_request_context.hpp":"taxi/uservices/userver/core/src/server/request/internal_request_context.hpp",
-  "core/src/server/request/request_base.cpp":"taxi/uservices/userver/core/src/server/request/request_base.cpp",
   "core/src/server/request/request_config.cpp":"taxi/uservices/userver/core/src/server/request/request_config.cpp",
-  "core/src/server/request/request_constructor.hpp":"taxi/uservices/userver/core/src/server/request/request_constructor.hpp",
   "core/src/server/request/request_context.cpp":"taxi/uservices/userver/core/src/server/request/request_context.cpp",
   "core/src/server/request/request_context_test.cpp":"taxi/uservices/userver/core/src/server/request/request_context_test.cpp",
   "core/src/server/request/request_parser.hpp":"taxi/uservices/userver/core/src/server/request/request_parser.hpp",
@@ -3352,6 +3359,7 @@
   "scripts/docs/doxygen-awesome-css/doxygen-awesome.css":"taxi/uservices/userver/scripts/docs/doxygen-awesome-css/doxygen-awesome.css",
   "scripts/docs/doxygen.conf":"taxi/uservices/userver/scripts/docs/doxygen.conf",
   "scripts/docs/en/cpp/def_groups.hpp":"taxi/uservices/userver/scripts/docs/en/cpp/def_groups.hpp",
+  "scripts/docs/en/deps/alpine.md":"taxi/uservices/userver/scripts/docs/en/deps/alpine.md",
   "scripts/docs/en/deps/arch.md":"taxi/uservices/userver/scripts/docs/en/deps/arch.md",
   "scripts/docs/en/deps/debian-11.md":"taxi/uservices/userver/scripts/docs/en/deps/debian-11.md",
   "scripts/docs/en/deps/fedora-35.md":"taxi/uservices/userver/scripts/docs/en/deps/fedora-35.md",
@@ -3555,6 +3563,7 @@
   "scripts/sql/requirements.txt":"taxi/uservices/userver/scripts/sql/requirements.txt",
   "scripts/sql/templates/sql.cpp.jinja":"taxi/uservices/userver/scripts/sql/templates/sql.cpp.jinja",
   "scripts/sql/templates/sql.hpp.jinja":"taxi/uservices/userver/scripts/sql/templates/sql.hpp.jinja",
+  "scripts/tests/test_start_with_testsuite.sh":"taxi/uservices/userver/scripts/tests/test_start_with_testsuite.sh",
   "scripts/uctl/uctl.bash_completion.sh":"taxi/uservices/userver/scripts/uctl/uctl.bash_completion.sh",
   "scripts/uctl/uctl.py":"taxi/uservices/userver/scripts/uctl/uctl.py",
   "testsuite/CMakeLists.txt":"taxi/uservices/userver/testsuite/CMakeLists.txt",

chaotic/CMakeLists.txt

@@ -2,17 +2,10 @@ project(userver-chaotic CXX)
 
 include(ChaoticGen)
 
-file(GLOB_RECURSE SOURCES
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp"
+userver_module(chaotic
+    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
+    UTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_test.cpp"
 )
-add_library(${PROJECT_NAME} STATIC ${SOURCES})
-target_include_directories(
-    ${PROJECT_NAME}
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-)
-target_link_libraries(${PROJECT_NAME} PUBLIC userver-universal)
 
 if(USERVER_BUILD_TESTS)
   userver_venv_setup(
@@ -36,12 +29,6 @@ if(USERVER_BUILD_TESTS)
   add_subdirectory(golden_tests)
 endif()
 
-_userver_directory_install(COMPONENT chaotic
-    DIRECTORY
-        "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    DESTINATION
-        "${CMAKE_INSTALL_INCLUDEDIR}/.."
-)
 _userver_directory_install(COMPONENT chaotic
     DIRECTORY
         "${CMAKE_CURRENT_SOURCE_DIR}/chaotic"
@@ -54,10 +41,6 @@ _userver_directory_install(COMPONENT chaotic
     DESTINATION
         "${CMAKE_INSTALL_BINDIR}"
 )
-_userver_install_targets(COMPONENT chaotic
-    TARGETS
-        ${PROJECT_NAME}
-)
 _userver_directory_install(COMPONENT chaotic
     FILES
         "${USERVER_ROOT_DIR}/cmake/ChaoticGen.cmake"

chaotic/bin/chaotic-gen

@@ -1,12 +1,12 @@
 #!/bin/sh
 
-BINDIR=`dirname $0`
+BINDIR=`dirname "$0"`
 USERVER_PYTHON="${USERVER_PYTHON:-python3}"
 
-CHAOTIC_DIR=$BINDIR/..
-if ! [ -e $CHAOTIC_DIR/chaotic/main.py ]; then
-    CHAOTIC_DIR=$BINDIR/../lib/userver/
+CHAOTIC_DIR="$BINDIR/.."
+if ! [ -e "$CHAOTIC_DIR/chaotic/main.py" ]; then
+    CHAOTIC_DIR="$BINDIR/../lib/userver/"
 fi
 
-export PYTHONPATH=$CHAOTIC_DIR
+export PYTHONPATH="$CHAOTIC_DIR"
 exec "$USERVER_PYTHON" "$CHAOTIC_DIR/chaotic/main.py" "$@"

chaotic/chaotic/back/cpp/types.py

@@ -29,10 +29,11 @@ def __hash__(self) -> int:
         return id(self)
 
     def is_isomorphic(self, other: 'CppType') -> bool:
+        assert self.json_schema is not None
         left = dataclasses.asdict(self.json_schema)
         left.pop('description', None)
         left['x_properties'].pop('description', None)
-
+        assert other.json_schema is not None
         right = dataclasses.asdict(other.json_schema)
         right.pop('description', None)
         right['x_properties'].pop('description', None)

chaotic/include/userver/chaotic/openapi/parameters.hpp

@@ -0,0 +1,71 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+USERVER_NAMESPACE_BEGIN
+
+namespace chaotic::openapi {
+
+enum class In {
+    kHeader,
+    kCookie,
+    kPath,
+    kQuery,
+    kQueryExplode,
+};
+
+using Name = const char* const;
+
+template <typename T>
+inline constexpr bool kIsTrivialRawType = std::is_integral_v<T>;
+
+template <>
+inline constexpr bool kIsTrivialRawType<bool> = true;
+
+template <>
+inline constexpr bool kIsTrivialRawType<std::string> = true;
+
+template <>
+inline constexpr bool kIsTrivialRawType<double> = true;
+
+template <typename RawType_, typename UserType_>
+struct TrivialParameterBase {
+    using RawType = RawType_;
+    using UserType = UserType_;
+
+    static_assert(kIsTrivialRawType<RawType>);
+};
+
+template <In In_, const Name& Name_, typename RawType_, typename UserType_ = RawType_>
+struct TrivialParameter {
+    static constexpr auto kIn = In_;
+    static constexpr auto& kName = Name_;
+
+    using Base = TrivialParameterBase<RawType_, UserType_>;
+
+    static_assert(kIn != In::kQueryExplode);
+};
+
+template <In In_, char Delimiter_, typename RawItemType_, typename UserItemType_ = RawItemType_>
+struct ArrayParameterBase {
+    static constexpr char kDelimiter = Delimiter_;
+    static constexpr auto kIn = In_;
+
+    using RawType = std::vector<std::string>;
+    using RawItemType = RawItemType_;
+    using UserType = std::vector<UserItemType_>;
+    using UserItemType = UserItemType_;
+};
+
+template <In In_, const Name& Name_, char Delimiter_, typename RawItemType_, typename UserItemType_ = RawItemType_>
+struct ArrayParameter {
+    static constexpr auto& kName = Name_;
+    static constexpr auto kIn = In_;
+
+    using Base = ArrayParameterBase<In_, Delimiter_, RawItemType_, UserItemType_>;
+};
+
+}  // namespace chaotic::openapi
+
+USERVER_NAMESPACE_END