Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issue with AzureBlobStore blockid incorrectly using base64url encoding #208

Merged
merged 1 commit into from
Aug 4, 2024
Merged

Fixes issue with AzureBlobStore blockid incorrectly using base64url encoding #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,10 @@ public String completeMultipartUpload(MultipartUpload mpu, List<MultipartPart> p
return sync.putBlockList(mpu.containerName(), azureBlob, blocks.build());
}

static String makeBlockId(int partNumber) {
return BaseEncoding.base64Url().encode(Ints.toByteArray(partNumber));
}
static String makeBlockId(int partNumber) {
// Azure expects a base64-encoded string ONLY. It does not support base64url encoding.
return BaseEncoding.base64().encode(Ints.toByteArray(partNumber));
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The url encoding is handled downstream by org.jclouds.util.Strings2's urlEncode method.

}

@Override
public MultipartPart uploadMultipartPart(MultipartUpload mpu, int partNumber, Payload payload) {
Expand Down
2 changes: 1 addition & 1 deletion providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@Test(groups = "unit", testName = "AzureBlobStore")
public class AzureBlobStoreTest {

private static final Pattern VALIDATION_PATTERN = Pattern.compile("[a-zA-Z0-9\\-_=]*");
private static final Pattern VALIDATION_PATTERN = Pattern.compile("^[a-zA-Z0-9+/=]*$");

public void testMakeBlockId() {
// how can i achieve something like a junit5 parametrized test in testng?
Expand Down
Loading