test: Enable GCP blob store conformance tests testDownloadWithKmsKey, testUploadWithKmsKey_happyPath, testUploadWithKmsKey_emptyKmsKeyId, testUploadWithKmsKey_nullKmsKeyId, testRangedReadWithKmsKey, testVersionedCopyFrom

Author: Yaminik1996

blob/blob-client/src/test/java/com/salesforce/multicloudj/blob/client/AbstractBlobStoreIT.java

@@ -55,6 +55,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -94,6 +95,10 @@ public interface Harness extends AutoCloseable {
 
         // Returns the KMS key ID for encryption tests (provider-specific)
         String getKmsKeyId();
+
+        default List<String> getWiremockExtensions() {
+            return Collections.emptyList();
+        }
     }
 
     protected abstract Harness createHarness();
@@ -108,7 +113,9 @@ public interface Harness extends AutoCloseable {
     @BeforeAll
     public void initializeWireMockServer() {
         harness = createHarness();
-        TestsUtil.startWireMockServer("src/test/resources", harness.getPort());
+        List<String> extensions = harness.getWiremockExtensions();
+        TestsUtil.startWireMockServer("src/test/resources", harness.getPort(), 
+                extensions.toArray(new String[0]));
     }
 
     /**
@@ -146,8 +153,8 @@ public void testNonexistentBucket() {
         // And run the tests given the non-existent bucket
         runOperationsThatShouldFail("testNonexistentBucket", bucketClient);
         if (!GCP_PROVIDER_ID.equals(harness.getProviderId())) {
-        runOperationsThatShouldNotFail("testNonexistentBucket", bucketClient);
-    }
+            runOperationsThatShouldNotFail("testNonexistentBucket", bucketClient);
+        }
     }
 
     @Test
@@ -160,8 +167,8 @@ public void testInvalidCredentials() {
         // And run the tests given the invalid credentialsOverrider
         runOperationsThatShouldFail("testInvalidCredentials", bucketClient);
         if (!GCP_PROVIDER_ID.equals(harness.getProviderId())) {
-        runOperationsThatShouldNotFail("testInvalidCredentials", bucketClient);
-    }
+            runOperationsThatShouldNotFail("testInvalidCredentials", bucketClient);
+        }
     }
 
     private void runOperationsThatShouldFail(String testName, BucketClient bucketClient) {
@@ -871,7 +878,7 @@ public TestConfig(String testName, Collection<String> keysToCreate, Collection<S
 
     @Test
     public void testVersionedDelete_fileDoesNotExist() throws IOException {
-
+        Assumptions.assumeFalse(GCP_PROVIDER_ID.equals(harness.getProviderId()));
         // Create the BucketClient
         AbstractBlobStore blobStore = harness.createBlobStore(true, true, true);
         BucketClient bucketClient = new BucketClient(blobStore);
@@ -1356,8 +1363,6 @@ public void testCopyFrom() throws IOException {
 
     @Test
     public void testVersionedCopyFrom() throws IOException {
-        Assumptions.assumeFalse(GCP_PROVIDER_ID.equals(harness.getProviderId()));
-
         String key = "conformance-tests/versionedCopyFrom/blob";
         String destKeyV1 = "conformance-tests/versionedCopyFrom/copied-from-blob-v1";
         String destKeyV2 = "conformance-tests/versionedCopyFrom/copied-from-blob-v2";
@@ -2737,22 +2742,19 @@ private void safeDeleteBlobs(BucketClient bucketClient, String... keys){
 
     @Test
     public void testUploadWithKmsKey_happyPath() {
-        Assumptions.assumeFalse(GCP_PROVIDER_ID.equals(harness.getProviderId()));
         String key = "conformance-tests/kms/upload-happy-path";
         String kmsKeyId = harness.getKmsKeyId();
         runUploadWithKmsKeyTest(key, kmsKeyId, "Test data with KMS encryption".getBytes());
     }
 
     @Test
     public void testUploadWithKmsKey_nullKmsKeyId() {
-        Assumptions.assumeFalse(GCP_PROVIDER_ID.equals(harness.getProviderId()));
         String key = "conformance-tests/kms/upload-null-key";
         runUploadWithKmsKeyTest(key, null, "Test data without KMS".getBytes());
     }
 
     @Test
     public void testUploadWithKmsKey_emptyKmsKeyId() {
-        Assumptions.assumeFalse(GCP_PROVIDER_ID.equals(harness.getProviderId()));
         String key = "conformance-tests/kms/upload-empty-key";
         runUploadWithKmsKeyTest(key, "", "Test data with empty KMS key".getBytes());
     }
@@ -2795,7 +2797,6 @@ private void runUploadWithKmsKeyTest(String key, String kmsKeyId, byte[] content
 
     @Test
     public void testDownloadWithKmsKey() throws IOException {
-        Assumptions.assumeFalse(GCP_PROVIDER_ID.equals(harness.getProviderId()));
         String key = "conformance-tests/kms/download-happy-path";
         String kmsKeyId = harness.getKmsKeyId();
         byte[] content = "Test data for KMS download".getBytes(StandardCharsets.UTF_8);
@@ -2833,7 +2834,6 @@ public void testDownloadWithKmsKey() throws IOException {
 
     @Test
     public void testRangedReadWithKmsKey() throws IOException {
-        Assumptions.assumeFalse(GCP_PROVIDER_ID.equals(harness.getProviderId()));
         String key = "conformance-tests/kms/ranged-read";
         String kmsKeyId = harness.getKmsKeyId();
         runRangedReadWithKmsKeyTest(key, kmsKeyId);

blob/blob-gcp/src/test/java/com/salesforce/multicloudj/blob/gcp/GcpBlobStoreIT.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class GcpBlobStoreIT extends AbstractBlobStoreIT {
@@ -114,6 +115,11 @@ public String getKmsKeyId() {
             return "projects/substrate-sdk-gcp-poc1/locations/us/keyRings/chameleon-test/cryptoKeys/chameleon-test";
         }
 
+        @Override
+        public List<String> getWiremockExtensions() {
+            return List.of("com.salesforce.multicloudj.blob.gcp.util.ResumableUploadIdTransformer");
+        }
+
         @Override
         public void close() {
             try {

blob/blob-gcp/src/test/java/com/salesforce/multicloudj/blob/gcp/util/ResumableUploadIdTransformer.java

@@ -0,0 +1,134 @@
+package com.salesforce.multicloudj.blob.gcp.util;
+
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;
+import com.github.tomakehurst.wiremock.matching.ContentPattern;
+import com.github.tomakehurst.wiremock.matching.RequestPattern;
+import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
+import com.github.tomakehurst.wiremock.stubbing.StubMapping;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+
+/**
+ * Transformer that replaces exact upload_id parameter values in resumable upload URLs
+ * with regex patterns to allow flexible matching during replay.
+ *
+ * This handles the dynamic upload_id values generated by GCP Storage for resumable uploads.
+ * The transformer converts exact URL matches to URL pattern matches by replacing
+ * the exact upload_id value with a regex pattern.
+ */
+public class ResumableUploadIdTransformer extends StubMappingTransformer {
+
+    // Pattern to match upload_id parameter: upload_id=<value>
+    // The value can contain alphanumeric, dash, underscore, and equals characters
+    private static final Pattern UPLOAD_ID_PATTERN = Pattern.compile("upload_id=[A-Za-z0-9_-]+");
+    private static final String UPLOAD_ID_REPLACEMENT = "upload_id=[^&]+";
+
+    @Override
+    public StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters) {
+        RequestPattern requestPattern = stubMapping.getRequest();
+        String url = requestPattern.getUrl();
+        String urlPattern = requestPattern.getUrlPattern();
+
+        // Check if this is a resumable upload request (PUT or POST with uploadType=resumable)
+        boolean isResumableUpload = (url != null && url.contains("uploadType=resumable")) ||
+                                   (urlPattern != null && urlPattern.contains("uploadType=resumable"));
+
+        if (isResumableUpload) {
+            String transformedPattern = null;
+
+            if (url != null && url.contains("upload_id=")) {
+                // Replace exact upload_id value with regex pattern and escape special characters
+                transformedPattern = escapeUrlForRegex(url);
+            } else if (urlPattern != null && urlPattern.contains("upload_id=")) {
+                // If it's already a pattern, ensure upload_id is flexible
+                transformedPattern = UPLOAD_ID_PATTERN.matcher(urlPattern).replaceAll(UPLOAD_ID_REPLACEMENT);
+            }
+
+            if (transformedPattern != null) {
+                // Rebuild the RequestPattern with the transformed URL pattern
+                RequestPatternBuilder builder = RequestPatternBuilder.newRequestPattern(
+                    requestPattern.getMethod(), 
+                    urlMatching(transformedPattern)
+                );
+                
+                // Copy body patterns if they exist
+                List<ContentPattern<?>> bodyPatterns = requestPattern.getBodyPatterns();
+                if (bodyPatterns != null && !bodyPatterns.isEmpty()) {
+                    for (ContentPattern<?> pattern : bodyPatterns) {
+                        builder.withRequestBody(pattern);
+                    }
+                }
+                
+                RequestPattern newRequestPattern = builder.build();
+                
+                // Create a new StubMapping with the modified RequestPattern
+                StubMapping newStubMapping = new StubMapping(newRequestPattern, stubMapping.getResponse());
+                // Copy all other properties from the original stub
+                newStubMapping.setId(stubMapping.getId());
+                newStubMapping.setPriority(stubMapping.getPriority());
+                newStubMapping.setScenarioName(stubMapping.getScenarioName());
+                newStubMapping.setRequiredScenarioState(stubMapping.getRequiredScenarioState());
+                newStubMapping.setNewScenarioState(stubMapping.getNewScenarioState());
+                newStubMapping.setPersistent(stubMapping.isPersistent());
+                return newStubMapping;
+            }
+        }
+
+        return stubMapping;
+    }
+
+    /**
+     * Escapes special regex characters in the URL while preserving our regex pattern for upload_id.
+     * WireMock regex patterns need special characters escaped, except for our intentional regex pattern.
+     */
+    private String escapeUrlForRegex(String url) {
+        // Replace upload_id value with regex pattern first
+        String withRegex = UPLOAD_ID_PATTERN.matcher(url).replaceAll(UPLOAD_ID_REPLACEMENT);
+        
+        // Now escape special regex characters, but preserve our upload_id=[^&]+ pattern
+        // We'll escape everything except the upload_id pattern we just inserted
+        StringBuilder result = new StringBuilder();
+        int uploadIdIndex = withRegex.indexOf("upload_id=[^&]+");
+        
+        if (uploadIdIndex >= 0) {
+            // Escape the part before upload_id pattern
+            String before = withRegex.substring(0, uploadIdIndex);
+            result.append(escapeRegexSpecialChars(before));
+            
+            // Keep the upload_id regex pattern as-is
+            result.append("upload_id=[^&]+");
+            
+            // Escape the part after upload_id pattern
+            String after = withRegex.substring(uploadIdIndex + "upload_id=[^&]+".length());
+            result.append(escapeRegexSpecialChars(after));
+        } else {
+            // No upload_id pattern found, escape the whole URL
+            result.append(escapeRegexSpecialChars(withRegex));
+        }
+        
+        return result.toString();
+    }
+    
+    /**
+     * Escapes special regex characters that need to be literal in the URL pattern.
+     */
+    private String escapeRegexSpecialChars(String str) {
+        return str.replaceAll("([\\\\^$\\[\\]{}()*+?.|])", "\\\\$1");
+    }
+
+
+    @Override
+    public String getName() {
+        return "resumable-upload-id-transformer";
+    }
+
+    @Override
+    public boolean applyGlobally() {
+        return true;
+    }
+}

