address comments

Signed-off-by: Yupeng Fu <yupeng@uber.com>
opensearch-project · Jan 29, 2025 · acb627e · acb627e
1 parent b10ac20
commit acb627e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/plugins/ingestion-kafka/build.gradle b/plugins/ingestion-kafka/build.gradle
@@ -38,6 +38,7 @@ dependencies {
   testImplementation "org.rnorth.duct-tape:duct-tape:${versions.ducttape}"
   testImplementation "org.apache.commons:commons-compress:${versions.commonscompress}"
   testImplementation "commons-io:commons-io:${versions.commonsio}"
+  testImplementation 'org.awaitility:awaitility:4.2.0'
 }
 
 internalClusterTest{

diff --git a/...ion-kafka/src/internalClusterTest/java/org/opensearch/plugin/kafka/IngestFromKafkaIT.java b/...ion-kafka/src/internalClusterTest/java/org/opensearch/plugin/kafka/IngestFromKafkaIT.java
@@ -40,7 +40,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import static org.hamcrest.Matchers.is;
-import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 
 /**
  * Integration test for Kafka ingestion

diff --git a/plugins/ingestion-kafka/src/test/java/org/opensearch/plugin/kafka/KafkaUtils.java b/plugins/ingestion-kafka/src/test/java/org/opensearch/plugin/kafka/KafkaUtils.java
@@ -17,7 +17,6 @@
 import org.apache.kafka.common.errors.TopicExistsException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +26,7 @@
 
 import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
-import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 
 public class KafkaUtils {
     private static final Logger LOGGER = LogManager.getLogger(KafkaUtils.class);
@@ -56,7 +55,7 @@ public static void createTopic(String topicName, int numOfPartitions, String boo
         }
 
         // validates topic is created
-        await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> { Assert.assertTrue(checkTopicExistence(topicName, bootstrapServers)); });
+        await().atMost(3, TimeUnit.SECONDS).until(() -> checkTopicExistence(topicName, bootstrapServers));
     }
 
     public static boolean checkTopicExistence(String topicName, String bootstrapServers) {

diff --git a/server/src/main/resources/org/opensearch/bootstrap/security.policy b/server/src/main/resources/org/opensearch/bootstrap/security.policy
@@ -194,7 +194,4 @@ grant {
   permission java.io.FilePermission "/sys/fs/cgroup/cpuacct/-", "read";
   permission java.io.FilePermission "/sys/fs/cgroup/memory", "read";
   permission java.io.FilePermission "/sys/fs/cgroup/memory/-", "read";
-
-  // allow awaitility in tests
-  permission java.lang.RuntimePermission "setDefaultUncaughtExceptionHandler";
 };
diff --git a/server/src/main/resources/org/opensearch/bootstrap/test-framework.policy b/server/src/main/resources/org/opensearch/bootstrap/test-framework.policy
@@ -167,4 +167,5 @@ grant {
   permission org.opensearch.secure_sm.ThreadContextPermission "markAsSystemContext";
   permission org.opensearch.secure_sm.ThreadContextPermission "stashAndMergeHeaders";
   permission org.opensearch.secure_sm.ThreadContextPermission "stashWithOrigin";
+  permission java.lang.RuntimePermission "setDefaultUncaughtExceptionHandler";
 };