(jclouds) branch master updated: JCLOUDS-1519: Fix the authorization error with b2 application keys

[gaul]

This is an automated email from the ASF dual-hosted git repository.

gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git


The following commit(s) were added to refs/heads/master by this push:
     new 41d842d449 JCLOUDS-1519: Fix the authorization error with b2 
application keys
41d842d449 is described below

commit 41d842d449e125411709613e27ca01c8fc5c4a4f
Author: davidsenk <da...@senk.me>
AuthorDate: Sun Feb 18 21:05:35 2024 -0500

    JCLOUDS-1519: Fix the authorization error with b2 application keys
---
 .../b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java   | 2 ++
 providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java     | 2 +-
 providers/b2/src/test/resources/create_bucket_request.json              | 2 +-
 providers/b2/src/test/resources/delete_bucket_request.json              | 2 +-
 providers/b2/src/test/resources/list_buckets_request.json               | 2 +-
 providers/b2/src/test/resources/update_bucket_request.json              | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java 
b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java
index b403a59322..d79f3daf5d 100644
--- 
a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java
+++ 
b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java
@@ -50,9 +50,11 @@ public final class RequestAuthorization implements 
HttpRequestFilter {
             endpoint.getPath() +
             (endpoint.getQuery() == null ? "" : "?" + endpoint.getQuery()));
 
+      String updatedRequestBody = 
request.getPayload().getRawContent().toString().replaceAll("\"accountId\":.?\".*\"",
 "\"accountId\":\"" + auth.accountId() + "\"");
       request = request.toBuilder()
             .endpoint(endpoint)
             .replaceHeader(HttpHeaders.AUTHORIZATION, 
auth.authorizationToken())
+            .payload(updatedRequestBody)
             .build();
       return request;
    }
diff --git 
a/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java 
b/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
index 391a82e9d9..b1cbe0a9ae 100644
--- a/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
+++ b/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
@@ -120,7 +120,7 @@ final class B2TestUtils {
     * @see RecordedRequest
     */
    private static void assertContentTypeIsJson(RecordedRequest request) {
-      
assertThat(request.getHeaders().values("Content-Type")).contains("application/json");
+      
assertThat(request.getHeaders().values("Content-Type")).contains("application/unknown");
    }
 
    /**
diff --git a/providers/b2/src/test/resources/create_bucket_request.json 
b/providers/b2/src/test/resources/create_bucket_request.json
index 8b72ad5b8f..589d345981 100644
--- a/providers/b2/src/test/resources/create_bucket_request.json
+++ b/providers/b2/src/test/resources/create_bucket_request.json
@@ -1,5 +1,5 @@
 {
-    "accountId": "ACCOUNT_ID",
+    "accountId": "YOUR_ACCOUNT_ID",
     "bucketName": "any_name_you_pick",
     "bucketType": "allPrivate"
 }
diff --git a/providers/b2/src/test/resources/delete_bucket_request.json 
b/providers/b2/src/test/resources/delete_bucket_request.json
index 8719353756..9848643b62 100644
--- a/providers/b2/src/test/resources/delete_bucket_request.json
+++ b/providers/b2/src/test/resources/delete_bucket_request.json
@@ -1,4 +1,4 @@
 {
-    "accountId": "ACCOUNT_ID",
+    "accountId": "YOUR_ACCOUNT_ID",
     "bucketId": "4a48fe8875c6214145260818"
 }
diff --git a/providers/b2/src/test/resources/list_buckets_request.json 
b/providers/b2/src/test/resources/list_buckets_request.json
index e2854f515e..62ec3999c4 100644
--- a/providers/b2/src/test/resources/list_buckets_request.json
+++ b/providers/b2/src/test/resources/list_buckets_request.json
@@ -1,3 +1,3 @@
 {
-    "accountId": "ACCOUNT_ID"
+    "accountId": "YOUR_ACCOUNT_ID"
 }
diff --git a/providers/b2/src/test/resources/update_bucket_request.json 
b/providers/b2/src/test/resources/update_bucket_request.json
index 64cc4753ef..ecc0849dca 100644
--- a/providers/b2/src/test/resources/update_bucket_request.json
+++ b/providers/b2/src/test/resources/update_bucket_request.json
@@ -1,5 +1,5 @@
 {
-    "accountId": "ACCOUNT_ID",
+    "accountId": "YOUR_ACCOUNT_ID",
     "bucketId": "4a48fe8875c6214145260818",
     "bucketType": "allPrivate"
 }