blob/blob-gcp/src/test/resources/mappings/delete-6w3ou2hjcm.json

@@ -0,0 +1,25 @@
+{
+  "id" : "531417ba-b6d4-4172-81f0-ee672fd5f557",
+  "name" : "storage_v1_b_substrate-sdk-gcp-poc1-test-bucket_o_conformance-tests_kms_download-happy-path",
+  "request" : {
+    "url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket/o/conformance-tests%2Fkms%2Fdownload-happy-path",
+    "method" : "DELETE"
+  },
+  "response" : {
+    "status" : 204,
+    "headers" : {
+      "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
+      "Server" : "UploadServer",
+      "Cache-Control" : "no-cache, no-store, max-age=0, must-revalidate",
+      "X-GUploader-UploadID" : "AHVrFxOgb3W1p0IaAChnG5rSTCgvZ9ZLIXjPG-d9xQVqXArluIuhgrNd0Eh33DpDOiAu5x8mSzqezQH4vdjHPA",
+      "Vary" : [ "Origin", "X-Origin" ],
+      "Pragma" : "no-cache",
+      "Expires" : "Mon, 01 Jan 1990 00:00:00 GMT",
+      "Date" : "Mon, 29 Dec 2025 20:02:52 GMT",
+      "Content-Type" : "application/json"
+    }
+  },
+  "uuid" : "531417ba-b6d4-4172-81f0-ee672fd5f557",
+  "persistent" : true,
+  "insertionIndex" : 863
+}

