]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #47746 from pritha-srivastava/wip-52789-pacific
authorCasey Bodley <cbodley@users.noreply.github.com>
Thu, 13 Oct 2022 13:56:43 +0000 (09:56 -0400)
committerGitHub <noreply@github.com>
Thu, 13 Oct 2022 13:56:43 +0000 (09:56 -0400)
pacific: rgw/sts: adding code for aws:RequestTags as part

1  2 
src/rgw/rgw_auth_s3.cc
src/rgw/rgw_op.cc
src/rgw/rgw_rest_s3.cc
src/test/rgw/test_rgw_lua.cc

Simple merge
Simple merge
Simple merge
index 80e249a686f1fa1b14058cc4a12387200c04b986,3c97c6dcd1204b3434325e8d31eed085a2ead6a6..b6bf0375a48a15518b89cf49b28987825067f707
@@@ -338,12 -338,11 +338,11 @@@ TEST(TestRGWLua, Environment
    )";
  
    DEFINE_REQ_STATE;
-   s.env[""] = "world";
-   s.env[""] = "bar";
-   s.env["goodbye"] = "cruel world";
-   s.env["ka"] = "boom";
+   s.env.emplace("", "bar");
+   s.env.emplace("goodbye", "cruel world");
+   s.env.emplace("ka", "boom");
  
 -  const auto rc = lua::request::execute(nullptr, nullptr, nullptr, &s, "put_obj", script);
 +  const auto rc = lua::request::execute(nullptr, nullptr, nullptr, &s, nullptr, script);
    ASSERT_EQ(rc, 0);
  }