Skip to content

Commit 82d4e2e

Browse files
committed
refactor: rename NATS JetStream consumer durable names to consumer names for clarity.
1 parent 4521212 commit 82d4e2e

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

Taskfile.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,8 @@ tasks:
437437
--nats-url="nats://127.0.0.1:4222" \
438438
--nats-subject="audit.>" \
439439
--nats-queue-group="search-indexer" \
440-
--nats-durable-name="search-indexer" \
440+
--nats-audit-consumer-name="search-indexer" \
441+
--nats-reindex-consumer-name="search-reindexer" \
441442
--nats-stream-name="AUDIT_EVENTS" \
442443
--meilisearch-domain="http://127.0.0.1:7700"
443444
silent: true

cmd/search/indexer/command.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ import (
2222
// ResourceIndexerOptions holds the configuration for the resource indexer.
2323
type ResourceIndexerOptions struct {
2424
// NATS connection and consumer settings
25-
NatsURL string
26-
NatsDurableName string
27-
NatsStreamName string
25+
NatsURL string
26+
NatsAuditConsumerName string
27+
NatsStreamName string
2828

2929
// NATS re-index consumer settings (separate REINDEX_EVENTS stream)
30-
NatsReindexStream string
31-
NatsReindexDurableName string
30+
NatsReindexStream string
31+
NatsReindexConsumerName string
3232

3333
// Meilisearch connection and timeout settings
3434
MeilisearchTaskWaitTimeout time.Duration
@@ -48,10 +48,10 @@ type ResourceIndexerOptions struct {
4848
func NewResourceIndexerOptions() *ResourceIndexerOptions {
4949
return &ResourceIndexerOptions{
5050
NatsURL: "nats://nats.nats-system.svc.cluster.local:4222",
51-
NatsDurableName: "search-indexer",
51+
NatsAuditConsumerName: "search-indexer",
5252
NatsStreamName: "AUDIT_EVENTS",
5353
NatsReindexStream: "REINDEX_EVENTS",
54-
NatsReindexDurableName: "search-reindexer",
54+
NatsReindexConsumerName: "search-reindexer",
5555
MeilisearchTaskWaitTimeout: 4 * time.Second,
5656
MeilisearchHTTPTimeout: 60 * time.Second,
5757
MeilisearchDomain: "http://meilisearch.meilisearch-system.svc.cluster.local:7700",
@@ -67,11 +67,11 @@ func NewResourceIndexerOptions() *ResourceIndexerOptions {
6767
// AddFlags adds the flags for the resource indexer to the command.
6868
func (o *ResourceIndexerOptions) AddFlags(fs *pflag.FlagSet) {
6969
fs.StringVar(&o.NatsURL, "nats-url", o.NatsURL, "The URL of the NATS server.")
70-
fs.StringVar(&o.NatsDurableName, "nats-durable-name", o.NatsDurableName, "The durable name of the audit-events JetStream consumer (must match the manifest).")
70+
fs.StringVar(&o.NatsAuditConsumerName, "nats-audit-consumer-name", o.NatsAuditConsumerName, "The name of the audit-events JetStream consumer (must match the manifest).")
7171
fs.StringVar(&o.NatsStreamName, "nats-stream-name", o.NatsStreamName, "The name of the audit-events JetStream stream.")
7272

7373
fs.StringVar(&o.NatsReindexStream, "nats-reindex-stream", o.NatsReindexStream, "The JetStream stream name for re-index messages.")
74-
fs.StringVar(&o.NatsReindexDurableName, "nats-reindex-durable-name", o.NatsReindexDurableName, "The durable name of the re-index JetStream consumer (must match the manifest).")
74+
fs.StringVar(&o.NatsReindexConsumerName, "nats-reindex-consumer-name", o.NatsReindexConsumerName, "The name of the re-index JetStream consumer (must match the manifest).")
7575

7676
fs.StringVar(&o.MeilisearchDomain, "meilisearch-domain", o.MeilisearchDomain, "Domain of the Meilisearch instance.")
7777
fs.DurationVar(&o.MeilisearchTaskWaitTimeout, "meilisearch-task-wait-timeout", o.MeilisearchTaskWaitTimeout, "Timeout for waiting for Meilisearch tasks to complete.")
@@ -89,17 +89,17 @@ func (o *ResourceIndexerOptions) Validate() error {
8989
if o.NatsURL == "" {
9090
return fmt.Errorf("nats-url must be set")
9191
}
92-
if o.NatsDurableName == "" {
93-
return fmt.Errorf("nats-durable-name must be set")
92+
if o.NatsAuditConsumerName == "" {
93+
return fmt.Errorf("nats-consummer-name must be set")
9494
}
9595
if o.NatsStreamName == "" {
9696
return fmt.Errorf("nats-stream-name must be set")
9797
}
9898
if o.NatsReindexStream == "" {
9999
return fmt.Errorf("nats-reindex-stream must be set")
100100
}
101-
if o.NatsReindexDurableName == "" {
102-
return fmt.Errorf("nats-reindex-durable-name must be set")
101+
if o.NatsReindexConsumerName == "" {
102+
return fmt.Errorf("nats-reindex-consumer-name must be set")
103103
}
104104
if o.MeilisearchDomain == "" {
105105
return fmt.Errorf("meilisearch-domain must be set")
@@ -219,9 +219,9 @@ func Run(o *ResourceIndexerOptions, ctx context.Context) error {
219219
}
220220

221221
// Consumer is declared in config/components/nats-config/nats-consumer.yaml
222-
auditConsumer, err := auditStream.Consumer(ctx, o.NatsDurableName)
222+
auditConsumer, err := auditStream.Consumer(ctx, o.NatsAuditConsumerName)
223223
if err != nil {
224-
return fmt.Errorf("failed to get consumer %s: %w", o.NatsDurableName, err)
224+
return fmt.Errorf("failed to get consumer %s: %w", o.NatsAuditConsumerName, err)
225225
}
226226

227227
// ── Re-index consumer (separate REINDEX_EVENTS stream) ──────────────────
@@ -232,9 +232,9 @@ func Run(o *ResourceIndexerOptions, ctx context.Context) error {
232232
}
233233

234234
// Consumer is declared in config/components/nats-config/nats-consumer.yaml
235-
reindexJSConsumer, err := reindexStream.Consumer(ctx, o.NatsReindexDurableName)
235+
reindexJSConsumer, err := reindexStream.Consumer(ctx, o.NatsReindexConsumerName)
236236
if err != nil {
237-
return fmt.Errorf("failed to get re-index consumer %s: %w", o.NatsReindexDurableName, err)
237+
return fmt.Errorf("failed to get re-index consumer %s: %w", o.NatsReindexConsumerName, err)
238238
}
239239

240240
// ── Meilisearch client ──────────────────────────────────────────────────

0 commit comments

Comments
 (0)