GCP pubsub conformance tests (#76)

Author: Yaminik1996

blob/blob-gcp/src/main/java/com/salesforce/multicloudj/blob/gcp/GcpBlobStore.java

@@ -42,6 +42,7 @@
 import com.salesforce.multicloudj.common.exceptions.UnknownException;
 import com.salesforce.multicloudj.common.gcp.CommonErrorCodeMapping;
 import com.salesforce.multicloudj.common.gcp.GcpConstants;
+import com.salesforce.multicloudj.common.gcp.GcpCredentialsProvider;
 import com.salesforce.multicloudj.common.provider.Provider;
 import lombok.Getter;
 import org.apache.http.HttpHost;

blob/blob-gcp/src/main/java/com/salesforce/multicloudj/blob/gcp/GcpCredentialsProvider.java renamed to multicloudj-common-gcp/src/main/java/com/salesforce/multicloudj/common/gcp/GcpCredentialsProvider.java

@@ -1,4 +1,4 @@
-package com.salesforce.multicloudj.blob.gcp;
+package com.salesforce.multicloudj.common.gcp;
 
 import com.google.auth.Credentials;
 import com.google.auth.oauth2.AccessToken;

multicloudj-common-gcp/src/test/java/com/salesforce/multicloudj/common/gcp/GcpCredentialsProviderTest.java

@@ -0,0 +1,65 @@
+package com.salesforce.multicloudj.common.gcp;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.google.auth.Credentials;
+import com.google.auth.oauth2.GoogleCredentials;
+import com.salesforce.multicloudj.sts.model.CredentialsOverrider;
+import com.salesforce.multicloudj.sts.model.CredentialsType;
+import com.salesforce.multicloudj.sts.model.StsCredentials;
+import org.junit.jupiter.api.Test;
+
+public class GcpCredentialsProviderTest {
+
+    @Test
+    void testGetCredentialsWithNullOverrider() {
+        Credentials credentials = GcpCredentialsProvider.getCredentials(null);
+        assertNull(credentials, "Credentials should be null when overrider is null");
+    }
+
+    @Test
+    void testGetCredentialsWithNullType() {
+        CredentialsOverrider overrider = new CredentialsOverrider.Builder(null).build();
+        Credentials credentials = GcpCredentialsProvider.getCredentials(overrider);
+        assertNull(credentials, "Credentials should be null when type is null");
+    }
+
+    @Test
+    void testGetCredentialsWithSessionType() {
+        // Arrange
+        String testToken = "test-security-token-12345";
+        StsCredentials stsCredentials = new StsCredentials(
+                "test-access-key-id",
+                "test-access-key-secret",
+                testToken
+        );
+        
+        CredentialsOverrider overrider = new CredentialsOverrider.Builder(CredentialsType.SESSION)
+                .withSessionCredentials(stsCredentials)
+                .build();
+
+        // Act
+        Credentials credentials = GcpCredentialsProvider.getCredentials(overrider);
+
+        // Assert
+        assertNotNull(credentials, "Credentials should not be null");
+        assertTrue(credentials instanceof GoogleCredentials,
+                "Credentials should be GoogleCredentials");
+    }
+
+    @Test
+    void testGetCredentialsWithSessionTypeAndNullSessionCredentials() {
+        // Arrange
+        CredentialsOverrider overrider = new CredentialsOverrider.Builder(CredentialsType.SESSION)
+                .build();
+
+        // Act & Assert - Should throw NullPointerException when sessionCredentials is null
+        assertThrows(NullPointerException.class, () -> {
+            GcpCredentialsProvider.getCredentials(overrider);
+        }, "NullPointerException expected when sessionCredentials is null");
+    }
+}
+

sts/sts-gcp/src/test/java/com/salesforce/multicloudj/sts/gcp/MockGoogleCredentialsFactory.java renamed to multicloudj-common-gcp/src/test/java/com/salesforce/multicloudj/common/gcp/util/MockGoogleCredentialsFactory.java

@@ -1,13 +1,14 @@
-package com.salesforce.multicloudj.sts.gcp;
+package com.salesforce.multicloudj.common.gcp.util;
 
 import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.GoogleCredentials;
 
 import java.util.Date;
 
 /**
- * Factory for creating mock {@link GoogleCredentials} instances that can be used in
- * playback-mode tests where no real Application Default Credentials (ADC) exist.
+ * Factory for creating mock {@link GoogleCredentials} instances for playback-mode tests.
+ * The credentials override {@code refreshAccessToken()} to return a static long-lived token,
+ * preventing external calls during test playback.
  */
 public final class MockGoogleCredentialsFactory {
 
@@ -16,21 +17,13 @@ private MockGoogleCredentialsFactory() {
     }
 
     /**
-     * Returns a simple {@link GoogleCredentials} object backed by a fixed, non-expiring
-     * {@link AccessToken}.
+     * Creates mock credentials with a long-lived access token for testing.
      */
     public static GoogleCredentials createMockCredentials() {
         // 100 years in the future
         Date futureDate = new Date(System.currentTimeMillis() + 100L * 365 * 24 * 60 * 60 * 1000);
         AccessToken token = new AccessToken("mock-gcp-oauth2-token", futureDate);
 
-        /*
-         * GoogleCredentials.create(AccessToken) returns an immutable credential that cannot
-         * refresh – calling refreshAccessToken() throws an IllegalStateException. The client
-         * libraries used by GcpStsIT will call refreshAccessToken() even when we have already
-         * supplied a long-lived token, so here we provide a small subclass that simply returns
-         * the same static AccessToken every time it’s asked to refresh.
-         */
         return new GoogleCredentials() {
             /** cached static token – never expires within the 100-year window */
             private final AccessToken staticToken = token;
@@ -42,4 +35,5 @@ public AccessToken refreshAccessToken() {
             }
         };
     }
-} 
+}
+

