Merge branch 'master' into feat/10265-routing-cmd

ipfs · Jan 30, 2025 · a887cf5 · a887cf5
2 parents 439f2d4 + dab91c8
commit a887cf5
Show file tree

Hide file tree

Showing 7 changed files with 297 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Kubo Changelogs
 
+- [v0.34](docs/changelogs/v0.34.md)
 - [v0.33](docs/changelogs/v0.33.md)
 - [v0.32](docs/changelogs/v0.32.md)
 - [v0.31](docs/changelogs/v0.31.md)

diff --git a/docs/changelogs/v0.33.md b/docs/changelogs/v0.33.md
diff --git a/docs/changelogs/v0.34.md b/docs/changelogs/v0.34.md
@@ -0,0 +1,19 @@
+# Kubo changelog v0.34
+
+- [v0.34.0](#v0310)
+
+## v0.34.0
+
+- [Overview](#overview)
+- [🔦 Highlights](#-highlights)
+- [📝 Changelog](#-changelog)
+- [👨‍👩‍👧‍👦 Contributors](#-contributors)
+
+### Overview
+
+### 🔦 Highlights
+
+### 📝 Changelog
+
+### 👨‍👩‍👧‍👦 Contributors
+
diff --git a/docs/config.md b/docs/config.md
@@ -2616,7 +2616,7 @@ You should use this datastore if:
 
 ### `pebbleds` profile
 
-Configures the node to use the pebble high-performance datastore.
+Configures the node to use the **EXPERIMENTAL** pebble high-performance datastore.
 
 Pebble is a LevelDB/RocksDB inspired key-value store focused on performance and internal usage by CockroachDB.
 You should use this datastore if:
@@ -2636,7 +2636,7 @@ You should use this datastore if:
 
 ### `badgerds` profile
 
-Configures the node to use the legacy badgerv1 datastore.
+Configures the node to use the **legacy** badgerv1 datastore.
 
 > [!CAUTION]
 > This is based on very old badger 1.x, which has known bugs and is no longer supported by the upstream team.

diff --git a/docs/datastores.md b/docs/datastores.md
@@ -46,6 +46,9 @@ Uses a leveldb database to store key value pairs.
 
 ## pebbleds
 
+> [!WARNING]
+> This is still **EXPERIMENTAL** opt-in. Datastore format can be set when first initializing the node via `ipfs init --profile pebbleds`.
+
 Uses [pebble](https://github.com/cockroachdb/pebble) as a key value store.
 
 ```json

diff --git a/test/sharness/t0060-daemon.sh b/test/sharness/t0060-daemon.sh
@@ -131,21 +131,21 @@ test_expect_success "ipfs help output looks good" '
 # check transport is encrypted by default and no plaintext is allowed
 
 test_expect_success SOCAT "default transport should support encryption (TLS, needs socat )" '
-  socat - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-tls &&
+  socat -s - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-tls &&
   grep -q "/tls" swarmnc &&
   test_must_fail grep -q "na" swarmnc ||
   test_fsh cat swarmnc
 '
 
 test_expect_success SOCAT "default transport should support encryption (Noise, needs socat )" '
-  socat - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-noise &&
+  socat -s - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-noise &&
   grep -q "/noise" swarmnc &&
   test_must_fail grep -q "na" swarmnc ||
   test_fsh cat swarmnc
 '
 
 test_expect_success SOCAT "default transport should not support plaintext (needs socat )" '
-  socat - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-plaintext &&
+  socat -s - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-plaintext &&
   grep -q "na" swarmnc &&
   test_must_fail grep -q "/plaintext" swarmnc ||
   test_fsh cat swarmnc

diff --git a/test/sharness/t0061-daemon-opts.sh b/test/sharness/t0061-daemon-opts.sh
@@ -18,7 +18,7 @@ apiaddr=$API_ADDR
 
 # Odd. this fails here, but the inverse works on t0060-daemon.
 test_expect_success SOCAT 'transport should be unencrypted ( needs socat )' '
-  socat - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-plaintext &&
+  socat -s - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-plaintext &&
   grep -q "/plaintext" swarmnc &&
   test_must_fail grep -q "na" swarmnc ||
   test_fsh cat swarmnc