Skip to content

Commit cedb175

Browse files
lucapettelucapette
authored
chore: use version catalog everywhere for deps (#28)
While streamlining the way we do dependencies, I realised I forgot to use the k8sclient in the tools project so I also fixed that.
1 parent eb5021e commit cedb175

File tree

7 files changed

+54
-43
lines changed

7 files changed

+54
-43
lines changed

‎buildSrc/src/main/kotlin/typestream.kotlin-conventions.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ group = "io.typestream"
1212

1313
repositories {
1414
mavenCentral()
15-
maven("https://packages.confluent.io/maven/") //TODO this doesn't belong here
1615
}
1716

1817
dependencies {

‎libs/k8s-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ plugins {
33
}
44

55
dependencies {
6-
implementation("io.fabric8:kubernetes-client:6.9.0")
6+
implementation(libs.kubernetes.client)
77
}

‎libs/testing/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ dependencies {
1212
implementation(project(":libs:konfig"))
1313
implementation(libs.avro)
1414
implementation(libs.bundles.kafka)
15-
implementation("org.testcontainers:redpanda:${libs.versions.testcontainers.get()}")
16-
17-
implementation("io.confluent:kafka-avro-serializer:7.1.0")
15+
implementation(libs.test.containers.redpanda)
16+
implementation(libs.kafka.avro.serializer)
1817
}

‎server/build.gradle.kts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ plugins {
55
application
66
}
77

8+
repositories {
9+
mavenCentral()
10+
maven("https://packages.confluent.io/maven/")
11+
}
12+
813
application {
914
mainClass.set("io.typestream.Main")
1015
}
@@ -16,19 +21,17 @@ dependencies {
1621
implementation(project(":libs:version-info"))
1722
implementation(project(":stub"))
1823

24+
implementation(libs.avro)
1925
implementation(libs.bundles.kafka)
2026
implementation(libs.bundles.sf4j)
21-
implementation(libs.avro)
22-
23-
implementation("com.squareup.okhttp3:okhttp:4.10.0")
24-
2527
runtimeOnly(libs.grpc.netty)
26-
implementation("io.grpc:grpc-services:${libs.versions.grpc.get()}")
28+
implementation(libs.grpc.services)
29+
implementation(libs.okhttp)
2730

2831
testImplementation(project(":libs:testing"))
2932
testImplementation(libs.bundles.testcontainers)
30-
testImplementation("org.testcontainers:redpanda:${libs.versions.testcontainers.get()}")
31-
testImplementation("io.grpc:grpc-testing:${libs.versions.grpc.get()}")
33+
testImplementation(libs.test.containers.redpanda)
34+
testImplementation(libs.grpc.testing)
3235
}
3336

3437
jib {

‎settings.gradle.kts

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,47 @@
11
rootProject.name = "typestream"
2-
include("libs:testing", "libs:k8s-client", "libs:konfig", "libs:option", "libs:version-info", "protos", "stub", "server", "tools")
2+
3+
include(
4+
"libs:testing",
5+
"libs:k8s-client",
6+
"libs:konfig",
7+
"libs:option",
8+
"libs:version-info",
9+
"protos",
10+
"stub",
11+
"server",
12+
"tools"
13+
)
314

415
dependencyResolutionManagement {
516
versionCatalogs {
617
create("libs") {
18+
version("avro", "1.11.2")
19+
version("confluent", "7.1.0")
720
version("grpc", "1.57.2")
821
version("grpcKotlin", "1.3.1")
22+
version("kafka", "3.1.0")
23+
version("kubernetes-client", "6.9.0")
24+
version("okhttp", "4.10.0")
925
version("protobuf", "3.24.2")
26+
version("rocksdbjni", "6.29.4.1")
1027
version("slf4j", "2.0.7")
11-
version("kafka", "3.1.0")
1228
version("testcontainers", "1.19.0")
13-
version("avro", "1.11.2")
14-
version("rocksdbjni", "6.29.4.1")
1529

1630
library("avro", "org.apache.avro", "avro").versionRef("avro")
17-
library("rocksdbjni", "org.rocksdb", "rocksdbjni").versionRef("rocksdbjni")
31+
library("grpc-netty", "io.grpc", "grpc-netty").versionRef("grpc")
32+
library("grpc-services", "io.grpc", "grpc-services").versionRef("grpc")
33+
library("grpc-testing", "io.grpc", "grpc-testing").versionRef("grpc")
1834
library("kafka-clients", "org.apache.kafka", "kafka-clients").versionRef("kafka")
1935
library("kafka-streams", "org.apache.kafka", "kafka-streams").versionRef("kafka")
20-
library("grpc-netty", "io.grpc", "grpc-netty").versionRef("grpc")
36+
library("kafka-avro-serializer", "io.confluent", "kafka-avro-serializer").versionRef("confluent")
37+
library("kubernetes-client", "io.fabric8", "kubernetes-client").versionRef("kubernetes-client")
38+
library("okhttp", "com.squareup.okhttp3", "okhttp").versionRef("okhttp")
39+
library("rocksdbjni", "org.rocksdb", "rocksdbjni").versionRef("rocksdbjni")
2140
library("slf4j-simple", "org.slf4j", "slf4j-simple").versionRef("slf4j")
2241
library("slf4j-api", "org.slf4j", "slf4j-api").versionRef("slf4j")
2342
library("test-containers", "org.testcontainers", "testcontainers-bom").versionRef("testcontainers")
2443
library("test-containers-junit", "org.testcontainers", "junit-jupiter").versionRef("testcontainers")
44+
library("test-containers-redpanda", "org.testcontainers", "redpanda").versionRef("testcontainers")
2545

2646
bundle("sf4j", listOf("slf4j-api", "slf4j-simple"))
2747
bundle("kafka", listOf("kafka-clients", "kafka-streams", "rocksdbjni"))

‎tools/build.gradle.kts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,28 @@ plugins {
55
application
66
}
77

8+
repositories {
9+
mavenCentral()
10+
maven("https://packages.confluent.io/maven/")
11+
}
12+
813
application {
914
mainClass.set("io.typestream.tools.Main")
1015
}
1116

1217
dependencies {
13-
implementation(project(":libs:testing"))
1418
implementation(project(":libs:konfig"))
19+
implementation(project(":libs:k8s-client"))
20+
implementation(project(":libs:testing"))
1521
implementation(project(":libs:version-info"))
16-
implementation("io.fabric8:kubernetes-client:6.8.1")
1722

18-
implementation(libs.bundles.sf4j)
19-
implementation(libs.bundles.kafka)
2023
implementation(libs.avro)
21-
implementation("io.confluent:kafka-avro-serializer:7.3.0")
24+
implementation(libs.bundles.kafka)
25+
implementation(libs.bundles.sf4j)
26+
implementation(libs.kafka.avro.serializer)
2227

2328
testImplementation(libs.bundles.testcontainers)
24-
testImplementation("org.testcontainers:redpanda:${libs.versions.testcontainers.get()}")
29+
testImplementation(libs.test.containers.redpanda)
2530
}
2631

2732
jib {

‎tools/src/main/kotlin/io/typestream/tools/Main.kt

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package io.typestream.tools
22

3-
import io.fabric8.kubernetes.client.ConfigBuilder
4-
import io.fabric8.kubernetes.client.KubernetesClientBuilder
53
import io.github.oshai.kotlinlogging.KotlinLogging
4+
import io.typestream.k8s.K8sClient
65
import io.typestream.tools.command.seed
76
import io.typestream.tools.command.streamPageViews
87
import java.io.FileInputStream
@@ -51,26 +50,12 @@ class Main(konfig: io.typestream.konfig.Konfig) {
5150
val serverConfig: InputStream? = if (kubernetesMode) {
5251
logger.info { "running in kubernetes mode" }
5352

54-
val kubeConfig = ConfigBuilder()
55-
.withConnectionTimeout(100)
56-
.withRequestTimeout(100)
57-
.build()
58-
val client = KubernetesClientBuilder().withConfig(kubeConfig).build()
53+
val k8sClient = K8sClient()
5954

6055
logger.info { "fetching config" }
6156

62-
client.use {
63-
val configMap = client.configMaps()
64-
.inNamespace("typestream")
65-
.withName("server-config")
66-
.get()
67-
logger.info { "config: ${configMap.data["server.properties"]}" }
68-
69-
if (configMap != null) {
70-
configMap.data["server.properties"]?.byteInputStream()
71-
} else {
72-
null
73-
}
57+
k8sClient.use {
58+
it.getServerProperties()
7459
}
7560
} else {
7661
logger.info { "running in local mode" }

0 commit comments

Comments
 (0)