From: Shilpa Jagannath Date: Wed, 4 Sep 2024 17:48:30 +0000 (-0700) Subject: Merge pull request #56616 from prazumovsky/wip-63620 X-Git-Tag: v17.2.8~101 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63c6316c4621cfe66bdf1ee3d7e6654e260d9cdf;p=ceph.git Merge pull request #56616 from prazumovsky/wip-63620 quincy: rgw/swift: preserve dashes/underscores in swift user metadata names --- 63c6316c4621cfe66bdf1ee3d7e6654e260d9cdf diff --cc qa/suites/rgw/tempest/tasks/rgw_tempest.yaml index ad9dc9dd502,51eed7def5e..09b8152c5f5 --- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml +++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml @@@ -46,11 -44,8 +46,9 @@@ tasks - .*test_container_synchronization.* - .*test_object_services.PublicObjectTest.test_access_public_container_object_without_using_creds - .*test_object_services.ObjectTest.test_create_object_with_transfer_encoding - - .*test_container_services.ContainerTest.test_create_container_with_remove_metadata_key - - .*test_container_services.ContainerTest.test_create_container_with_remove_metadata_value - .*test_object_expiry.ObjectExpiryTest.test_get_object_after_expiry_time - .*test_object_expiry.ObjectExpiryTest.test_get_object_at_expiry_time + - .*test_account_services.AccountTest.test_list_no_account_metadata overrides: ceph: diff --cc src/rgw/rgw_common.h index 521485e66dd,83b23d38a50..a7f85b78dfc --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@@ -1621,11 -1614,11 +1621,11 @@@ static constexpr uint32_t MATCH_POLICY_ static constexpr uint32_t MATCH_POLICY_ARN = 0x04; static constexpr uint32_t MATCH_POLICY_STRING = 0x08; -extern bool match_policy(std::string_view pattern, std::string_view input, +extern bool match_policy(const std::string& pattern, const std::string& input, uint32_t flag); - extern std::string camelcase_dash_http_attr(const std::string& orig); - extern std::string lowercase_dash_http_attr(const std::string& orig); + extern std::string camelcase_dash_http_attr(const std::string& orig, bool convert2dash = true); + extern std::string lowercase_dash_http_attr(const std::string& orig, bool bidirection = false); void rgw_setup_saved_curl_handles(); void rgw_release_all_curl_handles();