multicloudj-common/src/test/java/com/salesforce/multicloudj/common/util/common/TestsUtil.java

@@ -7,6 +7,7 @@
 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.MatchesJsonPathPattern;
 import com.github.tomakehurst.wiremock.matching.RegexPattern;
 import com.github.tomakehurst.wiremock.matching.RequestPattern;
 import com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;
@@ -25,6 +26,7 @@ public class TestsUtil {
     private static Logger logger = LoggerFactory.getLogger(TestsUtil.class);
     static WireMockServer wireMockServer;
     public static final String WIREMOCK_HOST = "localhost";
+    private static List<StubMappingTransformer> loadedTransformers = new ArrayList<>();
 
     public static class TruncateRequestBodyTransformer extends StubMappingTransformer {
 
@@ -69,6 +71,23 @@ public String getName() {
     public static void startWireMockServer(String rootDir, int port, String... extensionInstances) {
         boolean isRecordingEnabled = System.getProperty("record") != null;
         logger.info("Recording enabled: {}", isRecordingEnabled);
+
+        // Create extensions list with default transformer
+        List<StubMappingTransformer> extensions = new ArrayList<>();
+        extensions.add(new TruncateRequestBodyTransformer());
+
+        // Load additional extensions if provided
+        for (String extensionClass : extensionInstances) {
+            try {
+                Class<?> clazz = Class.forName(extensionClass);
+                StubMappingTransformer transformer = (StubMappingTransformer) clazz.getDeclaredConstructor().newInstance();
+                extensions.add(transformer);
+                logger.info("Loaded WireMock extension: {}", extensionClass);
+            } catch (Exception e) {
+                logger.warn("Failed to load WireMock extension: {}", extensionClass, e);
+            }
+        }
+
         wireMockServer = new WireMockServer(WireMockConfiguration.options()
                 .httpsPort(port)
                 .port(port+1) // http port
@@ -78,7 +97,7 @@ public static void startWireMockServer(String rootDir, int port, String... exten
                 .gzipDisabled(true)
                 .useChunkedTransferEncoding(Options.ChunkedEncodingPolicy.NEVER)
                 .filenameTemplate("{{request.method}}-{{randomValue length=10}}.json")
-                .extensions(new TruncateRequestBodyTransformer())
+                .extensions(extensions.toArray(new StubMappingTransformer[0]))
                 .enableBrowserProxying(true));
         wireMockServer.start();
     }
@@ -97,6 +116,15 @@ public static void startWireMockRecording(String targetEndpoint) {
                 .transformerParameters(Parameters.from(Map.of(TRUNCATE_MATCHER_REQUST_BODY_OVER,4096*2)))
                 .chooseBodyMatchTypeAutomatically(true, false, false)
                 .makeStubsPersistent(true);
+
+        // Apply transformers during recording
+        if (!loadedTransformers.isEmpty()) {
+            String[] transformerNames = loadedTransformers.stream()
+                    .map(StubMappingTransformer::getName)
+                    .toArray(String[]::new);
+            recordSpec = recordSpec.transformers(transformerNames);
+        }
+
         if (isRecordingEnabled) {
             wireMockServer.startRecording(recordSpec);
         }

pubsub/pubsub-aws/src/java/com/salesforce/multicloudj/pubsub/aws/AwsSubscription.java

@@ -1,16 +1,17 @@
 package com.salesforce.multicloudj.pubsub.aws;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
 import com.salesforce.multicloudj.common.aws.AwsConstants;
 import com.salesforce.multicloudj.common.exceptions.SubstrateSdkException;
+import com.salesforce.multicloudj.pubsub.batcher.Batcher;
 import com.salesforce.multicloudj.pubsub.driver.AbstractSubscription;
 import com.salesforce.multicloudj.pubsub.driver.AckID;
 import com.salesforce.multicloudj.pubsub.driver.Message;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
 public class AwsSubscription extends AbstractSubscription<AwsSubscription> {
 
     public AwsSubscription() {
@@ -40,12 +41,6 @@ protected void doSendNacks(List<AckID> ackIDs) {
         // TODO: Implement AWS SQS negative acknowledgment
     }
 
-    @Override
-    protected String getMessageId(AckID ackID) {
-        // TODO: Implement AWS-specific message ID extraction
-        return ackID != null ? ackID.toString() : null;
-    }
-
     @Override
     public void sendNack(AckID ackID) {
     }
@@ -85,6 +80,12 @@ protected List<Message> doReceiveBatch(int batchSize) {
         return Collections.emptyList();
     }
 
+    @Override
+    protected Batcher.Options createAckBatcherOptions() {
+        // AWS implementation not yet complete
+        throw new UnsupportedOperationException("AWS PubSub implementation not yet complete");
+    }
+
     public Builder builder() {
         return new Builder();
     }

pubsub/pubsub-client/src/main/java/com/salesforce/multicloudj/pubsub/client/ProviderSupplier.java

@@ -1,12 +1,12 @@
 package com.salesforce.multicloudj.pubsub.client;
 
-import com.salesforce.multicloudj.pubsub.driver.AbstractTopic;
-import com.salesforce.multicloudj.pubsub.driver.AbstractSubscription;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
 
+import com.salesforce.multicloudj.pubsub.driver.AbstractTopic;
+import com.salesforce.multicloudj.pubsub.driver.AbstractSubscription;
+
 /**
  * This class will attempt to find a PubSub provider in the classpath by providerId.
  * 

pubsub/pubsub-client/src/main/java/com/salesforce/multicloudj/pubsub/client/SubscriptionClient.java

@@ -1,18 +1,17 @@
 package com.salesforce.multicloudj.pubsub.client;
 
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
 import com.salesforce.multicloudj.common.exceptions.ExceptionHandler;
 import com.salesforce.multicloudj.common.exceptions.SubstrateSdkException;
 import com.salesforce.multicloudj.pubsub.driver.AbstractSubscription;
 import com.salesforce.multicloudj.pubsub.driver.AckID;
 import com.salesforce.multicloudj.pubsub.driver.Message;
 import com.salesforce.multicloudj.sts.model.CredentialsOverrider;
 
-import java.net.URI;
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
 /**
  * High-level client for receiving messages from a pubsub subscription.
  * 

pubsub/pubsub-client/src/main/java/com/salesforce/multicloudj/pubsub/client/TopicClient.java

@@ -1,14 +1,12 @@
 package com.salesforce.multicloudj.pubsub.client;
 
+import java.net.URI;
+
 import com.salesforce.multicloudj.common.exceptions.ExceptionHandler;
 import com.salesforce.multicloudj.common.exceptions.SubstrateSdkException;
-import com.salesforce.multicloudj.sts.model.CredentialsOverrider;
 import com.salesforce.multicloudj.pubsub.driver.AbstractTopic;
 import com.salesforce.multicloudj.pubsub.driver.Message;
-
-import java.net.URI;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
+import com.salesforce.multicloudj.sts.model.CredentialsOverrider;
 
 /**
  * High-level client for publishing messages to a pubsub topic.