]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #56616 from prazumovsky/wip-63620
authorShilpa Jagannath <smanjara@users.noreply.github.com>
Wed, 4 Sep 2024 17:48:30 +0000 (10:48 -0700)
committerGitHub <noreply@github.com>
Wed, 4 Sep 2024 17:48:30 +0000 (10:48 -0700)
quincy: rgw/swift: preserve dashes/underscores in swift user metadata names

1  2 
qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_op.cc

index ad9dc9dd50254fe0f2f4e8216286f48baa779b21,51eed7def5efbd150c3281d8032a2a56a55d311d..09b8152c5f5798c5120891367cc157084b12a9c7
@@@ -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:
Simple merge
index 521485e66dd31f13833e4d23549c957322a669d5,83b23d38a50b4f5f90402c03de35513c21ffc491..a7f85b78dfc3f48fce6528e26d9ea2165fca2b4b
@@@ -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();
Simple merge