Linter

roadrunner-server · Nov 7, 2023 · c921692 · c921692
1 parent e3adfb7
commit c921692
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/natsjobs/config.go b/natsjobs/config.go
@@ -6,7 +6,7 @@ import (
 
 const (
 	pipeSubject            string = "subject"
-	pipeStream             string = "streamID"
+	pipeStream             string = "stream_id"
 	pipePrefetch           string = "prefetch"
 	pipeDeleteAfterAck     string = "delete_after_ack"
 	pipeDeliverNew         string = "deliver_new"
@@ -21,7 +21,7 @@ type config struct {
 
 	Priority           int64  `mapstructure:"priority"`
 	Subject            string `mapstructure:"subject"`
-	StreamId           string `mapstructure:"streamID"`
+	StreamID           string `mapstructure:"stream_id"`
 	Prefetch           int    `mapstructure:"prefetch"`
 	RateLimit          uint64 `mapstructure:"rate_limit"`
 	DeleteAfterAck     bool   `mapstructure:"delete_after_ack"`
@@ -42,8 +42,8 @@ func (c *config) InitDefaults() {
 		c.Priority = 10
 	}
 
-	if c.StreamId == "" {
-		c.StreamId = "default-streamID"
+	if c.StreamID == "" {
+		c.StreamID = "default-streamID"
 	}
 
 	if c.Subject == "" {

diff --git a/natsjobs/driver.go b/natsjobs/driver.go
@@ -120,7 +120,7 @@ func FromConfig(tracer *sdktrace.TracerProvider, configKey string, log *zap.Logg
 	}
 
 	stream, err := js.CreateOrUpdateStream(context.Background(), jetstream.StreamConfig{
-		Name:     conf.StreamId,
+		Name:     conf.StreamID,
 		Subjects: []string{conf.Subject},
 	})
 	if err != nil {
@@ -141,7 +141,7 @@ func FromConfig(tracer *sdktrace.TracerProvider, configKey string, log *zap.Logg
 
 		priority:           conf.Priority,
 		subject:            conf.Subject,
-		streamID:           conf.StreamId,
+		streamID:           conf.StreamID,
 		deleteAfterAck:     conf.DeleteAfterAck,
 		deleteStreamOnStop: conf.DeleteStreamOnStop,
 		prefetch:           conf.Prefetch,

diff --git a/tests/configs/.rr-nats-durability-redial.yaml b/tests/configs/.rr-nats-durability-redial.yaml
@@ -32,7 +32,7 @@ jobs:
       config:
         prefetch: 100
         subject: default.*
-        streamId: foo
+        stream_id: foo
         deliver_new: true
         rate_limit: 100
         delete_after_ack: true
@@ -43,7 +43,7 @@ jobs:
       config:
         prefetch: 100
         subject: default2.*
-        streamId: foo2
+        stream_id: foo2
         rate_limit: 100
         deliver_new: true
         delete_after_ack: true

diff --git a/tests/configs/.rr-nats-init-v27-br.yaml b/tests/configs/.rr-nats-init-v27-br.yaml
@@ -32,7 +32,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default-5.*"
-        streamId: "foo-15"
+        stream_id: "foo-15"
         delete_after_ack: "true"
         deliver_new: "true"
         priority: 1
@@ -43,7 +43,7 @@ jobs:
         prefetch: 100
         subject: "default-6.*"
         delete_after_ack: "true"
-        streamId: "foo-6"
+        stream_id: "foo-6"
         deliver_new: "true"
         priority: 2
 

diff --git a/tests/configs/.rr-nats-init-v27.yaml b/tests/configs/.rr-nats-init-v27.yaml
@@ -32,7 +32,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default-3.*"
-        streamId: "foo-3"
+        stream_id: "foo-3"
         deliver_new: "true"
         priority: 1
 
@@ -41,7 +41,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default-4.*"
-        streamId: "foo-4"
+        stream_id: "foo-4"
         deliver_new: "true"
         priority: 2
 

diff --git a/tests/configs/.rr-nats-init.yaml b/tests/configs/.rr-nats-init.yaml
@@ -32,7 +32,7 @@ jobs:
       config:
         prefetch: 100
         subject: "xxxxxxx.*"
-        streamId: "foo"
+        stream_id: "foo"
         delete_after_ack: true
         deliver_new: "true"
         priority: 1
@@ -42,7 +42,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default-2.*"
-        streamId: "foo-2"
+        stream_id: "foo-2"
         deliver_new: "true"
         delete_after_ack: true
         priority: 2

diff --git a/tests/configs/.rr-nats-otel.yaml b/tests/configs/.rr-nats-otel.yaml
@@ -41,7 +41,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default-otel.*"
-        streamId: "foo-otel"
+        stream_id: "foo-otel"
         delete_after_ack: true
         deliver_new: "true"
         priority: 1

diff --git a/tests/configs/.rr-nats-pq.yaml b/tests/configs/.rr-nats-pq.yaml
@@ -30,7 +30,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default-pq.*"
-        streamId: "foo-pq"
+        stream_id: "foo-pq"
         delete_after_ack: true
         deliver_new: "true"
         priority: 1
@@ -40,7 +40,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default-2-pq.*"
-        streamId: "foo-2-pq"
+        stream_id: "foo-2-pq"
         deliver_new: "true"
         delete_after_ack: true
         priority: 2

diff --git a/tests/configs/.rr-nats-raw.yaml b/tests/configs/.rr-nats-raw.yaml
@@ -32,7 +32,7 @@ jobs:
       config:
         prefetch: 100
         subject: default-raw.*
-        streamId: foo-raw
+        stream_id: foo-raw
         consume_all: true
         delete_after_ack: true
         deliver_new: true

diff --git a/tests/configs/.rr-no-global.yaml b/tests/configs/.rr-no-global.yaml
@@ -31,7 +31,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default.*"
-        streamId: "foo"
+        stream_id: "foo"
         deliver_new: "true"
         priority: 1
 
@@ -40,7 +40,7 @@ jobs:
       config:
         prefetch: 100
         subject: "default.*"
-        streamId: "foo"
+        stream_id: "foo"
         deliver_new: "true"
         priority: 2
 

diff --git a/tests/jobs_nats_test.go b/tests/jobs_nats_test.go
@@ -988,7 +988,7 @@ func declareNATSPipe(address, subj, stream string) func(t *testing.T) {
 			"driver":      "nats",
 			"name":        "test-3",
 			"subject":     subj,
-			"streamID":    stream,
+			"stream_id":   stream,
 			"deliver_new": "true",
 			"prefetch":    "100",
 			"priority":    "3",