etcd: update to v3.5.9

Signed-off-by: Luca Burgazzoli <lburgazzoli@gmail.com>
etcd-io · May 29, 2023 · 7ffebed · 7ffebed
1 parent 7374906
commit 7ffebed
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 10 deletions.
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -42,6 +42,9 @@ jobs:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
         run: |
+          export TC_USER="$(id -u):$(id -g)"
+          echo "tc user -> $TC_USER"
+          
           ./gradlew spotlessCheck
           ./gradlew test
           ./gradlew publishToSonatype -Prelease.forceSnapshot
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -49,5 +49,8 @@ jobs:
           distribution: 'temurin'
       - name: Build Project
         run: |
+          export TC_USER="$(id -u):$(id -g)"
+          echo "tc user -> $TC_USER"
+          
           ./gradlew check -x test
           ./gradlew test
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/impl/WatchTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/impl/WatchTest.java
@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -280,7 +281,7 @@ public void testWatchAndGet(final Client client) throws Exception {
                 if (event.getEventType() == EventType.PUT) {
                     ByteSequence key1 = event.getKeyValue().getKey();
 
-                    client.getKVClient().get(key1).whenComplete((r, t) -> {
+                    Future<?> unused = client.getKVClient().get(key1).whenComplete((r, t) -> {
                         if (!r.getKvs().isEmpty()) {
                             ref.set(r.getKvs().get(0));
                         }

diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/impl/WatchTokenExpireTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/impl/WatchTokenExpireTest.java
@@ -18,7 +18,6 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
@@ -52,7 +51,8 @@ public class WatchTokenExpireTest {
         .withNodes(1)
         .withSsl(true)
         .withAdditionalArgs(
-            Arrays.asList("--auth-token",
+            List.of(
+                "--auth-token",
                 "jwt,pub-key=/etc/ssl/etcd/server.pem,priv-key=/etc/ssl/etcd/server-key.pem,sign-method=RS256,ttl=1s"))
         .build();
 
@@ -87,7 +87,8 @@ private Client createAuthClient() throws Exception {
             .user(user)
             .password(password)
             .authority("etcd0")
-            .sslContext(b -> b.trustManager(caFile)).build();
+            .sslContext(b -> b.trustManager(caFile))
+            .build();
     }
 
     @Test

diff --git a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/Etcd.java b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/Etcd.java
@@ -26,7 +26,7 @@
 import org.testcontainers.containers.Network;
 
 public final class Etcd {
-    public static final String CONTAINER_IMAGE = "gcr.io/etcd-development/etcd:v3.5.4";
+    public static final String CONTAINER_IMAGE = "gcr.io/etcd-development/etcd:v3.5.9";
     public static final int ETCD_CLIENT_PORT = 2379;
     public static final int ETCD_PEER_PORT = 2380;
     public static final String ETCD_DATA_DIR = "/data.etcd";

diff --git a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdContainer.java b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdContainer.java
@@ -110,6 +110,11 @@ protected void configure() {
         withLogConsumer(new Slf4jLogConsumer(LOGGER).withPrefix(node));
         withCommand(createCommand());
 
+        String user = System.getenv("TC_USER");
+        if (user != null) {
+            withCreateContainerCmdModifier(c -> c.withUser(user));
+        }
+
         waitingFor(Wait.forLogMessage(".*ready to serve client requests.*", 1));
     }
 
@@ -188,11 +193,15 @@ private String[] createCommand() {
 
     private static void deleteDataDirectory(Path dir) {
         if (dir != null && Files.exists(dir)) {
-            try (Stream<Path> stream = Files.walk(dir)) {
-                stream.sorted(Comparator.reverseOrder())
-                    .map(Path::toFile)
-                    .forEach(File::delete);
-            } catch (IOException e) {
+            try {
+                try (Stream<Path> stream = Files.walk(dir)) {
+                    stream.sorted(Comparator.reverseOrder())
+                        .map(Path::toFile)
+                        .forEach(File::delete);
+                } catch (IOException e) {
+                    LOGGER.error("Error deleting directory {}", dir, e);
+                }
+            } catch (Exception e) {
                 LOGGER.error("Error deleting directory {}", dir, e);
             }
         }