Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion api/v1/store_env.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,15 @@ func (s *Store) getWorker() []corev1.EnvVar {
Name: "MESSENGER_TRANSPORT_DSN",
Value: s.Spec.Worker.RedisDSN,
},
{
Name: "MESSENGER_CONSUMER_NAME",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
APIVersion: "v1",
FieldPath: "metadata.name",
},
},
},
}
}

Expand All @@ -202,12 +211,21 @@ func (s *Store) getWorker() []corev1.EnvVar {
{
Name: "MESSENGER_TRANSPORT_DSN",
Value: fmt.Sprintf(
"redis://%s:%d/messages/symfony/consumer?auto_setup=true&serializer=1&stream_max_entries=0&dbindex=%d",
"redis://%s:%d/messages/symfony?auto_setup=true&serializer=1&stream_max_entries=0&dbindex=%d",
s.Spec.Worker.RedisHost,
s.Spec.Worker.RedisPort,
s.Spec.Worker.RedisIndex,
),
},
{
Name: "MESSENGER_CONSUMER_NAME",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
APIVersion: "v1",
FieldPath: "metadata.name",
},
},
},
}
}
return []corev1.EnvVar{}
Expand Down
14 changes: 11 additions & 3 deletions api/v1/store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -540,14 +540,18 @@ func TestWorkerRedisDsnOverwrite(t *testing.T) {
}

env := store.GetEnv()
var foundDSN bool
var foundDSN, foundConsumerName bool
for _, envVar := range env {
if envVar.Name == "MESSENGER_TRANSPORT_DSN" {
foundDSN = true
assert.Equal(t, "redis://worker-redis:6380/messages?password=secret&group=custom", envVar.Value)
}
if envVar.Name == "MESSENGER_CONSUMER_NAME" {
foundConsumerName = true
}
}
assert.True(t, foundDSN, "MESSENGER_TRANSPORT_DSN should be set with DSN value")
assert.True(t, foundConsumerName, "MESSENGER_CONSUMER_NAME should be set")
})

t.Run("Worker without DSN", func(t *testing.T) {
Expand All @@ -565,13 +569,17 @@ func TestWorkerRedisDsnOverwrite(t *testing.T) {
}

env := store.GetEnv()
var foundDSN bool
var foundDSN, foundConsumerName bool
for _, envVar := range env {
if envVar.Name == "MESSENGER_TRANSPORT_DSN" {
foundDSN = true
assert.Equal(t, "redis://worker-host:6379/messages/symfony/consumer?auto_setup=true&serializer=1&stream_max_entries=0&dbindex=3", envVar.Value)
assert.Equal(t, "redis://worker-host:6379/messages/symfony?auto_setup=true&serializer=1&stream_max_entries=0&dbindex=3", envVar.Value)
}
if envVar.Name == "MESSENGER_CONSUMER_NAME" {
foundConsumerName = true
}
}
assert.True(t, foundDSN, "MESSENGER_TRANSPORT_DSN should be built from individual fields")
assert.True(t, foundConsumerName, "MESSENGER_CONSUMER_NAME should be set")
})
}
Loading