refactor: don't replace dots in subjects

bounoable · bounoable · commit 2fb98fe9876e · 2025-07-14T17:48:33.000+02:00
Other changes:
- build(docker): update base golang images from 1.22.9 to 1.23.0 for all Dockerfiles
- build(docker): remove version '3.8' from all docker-compose YAML files to simplify configs
- refactor(nats/options.go): improve comments formatting and clarity for QueueGroup and LoadBalancer options
- refactor(nats/options.go): remove RawSubjectFunc and simplify SubjectFunc implementation
- fix(nats/options.go): change defaultSubjectFunc to return eventName without replacing dots
- build(go): update go version from 1.22.9 to 1.23.0 and add toolchain go1.23.11 in go.work file
diff --git a/.docker/coverage.Dockerfile b/.docker/coverage.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.9
+FROM golang:1.23.0
 ARG TAGS
 ENV TAGS $TAGS
 WORKDIR /coverage
diff --git a/.docker/coverage.yml b/.docker/coverage.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   nats:
     image: nats
diff --git a/.docker/github.Dockerfile b/.docker/github.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.9
+FROM golang:1.23.0
 ARG TAGS
 ENV TAGS $TAGS
 WORKDIR /github
diff --git a/.docker/github.yml b/.docker/github.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   nats:
     image: nats
diff --git a/.docker/mongo-test.yml b/.docker/mongo-test.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   mongostore:
     image: mongo
diff --git a/.docker/nats-bench.Dockerfile b/.docker/nats-bench.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.9
+FROM golang:1.23.0
 WORKDIR /test
 COPY go.mod go.sum /test/
 RUN go mod download
diff --git a/.docker/nats-bench.yml b/.docker/nats-bench.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   jetstream:
     image: nats
diff --git a/.docker/nats-test.yml b/.docker/nats-test.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   nats:
     image: nats
diff --git a/.docker/postgres-test.yml b/.docker/postgres-test.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   postgres:
     image: postgres:latest
diff --git a/.docker/tag-test.Dockerfile b/.docker/tag-test.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.9
+FROM golang:1.23.0
 ARG TAGS
 ARG TEST_PATH=./...
 ENV TAGS $TAGS
diff --git a/backend/nats/options.go b/backend/nats/options.go
@@ -57,7 +57,7 @@ func EatErrors() EventBusOption {
 // This option has no effect if used with the "jetstream" driver in "pull" mode
 // (default).
 //
-// Use Case
+// # Use Case
 //
 // Queue groups can be used to load-balance between multiple subscribers of the
 // same event. When multiple subscribers are subscribed to an event and use the
@@ -91,9 +91,10 @@ func QueueGroup(fn func(eventName string) string) EventBusOption {
 // between event buses that share the same serviceName. The option applies the
 // QueueGroup option so that the queue group for the subscription to an event is
 // built in the following format:
+//
 //	fmt.Sprintf("%s:%s", <serviceName>, <eventName>)
 //
-// Caution
+// # Caution
 //
 // Providing a load-balanced event bus as the underlying bus to a command bus
 // should be avoided, and providing it to a projection schedule should be done
@@ -121,22 +122,16 @@ func LoadBalancer(serviceName string) EventBusOption {
 	})
 }
 
-// RawSubjectFunc returns an option that specifies how the NATS subjects for
-// event names are generated without any modifications.
-func RawSubjectFunc(fn func(eventName string) string) EventBusOption {
-	return func(bus *EventBus) {
-		bus.subjectFunc = fn
-	}
-}
-
 // SubjectFunc returns an option that specifies how the NATS subjects for event
-// names are generated. Any "." in the subject are replaced by "_".
+// names are generated.
+//
+// By default, the event name is used as the subject.
 //
-// By default, a subject is the event name with "." replaced by "_".
+// Read more about subjects: https://docs.nats.io/nats-concepts/subjects
 func SubjectFunc(fn func(eventName string) string) EventBusOption {
-	return RawSubjectFunc(func(eventName string) string {
-			return replaceDots(fn(eventName))
-	})
+	return func(bus *EventBus) {
+		bus.subjectFunc = fn
+	}
 }
 
 // SubjectFunc returns an option that specifies how the NATS subjects for event
@@ -158,7 +153,7 @@ func PullTimeout(d time.Duration) EventBusOption {
 }
 
 func defaultSubjectFunc(eventName string) string {
-	return replaceDots(eventName)
+	return eventName
 }
 
 func noQueue(string) (q string) { return }
diff --git a/go.work.sum b/go.work.sum

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.22.9`
	`1`	`+FROM golang:1.23.0`
`2`	`2`	`ARG TAGS`
`3`	`3`	`ENV TAGS $TAGS`
`4`	`4`	`WORKDIR /coverage`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-version: '3.8'`
`2`	`1`	`services:`
`3`	`2`	`nats:`
`4`	`3`	`image: nats`