diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2337363..6812963 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ to abide to the `TypeStream` [code of conduct](/CODE_OF_CONDUCT.md). - [Go](https://go.dev) - [Protobuf](https://protobuf.dev/) - [Make](https://www.gnu.org/software/make/) -- [Redpanda](https://redpanda.com/) (you need `rpk` locally) +- [Redpanda](https://redpanda.com/) (you need `rpk` locally. Min version: `v24.1.2`) ## Set up your machine diff --git a/libs/testing/src/main/kotlin/io/typestream/testing/TestKafka.kt b/libs/testing/src/main/kotlin/io/typestream/testing/TestKafka.kt index 5b2346b..0d4677c 100644 --- a/libs/testing/src/main/kotlin/io/typestream/testing/TestKafka.kt +++ b/libs/testing/src/main/kotlin/io/typestream/testing/TestKafka.kt @@ -5,7 +5,7 @@ import io.typestream.testing.kafka.KafkaProducerWrapper import io.typestream.testing.model.TestRecord import org.testcontainers.redpanda.RedpandaContainer -class TestKafka : RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v23.3.2") { +class TestKafka : RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v24.2.9") { fun produceRecords(topic: String, encoding: String, vararg records: TestRecord): List { val adminClient = AdminClientWrapper(bootstrapServers) adminClient.createTopics(topic) diff --git a/scripts/.gitignore b/scripts/.gitignore index 405ec2c..9a449be 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1 +1 @@ -*.toml +*.auto.toml diff --git a/scripts/dev/README.md b/scripts/dev/README.md index 41ff0c2..98abdf6 100644 --- a/scripts/dev/README.md +++ b/scripts/dev/README.md @@ -1,7 +1,3 @@ -# Scripts +# Dev scripts Scripts for local development. - -Mostly hacky scripts at the moment because we're waiting for [this -issue](https://github.com/redpanda-data/redpanda/pull/4966) to be merged and -released. diff --git a/scripts/dev/kafkastart.sh b/scripts/dev/kafkastart.sh index 2754cb3..29bb985 100755 --- a/scripts/dev/kafkastart.sh +++ b/scripts/dev/kafkastart.sh @@ -3,20 +3,4 @@ set -euo pipefail IFS=$'\n\t' -script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) - -rpk container start - -kafka_port=$(docker port "$(docker ps --filter name=rp-node-0 --format '{{.ID}}')" | grep 9093 | cut -d: -f2) -registry_port=$(docker port "$(docker ps --filter name=rp-node-0 --format '{{.ID}}')" | grep 8081 | cut -d: -f2) - -{ - echo "[grpc]" - echo "port=4242" - echo "[sources.kafka.local]" - echo "bootstrapServers=\"localhost:$kafka_port\"" - echo "schemaRegistry.url=\"http://localhost:$registry_port\"" - echo "fsRefreshRate=10" -} > "$script_dir"/typestream.toml - -echo "export BOOTSTRAP_SERVER=localhost:$kafka_port" +rpk container start --kafka-ports 9092 --schema-registry-ports 8081 --console-port 8080 diff --git a/scripts/dev/typestream.toml b/scripts/dev/typestream.toml new file mode 100644 index 0000000..21f0d43 --- /dev/null +++ b/scripts/dev/typestream.toml @@ -0,0 +1,6 @@ +[grpc] +port=4242 +[sources.kafka.local] +bootstrapServers="localhost:9092" +schemaRegistry.url="http://localhost:8081" +fsRefreshRate=10