blob/blob-gcp/src/test/resources/mappings/delete-cdoekyn53b.json

@@ -0,0 +1,25 @@
+{
+  "id" : "12b90d1c-427a-4afb-8b49-f65659fa5520",
+  "name" : "storage_v1_b_substrate-sdk-gcp-poc1-test-bucket_o_conformance-tests_kms_ranged-read",
+  "request" : {
+    "url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket/o/conformance-tests%2Fkms%2Franged-read",
+    "method" : "DELETE"
+  },
+  "response" : {
+    "status" : 204,
+    "headers" : {
+      "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
+      "Server" : "UploadServer",
+      "Cache-Control" : "no-cache, no-store, max-age=0, must-revalidate",
+      "X-GUploader-UploadID" : "AHVrFxNmhg9_j3PjTOzJ_ue8p5DF-xnWzQPygCXJ-UcMswM-87WEEZX70N7byIlgZPhSXWSa",
+      "Vary" : [ "Origin", "X-Origin" ],
+      "Pragma" : "no-cache",
+      "Expires" : "Mon, 01 Jan 1990 00:00:00 GMT",
+      "Date" : "Mon, 29 Dec 2025 20:09:04 GMT",
+      "Content-Type" : "application/json"
+    }
+  },
+  "uuid" : "12b90d1c-427a-4afb-8b49-f65659fa5520",
+  "persistent" : true,
+  "insertionIndex" : 891
+}

