Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix: repair main CI (AslExecutor test compilation, Redshift compat test endpoint) (#2726)

Matan Baruch477e8ae7b910
diff --git a/compatibility-tests/sdk-test-java/src/test/java/io/github/hectorvent/floci/compat/RedshiftTest.java b/compatibility-tests/sdk-test-java/src/test/java/io/github/hectorvent/floci/compat/RedshiftTest.java
index 80bbaa270a..e8380e3554 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/io/github/hectorvent/floci/compat/RedshiftTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/io/github/hectorvent/floci/compat/RedshiftTest.java
@@ -1,5 +1,6 @@
package io.github.hectorvent.floci.compat;
+import com.floci.test.TestFixtures;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -13,23 +14,14 @@ import software.amazon.awssdk.services.redshift.model.DescribeClustersResponse;
import software.amazon.awssdk.services.redshift.model.DeleteClusterRequest;
import software.amazon.awssdk.services.redshift.model.DeleteClusterResponse;
-import java.sql.Connection;
-import java.sql.DriverManager;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class RedshiftTest {
private RedshiftClient getClient() {
- return RedshiftClient.builder()
- .region(software.amazon.awssdk.regions.Region.US_EAST_1)
- .credentialsProvider(software.amazon.awssdk.auth.credentials.StaticCredentialsProvider.create(
- software.amazon.awssdk.auth.credentials.AwsBasicCredentials.create("test", "test")))
- .endpointOverride(java.net.URI.create("http://localhost:4566"))
- .build();
+ return TestFixtures.redshiftClient();
}
@Test
@@ -52,14 +44,8 @@ public class RedshiftTest {
Cluster cluster = describeRes.clusters().get(0);
assertEquals("test-cluster", cluster.clusterIdentifier());
assertNotNull(cluster.endpoint());
-
- String address = cluster.endpoint().address();
- int port = cluster.endpoint().port();
-
- String jdbcUrl = "jdbc:postgresql://" + address + ":" + port + "/dev";
- try (Connection conn = DriverManager.getConnection(jdbcUrl, "admin", "Password123")) {
- assertTrue(conn.isValid(5));
- }
+ // No JDBC connection here: the endpoint carries the backing container's own host/port
+ // (Redshift has no RDS-style auth proxy yet), which isn't reachable from the harness.
}
@Test
diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest.java
index 4d6dbad84f..4ca7bc7c8a 100644
--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest.java
@@ -77,7 +77,8 @@ class AslExecutorTaskHistoryEventsTest {
mock(io.github.hectorvent.floci.services.scheduler.SchedulerController.class),
objectMapper,
new JsonataEvaluator(objectMapper),
- mock(Instance.class), mock(EmulatorConfig.class), vertx);
+ mock(Instance.class), mock(EmulatorConfig.class), vertx,
+ mock(io.github.hectorvent.floci.core.common.CustomResourceLiveness.class));
}
@Test