Skip to content

Commit c28f3aa

Browse files
committed
feat all: minor pre-release tweaks and fixes
Tests: протестировано CI commit_hash:1abee21a9c0bf9ed453ce20e835834aea926f84b
1 parent 596b7c2 commit c28f3aa

5 files changed

Lines changed: 35 additions & 14 deletions

File tree

.github/workflows/publish-ubuntu-22.04-images.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,17 @@ jobs:
1818
USERVER_IMAGE_TAG: ${{ github.event.release.tag_name || 'latest' }}
1919
steps:
2020
- uses: actions/checkout@v5
21+
22+
- name: Free disk space
23+
run: |
24+
df -h
25+
# See https://stackoverflow.com/questions/75536771/github-runner-out-of-disk-space-after-building-docker-image
26+
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /usr/lib/php* /opt/ghc \
27+
/usr/local/share/powershell /usr/share/swift /usr/local/.ghcup \
28+
/opt/hostedtoolcache/CodeQL || true
29+
sudo docker image prune --all --force
30+
df -h
31+
2132
- name: Login to GitHub Container Registry
2233
uses: docker/login-action@v3
2334
with:

.github/workflows/publish-ubuntu-24.04-images.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,17 @@ jobs:
1818
USERVER_IMAGE_TAG: ${{ github.event.release.tag_name || 'latest' }}
1919
steps:
2020
- uses: actions/checkout@v5
21+
22+
- name: Free disk space
23+
run: |
24+
df -h
25+
# See https://stackoverflow.com/questions/75536771/github-runner-out-of-disk-space-after-building-docker-image
26+
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /usr/lib/php* /opt/ghc \
27+
/usr/local/share/powershell /usr/share/swift /usr/local/.ghcup \
28+
/opt/hostedtoolcache/CodeQL || true
29+
sudo docker image prune --all --force
30+
df -h
31+
2132
- name: Login to GitHub Container Registry
2233
uses: docker/login-action@v3
2334
with:

core/src/server/middlewares/handler_adapter.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,12 @@ void HandlerAdapter::LogRequest(const http::HttpRequest& request, request::Reque
154154
misc::CutTrailingSlash(request.GetRequestPath(), handler_.GetConfig().url_trailing_slash);
155155

156156
logging::LogExtra log_extra{
157-
{tracing::kHttpMetaType, std::string{meta_type}},
158-
{tracing::kType, std::string{kTracingTypeRequest}},
157+
{tracing::kHttpMetaType, meta_type},
158+
{tracing::kType, kTracingTypeRequest},
159159
{"request_body_length", request.RequestBody().length()},
160-
{std::string{kTracingBody},
161-
handler_.GetRequestBodyForLoggingChecked(request, context, request.RequestBody())},
162-
{std::string{kTracingUri}, handler_.GetUrlForLoggingChecked(request, context)},
163-
{tracing::kHttpMethod, std::string{request.GetMethodStr()}},
160+
{kTracingBody, handler_.GetRequestBodyForLoggingChecked(request, context, request.RequestBody())},
161+
{kTracingUri, handler_.GetUrlForLoggingChecked(request, context)},
162+
{tracing::kHttpMethod, request.GetMethodStr()},
164163
};
165164
log_extra.Extend(GetHeadersLogExtra(
166165
need_log_request_headers, request, header_whitelist, handler_.GetConfig().request_headers_size_log_limit

libraries/s3api/src/s3api/clients/client.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ std::string GeneratePresignedUrl(
9696
return generated_url.str();
9797
}
9898

99-
std::vector<ObjectMeta> ParseS3ListResponse(std::string_view s3_response) {
99+
std::vector<ObjectMeta> ParseS3ListResponse(utils::zstring_view s3_response) {
100100
std::vector<ObjectMeta> result;
101101
pugi::xml_document xml;
102-
const pugi::xml_parse_result parse_result = xml.load_string(s3_response.data());
102+
const pugi::xml_parse_result parse_result = xml.load_string(s3_response.c_str());
103103
if (parse_result.status != pugi::status_ok) {
104104
throw ListBucketError(fmt::format(
105105
"Failed to parse S3 list response as xml, error: {}, response: {}", parse_result.description(), s3_response
@@ -121,10 +121,10 @@ std::vector<ObjectMeta> ParseS3ListResponse(std::string_view s3_response) {
121121
return result;
122122
}
123123

124-
std::vector<std::string> ParseS3DirectoriesListResponse(std::string_view s3_response) {
124+
std::vector<std::string> ParseS3DirectoriesListResponse(utils::zstring_view s3_response) {
125125
std::vector<std::string> result;
126126
pugi::xml_document xml;
127-
const pugi::xml_parse_result parse_result = xml.load_string(s3_response.data());
127+
const pugi::xml_parse_result parse_result = xml.load_string(s3_response.c_str());
128128
if (parse_result.status != pugi::status_ok) {
129129
throw ListBucketError(fmt::format(
130130
"Failed to parse S3 directories list response as xml, error: {}, "

testsuite/pytest_plugins/pytest_userver/s3api.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def put_object(self, request):
168168
user_defined_meta[meta_key] = meta_value
169169

170170
meta = bucket_storage.put_object(key, data, user_defined_meta)
171-
# Some clients like aws sdk cpp can parse not empty body
171+
# Some clients like AWS SDK for C++ parse not empty body as XML
172172
return self._mockserver.make_response('', 200, headers=meta)
173173

174174
def copy_object(self, request):
@@ -185,7 +185,7 @@ def copy_object(self, request):
185185
src_data = src_obj.data
186186
src_meta = src_obj.meta
187187
meta = dst_bucket_storage.put_object(key, src_data, src_meta)
188-
# Some clients like aws sdk cpp can parse not empty body
188+
# Some clients like AWS SDK for C++ parse not empty body as XML
189189
return self._mockserver.make_response('', 200, headers=meta)
190190

191191
def get_objects(self, request):
@@ -220,7 +220,7 @@ def delete_object(self, request):
220220

221221
bucket_storage.delete_object(key)
222222
# S3 always return 204, even if file doesn't exist
223-
# Some clients like aws sdk cpp can parse not empty body
223+
# Some clients like AWS SDK for C++ parse not empty body as XML
224224
return self._mockserver.make_response('', 204)
225225

226226
def get_object_head(self, request):
@@ -231,7 +231,7 @@ def get_object_head(self, request):
231231
s3_object = bucket_storage.get_object(key)
232232
if not s3_object:
233233
return self._mockserver.make_response('Object not found', 404)
234-
# Some clients like aws sdk cpp can parse not empty body
234+
# Some clients like AWS SDK for C++ parse not empty body as XML
235235
return self._mockserver.make_response(
236236
'',
237237
200,

0 commit comments

Comments
 (0)