blob/blob-gcp/src/test/resources/mappings/delete-drgaiilrpb.json

@@ -0,0 +1,25 @@
+{
+  "id" : "a04882ab-493f-4490-a8e9-064a9e827d16",
+  "name" : "storage_v1_b_substrate-sdk-gcp-poc1-test-bucket_o_conformance-tests_kms_upload-null-key",
+  "request" : {
+    "url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket/o/conformance-tests%2Fkms%2Fupload-null-key",
+    "method" : "DELETE"
+  },
+  "response" : {
+    "status" : 204,
+    "headers" : {
+      "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
+      "Server" : "UploadServer",
+      "Cache-Control" : "no-cache, no-store, max-age=0, must-revalidate",
+      "X-GUploader-UploadID" : "AHVrFxOWNLPu7C3_wNABfMAfiJavsd4RO-CE2HhH3tIXYGgcX_cgIKxJXwbWq2J0LeRJ5UFe",
+      "Vary" : [ "Origin", "X-Origin" ],
+      "Pragma" : "no-cache",
+      "Expires" : "Mon, 01 Jan 1990 00:00:00 GMT",
+      "Date" : "Mon, 29 Dec 2025 20:08:16 GMT",
+      "Content-Type" : "application/json"
+    }
+  },
+  "uuid" : "a04882ab-493f-4490-a8e9-064a9e827d16",
+  "persistent" : true,
+  "insertionIndex" : 884
+}

blob/blob-gcp/src/test/resources/mappings/delete-hcupljexaa.json

@@ -0,0 +1,25 @@
+{
+  "id" : "12490805-8dc1-4f5b-a110-7cef7a1f6e65",
+  "name" : "storage_v1_b_substrate-sdk-gcp-poc1-test-bucket_o_conformance-tests_kms_upload-happy-path",
+  "request" : {
+    "url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket/o/conformance-tests%2Fkms%2Fupload-happy-path",
+    "method" : "DELETE"
+  },
+  "response" : {
+    "status" : 204,
+    "headers" : {
+      "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
+      "Server" : "UploadServer",
+      "Cache-Control" : "no-cache, no-store, max-age=0, must-revalidate",
+      "X-GUploader-UploadID" : "AHVrFxMzg4fSYxLMd3E0aO8oyhIPYW1-oFjveo5_vk09ictySqjJLKbg0BJo3QojvVtI_CjGDiqP8DR7ECeGGg",
+      "Vary" : [ "Origin", "X-Origin" ],
+      "Pragma" : "no-cache",
+      "Expires" : "Mon, 01 Jan 1990 00:00:00 GMT",
+      "Date" : "Mon, 29 Dec 2025 20:03:14 GMT",
+      "Content-Type" : "application/json"
+    }
+  },
+  "uuid" : "12490805-8dc1-4f5b-a110-7cef7a1f6e65",
+  "persistent" : true,
+  "insertionIndex" : 870
+}

blob/blob-gcp/src/test/resources/mappings/delete-jauidxy2tp.json

@@ -0,0 +1,25 @@
+{
+  "id" : "d27615af-1d5f-4849-9759-533ddb4b624d",
+  "name" : "storage_v1_b_substrate-sdk-gcp-poc1-test-bucket-versioned_o_conformance-tests_versionedcopyfrom_blob",
+  "request" : {
+    "url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2FversionedCopyFrom%2Fblob",
+    "method" : "DELETE"
+  },
+  "response" : {
+    "status" : 204,
+    "headers" : {
+      "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
+      "Server" : "UploadServer",
+      "Cache-Control" : "no-cache, no-store, max-age=0, must-revalidate",
+      "X-GUploader-UploadID" : "AHVrFxOCInV5IuowOoWIEWtFKct_wkFcxdKqsV8DHUiWI7Kfuk2D8MaQBzWIQxfRXgdzksZI",
+      "Vary" : [ "Origin", "X-Origin" ],
+      "Pragma" : "no-cache",
+      "Expires" : "Mon, 01 Jan 1990 00:00:00 GMT",
+      "Date" : "Mon, 29 Dec 2025 20:09:35 GMT",
+      "Content-Type" : "application/json"
+    }
+  },
+  "uuid" : "d27615af-1d5f-4849-9759-533ddb4b624d",
+  "persistent" : true,
+  "insertionIndex" : 910
+}